From 1dccb8a26769e33eadc4e369fe6b200acc7d986e Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Tue, 29 Oct 2024 11:08:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/order/OrderController.java | 4 +-- .../service/order/OrderInputProcessor.java | 9 ++---- .../executor/service/order/OrderService.java | 6 ++-- .../service/order/OrderServiceImpl.java | 10 +++--- .../admin/api/webcad/ApiTypeRealize.java | 4 +-- .../system/dal/mysql/dept/PostMapper.java | 31 +++++++++++-------- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java index 3eaf14637..a4be8fe43 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java @@ -214,7 +214,7 @@ public class OrderController { JSONObject plate = apiDataAchieve.getApiPlateDetailMessage(token, orderNo).get(); JSONObject dataModule = apiDataAchieve.getApiGroupMessage(token, orderNo).get(); JSONObject block = apiDataAchieve.getApiBlocksMessage(token, orderNo).get(); - Map> listMap = apiTypeRealize.apiPlateDataChange( + Map listMap = apiTypeRealize.apiPlateDataChange( order, dataPlates,//板件生产信息 dataParts,// 配件信息 @@ -398,7 +398,7 @@ public class OrderController { @Parameter(name = "deleted", description = "是否删除", example = "false") }) @PreAuthorize("@ss.hasPermission('production:manager-list:detail')") - public CommonResult>> getModule(@RequestParam("orderId") Long orderId, + public CommonResult> getModule(@RequestParam("orderId") Long orderId, @RequestParam(value = "deleted", required = false, defaultValue = "false") Boolean deleted) { if (deleted == null) { deleted = false; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java index dea75549c..8ac8a2c63 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java @@ -38,6 +38,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.io.IOException; import java.util.*; +import java.util.function.BiConsumer; import java.util.stream.Collectors; import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; @@ -145,13 +146,7 @@ public class OrderInputProcessor { plateGoodMapper.insertBatch(plateGoodDOS.stream().skip(i).limit(1000).collect(Collectors.toList())); } } - //rawGoodsMapper.insertBatch(rawGoodsDOS); - //orderBodyMapper.insertBatch(orderBodyDOS); - //orderGroupMapper.insertBatch(orderGroupDOS); - //orderPartsMapper.insertBatch(orderPartsDOS); - //plateMapper.insertBatch(plateDOS); - //orderModuleExtraMapper.insertBatch(orderModuleExtraDOS); - //orderItemMapper.insertBatch(itemDOS); + } /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java index 9650a3358..d851c3079 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java @@ -60,9 +60,9 @@ public interface OrderService { /** * @param orderId: 生产单Id - * @return Map> + * @return Map */ - Map> getModule(Long orderId, Integer deleted); + Map getModule(Long orderId, Integer deleted); /** * @param orderId: 生产单id @@ -98,7 +98,7 @@ public interface OrderService { * @author Administrator * @date 2024/3/30 */ - Long importApiData(Map> listMap); + Long importApiData(Map listMap); /** * 文件数据导入 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index 7f88b53aa..2898fc27c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -208,14 +208,14 @@ public class OrderServiceImpl implements OrderService { } @Override - public Map> getModule(Long orderId, Integer deleted) { + public Map getModule(Long orderId, Integer deleted) { // 柜体信息 List orderModuleRespVOList = orderBodyMapper.selectModuleByOrderId(orderId, getUserOrganId(), deleted); // 配件 List orderItemDOS = orderItemMapper.selectPartsByOrderId(orderId, getUserOrganId(), deleted); - Map> map = new HashMap<>(); + Map map = new HashMap<>(); map.put("module", orderModuleRespVOList); map.put("parts", orderItemDOS); return map; @@ -362,7 +362,7 @@ public class OrderServiceImpl implements OrderService { @Override @Transactional(rollbackFor = Exception.class) - public Long importApiData(Map> listMap) { + public Long importApiData(Map listMap) { List order = (List) listMap.get("orderDO"); if (order != null && order.size() > 0) { OrderDO orderDO = order.get(0); @@ -394,11 +394,11 @@ public class OrderServiceImpl implements OrderService { orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, itemDO, goodsDO, plateGoodDOS); List orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class); - if (orderModelDOs.size() > 0) { + if (!orderModelDOs.isEmpty()) { orderModelDOs.forEach(orderModelDO -> orderModelDO.setOrderId(order.get(0).getId())); orderInputProcessor.batchSaveModel(orderModelDOs); } - if (partsRemark.size() > 0) { + if (!partsRemark.isEmpty()) { orderInputProcessor.batchSaveOrderPartsModel(partsRemark); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java index 902b887f0..83403355a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java @@ -66,12 +66,12 @@ public class ApiTypeRealize { * @author Administrator * @date 2024/5/6 */ - public Map> apiPlateDataChange(JSONObject order, JSONObject dataPlates, JSONObject dataParts + public Map apiPlateDataChange(JSONObject order, JSONObject dataPlates, JSONObject dataParts , JSONObject dataBody, JSONObject dataGoods , JSONObject plates, JSONObject dataModule , JSONObject dataBlocks, String orderNo,Long orderId, Long organId) { - Map> map = new HashMap<>(); + Map map = new HashMap<>(); // 生产单id // Long orderId = (Long) identifierGenerator.nextId(null); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/dept/PostMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/dept/PostMapper.java index 3f97695c6..c2f3f4a30 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/dept/PostMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/dept/PostMapper.java @@ -3,6 +3,7 @@ package com.cf.imes.module.system.dal.mysql.dept; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.cf.imes.framework.organ.core.context.OrganContextHolder; import com.cf.imes.framework.security.core.LoginUser; import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.module.system.controller.admin.dept.vo.post.PostPageReqVO; @@ -35,28 +36,32 @@ public interface PostMapper extends BaseMapperX { lambdaQueryWrapperX.eqIfPresent(PostDO::getOrganId, loginUser.getOrganId()); } // 获取分页结果 - PageResult pageResult = selectPage(reqVO, lambdaQueryWrapperX +// PageResult pageResult = selectPage(reqVO, lambdaQueryWrapperX +// .likeIfPresent(PostDO::getCode, reqVO.getCode()) +// .likeIfPresent(PostDO::getName, reqVO.getName()) +// .eqIfPresent(PostDO::getStatus, reqVO.getStatus()) +// .orderByDesc(PostDO::getSort)); + + // 重新设置 id 值 +// List records = pageResult.getList(); +// for (int i = 0; i < records.size(); i++) { +// PostDO postDO = records.get(i); +// postDO.setId((long) (i + 1)); +// } + + return selectPage(reqVO, lambdaQueryWrapperX .likeIfPresent(PostDO::getCode, reqVO.getCode()) .likeIfPresent(PostDO::getName, reqVO.getName()) .eqIfPresent(PostDO::getStatus, reqVO.getStatus()) - .orderByDesc(PostDO::getId)); - - // 重新设置 id 值 - List records = pageResult.getList(); - for (int i = 0; i < records.size(); i++) { - PostDO postDO = records.get(i); - postDO.setId((long) (i + 1)); - } - - return pageResult; + .orderByDesc(PostDO::getSort)); } default PostDO selectByName(String name) { - return selectOne(PostDO::getName, name); + return selectOne(PostDO::getName, name, PostDO::getOrganId, OrganContextHolder.getOrganId()); } default PostDO selectByCode(String code) { - return selectOne(PostDO::getCode, code); + return selectOne(PostDO::getCode, code, PostDO::getOrganId, OrganContextHolder.getOrganId()); } }