From 3ec33511ce5a20e380d91885c8668a72c9dc6ae6 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 14 Dec 2022 17:45:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E8=AE=BE=E5=A4=87=E9=A2=86=E7=94=A8?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=B7=BB=E5=8A=A0=E9=A2=86=E7=94=A8=E4=BA=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/DeviceCollectOrderEntity.java | 7 +++- .../inventory/DeviceCollectOrderDao.xml | 39 ++++++++++++------- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java index eaf9c77a..f1fe0152 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java @@ -23,7 +23,7 @@ public class DeviceCollectOrderEntity { private String deptCode; /** - * 领用人 + * 创建人 */ private String createUser; @@ -46,4 +46,9 @@ public class DeviceCollectOrderEntity { * 状态 0：草稿 1：未审核 2：已审核 */ private Integer status; + + /** + * 领用人 + */ + private String collectUser; } \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml index e0556375..1e34dfdc 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml @@ -10,6 +10,7 @@ + @@ -20,7 +21,8 @@ auditUser, createTime, updateTime, - `status` + `status`, + collectUser select dco.id, - dco.orderId, - dco.deptCode, - dco.createUser, - dco.auditUser, - dco.createTime, - dco.updateTime, - dco.status, - auth_dept.name deptName + dco.orderId, + dco.deptCode, + dco.createUser, + dco.auditUser, + dco.createTime, + dco.updateTime, + dco.status, + dco.collectUser, + auth_dept.name deptName from device_collect_order dco - left join auth_dept on dco.deptCode = auth_dept.code + left join auth_dept on dco.deptCode = auth_dept.code AND dco.status = #{status} From b55295451f1acc1ad2e6ba14789ae7b2aa3a266b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 15 Dec 2022 09:51:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=B3=BB=E7=BB=9FbusUser=E4=B8=8A=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BussinessLocalTypeController.java | 6 ++- .../business/StockOrderDetailController.java | 27 ++++++++++ .../controller/inout/WareHouseController.java | 2 +- .../inventory/InvSubWarehouseController.java | 53 +++++++++++-------- .../dao/basic/BussinessLocalTypeDao.java | 5 +- .../glxp/api/admin/dao/basic/UdiInfoDao.java | 2 + .../glxp/api/admin/dao/inout/CodesDao.java | 3 ++ .../glxp/api/admin/dao/inout/OrderDao.java | 8 +++ .../basic/BussinessLocalTypeService.java | 2 +- .../impl/BussinessLocalTypeServiceImpl.java | 11 ++-- .../business/impl/StockOrderServiceImpl.java | 19 +++++-- .../mapper/basic/BussinessLocalTypeDao.xml | 14 +++++ .../mybatis/mapper/basic/EntrustReceDao.xml | 4 +- .../mybatis/mapper/inout/CodesDao.xml | 12 +++++ .../mybatis/mapper/inout/OrderDao.xml | 8 +++ 15 files changed, 135 insertions(+), 41 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java index 014d73e9..bc88a4f0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java @@ -204,6 +204,10 @@ public class BussinessLocalTypeController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } if (bussinessTypeEntity != null) { + BussinessLocalTypeEntity bussinessLocalTypeEntity1 = bussinessLocalTypeService.findBTByName(bussinessTypeEntity.getName(),String.valueOf(bussinessTypeEntity.getId())); + if (bussinessLocalTypeEntity1 != null) { + return ResultVOUtils.error(999, "业务单据类型名称已存在！"); + } bussinessTypeEntity.setUpdateTime(new Date()); bussinessLocalTypeService.updateBusLocalType(bussinessTypeEntity); } else { @@ -223,7 +227,7 @@ public class BussinessLocalTypeController { if (bussinessTypeEntity != null) { bussinessTypeEntity.setAction("ST" + CustomUtil.getId()); BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findByAction(bussinessTypeEntity.getAction()); - BussinessLocalTypeEntity bussinessLocalTypeEntity1 = bussinessLocalTypeService.findBTByName(bussinessTypeEntity.getName()); + BussinessLocalTypeEntity bussinessLocalTypeEntity1 = bussinessLocalTypeService.findBTByName(bussinessTypeEntity.getName(),null); if (bussinessLocalTypeEntity1 != null) { return ResultVOUtils.error(999, "业务单据类型名称已存在！"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java index 5d04acb6..5a10fbaa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java @@ -14,6 +14,7 @@ import com.glxp.api.admin.entity.business.StockOrderDetailEntity; import com.glxp.api.admin.entity.business.StockOrderEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.entity.inventory.InvProductEntity; import com.glxp.api.admin.exception.JsonException; import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; @@ -38,6 +39,7 @@ import com.glxp.api.admin.service.business.StockOrderService; import com.glxp.api.admin.service.info.CompanyProductRelevanceService; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.CodesService; +import com.glxp.api.admin.service.inventory.InvProductService; import com.glxp.api.admin.service.purchase.SupProductService; import com.glxp.api.admin.util.FilterUdiUtils; import com.glxp.api.common.enums.ResultEnum; @@ -84,6 +86,8 @@ public class StockOrderDetailController { CodesService codesService; @Resource SupProductService supProductService; + @Resource + InvProductService invProductService; @AuthRuleAnnotation("") @@ -589,6 +593,29 @@ public class StockOrderDetailController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + //判断 + InvProductEntity invProductEntity=invProductService.selectExit(stockOrderDetailFilterRequest.getProductId()); + if(invProductEntity!=null){ + UdiInfoEntity udiInfoEntity= udiInfoService.findByNameCode(invProductEntity.getNameCode()); + if(udiInfoEntity!=null){ + if(udiInfoEntity.getScbssfbhph().equals("是")){ + if(stockOrderDetailFilterRequest.getBatchNo()==null){ + return ResultVOUtils.error(999,"批次号不能为空！"); + } + } + if(udiInfoEntity.getScbssfbhscrq().equals("是")){ + if(stockOrderDetailFilterRequest.getProductDate()==null){ + return ResultVOUtils.error(999,"生产日期不能为空！"); + } + } + if(udiInfoEntity.getScbssfbhsxrq().equals("是")){ + if(stockOrderDetailFilterRequest.getExpireDate()==null){ + return ResultVOUtils.error(999,"失效日期不能为空！"); + } + } + } + } + if (StringUtils.isNotBlank(stockOrderDetailFilterRequest.getId())) { if (StringUtils.isBlank(stockOrderDetailFilterRequest.getCount()) || StringUtils.isBlank(stockOrderDetailFilterRequest.getReCount())) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index b4e31bdf..e9a8f82a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -844,7 +844,7 @@ public class WareHouseController { if (udiRelevanceResponse.getBhzxxsbzsl() == 0) { actCount = udiRelevanceResponse.getZxxsbzbhsydysl(); } else { - actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getBhzxxsbzsl(); + actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl(); } } else { actCount = udiRelevanceResponse.getBhzxxsbzsl(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java index fe2abc51..ef96b0c3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java @@ -86,30 +86,39 @@ public class InvSubWarehouseController { } } } else{ - //走这边表示单据选择的是往来单位里面调出调入的库 - //判断单据类型是1就是设置单据需要需要查询除自己以外的分库 - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv"); - if(systemParamConfigEntity.getParamValue().equals("0")){ - //不允许调拨 - // 查询总库信息 - InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); - //查询仓库信息 - //查询仓库信息 - if(invSubWarehouseEntity!=null){ - InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId()); - filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode()); - filterInvWarehouseRequest.setSuperiorPcode(invWarehouseEntity.getPcode()); + if(filterInvWarehouseRequest.getFilter()==3 && filterInvWarehouseRequest.getFilter()!=null){ + + if (authAdmin.getCustomerId()==110) + filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); + else { + filterInvWarehouseRequest.setSpUse(true); + } + }else{ + //走这边表示单据选择的是往来单位里面调出调入的库 + //判断单据类型是1就是设置单据需要需要查询除自己以外的分库 + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv"); + if (systemParamConfigEntity.getParamValue().equals("0")) { + //不允许调拨 + // 查询总库信息 + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); + //查询仓库信息 + if(invSubWarehouseEntity!=null){ + InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId()); + filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode()); + filterInvWarehouseRequest.setSuperiorPcode(invWarehouseEntity.getPcode()); + filterInvWarehouseRequest.setCode(null); + }else { + return ResultVOUtils.error(999,"分库编号为空！"); + } + + + } else { + //允许调拨 + //查询总库信息 + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); + filterInvWarehouseRequest.setWarehouseCode(invSubWarehouseEntity.getParentId()); filterInvWarehouseRequest.setCode(null); - }else { - return ResultVOUtils.error(999,"分库编号为空！"); } - - }else { - //允许调拨 - //查询总库信息 - InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); - filterInvWarehouseRequest.setWarehouseCode(invSubWarehouseEntity.getParentId()); - filterInvWarehouseRequest.setCode(null); } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java index 861e7546..d351f7e2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java @@ -27,9 +27,6 @@ public interface BussinessLocalTypeDao { List filterAllList(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); - BussinessLocalTypeEntity findBTByAction(String action); - - BussinessLocalTypeEntity findBTByName(String name); boolean updateBusLocalType(BussinessLocalTypeEntity bussinessTypeEntity); @@ -45,4 +42,6 @@ public interface BussinessLocalTypeDao { * @param action */ Boolean selectPreInByOrderType(String action); + //根据名字查询 + BussinessLocalTypeEntity selectByName(@Param("name") String name,@Param("id") String id); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoDao.java index f3097257..a8349cbf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoDao.java @@ -58,4 +58,6 @@ public interface UdiInfoDao { */ void updateUdiInfoByUuid(UdiInfoEntity udiInfoEntity); + + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java index b4acf000..765301af 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java @@ -59,4 +59,7 @@ public interface CodesDao { * @return */ String selectSupIdByCode(String code); + + WarehouseEntity findOrderId(@Param("orderId") String orderId); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java index 3709369b..8f32773a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java @@ -92,4 +92,12 @@ public interface OrderDao { * @return */ OrderNoResult selectOrderNos(String id); + + /** + * 根据扫码单据ID和业务单据ID查询已完成单据 + * + * @param billNo + * @return + */ + List selectByBillNoAndStatus(String billNo); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java index f9e7b380..21644161 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java @@ -31,7 +31,7 @@ public interface BussinessLocalTypeService { BussinessLocalTypeEntity findByAction(String action); BussinessLocalTypeEntity findBTByAction(String action); - BussinessLocalTypeEntity findBTByName(String name); + BussinessLocalTypeEntity findBTByName(String name,String id); boolean insertBussinessType(BussinessLocalTypeEntity bussinessLocalTypeEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java index 392a1853..2c18193e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java @@ -147,17 +147,12 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService } @Override - public BussinessLocalTypeEntity findBTByName(String name) { + public BussinessLocalTypeEntity findBTByName(String name,String id) { if (StrUtil.isEmpty(name)) { return null; } - BussinessLocalTypeFilterRequest bussinessTypeFilterRequest = new BussinessLocalTypeFilterRequest(); - bussinessTypeFilterRequest.setName(name); - List data = bussinessLocalTypeDao.filterList(bussinessTypeFilterRequest); - if (data != null && data.size() > 0) { - return data.get(0); - } - return null; + BussinessLocalTypeEntity bussinessLocalTypeEntity=bussinessLocalTypeDao.selectByName(name,id); + return bussinessLocalTypeEntity; } @Override diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java index aa6a09f6..757d39fc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java @@ -300,7 +300,18 @@ public class StockOrderServiceImpl implements StockOrderService { //查询业务单据 StockOrderEntity stockOrderEntity = stockOrderDao.selectByBillNo(billNo); //查询扫码单据 - OrderEntity orderEntity = orderDao.selectByBillNo(billNo); + OrderEntity orderEntity=new OrderEntity(); + List orderEntityList = orderDao.selectByBillNoAndStatus(billNo); + if(orderEntityList.size()>1){ + for (OrderEntity obj:orderEntityList){ + if(obj.getErpFk().equals(billNo)){ + orderEntity=obj; + break; + } + } + }else{ + orderEntity=orderEntityList.get(0); + } BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction()); if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_CHECKED)) { //回退未验收单据 @@ -319,11 +330,13 @@ public class StockOrderServiceImpl implements StockOrderService { orderEntity.setErpFk(""); stockOrderDao.updateById(stockOrderEntity); orderDao.updateOrder(orderEntity); + } else { orderEntity.setErpFk(""); stockOrderDao.deleteById(stockOrderEntity.getId()); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); orderDao.updateOrder(orderEntity); + List warehouseEntityList = codesDao.findByReceiptId(orderEntity.getId()); if (CollUtil.isNotEmpty(warehouseEntityList)) { codesTempService.insertCodesTemp(warehouseEntityList); @@ -447,7 +460,7 @@ public class StockOrderServiceImpl implements StockOrderService { orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK); orderEntity.setErpFk(""); stockOrderDao.updateById(stockOrderEntity); - orderDao.updateOrder(orderEntity); +// orderDao.updateOrder(orderEntity); } else { orderEntity.setErpFk(""); stockOrderDao.deleteById(stockOrderEntity.getId()); @@ -456,7 +469,7 @@ public class StockOrderServiceImpl implements StockOrderService { List warehouseEntityList = codesDao.findByReceiptId(orderEntity.getId()); if (CollUtil.isNotEmpty(warehouseEntityList)) { codesTempService.insertCodesTemp(warehouseEntityList); - codesDao.deleteByOrderId(orderEntity.getId()); +// codesDao.deleteByOrderId(orderEntity.getId()); } } } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml index 8f0b81cc..fa778e2d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -281,4 +281,18 @@ select localAction from basic_bussiness_type where basic_bussiness_type.action = #{action} ) + + diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml index 7e810ab5..61072eef 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml @@ -73,8 +73,8 @@ select supId from io_codes where code = #{code} limit 1 + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index c4e840d3..986d84eb 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -661,4 +661,12 @@ where id = #{id} + + \ No newline at end of file From 609b9e6bb6623475e24c03b26e031d21359a72eb Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 15 Dec 2022 12:43:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/admin/dao/basic/BasicDownloadDao.java | 2 + .../api/admin/dao/basic/BasicExportDao.java | 2 + .../admin/dao/thrsys/ThrCorpExportLogDao.java | 2 + .../dao/thrsys/ThrCorpImportDetailDao.java | 2 + .../admin/dao/thrsys/ThrCorpImportLogDao.java | 2 + .../api/admin/dao/thrsys/ThrImportLogDao.java | 2 + .../admin/dao/thrsys/ThrOrderDetailDao.java | 2 + .../dao/thrsys/ThrOrderExportLogDao.java | 2 + .../dao/thrsys/ThrOrderImportDetailDao.java | 2 + .../dao/thrsys/ThrOrderImportLogDao.java | 2 + .../dao/thrsys/ThrProductsExportLogDao.java | 2 + .../thrsys/ThrProductsImportDetailDao.java | 2 + .../dao/thrsys/ThrProductsImportLogDao.java | 2 + .../service/basic/BasicDownloadService.java | 4 + .../service/basic/BasicExportService.java | 2 + .../basic/impl/BasicDownloadServiceImpl.java | 5 + .../basic/impl/BasicExportServiceImpl.java | 4 + .../thrsys/ThrCorpExportLogService.java | 2 + .../thrsys/ThrCorpImportDetailService.java | 2 + .../thrsys/ThrCorpImportLogService.java | 2 + .../service/thrsys/ThrImportLogService.java | 2 + .../service/thrsys/ThrOrderDetailService.java | 2 + .../thrsys/ThrOrderExportLogService.java | 2 + .../thrsys/ThrOrderImportDetailService.java | 2 + .../thrsys/ThrOrderImportLogService.java | 2 + .../thrsys/ThrProductsExportLogService.java | 2 + .../ThrProductsImportDetailService.java | 2 + .../thrsys/ThrProductsImportLogService.java | 2 + .../impl/ThrCorpExportLogServiceImpl.java | 5 + .../impl/ThrCorpImportDetailServiceImpl.java | 5 + .../impl/ThrCorpImportLogServiceImpl.java | 6 ++ .../thrsys/impl/ThrImportLogServiceImpl.java | 5 + .../impl/ThrOrderDetailServiceImpl.java | 5 + .../impl/ThrOrderExportLogServiceImpl.java | 5 + .../impl/ThrOrderImportDetailServiceImpl.java | 5 + .../impl/ThrOrderImportLogServiceImpl.java | 6 ++ .../impl/ThrProductsExportLogServiceImpl.java | 5 + .../ThrProductsImportDetailServiceImpl.java | 5 + .../impl/ThrProductsImportLogServiceImpl.java | 5 + .../glxp/api/admin/thread/CleanDataTask.java | 95 +++++++++++++++++++ .../main/resources/application-dev.properties | 4 +- .../mybatis/mapper/basic/BasicDownloadDao.xml | 4 + .../mybatis/mapper/basic/BasicExportDao.xml | 5 + .../mapper/thrsys/ThrCorpExportLogDao.xml | 5 + .../mapper/thrsys/ThrCorpImportDetailDao.xml | 5 + .../mapper/thrsys/ThrCorpImportLogDao.xml | 5 + .../mybatis/mapper/thrsys/ThrImportLogDao.xml | 5 + .../mapper/thrsys/ThrOrderDetailDao.xml | 5 + .../mapper/thrsys/ThrOrderExportLogDao.xml | 6 ++ .../mapper/thrsys/ThrOrderImportDetailDao.xml | 6 ++ .../mapper/thrsys/ThrOrderImportLogDao.xml | 5 + .../mapper/thrsys/ThrProductsExportLogDao.xml | 6 ++ .../thrsys/ThrProductsImportDetailDao.xml | 5 + .../mapper/thrsys/ThrProductsImportLogDao.xml | 6 ++ .../main/resources/schemas/schema_v2.1.sql | 8 ++ 55 files changed, 293 insertions(+), 2 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/thread/CleanDataTask.java diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicDownloadDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicDownloadDao.java index d0a5f56d..9429c800 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicDownloadDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicDownloadDao.java @@ -17,6 +17,8 @@ public interface BasicDownloadDao { boolean deleteById(@Param("id") String id); + boolean deleteByTime(); + boolean updateDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportDao.java index 60d6db0e..57df6162 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportDao.java @@ -19,6 +19,8 @@ public interface BasicExportDao { boolean deleteById(@Param("id") String id); + boolean deleteByTime(); + boolean updateExportStatus(BasicExportStatusEntity warehouseEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpExportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpExportLogDao.java index 28462cd6..b8d98a8b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpExportLogDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpExportLogDao.java @@ -19,5 +19,7 @@ public interface ThrCorpExportLogDao { boolean deleteById(@Param("id") String id); + boolean deleteByTime(); + String selectFilePathById(@Param("id") String id); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportDetailDao.java index dd9a12b0..a5f1209e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportDetailDao.java @@ -20,4 +20,6 @@ public interface ThrCorpImportDetailDao { boolean deleteById(@Param("id") String id); boolean deleteByGenkey(@Param("genKey") String genKey); + + boolean deleteByTime(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportLogDao.java index 873205d6..7ebb8a79 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportLogDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportLogDao.java @@ -18,4 +18,6 @@ public interface ThrCorpImportLogDao { boolean deleteById(@Param("id") String id); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrImportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrImportLogDao.java index 277335f7..c0c3e452 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrImportLogDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrImportLogDao.java @@ -18,5 +18,7 @@ public interface ThrImportLogDao { boolean deleteById(@Param("id") String id); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java index c15b610f..e81d06cf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java @@ -26,4 +26,6 @@ public interface ThrOrderDetailDao { boolean deleteAll(); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderExportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderExportLogDao.java index 8c0d9b1e..15a95242 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderExportLogDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderExportLogDao.java @@ -17,4 +17,6 @@ public interface ThrOrderExportLogDao { boolean updateThrOrderExportLog(ThrOrderExportLogEntity thrOrderExportLogEntity); boolean deleteById(@Param("id") String id); + + boolean deleteByTime(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportDetailDao.java index 60b6f2de..cc252590 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportDetailDao.java @@ -21,4 +21,6 @@ public interface ThrOrderImportDetailDao { boolean deleteById(@Param("id") String id); boolean deleteByGenkey(@Param("genKey") String genKey); + + boolean deleteByTime(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportLogDao.java index 04c5abd5..9da9f614 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportLogDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportLogDao.java @@ -18,4 +18,6 @@ public interface ThrOrderImportLogDao { boolean deleteById(@Param("id") String id); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsExportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsExportLogDao.java index 90e5d508..a0738f31 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsExportLogDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsExportLogDao.java @@ -25,4 +25,6 @@ public interface ThrProductsExportLogDao { * @return */ String selectFilePathById(@Param("id") String id); + + boolean deleteByTime(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportDetailDao.java index af6380eb..5a02e69b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportDetailDao.java @@ -21,6 +21,8 @@ public interface ThrProductsImportDetailDao { boolean deleteById(@Param("id") String id); + + boolean deleteByTime(); boolean deleteByGenkey(@Param("genKey") String genKey); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportLogDao.java index e32cbcc9..c1853bbf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportLogDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportLogDao.java @@ -16,4 +16,6 @@ public interface ThrProductsImportLogDao { boolean updateImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity); boolean deleteById(@Param("id") String id); + + boolean deleteByTime(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicDownloadService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicDownloadService.java index 287b1e3a..efeee8be 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicDownloadService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicDownloadService.java @@ -15,5 +15,9 @@ public interface BasicDownloadService { boolean deleteById(String id); + boolean deleteByTime(); + + + boolean updateDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportService.java index 5bfacd72..f1f3a885 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportService.java @@ -17,5 +17,7 @@ public interface BasicExportService { boolean deleteById(String id); + boolean deleteByTime(); + boolean updateExportStatus(BasicExportStatusEntity warehouseEntity); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicDownloadServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicDownloadServiceImpl.java index 01ee543f..f46a91ed 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicDownloadServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicDownloadServiceImpl.java @@ -52,6 +52,11 @@ public class BasicDownloadServiceImpl implements BasicDownloadService { return basicDownloadDao.deleteById(id); } + @Override + public boolean deleteByTime() { + return basicDownloadDao.deleteByTime(); + } + @Override public boolean updateDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity) { return basicDownloadDao.updateDownloadStatus(basicDownloadStatusEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportServiceImpl.java index 012841da..2db1d687 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportServiceImpl.java @@ -54,6 +54,10 @@ public class BasicExportServiceImpl implements BasicExportService { return basicExportDao.deleteById(id); } + @Override + public boolean deleteByTime() { + return basicExportDao.deleteByTime(); + } @Override public boolean updateExportStatus(BasicExportStatusEntity basicExportStatusEntity) { return basicExportDao.updateExportStatus(basicExportStatusEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpExportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpExportLogService.java index 6bab1325..894189fe 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpExportLogService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpExportLogService.java @@ -20,4 +20,6 @@ public interface ThrCorpExportLogService { boolean deleteById(String id); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportDetailService.java index ad557dcc..87072524 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportDetailService.java @@ -22,4 +22,6 @@ public interface ThrCorpImportDetailService { boolean deleteByGenkey( String genKey); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportLogService.java index 3cb510d5..4d09e777 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportLogService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportLogService.java @@ -17,4 +17,6 @@ public interface ThrCorpImportLogService { boolean deleteById(String id); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrImportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrImportLogService.java index 23988cd2..f49f4524 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrImportLogService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrImportLogService.java @@ -16,5 +16,7 @@ public interface ThrImportLogService { boolean deleteById(String id); + boolean deleteByTime(); + ThrImportLogEntity selectByGenKey(String genKey); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java index af25b7b2..acebe70b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java @@ -22,4 +22,6 @@ public interface ThrOrderDetailService { boolean deleteAll(); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderExportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderExportLogService.java index 64180d7a..b60cf943 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderExportLogService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderExportLogService.java @@ -16,4 +16,6 @@ public interface ThrOrderExportLogService { boolean updateThrOrderExportLog(ThrOrderExportLogEntity thrOrderExportLogEntity); boolean deleteById(String id); + + boolean deleteByTime(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportDetailService.java index 8c79c10f..bb4f9158 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportDetailService.java @@ -17,5 +17,7 @@ public interface ThrOrderImportDetailService { boolean deleteById(String id); + boolean deleteByTime(); + boolean deleteByGenkey(String genKey); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportLogService.java index ad67abb3..57c92a92 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportLogService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportLogService.java @@ -16,4 +16,6 @@ public interface ThrOrderImportLogService { boolean deleteById(String id); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsExportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsExportLogService.java index 5011baea..a51fb6ca 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsExportLogService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsExportLogService.java @@ -17,4 +17,6 @@ public interface ThrProductsExportLogService { boolean deleteById(String id); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportDetailService.java index 230ac442..b4901fd1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportDetailService.java @@ -16,6 +16,8 @@ public interface ThrProductsImportDetailService { boolean deleteById(String id); + boolean deleteByTime(); + boolean deleteByGenkey(String genKey); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportLogService.java index 1157d28e..9c8e8360 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportLogService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportLogService.java @@ -14,5 +14,7 @@ public interface ThrProductsImportLogService { boolean deleteById(String id); + boolean deleteByTime(); + ThrProductsImportLogEntity selectByGenKey(String genKey); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpExportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpExportLogServiceImpl.java index d037714f..9b50530a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpExportLogServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpExportLogServiceImpl.java @@ -61,4 +61,9 @@ public class ThrCorpExportLogServiceImpl implements ThrCorpExportLogService { } return thrCorpExportLogDao.deleteById(id); } + + @Override + public boolean deleteByTime() { + return thrCorpExportLogDao.deleteByTime(); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java index 6a25f41d..05d025a7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java @@ -54,4 +54,9 @@ public class ThrCorpImportDetailServiceImpl implements ThrCorpImportDetailServic public boolean deleteByGenkey(String genKey) { return thrCorpImportDetailDao.deleteByGenkey(genKey); } + + @Override + public boolean deleteByTime() { + return thrCorpImportDetailDao.deleteByTime(); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportLogServiceImpl.java index 84f35797..572b7687 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportLogServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportLogServiceImpl.java @@ -55,4 +55,10 @@ public class ThrCorpImportLogServiceImpl implements ThrCorpImportLogService { public boolean deleteById(String id) { return thrCorpImportLogDao.deleteById(id); } + + @Override + public boolean deleteByTime() { + return thrCorpImportLogDao.deleteByTime(); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrImportLogServiceImpl.java index cb8be72a..e5d28817 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrImportLogServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrImportLogServiceImpl.java @@ -45,6 +45,11 @@ public class ThrImportLogServiceImpl implements ThrImportLogService { return thrImportLogDao.deleteById(id); } + @Override + public boolean deleteByTime() { + return thrImportLogDao.deleteByTime(); + } + @Override public ThrImportLogEntity selectByGenKey(String genKey) { FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java index cc428160..be137ec7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java @@ -60,4 +60,9 @@ public class ThrOrderDetailServiceImpl implements ThrOrderDetailService { public boolean deleteAll() { return thrOrderDetailDao.deleteAll(); } + + @Override + public boolean deleteByTime() { + return thrOrderDetailDao.deleteByTime(); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderExportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderExportLogServiceImpl.java index bbd7d455..b7698494 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderExportLogServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderExportLogServiceImpl.java @@ -55,4 +55,9 @@ public class ThrOrderExportLogServiceImpl implements ThrOrderExportLogService { public boolean deleteById(String id) { return thrOrderExportLogDao.deleteById(id); } + + @Override + public boolean deleteByTime() { + return thrOrderExportLogDao.deleteByTime(); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java index 30920cd2..6db942d6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java @@ -50,6 +50,11 @@ public class ThrOrderImportDetailServiceImpl implements ThrOrderImportDetailServ return thrOrderImportDetailDao.deleteById(id); } + @Override + public boolean deleteByTime() { + return thrOrderImportDetailDao.deleteByTime(); + } + @Override public boolean deleteByGenkey(String genKey) { return thrOrderImportDetailDao.deleteByGenkey(genKey); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportLogServiceImpl.java index 16a55bac..49eb7906 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportLogServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportLogServiceImpl.java @@ -57,4 +57,10 @@ public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService { public boolean deleteById(String id) { return thrOrderImportLogDao.deleteById(id); } + + @Override + public boolean deleteByTime() { + return thrOrderImportLogDao.deleteByTime(); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsExportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsExportLogServiceImpl.java index b10c8e77..3caf00d1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsExportLogServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsExportLogServiceImpl.java @@ -61,4 +61,9 @@ public class ThrProductsExportLogServiceImpl implements ThrProductsExportLogServ } return thrProductsExportLogDao.deleteById(id); } + + @Override + public boolean deleteByTime() { + return thrProductsExportLogDao.deleteByTime(); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java index 9a9fb98c..2c14f8f5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java @@ -50,6 +50,11 @@ public class ThrProductsImportDetailServiceImpl implements ThrProductsImportDeta return thrProductsImportDetailDao.deleteById(id); } + @Override + public boolean deleteByTime() { + return thrProductsImportDetailDao.deleteByTime(); + } + @Override public boolean deleteByGenkey(String genKey) { return thrProductsImportDetailDao.deleteByGenkey(genKey); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportLogServiceImpl.java index afa49ec9..5212f4a2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportLogServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportLogServiceImpl.java @@ -44,6 +44,11 @@ public class ThrProductsImportLogServiceImpl implements ThrProductsImportLogServ return thrProductsImportLogDao.deleteById(id); } + @Override + public boolean deleteByTime() { + return thrProductsImportLogDao.deleteByTime(); + } + @Override public ThrProductsImportLogEntity selectByGenKey(String genKey) { FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/CleanDataTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/CleanDataTask.java new file mode 100644 index 00000000..1ce8b48c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/CleanDataTask.java @@ -0,0 +1,95 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.dao.schedule.ScheduledDao; +import com.glxp.api.admin.entity.info.ScheduledEntity; +import com.glxp.api.admin.req.info.ScheduledRequest; +import com.glxp.api.admin.service.basic.BasicDownloadService; +import com.glxp.api.admin.service.basic.BasicExportService; +import com.glxp.api.admin.service.thrsys.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.SchedulingConfigurer; +import org.springframework.scheduling.config.ScheduledTaskRegistrar; +import org.springframework.scheduling.support.CronTrigger; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * 删除数据 + */ +@Slf4j +@Component +@EnableScheduling +public class CleanDataTask implements SchedulingConfigurer { + + @Resource + private ScheduledDao scheduledDao; + @Resource + private BasicExportService basicExportService; + @Resource + private BasicDownloadService basicDownloadService; + @Resource + private ThrCorpExportLogService thrCorpExportLogService; + @Resource + private ThrCorpImportDetailService thrCorpImportDetailService; + @Resource + private ThrCorpImportLogService thrCorpImportLogService; + @Resource + private ThrImportLogService thrImportLogService; + @Resource + private ThrOrderDetailService thrOrderDetailService; + @Resource + private ThrOrderExportLogService thrOrderExportLogService; + @Resource + private ThrOrderImportDetailService thrOrderImportDetailService; + @Resource + private ThrOrderImportLogService thrOrderImportLogService; + @Resource + private ThrProductsImportLogService thrProductsImportLogService; + @Resource + private ThrProductsExportLogService thrProductsExportLogService; + @Resource + private ThrProductsImportDetailService thrProductsImportDetailService; + + @Override + public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { + taskRegistrar.addTriggerTask(() -> process(), + triggerContext -> { + ScheduledRequest scheduledRequest = new ScheduledRequest(); + scheduledRequest.setCronName("ScheduledDeletion"); + ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); + String cron = scheduledEntity.getCron(); + if (cron.isEmpty()) { + log.error("cron is null"); + } + return new CronTrigger(cron).nextExecutionTime(triggerContext); + }); + } + + private void process() { + log.info("开始清理 30 天前的历史数据"); + //删除同步任务 + log.info("开始删除同步任务历史记录"); + basicExportService.deleteByTime(); + //删除下载记录 + log.info("开始删除下载记录"); + basicDownloadService.deleteByTime(); + //删除第三方数据 + log.info("开始删除第三方数据"); + thrCorpExportLogService.deleteByTime(); + thrCorpImportDetailService.deleteByTime(); + thrCorpImportLogService.deleteByTime(); + thrImportLogService.deleteByTime(); + thrOrderDetailService.deleteByTime(); + thrOrderExportLogService.deleteByTime(); + thrOrderImportDetailService.deleteByTime(); + thrOrderImportLogService.deleteByTime(); + thrProductsImportLogService.deleteByTime(); + thrProductsExportLogService.deleteByTime(); + thrProductsImportDetailService.deleteByTime(); + log.info("历史数据清理完成"); + } + + +} diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 9ff15a1c..33ee9eb0 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,8 +1,8 @@ server.port=9991 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3364/udiwms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root -spring.datasource.password=Glxp@6066 +spring.datasource.password=root spring.datasource.hikari.connection-timeout=60000 spring.datasource.hikari.maximum-pool-size=60 spring.datasource.hikari.minimum-idle=10 diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml index 4c66913a..6c0f6345 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml @@ -68,5 +68,9 @@ FROM basic_download_status WHERE id = #{id} + + Delete From basic_download_status + where date(startTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml index f44bc8a6..e8e1d098 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml @@ -71,4 +71,9 @@ WHERE id = #{id} + + Delete From basic_export_status + where date(startTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml index 4e45e881..b831e27c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml @@ -53,4 +53,9 @@ WHERE genKey = #{genKey} + + Delete From thr_corp_export_log + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml index 597678f0..39150627 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml @@ -89,4 +89,9 @@ WHERE id = #{id} + + Delete From thr_corp_import_detail + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml index 85afe623..830ddb0f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml @@ -55,4 +55,9 @@ WHERE genKey = #{genKey} + + Delete From thr_corp_import_log + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrImportLogDao.xml index 66b8bc69..630c16b2 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrImportLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrImportLogDao.xml @@ -59,4 +59,9 @@ WHERE genKey = #{genKey} + + Delete From thr_import_log + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml index 525bce26..8541c036 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml @@ -126,4 +126,9 @@ FROM thr_order_detail + + Delete From thr_order_detail + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderExportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderExportLogDao.xml index 41c06c0a..fba76704 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderExportLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderExportLogDao.xml @@ -50,4 +50,10 @@ WHERE genKey = #{genKey} + + Delete From thr_order_export_log + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml index a3331b2f..c665cc30 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml @@ -90,4 +90,10 @@ WHERE id = #{id} + + + Delete From thr_order_import_detail + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml index d06df015..cd990e98 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml @@ -54,4 +54,9 @@ WHERE genKey = #{genKey} + + Delete From thr_order_import_log + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml index 2213c2e0..0a240c48 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml @@ -53,4 +53,10 @@ WHERE genKey = #{genKey} + + + Delete From thr_products_export_log + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml index e73a9eaa..e0d86e8d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml @@ -102,4 +102,9 @@ WHERE id = #{id} + + Delete From thr_products_import_detail + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml index 7a30ae16..bf76ba29 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml @@ -54,4 +54,10 @@ WHERE genKey = #{genKey} + + + Delete From thr_porducts_import_log + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/schemas/schema_v2.1.sql b/api-admin/src/main/resources/schemas/schema_v2.1.sql index db702ace..851ba98f 100644 --- a/api-admin/src/main/resources/schemas/schema_v2.1.sql +++ b/api-admin/src/main/resources/schemas/schema_v2.1.sql @@ -4,6 +4,14 @@ CALL Pro_Temp_ColumnWork ('basic_export_status','receiveStatus','varchar(255) ', CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1); CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1); +INSERT ignore INTO scheduled(id, cronName, cron, customerId, remark) +VALUES +(16, 'ScheduledDeletion', '0 0 2 1/1 * ? ', NULL, '删除30天数据'); + +INSERT ignore INTO system_param_config ( id, parentId, paramName, paramKey, paramValue, paramStatus, paramType, paramExplain ) +VALUES + ( 20009, 0, '删除30天数据', 'ScheduledDeletion', '1', 1, 0, '1:是，0：否' ); + -- 创建表时必须 create table if not exists 表名