Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

1、sonarqube质量修复；2、短信模板增删查询移除短信渠道相关内容；

Browse Source
This commit is contained in:
gaoqr
2024-10-11 16:09:34 +08:00
parent 7391b6365d
commit 2da653d9fb
24 changed files with 243 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java
+3 -9
View File
@@ -40,11 +40,11 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
import java.io.File;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ExecutionException;
import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -54,16 +54,10 @@ import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.IMPORT
import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId;
import static com.cf.imes.module.executor.enums.ErrorCodeConstants.*;
import com.cf.imes.module.executor.dal.dataobject.order.OrderDO;
import com.cf.imes.module.executor.service.order.OrderService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import java.util.concurrent.ExecutionException;
@Tag(name = "管理后台 - 生产单管理")
@@ -165,7 +159,7 @@ public class OrderController {
@GetMapping("/get-import-template")
@Operation(summary = "获得导入生产单模板")
@Parameter(name = "value", description = "文件类型", required = true, example = "0")
public void importTemplate(HttpServletResponse response, @RequestParam("value") String value) {
public void importTemplate(HttpServletResponse response, @RequestParam("value") @NotEmpty(message = "文件路径不能为空") String value) {
orderService.exportTemplate(response, value);
}
@@ -404,7 +398,7 @@ public class OrderController {
@Parameter(name = "deleted", description = "是否删除", example = "false")
})
@PreAuthorize("@ss.hasPermission('production:manager-list:detail')")
public CommonResult<Map<String, List<?>>> getModule(@RequestParam("orderId") Long orderId,
public CommonResult<Map<String, List>> getModule(@RequestParam("orderId") Long orderId,
@RequestParam(value = "deleted", required = false, defaultValue = "false") Boolean deleted) {
if (deleted == null) {
deleted = false;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailVO.java
+4 -1
View File
@@ -4,13 +4,16 @@ import com.cf.imes.module.executor.controller.admin.plan.dto.*;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author Beal
*/
@Data
public class PlateDetailVO {
public class PlateDetailVO implements Serializable {
private static final long serialVersionUID = 5934179383701994502L;
@Schema(description = "生产单id")
private Long orderId;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java
+1 -1
View File
@@ -64,7 +64,7 @@ public interface OrderService {
* @param orderId: 生产单Id
* @return Map<String, List<?>>
*/
Map<String,List<?>> getModule(Long orderId, Integer deleted);
Map<String,List> getModule(Long orderId, Integer deleted);
/**
* @param orderId: 生产单id
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
+31 -37
View File
File diff suppressed because one or more lines are too long
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+37 -27
View File
@@ -119,6 +119,16 @@ public class PlanServiceImpl implements PlanService {
@Resource
private OptimizePlanService optimizePlanService;
// 重复使用的常量
private static final String FIELD_OG_ID = "og.id";
private static final String FIELD_OP_FILTER_TYPE = "op.filter_type";
private static final String FIELD_OP_IS_SPECIAL_SHAPED = "op.is_special_shaped";
private static final String FIELD_IS_SCULPT = "op.is_sculpt";
private static final String FIELD_IS_DOOR = "op.is_door";
private static final String FIELD_OP_HEIGHT = "op.height";
private static final String FIELD_OP_WIDTH = "op.width";
private static final String FIELD_PLANID = "planId";
@Override
@Transactional(rollbackFor = Exception.class)
public Map<String,Long> createPlan(PlanSaveReqVO createReqVO) {
@@ -587,20 +597,20 @@ public class PlanServiceImpl implements PlanService {
// .eq("og.deleted",false)
// .isNull("opi.item_id")
// todo 修改排单数据筛选，目前只解决了非混单的情况，混单情况待解决
.inIfPresent("og.id",goodsIds)
.inIfPresent(FIELD_OG_ID,goodsIds)
.inIfPresent("o.id",pageReqVO.getOrderIds())
.likeIfPresent("o.id", pageReqVO.getOrderId() != null ? pageReqVO.getOrderId().toString() : null)
.inIfPresent("og.id",pageReqVO.getIds())
.inIfPresent(FIELD_OG_ID,pageReqVO.getIds())
.likeIfPresent("o.customer", pageReqVO.getConsignee())
.likeIfPresent("o.custom_order_no", pageReqVO.getDefaultId())
.likeIfPresent("o.address", pageReqVO.getConsigneeAddress())
.betweenIfPresent("o.order_date", pageReqVO.getCreateTime())
.eqIfPresent("op.is_special_shaped", pageReqVO.getRectangle() != null ? false: null)
.eqIfPresent("op.is_special_shaped", pageReqVO.getSpecialShaped())
.eqIfPresent("op.is_sculpt", pageReqVO.getSculpt())
.eqIfPresent("op.is_door", pageReqVO.getIsDoor())
.betweenIfPresent("op.height", new BigDecimal[]{pageReqVO.getLongMinRang(), pageReqVO.getLongMaxRang()})
.betweenIfPresent("op.width", new BigDecimal[]{pageReqVO.getWidthMinRang(), pageReqVO.getWidthMaxRang()})
.eqIfPresent(FIELD_OP_IS_SPECIAL_SHAPED, pageReqVO.getRectangle() != null ? false: null)
.eqIfPresent(FIELD_OP_IS_SPECIAL_SHAPED, pageReqVO.getSpecialShaped())
.eqIfPresent(FIELD_IS_SCULPT, pageReqVO.getSculpt())
.eqIfPresent(FIELD_IS_DOOR, pageReqVO.getIsDoor())
.betweenIfPresent(FIELD_OP_HEIGHT, new BigDecimal[]{pageReqVO.getLongMinRang(), pageReqVO.getLongMaxRang()})
.betweenIfPresent(FIELD_OP_WIDTH, new BigDecimal[]{pageReqVO.getWidthMinRang(), pageReqVO.getWidthMaxRang()})
.orderByDesc("o.id");
String filterTypes = "";
@@ -614,7 +624,7 @@ public class PlanServiceImpl implements PlanService {
filterTypes += PlanFilterTypeEnum.TWODIMENSIONALCUTTINGPATH.getType().toString();
}
queryWrapperX.likeIfPresent("op.filter_type", insertSeparator(filterTypes));
queryWrapperX.likeIfPresent(FIELD_OP_FILTER_TYPE, insertSeparator(filterTypes));
// todo 目前修改一半，速度无法再进行特别的优化，需等后面修改表结构再进行优化
@@ -802,7 +812,7 @@ public class PlanServiceImpl implements PlanService {
// .eq("og.plan_id",0)
// .eq("og.deleted",false)
.inIfPresent("og.order_id", pageReqVO.getOrderIds())
.inIfPresent("og.id", pageReqVO.getIds())
.inIfPresent(FIELD_OG_ID, pageReqVO.getIds())
// todo 修改排单数据筛选，目前只解决了非混单的情况，混单情况待解决
.eqIfPresent("og.goods_id",pageReqVO.getGoodsId())
.likeIfPresent("o.id", pageReqVO.getOrderId() != null ? pageReqVO.getOrderId().toString() : null)
@@ -810,12 +820,12 @@ public class PlanServiceImpl implements PlanService {
.likeIfPresent("o.custom_order_no", pageReqVO.getDefaultId())
.likeIfPresent("o.address", pageReqVO.getConsigneeAddress())
.betweenIfPresent("o.order_date", pageReqVO.getCreateTime())
.eqIfPresent("op.is_special_shaped", pageReqVO.getRectangle() != null ? false: null)
.eqIfPresent("op.is_special_shaped", pageReqVO.getSpecialShaped())
.eqIfPresent("op.is_sculpt", pageReqVO.getSculpt())
.eqIfPresent("op.is_door", pageReqVO.getIsDoor())
.betweenIfPresent("op.height", new BigDecimal[]{pageReqVO.getLongMinRang(), pageReqVO.getLongMaxRang()})
.betweenIfPresent("op.width", new BigDecimal[]{pageReqVO.getWidthMinRang(), pageReqVO.getWidthMaxRang()});
.eqIfPresent(FIELD_OP_IS_SPECIAL_SHAPED, pageReqVO.getRectangle() != null ? false: null)
.eqIfPresent(FIELD_OP_IS_SPECIAL_SHAPED, pageReqVO.getSpecialShaped())
.eqIfPresent(FIELD_IS_SCULPT, pageReqVO.getSculpt())
.eqIfPresent(FIELD_IS_DOOR, pageReqVO.getIsDoor())
.betweenIfPresent(FIELD_OP_HEIGHT, new BigDecimal[]{pageReqVO.getLongMinRang(), pageReqVO.getLongMaxRang()})
.betweenIfPresent(FIELD_OP_WIDTH, new BigDecimal[]{pageReqVO.getWidthMinRang(), pageReqVO.getWidthMaxRang()});
String filterTypes = "";
if (Objects.nonNull(pageReqVO.getHoleThrough()) && pageReqVO.getHoleThrough()) {
filterTypes += PlanFilterTypeEnum.DIGGINGTHROUGHTHESHAPE.getType().toString();
@@ -827,7 +837,7 @@ public class PlanServiceImpl implements PlanService {
filterTypes += PlanFilterTypeEnum.TWODIMENSIONALCUTTINGPATH.getType().toString();
}
queryWrapperX.likeIfPresent("op.filter_type", insertSeparator(filterTypes));
queryWrapperX.likeIfPresent(FIELD_OP_FILTER_TYPE, insertSeparator(filterTypes));
IPage<OrderGoodsResp> orderGoodsResps = orderMapper.selectOrderIds(page,queryWrapperX);
@@ -925,13 +935,13 @@ public class PlanServiceImpl implements PlanService {
queryWrapperX.eq("og.organ_id",getUserOrganId())
.eq("og.deleted",false)
.in("og.plan_id", vo.getPlanIds())
.eqIfPresent("op.is_door", vo.getIsDoor())
.eqIfPresent("op.is_special_shaped", vo.getRectangle() != null ? false: null)
.eqIfPresent("op.is_special_shaped", vo.getSpecialShaped())
.eqIfPresent("op.is_sculpt", vo.getSculpt())
.betweenIfPresent("op.width", new BigDecimal[]{vo.getWidthMinRang(), vo.getWidthMaxRang()})
.betweenIfPresent("op.height", new BigDecimal[]{vo.getLongMinRang(), vo.getLongMaxRang()})
.likeIfPresent("op.filter_type", insertSeparator(filterTypes));
.eqIfPresent(FIELD_IS_DOOR, vo.getIsDoor())
.eqIfPresent(FIELD_OP_IS_SPECIAL_SHAPED, vo.getRectangle() != null ? false: null)
.eqIfPresent(FIELD_OP_IS_SPECIAL_SHAPED, vo.getSpecialShaped())
.eqIfPresent(FIELD_IS_SCULPT, vo.getSculpt())
.betweenIfPresent(FIELD_OP_WIDTH, new BigDecimal[]{vo.getWidthMinRang(), vo.getWidthMaxRang()})
.betweenIfPresent(FIELD_OP_HEIGHT, new BigDecimal[]{vo.getLongMinRang(), vo.getLongMaxRang()})
.likeIfPresent(FIELD_OP_FILTER_TYPE, insertSeparator(filterTypes));
PageDTO<PlateResList> page = new PageDTO<>(vo.getPageNo(), vo.getPageSize());
@@ -1057,7 +1067,7 @@ public class PlanServiceImpl implements PlanService {
DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder();
builder.index(index);
builder.query(q -> q.terms(b -> b.field("planId").terms(e -> e.value(fieldValues))));
builder.query(q -> q.terms(b -> b.field(FIELD_PLANID).terms(e -> e.value(fieldValues))));
try {
DeleteByQueryResponse response = elasticsearchClient.deleteByQuery(builder.build());
@@ -1075,7 +1085,7 @@ public class PlanServiceImpl implements PlanService {
SearchRequest.Builder builder = new SearchRequest.Builder();
builder.index(index);
builder.size(size);
builder.query(q -> q.terms(b -> b.field("planId").terms(e -> e.value(fieldValues))));
builder.query(q -> q.terms(b -> b.field(FIELD_PLANID).terms(e -> e.value(fieldValues))));
try {
SearchResponse<OptimizeBoardModelDO> search = elasticsearchClient.search(builder.build(), OptimizeBoardModelDO.class);
List<Hit<OptimizeBoardModelDO>> hits = search.hits().hits();
@@ -1094,7 +1104,7 @@ public class PlanServiceImpl implements PlanService {
SearchRequest.Builder builder = new SearchRequest.Builder();
builder.index(index);
builder.size(size);
builder.query(q -> q.term(b -> b.field("planId").value(planId)));
builder.query(q -> q.term(b -> b.field(FIELD_PLANID).value(planId)));
try {
SearchResponse<OptimizeBoardModelDO> search = elasticsearchClient.search(builder.build(), OptimizeBoardModelDO.class);
List<Hit<OptimizeBoardModelDO>> hits = search.hits().hits();
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/FileTypeChangeUtil.java
-28
View File
@@ -1,28 +0,0 @@
package com.cf.imes.module.executor.util;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.List;
/**
* 生产单新增传入文件格式转换工具
*/
public interface FileTypeChangeUtil {
// 文件数据格式转换
<T> List<?> fileDataChange(MultipartFile file) throws IOException;
// Api数据格式转换
// ds数据转换
// 数据转换成功判断
boolean getFlag();
// 根据文件类型判断使用那种方式进行数据转换
default <T> List<?> chooseType(MultipartFile file, String type) throws IOException {
if (type.equals("cf_cad"))
return fileDataChange(file);
return null;
}
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/ToolUtil.java
+4 -3
View File
@@ -34,20 +34,21 @@ public class ToolUtil {
// 日期格式转换
public static Map<String, Object> changeDate(String date, DateTimeFormatter formatter) {
String errorKey = "error";
Map<String, Object> map = new HashMap<>();
LocalDate localDate;
if (date == null){
localDate = LocalDate.now();
map.put("date", localDate);
map.put("error", 0);
map.put(errorKey, 0);
}else {
try {
localDate = LocalDate.parse(date, formatter);
map.put("date", localDate);
map.put("error", 1);
map.put(errorKey, 1);
} catch (DateTimeParseException e) {
map.put("date", date);
map.put("error", -1);
map.put(errorKey, -1);
}
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiDataAchieve.java
+50 -43
View File
@@ -1,10 +1,8 @@
package com.cf.imes.module.executor.util.fileConversion.admin.api.webcad;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.cf.imes.module.executor.enums.ErrorCodeConstants;
import com.cf.imes.module.system.api.application.ApplicationApi;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
@@ -37,6 +35,15 @@ public class ApiDataAchieve {
private static final int PARTS_PAGE_MAX = 100;
// 重复使用的常量
private static final String ORDER_NO_KEY = "order_no";
private static final String CURR_PAGE_KEY = "curr_page";
private static final String PAGE_COUNT_KEY = "page_count";
private static final String ERR_CODE_KEY = "err_code";
private static final String PAGECOUNT_KEY = "PageCount";
private static final String VALUE_KEY = "value";
// 获得token数据
public Future<JSONObject> getApiToken(Long organId) {
JSONObject app = applicationApi.getApplicationByOrganId(organId);
@@ -55,7 +62,7 @@ public class ApiDataAchieve {
@Async
public Future<JSONObject> getApiPlateProData(String token, String orderNo) {
JSONObject jsonPlatesData = new JSONObject();
jsonPlatesData.put("order_no", "N" + orderNo);//生产单号需要传入赋值
jsonPlatesData.put(ORDER_NO_KEY, "N" + orderNo);//生产单号需要传入赋值
jsonPlatesData.put("format", "json");
JSONObject dataPlates = apiDataProduction.getApiOrderMessage(token, jsonPlatesData);
return new AsyncResult<>(dataPlates);
@@ -65,17 +72,17 @@ public class ApiDataAchieve {
@Async
public Future<JSONObject> getApiPartsMessage(String token, String orderNo) {
JSONObject jsonParts = new JSONObject();
jsonParts.put("curr_page", 1);
jsonParts.put("page_count", PARTS_PAGE_MAX);
jsonParts.put("order_no", "N" + orderNo);
jsonParts.put(CURR_PAGE_KEY, 1);
jsonParts.put(PAGE_COUNT_KEY, PARTS_PAGE_MAX);
jsonParts.put(ORDER_NO_KEY, "N" + orderNo);
JSONObject parts = apiDataProduction.getApiOrderPartsMessage(token, jsonParts);
if (!parts.getString("err_code").equals("0")) {
if (!parts.getString(ERR_CODE_KEY).equals("0")) {
log.error("配件数据获取错误" + "N" + orderNo);
throw exception(PARTS_DATA_ERROR);
}
JSONObject dataParts = new JSONObject();
for (int i = 1; i <= parts.getJSONObject("value").getInteger("PageCount"); i++) {
jsonParts.put("curr_page", i);
for (int i = 1; i <= parts.getJSONObject(VALUE_KEY).getInteger(PAGECOUNT_KEY); i++) {
jsonParts.put(CURR_PAGE_KEY, i);
JSONObject value = apiDataProduction.getApiOrderPartsMessage(token, jsonParts);
dataParts = mergeJSONObjects(dataParts, value);
}
@@ -86,17 +93,17 @@ public class ApiDataAchieve {
@Async
public Future<JSONObject> getApiBodyMessage(String token, String orderNo) {
JSONObject jsonBody = new JSONObject();
jsonBody.put("curr_page", 1);
jsonBody.put("page_count", PARTS_PAGE_MAX);
jsonBody.put("order_no", "N" + orderNo);
jsonBody.put(CURR_PAGE_KEY, 1);
jsonBody.put(PAGE_COUNT_KEY, PARTS_PAGE_MAX);
jsonBody.put(ORDER_NO_KEY, "N" + orderNo);
JSONObject body = apiDataProduction.getApiOrderBodyMessage(token, jsonBody);
if (!body.getString("err_code").equals("0")) {
if (!body.getString(ERR_CODE_KEY).equals("0")) {
log.error("柜体数据获取错误" + "N" + orderNo);
throw exception(BODY_DATA_ERROR);
}
JSONObject dataBody = new JSONObject();
for (int i = 1; i <= body.getJSONObject("value").getInteger("PageCount"); i++) {
jsonBody.put("curr_page", i);
for (int i = 1; i <= body.getJSONObject(VALUE_KEY).getInteger(PAGECOUNT_KEY); i++) {
jsonBody.put(CURR_PAGE_KEY, i);
JSONObject value = apiDataProduction.getApiOrderBodyMessage(token, jsonBody);
dataBody = mergeJSONObjects(dataBody, value);
}
@@ -107,17 +114,17 @@ public class ApiDataAchieve {
@Async
public Future<JSONObject> getApiGoodsMessage(String token, String orderNo) {
JSONObject jsonGoods = new JSONObject();
jsonGoods.put("curr_page", 1);
jsonGoods.put("page_count", PARTS_PAGE_MAX);
jsonGoods.put("order_no", "N" + orderNo);
jsonGoods.put(CURR_PAGE_KEY, 1);
jsonGoods.put(PAGE_COUNT_KEY, PARTS_PAGE_MAX);
jsonGoods.put(ORDER_NO_KEY, "N" + orderNo);
JSONObject goods = apiDataProduction.getApiOrderGoodsMessage(token, jsonGoods);
if (!goods.getString("err_code").equals("0")) {
if (!goods.getString(ERR_CODE_KEY).equals("0")) {
log.error("商品信息转换失败" + "N" + orderNo);
throw exception(GOODS_DATA_ERROR);
}
JSONObject dataGoods = new JSONObject();
for (int i = 1; i <= goods.getJSONObject("value").getInteger("PageCount"); i++) {
jsonGoods.put("curr_page", i);
for (int i = 1; i <= goods.getJSONObject(VALUE_KEY).getInteger(PAGECOUNT_KEY); i++) {
jsonGoods.put(CURR_PAGE_KEY, i);
JSONObject value = apiDataProduction.getApiOrderGoodsMessage(token, jsonGoods);
dataGoods = mergeJSONObjects(dataGoods, value);
}
@@ -128,17 +135,17 @@ public class ApiDataAchieve {
@Async
public Future<JSONObject> getApiPlateDetailMessage(String token, String orderNo) {
JSONObject jsonPlates = new JSONObject();
jsonPlates.put("curr_page", 1);
jsonPlates.put("page_count", PARTS_PAGE_MAX);
jsonPlates.put("order_no", "N" + orderNo);
jsonPlates.put(CURR_PAGE_KEY, 1);
jsonPlates.put(PAGE_COUNT_KEY, PARTS_PAGE_MAX);
jsonPlates.put(ORDER_NO_KEY, "N" + orderNo);
JSONObject plates = apiDataProduction.getApiBlocksDataMessage(token, jsonPlates);
if (!plates.getString("err_code").equals("0")) {
if (!plates.getString(ERR_CODE_KEY).equals("0")) {
log.error("板材明细获取错误" + "N" + orderNo);
throw exception(PLATE_DATA_ERROR);
}
JSONObject plate = new JSONObject();
for (int i = 1; i <= plates.getJSONObject("value").getInteger("PageCount"); i++) {
jsonPlates.put("curr_page", i);
for (int i = 1; i <= plates.getJSONObject(VALUE_KEY).getInteger(PAGECOUNT_KEY); i++) {
jsonPlates.put(CURR_PAGE_KEY, i);
JSONObject value = apiDataProduction.getApiBlocksDataMessage(token, jsonPlates);
plate = mergeJSONObjects(plate, value);
}
@@ -149,7 +156,7 @@ public class ApiDataAchieve {
@Async
public Future<JSONObject> getApiGroupMessage(String token, String orderNo) {
JSONObject jsonModule = new JSONObject();
jsonModule.put("order_no", "N" + orderNo);
jsonModule.put(ORDER_NO_KEY, "N" + orderNo);
JSONObject dataModule = apiDataProduction.getApiModuleTypeDataMessage(token, jsonModule);
return new AsyncResult<>(dataModule);
}
@@ -158,16 +165,16 @@ public class ApiDataAchieve {
@Async
public Future<JSONObject> getApiBlocksMessage(String token, String orderNo) {
JSONObject jsonBlocks = new JSONObject();
jsonBlocks.put("curr_page", 1);
jsonBlocks.put("page_count", PARTS_PAGE_MAX);
jsonBlocks.put("order_no", "N" + orderNo);
jsonBlocks.put(CURR_PAGE_KEY, 1);
jsonBlocks.put(PAGE_COUNT_KEY, PARTS_PAGE_MAX);
jsonBlocks.put(ORDER_NO_KEY, "N" + orderNo);
JSONObject blocks = apiDataProduction.getApiBlocksMessage(token, jsonBlocks);
if (!blocks.getString("err_code").equals("0")) {
if (!blocks.getString(ERR_CODE_KEY).equals("0")) {
log.error("板材数据获取错误" + "N" + orderNo);
}
JSONObject block = new JSONObject();
for (int i = 1; i <= blocks.getJSONObject("value").getInteger("PageCount"); i++) {
jsonBlocks.put("curr_page", i);
for (int i = 1; i <= blocks.getJSONObject(VALUE_KEY).getInteger(PAGECOUNT_KEY); i++) {
jsonBlocks.put(CURR_PAGE_KEY, i);
JSONObject value = apiDataProduction.getApiBlocksMessage(token, jsonBlocks);
block = mergeJSONObjects(block, value);
}
@@ -177,7 +184,7 @@ public class ApiDataAchieve {
// 订单获取
public Future<JSONObject> getApiOrder(String token, String shopId, String orderNo) {
JSONObject jsonOrders = new JSONObject();
jsonOrders.put("order_no", shopId + "@N" +orderNo);
jsonOrders.put(ORDER_NO_KEY, shopId + "@N" +orderNo);
JSONObject order = apiDataProduction.getApiOrderList(token, jsonOrders);
return new AsyncResult<>(order);
}
@@ -201,24 +208,24 @@ public class ApiDataAchieve {
jsonOrders.put("create_date_max", createDateMax + " 23:59:59");
}
jsonOrders.put("curr_page", 1);
jsonOrders.put("page_count", PARTS_PAGE_MAX);
jsonOrders.put(CURR_PAGE_KEY, 1);
jsonOrders.put(PAGE_COUNT_KEY, PARTS_PAGE_MAX);
if (orderNo != null) {
jsonOrders.put("order_no", shopId + "@N" +orderNo);
jsonOrders.put(ORDER_NO_KEY, shopId + "@N" +orderNo);
}
if (customOrderNo != null){
jsonOrders.put("custom_order_no", customOrderNo);
}
JSONObject orders = apiDataProduction.getApiOrderList(token, jsonOrders);
if (!orders.getString("err_code").equals("0")) {
if (!orders.getString(ERR_CODE_KEY).equals("0")) {
throw exception(ORDER_READ_ERR);
}
JSONObject order = new JSONObject();
int countPage = divideWithPlusOne(orders.getInteger("count"), PARTS_PAGE_MAX);
for (int i = 1; i <= countPage; i++) {
jsonOrders.put("curr_page", i);
jsonOrders.put(CURR_PAGE_KEY, i);
JSONObject value = apiDataProduction.getApiOrderList(token, jsonOrders);
order = mergeData(order, value);
}
@@ -232,8 +239,8 @@ public class ApiDataAchieve {
// 合并 List 属性
JSONArray mergedList = new JSONArray();
JSONArray list1 = null;
if (object1.getJSONObject("value") != null) {
list1 = object1.getJSONObject("value").getJSONArray("List");
if (object1.getJSONObject(VALUE_KEY) != null) {
list1 = object1.getJSONObject(VALUE_KEY).getJSONArray("List");
if (list1 != null) {
for (int i = 0; i < list1.size(); i++) {
mergedList.add(list1.getJSONObject(i));
@@ -248,7 +255,7 @@ public class ApiDataAchieve {
}
}
}
JSONArray list2 = object2.getJSONObject("value").getJSONArray("List");
JSONArray list2 = object2.getJSONObject(VALUE_KEY).getJSONArray("List");
if (list2 != null) {
for (int i = 0; i < list2.size(); i++) {
mergedList.add(list2.getJSONObject(i));
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/VO/RemarkXmlVOS.java
+4 -1
View File
@@ -8,6 +8,7 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
import java.util.List;
@Data
@@ -15,7 +16,9 @@ import java.util.List;
@NoArgsConstructor
@XmlRootElement(name = "Remarks")
@XmlAccessorType(XmlAccessType.FIELD)
public class RemarkXmlVOS {
public class RemarkXmlVOS implements Serializable {
private static final long serialVersionUID = 720894888203768497L;
@XmlElement(name = "Remark")
private List<RemarkXmlVO> remarkXmlVOList;