From 3b3099d91a15d62cf9ed5737e5e3b85ab9d71c12 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sun, 25 Jun 2023 23:33:07 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trace/TraceManuOrderController.java | 29 +++++++----- .../trace/TraceOrderController.java | 5 ++- .../controller/trace/UdiTraceController.java | 1 + .../api/dao/trace/TraceManuCodeRelMapper.java | 5 ++- .../api/dao/trace/TraceManuOrderMapper.java | 3 +- .../glxp/api/dao/trace/TraceOrderMapper.java | 5 ++- .../trace/TraceManuCodeRelService.java | 13 ------ .../service/trace/TraceManuOrderService.java | 4 ++ .../api/service/trace/TraceOrderService.java | 3 ++ .../api/service/trace/UdiTraceService.java | 45 +++++++++++-------- ...Impl.java => TraceManuCodeRelService.java} | 14 ++++-- src/main/resources/application-dev.yml | 8 ++-- 12 files changed, 79 insertions(+), 56 deletions(-) delete mode 100644 src/main/java/com/glxp/api/service/trace/TraceManuCodeRelService.java rename src/main/java/com/glxp/api/service/trace/impl/{TraceManuCodeRelServiceImpl.java => TraceManuCodeRelService.java} (71%) diff --git a/src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java b/src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java index 1c6401a..d0ae3b8 100644 --- a/src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java +++ b/src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java @@ -16,10 +16,9 @@ import com.glxp.api.req.trace.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.trace.TraceManuCodeRellResponse; import com.glxp.api.res.trace.TraceManuOrderResponse; -import com.glxp.api.service.trace.TraceManuCodeRelService; import com.glxp.api.service.trace.TraceManuOrderService; import com.glxp.api.service.trace.TraceTaskNoticeService; -import com.glxp.api.service.trace.TraceTaskService; +import com.glxp.api.service.trace.impl.TraceManuCodeRelService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -82,12 +81,12 @@ public class TraceManuOrderController { @AuthRuleAnnotation("udi/trace/manu/order/relCode") @GetMapping("udi/trace/manu/order/relCode") public BaseResponse filterDetail(TraceManuDetailRequest traceManuDetailRequest) { - List traceManuCodeRellResponses = traceManuCodeRelService.filterList(traceManuDetailRequest); - PageInfo pageInfo = new PageInfo<>(traceManuCodeRellResponses); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(traceManuCodeRellResponses); - return ResultVOUtils.success(pageSimpleResponse); + List traceManuCodeRellResponses = traceManuCodeRelService.filterList(traceManuDetailRequest); + PageInfo pageInfo = new PageInfo<>(traceManuCodeRellResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(traceManuCodeRellResponses); + return ResultVOUtils.success(pageSimpleResponse); } @@ -114,16 +113,24 @@ public class TraceManuOrderController { return ResultVOUtils.error(500, "UDI码关联关系不能为空！"); } List traceManuCodeRelEntities = new ArrayList<>(); + try { + traceManuOrderService.replace(traceManuOrderEntity); + } catch (Exception e) { + e.printStackTrace(); + } traceManuDetailRequests.stream().forEach(item -> { TraceManuCodeRelEntity traceManuCodeRelEntity = new TraceManuCodeRelEntity(); BeanUtils.copyProperties(item, traceManuCodeRelEntity); traceManuCodeRelEntity.setManuOrderIdFk(traceManuOrderEntity.getId()); - traceManuCodeRelEntity.setManuOrderNo(traceManuOrderEntity.getRecordCode()); + traceManuCodeRelEntity.setManuOrderNo(traceManuOrderEntity.getBillNo()); traceManuCodeRelEntity.setId(IdUtil.getSnowflakeNextId()); traceManuCodeRelEntities.add(traceManuCodeRelEntity); }); - traceManuOrderService.save(traceManuOrderEntity); - traceManuCodeRelService.saveOrUpdateBatch(traceManuCodeRelEntities); + + traceManuCodeRelService.replaceList(traceManuCodeRelEntities); + taskNoticeEntity.setStatus(3); + taskNoticeEntity.setUpdateTime(new Date()); + traceTaskNoticeService.updateById(taskNoticeEntity); return ResultVOUtils.success("成功"); } diff --git a/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java b/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java index 3fde426..a9da5dc 100644 --- a/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java +++ b/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java @@ -93,7 +93,10 @@ public class TraceOrderController extends BaseController { traceOrderEntity.setTraceProductIdFk(taskNoticeEntity.getProdudctRecordIdFk()); traceOrderEntity.setId(IdUtil.getSnowflakeNextId()); traceOrderEntity.setUpdateTime(new Date()); - traceOrderService.save(traceOrderEntity); + traceOrderService.replace(traceOrderEntity); + taskNoticeEntity.setStatus(3); + taskNoticeEntity.setUpdateTime(new Date()); + traceTaskNoticeService.updateById(taskNoticeEntity); System.out.println("成功"); return ResultVOUtils.success("成功"); } diff --git a/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java b/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java index c90660f..b43b459 100644 --- a/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java +++ b/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java @@ -26,6 +26,7 @@ import com.glxp.api.service.basic.BasicUdiRelService; import com.glxp.api.service.sup.UserCompanyService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.trace.*; +import com.glxp.api.service.trace.impl.TraceManuCodeRelService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.udi.FilterUdiUtils; import io.swagger.annotations.Api; diff --git a/src/main/java/com/glxp/api/dao/trace/TraceManuCodeRelMapper.java b/src/main/java/com/glxp/api/dao/trace/TraceManuCodeRelMapper.java index 4fa5c28..7e326b5 100644 --- a/src/main/java/com/glxp/api/dao/trace/TraceManuCodeRelMapper.java +++ b/src/main/java/com/glxp/api/dao/trace/TraceManuCodeRelMapper.java @@ -1,7 +1,9 @@ package com.glxp.api.dao.trace; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.trace.TraceManuCodeRelEntity; +import com.glxp.api.entity.trace.TraceOrderEntity; import com.glxp.api.req.trace.TraceManuDetailRequest; import com.glxp.api.req.trace.TraceManuOrderRequest; import com.glxp.api.res.trace.TraceManuCodeRellResponse; @@ -11,7 +13,6 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface TraceManuCodeRelMapper extends BaseMapper { - +public interface TraceManuCodeRelMapper extends BaseMapperPlus { List filterTraceManuCodeRel(TraceManuDetailRequest traceManuDetailRequest); } diff --git a/src/main/java/com/glxp/api/dao/trace/TraceManuOrderMapper.java b/src/main/java/com/glxp/api/dao/trace/TraceManuOrderMapper.java index d22be92..9d40095 100644 --- a/src/main/java/com/glxp/api/dao/trace/TraceManuOrderMapper.java +++ b/src/main/java/com/glxp/api/dao/trace/TraceManuOrderMapper.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.trace; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.trace.TraceManuOrderEntity; import com.glxp.api.req.trace.TraceManuOrderRequest; import com.glxp.api.res.trace.TraceManuOrderResponse; @@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface TraceManuOrderMapper extends BaseMapper { +public interface TraceManuOrderMapper extends BaseMapperPlus { List filterTraces(TraceManuOrderRequest traceManuOrderRequest); diff --git a/src/main/java/com/glxp/api/dao/trace/TraceOrderMapper.java b/src/main/java/com/glxp/api/dao/trace/TraceOrderMapper.java index 19514b2..e86664a 100644 --- a/src/main/java/com/glxp/api/dao/trace/TraceOrderMapper.java +++ b/src/main/java/com/glxp/api/dao/trace/TraceOrderMapper.java @@ -1,7 +1,10 @@ package com.glxp.api.dao.trace; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.dao.system.SystemPDFModuleDao; import com.glxp.api.entity.sup.UserCompanyEntity; +import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.entity.trace.TraceOrderEntity; import com.glxp.api.req.auth.FilterUserComapanyRequest; import com.glxp.api.req.trace.TraceOrderDetailRequest; @@ -14,7 +17,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface TraceOrderMapper extends BaseMapper { +public interface TraceOrderMapper extends BaseMapperPlus { List queryTraceOrderList(TraceOrderDetailRequest traceOrderDetailRequest); diff --git a/src/main/java/com/glxp/api/service/trace/TraceManuCodeRelService.java b/src/main/java/com/glxp/api/service/trace/TraceManuCodeRelService.java deleted file mode 100644 index 4ababb0..0000000 --- a/src/main/java/com/glxp/api/service/trace/TraceManuCodeRelService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.glxp.api.service.trace; - -import com.glxp.api.entity.trace.TraceManuCodeRelEntity; -import com.baomidou.mybatisplus.extension.service.IService; -import com.glxp.api.req.trace.TraceManuDetailRequest; -import com.glxp.api.res.trace.TraceManuCodeRellResponse; - -import java.util.List; - -public interface TraceManuCodeRelService extends IService { - - List filterList(TraceManuDetailRequest traceManuDetailRequest); -} diff --git a/src/main/java/com/glxp/api/service/trace/TraceManuOrderService.java b/src/main/java/com/glxp/api/service/trace/TraceManuOrderService.java index de60b1d..293f925 100644 --- a/src/main/java/com/glxp/api/service/trace/TraceManuOrderService.java +++ b/src/main/java/com/glxp/api/service/trace/TraceManuOrderService.java @@ -42,4 +42,8 @@ public class TraceManuOrderService extends ServiceImpl 0; + } } diff --git a/src/main/java/com/glxp/api/service/trace/TraceOrderService.java b/src/main/java/com/glxp/api/service/trace/TraceOrderService.java index eed016f..de0f1e3 100644 --- a/src/main/java/com/glxp/api/service/trace/TraceOrderService.java +++ b/src/main/java/com/glxp/api/service/trace/TraceOrderService.java @@ -83,5 +83,8 @@ public class TraceOrderService extends ServiceImpl 0; + } } diff --git a/src/main/java/com/glxp/api/service/trace/UdiTraceService.java b/src/main/java/com/glxp/api/service/trace/UdiTraceService.java index 8684779..1eeeeed 100644 --- a/src/main/java/com/glxp/api/service/trace/UdiTraceService.java +++ b/src/main/java/com/glxp/api/service/trace/UdiTraceService.java @@ -132,10 +132,10 @@ public class UdiTraceService { if (manuTaskNotity == null) { manuTaskNotity = createTraceNotice(1, traceProductDetailEntity, companyId); pushDelayExpireTask(manuTaskNotity); - pushMq(traceProductDetailEntity, companyId); + pushMq(manuTaskNotity, companyId); } else if (manuTaskNotity.getStatus() == 4) { //任务超时未处理，重新推送消息 - pushMq(traceProductDetailEntity, companyId); + pushMq(manuTaskNotity, companyId); } //2.出入库生产订单关联关系 @@ -143,10 +143,10 @@ public class UdiTraceService { if (inoutTaskNotity == null) { inoutTaskNotity = createTraceNotice(2, traceProductDetailEntity, companyId); pushDelayExpireTask(inoutTaskNotity); - pushMq(traceProductDetailEntity, companyId); + pushMq(inoutTaskNotity, companyId); } else if (inoutTaskNotity.getStatus() == 4) { //任务超时未处理，重新推送消息 - pushMq(traceProductDetailEntity, companyId); + pushMq(inoutTaskNotity, companyId); } @@ -166,10 +166,10 @@ public class UdiTraceService { if (taskNoticeEntity == null) { taskNoticeEntity = createTraceNotice(1, traceProductDetailEntity, companyId); pushDelayExpireTask(taskNoticeEntity); - pushMq(traceProductDetailEntity, companyId); + pushMq(taskNoticeEntity, companyId); } else if (taskNoticeEntity.getStatus() == 4) { //任务超时未处理，重新推送消息 - pushMq(traceProductDetailEntity, companyId); + pushMq(taskNoticeEntity, companyId); } } } @@ -178,11 +178,18 @@ public class UdiTraceService { // 创建现场检查询任务 public void createCheckTraceTask(TraceProductDetailEntity traceProductDetailEntity, Long companyId) { - //1.查询出入库单消息是否已经上传 - if (traceProductDetailEntity.getStatus() == 1) { //出入库订单未处理 - createTraceNotice(2, traceProductDetailEntity, companyId); - pushMq(traceProductDetailEntity, companyId); - } else if (traceProductDetailEntity.getStatus() == 2) { //出入库订单未处理完成 + + TraceTaskNoticeEntity inoutTaskNotity = traceTaskNoticeService.findTask(2, traceProductDetailEntity.getId(), companyId); + if (inoutTaskNotity == null) { + inoutTaskNotity = createTraceNotice(2, traceProductDetailEntity, companyId); + pushDelayExpireTask(inoutTaskNotity); + pushMq(inoutTaskNotity, companyId); + } else if (inoutTaskNotity.getStatus() == 4) { + //任务超时未处理，重新推送消息 + pushMq(inoutTaskNotity, companyId); + } + + if (traceProductDetailEntity.getStatus() == 2) { //出入库订单未处理完成 //列出需要查询推送企业 List traceOrderEntities = traceOrderService.findByProductIdFk(traceProductDetailEntity.getId()); if (CollUtil.isNotEmpty(traceOrderEntities)) { @@ -202,10 +209,10 @@ public class UdiTraceService { if (taskNoticeEntity == null) { taskNoticeEntity = createTraceNotice(1, traceProductDetailEntity, companyId); pushDelayExpireTask(taskNoticeEntity); - pushMq(traceProductDetailEntity, companyId); + pushMq(taskNoticeEntity, companyId); } else if (taskNoticeEntity.getStatus() == 4) { //任务超时未处理，重新推送消息 - pushMq(traceProductDetailEntity, companyId); + pushMq(taskNoticeEntity, companyId); } } } @@ -243,16 +250,16 @@ public class UdiTraceService { } - public void pushMq(TraceProductDetailEntity traceProductDetailEntity, Long companyId) { + public void pushMq(TraceTaskNoticeEntity traceTaskNoticeEntity, Long companyId) { //6.构建MQ推送消息 MqTraceMessage mqTraceMessage = new MqTraceMessage(); mqTraceMessage.setCreateTime(new Date()); - mqTraceMessage.setTaskType(1); + mqTraceMessage.setTaskType(traceTaskNoticeEntity.getTaskType()); mqTraceMessage.setCompanyId(companyId); - mqTraceMessage.setCerditNo(traceProductDetailEntity.getCreditNum()); - mqTraceMessage.setTaskId(traceProductDetailEntity.getId()); - rabbitPushService.send(mqTraceMessage); -// rabbitPushService.publicPush(mqTraceMessage); + mqTraceMessage.setCerditNo(traceTaskNoticeEntity.getCreditNum()); + mqTraceMessage.setTaskId(traceTaskNoticeEntity.getId()); +// rabbitPushService.send(mqTraceMessage); + rabbitPushService.publicPush(mqTraceMessage); } diff --git a/src/main/java/com/glxp/api/service/trace/impl/TraceManuCodeRelServiceImpl.java b/src/main/java/com/glxp/api/service/trace/impl/TraceManuCodeRelService.java similarity index 71% rename from src/main/java/com/glxp/api/service/trace/impl/TraceManuCodeRelServiceImpl.java rename to src/main/java/com/glxp/api/service/trace/impl/TraceManuCodeRelService.java index 4099ef3..3c95f24 100644 --- a/src/main/java/com/glxp/api/service/trace/impl/TraceManuCodeRelServiceImpl.java +++ b/src/main/java/com/glxp/api/service/trace/impl/TraceManuCodeRelService.java @@ -3,7 +3,6 @@ package com.glxp.api.service.trace.impl; import com.github.pagehelper.PageHelper; import com.glxp.api.req.trace.TraceManuDetailRequest; import com.glxp.api.res.trace.TraceManuCodeRellResponse; -import com.glxp.api.service.trace.TraceManuCodeRelService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.entity.trace.TraceManuCodeRelEntity; @@ -14,12 +13,10 @@ import java.util.Collections; import java.util.List; @Service -public class TraceManuCodeRelServiceImpl extends ServiceImpl implements TraceManuCodeRelService { - +public class TraceManuCodeRelService extends ServiceImpl { @Resource TraceManuCodeRelMapper traceManuCodeRelMapper; - @Override public List filterList(TraceManuDetailRequest traceManuDetailRequest) { if (traceManuDetailRequest == null) { return Collections.emptyList(); @@ -30,4 +27,13 @@ public class TraceManuCodeRelServiceImpl extends ServiceImpl 0; + } + + public boolean replaceList(List traceManuCodeRelEntities) { + return traceManuCodeRelMapper.replaceBatch(traceManuCodeRelEntities) > 0; + } } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index bc35fe4..36de819 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,9 +4,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_cpt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_cpt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Glxp@6066 + password: 123456 hikari: connection-timeout: 60000 maximum-pool-size: 20 @@ -15,7 +15,7 @@ spring: redis: database: 14 - host: 192.168.0.166 + host: 127.0.0.1 port: 6379 # password: 123456 timeout: 300 @@ -34,7 +34,7 @@ spring: max-request-size: 500MB rabbitmq: - host: 192.168.0.166 + host: 127.0.0.1 port: 5672 username: cpt password: 123456