From af692363bd59947383274dea5beca76b014d1105 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 28 Mar 2023 09:05:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=8C=E6=AD=A5=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicGenExcelService.java | 4 +- .../inout/IoCodeTempController.java | 11 +- .../sync/SpsSyncDownloadStatusController.java | 84 ++++++++++++++ .../sync/SpsSyncExportStatusController.java | 104 ++++++++++++++++++ .../SyncDataSetController.java | 19 ++-- .../thrsys/ThirdUploadSetController.java | 2 +- .../glxp/api/dao/sync/BasicDownloadDao.java | 25 +++++ .../com/glxp/api/dao/sync/BasicExportDao.java | 24 ++++ .../glxp/api/dao/sync/BasicExportTimeDao.java | 20 ++++ .../dao/{system => sync}/SyncDataSetDao.java | 4 +- .../api/dao/system/SyncDataBustypeDao.java | 2 +- .../dao/system/SyncUploadDataBustypeDao.java | 2 +- .../sync/BasicDownloadStatusEntity.java | 27 +++++ .../entity/sync/BasicExportStatusEntity.java | 19 ++++ .../sync/BasicExportStatusTimeEntity.java | 13 +++ .../SyncDataBustypeEntity.java | 2 +- .../api/entity/sync/SyncDataSetEntity.java | 45 ++++++++ .../api/entity/system/SyncDataSetEntity.java | 45 -------- .../system/SyncUploadDataSetEntity.java | 1 + .../com/glxp/api/http/SpsDirectClient.java | 103 ----------------- .../api/req/sync/BasicDownloadRequest.java | 16 +++ .../req/sync/BasicExportStatusRequest.java | 16 +++ .../api/req/sync/BasicExportTimeRequest.java | 10 ++ .../glxp/api/req/sync/SpsSyncDataRequest.java | 10 ++ .../api/res/system/SyncDataSetResponse.java | 2 +- .../inout/impl/IoOrderServiceImpl.java | 2 +- .../service/sync/BasicDownloadService.java | 22 ++++ .../api/service/sync/BasicExportService.java | 23 ++++ .../service/sync/BasicExportTimeService.java | 22 ++++ .../SyncDataBustypeService.java | 4 +- .../{system => sync}/SyncDataSetService.java | 4 +- .../sync/impl/BasicDownloadServiceImpl.java | 66 +++++++++++ .../sync/impl/BasicExportServiceImpl.java | 66 +++++++++++ .../sync/impl/BasicExportTimeServiceImpl.java | 59 ++++++++++ .../impl/SyncDataBustypeServiceImpl.java | 6 +- .../impl/SyncDataSetServiceImpl.java | 12 +- .../system/SyncUploadDataBustypeService.java | 2 +- .../SyncUploadDataBustypeServiceImpl.java | 2 +- .../impl/SyncUploadDataSetServiceImpl.java | 2 +- .../api/service/thrsys/ThrCorpsDlService.java | 6 +- .../service/thrsys/ThrOrdersDlService.java | 4 +- .../service/thrsys/ThrProductsDlService.java | 4 +- .../mybatis/mapper/sync/BasicDownloadDao.xml | 89 +++++++++++++++ .../mybatis/mapper/sync/BasicExportDao.xml | 97 ++++++++++++++++ .../mapper/sync/BasicExportTimeDao.xml | 47 ++++++++ .../mybatis/mapper/sync/SyncDataSetDao.xml | 48 ++++++++ .../mapper/system/SyncDataBustypeDao.xml | 6 +- .../mybatis/mapper/system/SyncDataSetDao.xml | 53 --------- .../system/SyncUploadDataBustypeDao.xml | 6 +- .../mybatis/mapper/thrsys/ThrProductsDao.xml | 2 +- 50 files changed, 1003 insertions(+), 261 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadStatusController.java create mode 100644 src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java rename src/main/java/com/glxp/api/controller/{system => sync}/SyncDataSetController.java (90%) create mode 100644 src/main/java/com/glxp/api/dao/sync/BasicDownloadDao.java create mode 100644 src/main/java/com/glxp/api/dao/sync/BasicExportDao.java create mode 100644 src/main/java/com/glxp/api/dao/sync/BasicExportTimeDao.java rename src/main/java/com/glxp/api/dao/{system => sync}/SyncDataSetDao.java (68%) create mode 100644 src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java create mode 100644 src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java create mode 100644 src/main/java/com/glxp/api/entity/sync/BasicExportStatusTimeEntity.java rename src/main/java/com/glxp/api/entity/{system => sync}/SyncDataBustypeEntity.java (83%) create mode 100644 src/main/java/com/glxp/api/entity/sync/SyncDataSetEntity.java delete mode 100644 src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java delete mode 100644 src/main/java/com/glxp/api/http/SpsDirectClient.java create mode 100644 src/main/java/com/glxp/api/req/sync/BasicDownloadRequest.java create mode 100644 src/main/java/com/glxp/api/req/sync/BasicExportStatusRequest.java create mode 100644 src/main/java/com/glxp/api/req/sync/BasicExportTimeRequest.java create mode 100644 src/main/java/com/glxp/api/req/sync/SpsSyncDataRequest.java create mode 100644 src/main/java/com/glxp/api/service/sync/BasicDownloadService.java create mode 100644 src/main/java/com/glxp/api/service/sync/BasicExportService.java create mode 100644 src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java rename src/main/java/com/glxp/api/service/{system => sync}/SyncDataBustypeService.java (69%) rename src/main/java/com/glxp/api/service/{system => sync}/SyncDataSetService.java (71%) create mode 100644 src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java create mode 100644 src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java create mode 100644 src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java rename src/main/java/com/glxp/api/service/{system => sync}/impl/SyncDataBustypeServiceImpl.java (81%) rename src/main/java/com/glxp/api/service/{system => sync}/impl/SyncDataSetServiceImpl.java (79%) create mode 100644 src/main/resources/mybatis/mapper/sync/BasicDownloadDao.xml create mode 100644 src/main/resources/mybatis/mapper/sync/BasicExportDao.xml create mode 100644 src/main/resources/mybatis/mapper/sync/BasicExportTimeDao.xml create mode 100644 src/main/resources/mybatis/mapper/sync/SyncDataSetDao.xml delete mode 100644 src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml diff --git a/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java b/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java index 99640c13..818f7fd4 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java @@ -7,7 +7,7 @@ import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicCorpsExportLogEntity; import com.glxp.api.entity.basic.BasicProductsExportLogEntity; -import com.glxp.api.entity.system.SyncDataSetEntity; +import com.glxp.api.entity.sync.SyncDataSetEntity; import com.glxp.api.http.HttpOkClient; import com.glxp.api.req.basic.BasicCorpsExportRequest; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; @@ -16,7 +16,7 @@ import com.glxp.api.res.basic.UdiRelevanceExportJsonResponse; import com.glxp.api.service.basic.BasicCorpExportLogService; import com.glxp.api.service.basic.BasicCorpService; import com.glxp.api.service.basic.BasicProductsExportLogService; -import com.glxp.api.service.system.SyncDataSetService; +import com.glxp.api.service.sync.SyncDataSetService; import com.glxp.api.util.ExcelUtil; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index e1addf5c..4847befe 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -18,9 +18,7 @@ import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.inv.InvPreinDetailEntity; -import com.glxp.api.entity.purchase.SupProductEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; -import com.glxp.api.http.SpsDirectClient; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.req.inout.AddEnterCodeRequest; import com.glxp.api.req.inout.AddOrderRequest; @@ -31,7 +29,6 @@ import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRlSupResponse; import com.glxp.api.res.inout.AddCodeResult; import com.glxp.api.res.inout.IoCodeTempResponse; -import com.glxp.api.service.auth.DeptService; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.*; import com.glxp.api.service.inout.*; @@ -66,8 +63,6 @@ public class IoCodeTempController extends BaseController { @Resource private IBasicBussinessTypeService basicBussinessTypeService; @Resource - private SpsDirectClient spsDirectClient; - @Resource IoAddInoutService transInoutService; @Resource private SystemParamConfigService systemParamConfigService; @@ -128,10 +123,6 @@ public class IoCodeTempController extends BaseController { inPostOrder.setPostOrders(inPostOrders); outPostOrder.setPostOrders(outPostOrders); - if (CollUtil.isNotEmpty(outPostOrders)) { - outPostOrder.setWmsUserId(userId + ""); - return spsDirectClient.uploadPdaOrder(outPostOrder); - } if (CollUtil.isNotEmpty(inPostOrders)) { inPostOrder.setCustomerId(getCustomerId()); @@ -999,7 +990,7 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(500, "数量不能小于0"); } codeTempEntity.setReCount(codeTempEntity.getMyCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode())); - if(codeTempEntity.getId() == null){ + if (codeTempEntity.getId() == null) { } int b = codeTempService.updateById(codeTempEntity); diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadStatusController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadStatusController.java new file mode 100644 index 00000000..aede6548 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadStatusController.java @@ -0,0 +1,84 @@ +package com.glxp.api.controller.sync; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.sync.BasicDownloadStatusEntity; +import com.glxp.api.req.sync.BasicDownloadRequest; +import com.glxp.api.req.sync.SpsSyncDataRequest; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.sync.BasicDownloadService; +import com.glxp.api.util.RedisUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +@Slf4j +@RestController +public class SpsSyncDownloadStatusController { + + @Resource + BasicDownloadService basicDownloadService; + @Resource + RedisUtil redisUtil; + + + @GetMapping("sps/sync/connect/test") + public BaseResponse connectTest(SpsSyncDataRequest spsSyncDataRequest) { + return ResultVOUtils.success("连接成功"); + } + + @AuthRuleAnnotation("") + @GetMapping("/spssync/download/basic/udiinfo/getStatus") + public BaseResponse getStatus(BasicDownloadRequest basicDownloadRequest) { + List basicDownloadStatusEntities = basicDownloadService.filterDownloadStatus(basicDownloadRequest); + return ResultVOUtils.success(basicDownloadStatusEntities); + } + + @AuthRuleAnnotation("") + @GetMapping("/spssync/download/basic/udiinfo/filter") + public BaseResponse filterStatus(BasicDownloadRequest basicDownloadRequest) { + List basicDownloadStatusEntities = basicDownloadService.filterDownloadStatus(basicDownloadRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicDownloadStatusEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicDownloadStatusEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @PostMapping("/spssync/download/basic/udiinfo/deleteByStatus") + public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) { + + boolean b = basicDownloadService.deleteById(deleteRequest.getId()); + redisUtil.del(deleteRequest.getId()); + if (b) + return ResultVOUtils.success("删除成功！"); + else + return ResultVOUtils.error(500, "删除失败！"); + } + + @AuthRuleAnnotation("") + @PostMapping("/spssync/download/basic/udiinfo/updateStatus") + public BaseResponse updateStatus(@RequestBody BasicDownloadStatusEntity basicDownloadStatusEntity) { + + basicDownloadStatusEntity.setEndTime(new Date()); + basicDownloadStatusEntity.setUpdateTime(new Date()); + boolean b = basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); + if (b) + return ResultVOUtils.success("更新成功！"); + else + return ResultVOUtils.error(500, "更新成功！"); + } + + +} diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java new file mode 100644 index 00000000..cabaefaf --- /dev/null +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java @@ -0,0 +1,104 @@ +package com.glxp.api.controller.sync; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.sync.BasicExportStatusEntity; +import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; +import com.glxp.api.req.sync.BasicExportStatusRequest; +import com.glxp.api.req.sync.BasicExportTimeRequest; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.sync.BasicExportService; +import com.glxp.api.service.sync.BasicExportTimeService; +import com.glxp.api.util.RedisUtil; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +@RestController +public class SpsSyncExportStatusController { + + + @Resource + BasicExportService basicExportService; + @Resource + BasicExportTimeService basicExportTimeService; + @Resource + RedisUtil redisUtil; + + @GetMapping("/spssync/basic/udiinfo/getStatus") + public BaseResponse getStatus(BasicExportStatusRequest basicExportStatusRequest) { + List basicExportStatusEntities = basicExportService.filterExportStatus(basicExportStatusRequest); + return ResultVOUtils.success(basicExportStatusEntities); + } + + @GetMapping("/spssync/basic/udiinfo/filter") + public BaseResponse filterStatus(BasicExportStatusRequest basicExportStatusRequest) { + List basicExportStatusEntities = basicExportService.filterExportStatus(basicExportStatusRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicExportStatusEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicExportStatusEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @PostMapping("/spssync/basic/udiinfo/deleteByStatus") + public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) { + + boolean b = basicExportService.deleteById(deleteRequest.getId()); + redisUtil.del(deleteRequest.getId()); + if (b) + return ResultVOUtils.success("删除成功！"); + else + return ResultVOUtils.error(500, "删除失败！"); + } + + @AuthRuleAnnotation("") + @PostMapping("/spssync/basic/udiinfo/updateStatus") + public BaseResponse updateStatus(@RequestBody BasicExportStatusEntity basicExportStatusEntity) { + if (StrUtil.isEmpty(basicExportStatusEntity.getReceiveStatus())) { + basicExportStatusEntity.setEndTime(new Date()); + } + basicExportStatusEntity.setUpdateTime(new Date()); + boolean b = basicExportService.updateExportStatus(basicExportStatusEntity); + if (b) + return ResultVOUtils.success("更新成功！"); + else + return ResultVOUtils.error(500, "更新成功！"); + } + + @AuthRuleAnnotation("") + @GetMapping("/spssync/basic/schedule/lastTime") + public BaseResponse getLastUpdateTime(BasicExportTimeRequest basicExportTimeRequest) { + List basicExportStatusEntities = basicExportTimeService.filterExportStatus(basicExportTimeRequest); + if (CollUtil.isNotEmpty(basicExportStatusEntities)) { + return ResultVOUtils.success(basicExportStatusEntities.get(0).getLastUpdateTime()); + } else { + return ResultVOUtils.success("1949-01-01 00:00:00"); + } + } + + @AuthRuleAnnotation("") + @PostMapping("/spssync/basic/schedule/updateLastTime") + public BaseResponse updateLastTime(@RequestBody BasicExportStatusTimeEntity basicExportStatusTimeEntity) { + + boolean b = basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); + if (b) + return ResultVOUtils.success("更新成功！"); + else + return ResultVOUtils.error(500, "更新失败！"); + } + + +} diff --git a/src/main/java/com/glxp/api/controller/system/SyncDataSetController.java b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java similarity index 90% rename from src/main/java/com/glxp/api/controller/system/SyncDataSetController.java rename to src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java index b43445b5..05884b9e 100644 --- a/src/main/java/com/glxp/api/controller/system/SyncDataSetController.java +++ b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java @@ -1,17 +1,17 @@ -package com.glxp.api.controller.system; +package com.glxp.api.controller.sync; import cn.hutool.core.collection.CollUtil; import com.glxp.api.annotation.AuthRuleAnnotation; -import com.glxp.api.constant.Constant; -import com.glxp.api.entity.system.SyncDataBustypeEntity; -import com.glxp.api.entity.system.SyncDataSetEntity; -import com.glxp.api.res.system.SyncDataSetResponse; -import com.glxp.api.service.system.SyncDataBustypeService; -import com.glxp.api.service.system.SyncDataSetService; -import com.glxp.api.util.RedisUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.Constant; +import com.glxp.api.entity.sync.SyncDataBustypeEntity; +import com.glxp.api.entity.sync.SyncDataSetEntity; +import com.glxp.api.res.system.SyncDataSetResponse; +import com.glxp.api.service.sync.SyncDataBustypeService; +import com.glxp.api.service.sync.SyncDataSetService; +import com.glxp.api.util.RedisUtil; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -54,7 +54,6 @@ public class SyncDataSetController { ) { SyncDataSetEntity syncDataSetEntity = new SyncDataSetEntity(); BeanUtils.copyProperties(syncDataSetResponse, syncDataSetEntity); - syncDataSetEntity.setId(1); List busTypes = syncDataSetResponse.getBusTypes(); syncDataBustypeService.deleteAll(); if (CollUtil.isNotEmpty(busTypes)) @@ -71,4 +70,6 @@ public class SyncDataSetController { } return ResultVOUtils.success(); } + + } diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java index 62414e60..b49240d3 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java @@ -2,7 +2,7 @@ package com.glxp.api.controller.thrsys; import cn.hutool.core.collection.CollUtil; import com.glxp.api.annotation.AuthRuleAnnotation; -import com.glxp.api.entity.system.SyncDataBustypeEntity; +import com.glxp.api.entity.sync.SyncDataBustypeEntity; import com.glxp.api.entity.system.SyncUploadDataSetEntity; import com.glxp.api.service.system.SyncUploadDataBustypeService; import com.glxp.api.service.system.SyncUploadDataSetService; diff --git a/src/main/java/com/glxp/api/dao/sync/BasicDownloadDao.java b/src/main/java/com/glxp/api/dao/sync/BasicDownloadDao.java new file mode 100644 index 00000000..6b50ba4a --- /dev/null +++ b/src/main/java/com/glxp/api/dao/sync/BasicDownloadDao.java @@ -0,0 +1,25 @@ +package com.glxp.api.dao.sync; + +import com.glxp.api.entity.sync.BasicDownloadStatusEntity; +import com.glxp.api.req.sync.BasicDownloadRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BasicDownloadDao { + + + List filterDownloadStatus(BasicDownloadRequest basicDownloadRequest); + + boolean insertDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByTime(); + + boolean updateDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity); + + +} diff --git a/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java b/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java new file mode 100644 index 00000000..76c6830d --- /dev/null +++ b/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java @@ -0,0 +1,24 @@ +package com.glxp.api.dao.sync; + +import com.glxp.api.entity.sync.BasicExportStatusEntity; +import com.glxp.api.req.sync.BasicExportStatusRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BasicExportDao { + + + List filterExportStatus(BasicExportStatusRequest basicExportStatusRequest); + + boolean insertExportStatus(BasicExportStatusEntity ioOrderStatusEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByTime(); + + boolean updateExportStatus(BasicExportStatusEntity warehouseEntity); + +} diff --git a/src/main/java/com/glxp/api/dao/sync/BasicExportTimeDao.java b/src/main/java/com/glxp/api/dao/sync/BasicExportTimeDao.java new file mode 100644 index 00000000..aa615cca --- /dev/null +++ b/src/main/java/com/glxp/api/dao/sync/BasicExportTimeDao.java @@ -0,0 +1,20 @@ +package com.glxp.api.dao.sync; + +import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; +import com.glxp.api.req.sync.BasicExportTimeRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface BasicExportTimeDao { + + + List filterExportStatus(BasicExportTimeRequest basicExportStatusRequest); + + boolean insertExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity); + + boolean deleteById(String id); + + boolean updateExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity); +} diff --git a/src/main/java/com/glxp/api/dao/system/SyncDataSetDao.java b/src/main/java/com/glxp/api/dao/sync/SyncDataSetDao.java similarity index 68% rename from src/main/java/com/glxp/api/dao/system/SyncDataSetDao.java rename to src/main/java/com/glxp/api/dao/sync/SyncDataSetDao.java index 4e89d05d..2f101e3c 100644 --- a/src/main/java/com/glxp/api/dao/system/SyncDataSetDao.java +++ b/src/main/java/com/glxp/api/dao/sync/SyncDataSetDao.java @@ -1,6 +1,6 @@ -package com.glxp.api.dao.system; +package com.glxp.api.dao.sync; -import com.glxp.api.entity.system.SyncDataSetEntity; +import com.glxp.api.entity.sync.SyncDataSetEntity; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/glxp/api/dao/system/SyncDataBustypeDao.java b/src/main/java/com/glxp/api/dao/system/SyncDataBustypeDao.java index 081bd743..5643c2f8 100644 --- a/src/main/java/com/glxp/api/dao/system/SyncDataBustypeDao.java +++ b/src/main/java/com/glxp/api/dao/system/SyncDataBustypeDao.java @@ -1,6 +1,6 @@ package com.glxp.api.dao.system; -import com.glxp.api.entity.system.SyncDataBustypeEntity; +import com.glxp.api.entity.sync.SyncDataBustypeEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/system/SyncUploadDataBustypeDao.java b/src/main/java/com/glxp/api/dao/system/SyncUploadDataBustypeDao.java index 03120a02..caf96937 100644 --- a/src/main/java/com/glxp/api/dao/system/SyncUploadDataBustypeDao.java +++ b/src/main/java/com/glxp/api/dao/system/SyncUploadDataBustypeDao.java @@ -1,6 +1,6 @@ package com.glxp.api.dao.system; -import com.glxp.api.entity.system.SyncDataBustypeEntity; +import com.glxp.api.entity.sync.SyncDataBustypeEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java new file mode 100644 index 00000000..9842cd3e --- /dev/null +++ b/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java @@ -0,0 +1,27 @@ +package com.glxp.api.entity.sync; + +import lombok.Data; + +import java.util.Date; + +@Data +public class BasicDownloadStatusEntity { + + /** + * 记录ID + */ + private String id; + + /** + * 任务ID + */ + private String taskId; + private String idDatas; + private Integer status; + private Integer type; + private Date updateTime; + private Integer scheduleType; + private Date startTime; + private Date endTime; + private String remark; +} diff --git a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java new file mode 100644 index 00000000..4326a37e --- /dev/null +++ b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java @@ -0,0 +1,19 @@ +package com.glxp.api.entity.sync; + +import lombok.Data; + +import java.util.Date; + +@Data +public class BasicExportStatusEntity { + private String id; + private String idDatas; + private Integer status; + private Integer type; + private Date updateTime; + private Integer scheduleType; + private Date startTime; + private Date endTime; + private String remark; + private String receiveStatus; +} diff --git a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusTimeEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusTimeEntity.java new file mode 100644 index 00000000..fc516426 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusTimeEntity.java @@ -0,0 +1,13 @@ +package com.glxp.api.entity.sync; + +import lombok.Data; + +@Data +public class BasicExportStatusTimeEntity { + + private Integer id; + private String lastUpdateTime; + private String key; + private String remark; + +} diff --git a/src/main/java/com/glxp/api/entity/system/SyncDataBustypeEntity.java b/src/main/java/com/glxp/api/entity/sync/SyncDataBustypeEntity.java similarity index 83% rename from src/main/java/com/glxp/api/entity/system/SyncDataBustypeEntity.java rename to src/main/java/com/glxp/api/entity/sync/SyncDataBustypeEntity.java index a1c01977..0c812a86 100644 --- a/src/main/java/com/glxp/api/entity/system/SyncDataBustypeEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/SyncDataBustypeEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.system; +package com.glxp.api.entity.sync; import lombok.Data; diff --git a/src/main/java/com/glxp/api/entity/sync/SyncDataSetEntity.java b/src/main/java/com/glxp/api/entity/sync/SyncDataSetEntity.java new file mode 100644 index 00000000..70d56ad4 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/sync/SyncDataSetEntity.java @@ -0,0 +1,45 @@ +package com.glxp.api.entity.sync; + +import lombok.Data; + +import java.util.List; + +@Data +public class SyncDataSetEntity { + private Integer id; + private boolean typeBus; + private boolean typeScan; + private boolean typeThird; + private boolean basicProducts; + private boolean basicCorp; + private boolean basicInv; + private boolean basicThirdProducts; + private boolean basicThirdCorp; + private boolean basicThirdInv; + private boolean basicThirdBusOrder; + private boolean dbDiProducts; + private boolean downstreamEnable; + private boolean orderScanFinish; + private boolean orderUnReceive; + private boolean orderUnCheck; + private String busTypes; + private boolean sysUser; + + private Integer syncTime; + + private Integer orderSyncTime; + private String orderSyncStart; + private String basicSyncStart; + private boolean entrustAction; + + + private boolean unCheckCert; + private boolean checkedCert; + private boolean companyCert; + private boolean manufacturerCert; + private boolean productCert; + + private String syncIp; + + +} diff --git a/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java b/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java deleted file mode 100644 index 429f8ff0..00000000 --- a/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.glxp.api.entity.system; - -import lombok.Data; - -@Data -public class SyncDataSetEntity { - - private Integer id; - private boolean typeBus; //业务单据类型 - private boolean typeScan; //扫码单据类型 - private boolean typeThird; //第三方单据类型 - private boolean basicProducts; //耗材字典 - private boolean basicCorp; //往来单位字典 - private boolean basicInv; //仓库字典 - private boolean basicThirdProducts; //第三方产品信息 - private boolean basicThirdCorp; //第三方往来信息 - private boolean basicThirdInv; //第三方仓库信息 - private boolean basicThirdBusOrder; //第三方业务单据 - private boolean orderScanFinish; //已完成单据 - private boolean dbDiProducts; //DI产品信息 - private boolean downstreamEnable; //上游是否联通 - private Integer syncTime; //数据上传间隔时间 - private Integer syncDownloadTime; //数据下载间隔时间 - - private boolean orderUnReceive; //未验收单据 - private boolean orderUnCheck; //待校验单据 - private String busTypes; //单据类型 - private String syncIp; - private boolean sysUser; - private boolean entrustAction; - - - private Integer orderSyncTime; - private Integer orderSyncDlTime; - - private boolean unCheckCert; - private boolean checkedCert; - private boolean companyCert; - private boolean manufacturerCert; - private boolean productCert; - - - private String orderSyncStart; - private String basicSyncStart; -} diff --git a/src/main/java/com/glxp/api/entity/system/SyncUploadDataSetEntity.java b/src/main/java/com/glxp/api/entity/system/SyncUploadDataSetEntity.java index d2358252..f65824bb 100644 --- a/src/main/java/com/glxp/api/entity/system/SyncUploadDataSetEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SyncUploadDataSetEntity.java @@ -1,5 +1,6 @@ package com.glxp.api.entity.system; +import com.glxp.api.entity.sync.SyncDataBustypeEntity; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/http/SpsDirectClient.java b/src/main/java/com/glxp/api/http/SpsDirectClient.java deleted file mode 100644 index 20c20044..00000000 --- a/src/main/java/com/glxp/api/http/SpsDirectClient.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.glxp.api.http; - -import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.entity.system.SyncDataSetEntity; -import com.glxp.api.req.inout.PostOrderRequest; -import com.glxp.api.service.system.SyncDataSetService; -import com.glxp.api.util.OkHttpCli; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.Map; - -@Service -public class SpsDirectClient { - @Resource - private OkHttpCli okHttpCli; - @Resource - SyncDataSetService syncDataSetService; - - public String getIpUrl() { - SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet(); - return syncDataSetEntity.getSyncIp(); - } - - //单据验收 todo -// public BaseResponse reviewOrder(OrderFilterRequest orderFilterRequest) { -// String json = JSONUtil.toJsonStr(orderFilterRequest); -// String result = okHttpCli.doPostJson(getIpUrl() + "/sps/review/download/order/finsih", json); -// BaseResponse response = -// JSONObject.parseObject(result, new TypeReference>() { -// }); -// return response; -// -// } - - //获取未验收的单据 - public BaseResponse downloadOrder(String orderId, String wmsUserId, String action) { - Map paramMap = new HashMap<>(16); - paramMap.put("wmsUserId", wmsUserId); - paramMap.put("orderId", orderId); - paramMap.put("action", action); - String response = okHttpCli.doGet(getIpUrl() + "/sps/review/download/order", paramMap); - try { - BaseResponse data = JSONObject.parseObject(response, new TypeReference() { - }); - return data; - } catch (Exception e) { - e.printStackTrace(); - return ResultVOUtils.error(500, "连接失败！"); - } - } - - //获取未验收的单据详情 - public BaseResponse downloadOrderDetail(String orderId, String wmsUserId) { - Map paramMap = new HashMap<>(16); - paramMap.put("wmsUserId", wmsUserId); - paramMap.put("orderId", orderId); - String response = okHttpCli.doGet(getIpUrl() + "/sps/review/download/orderDetail", paramMap); - try { - BaseResponse data = JSONObject.parseObject(response, new TypeReference() { - }); - return data; - } catch (Exception e) { - e.printStackTrace(); - return ResultVOUtils.error(500, "连接失败！"); - } - } - - - //获取未验收的单据条码 - public BaseResponse downloadCodes(String wmsUserId, String orderId) { - Map paramMap = new HashMap<>(16); - paramMap.put("wmsUserId", wmsUserId); - paramMap.put("orderId", orderId); - String response = okHttpCli.doGet(getIpUrl() + "/sps/review/download/codes", paramMap); - try { - BaseResponse data = JSONObject.parseObject(response, new TypeReference() { - }); - return data; - } catch (Exception e) { - e.printStackTrace(); - return ResultVOUtils.error(500, "连接失败！"); - } - } - - - //单据上传 - public BaseResponse uploadPdaOrder(PostOrderRequest postOrderRequest) { - String json = JSONUtil.toJsonStr(postOrderRequest); - String result = okHttpCli.doPostJson(getIpUrl() + "/sps/pda/upload/orders", json); - BaseResponse response = - JSONObject.parseObject(result, new TypeReference>() { - }); - return response; - - } - -} diff --git a/src/main/java/com/glxp/api/req/sync/BasicDownloadRequest.java b/src/main/java/com/glxp/api/req/sync/BasicDownloadRequest.java new file mode 100644 index 00000000..ba4b52b6 --- /dev/null +++ b/src/main/java/com/glxp/api/req/sync/BasicDownloadRequest.java @@ -0,0 +1,16 @@ +package com.glxp.api.req.sync; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class BasicDownloadRequest extends ListPageRequest { + private String id; + private String taskId; //任务ID + private Integer status; + private Integer type; + private String idDatas; + private Integer scheduleType; + public Integer createType; + private String syncTime; +} diff --git a/src/main/java/com/glxp/api/req/sync/BasicExportStatusRequest.java b/src/main/java/com/glxp/api/req/sync/BasicExportStatusRequest.java new file mode 100644 index 00000000..81bb33c9 --- /dev/null +++ b/src/main/java/com/glxp/api/req/sync/BasicExportStatusRequest.java @@ -0,0 +1,16 @@ +package com.glxp.api.req.sync; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class BasicExportStatusRequest extends ListPageRequest { + private String id; + private Integer status; + private Integer type; + private Integer scheduleType; + private String idDatas; + public Integer createType; + private String syncTime; + private String receiveStatus; +} diff --git a/src/main/java/com/glxp/api/req/sync/BasicExportTimeRequest.java b/src/main/java/com/glxp/api/req/sync/BasicExportTimeRequest.java new file mode 100644 index 00000000..71ab0b66 --- /dev/null +++ b/src/main/java/com/glxp/api/req/sync/BasicExportTimeRequest.java @@ -0,0 +1,10 @@ +package com.glxp.api.req.sync; + +import lombok.Data; + +@Data +public class BasicExportTimeRequest { + + private Integer id; + private String key; +} diff --git a/src/main/java/com/glxp/api/req/sync/SpsSyncDataRequest.java b/src/main/java/com/glxp/api/req/sync/SpsSyncDataRequest.java new file mode 100644 index 00000000..bf4f6481 --- /dev/null +++ b/src/main/java/com/glxp/api/req/sync/SpsSyncDataRequest.java @@ -0,0 +1,10 @@ +package com.glxp.api.req.sync; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class SpsSyncDataRequest extends ListPageRequest { + + private String lastUpdateTime; +} diff --git a/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java b/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java index a7f59e15..54f35983 100644 --- a/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java +++ b/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java @@ -1,6 +1,6 @@ package com.glxp.api.res.system; -import com.glxp.api.entity.system.SyncDataBustypeEntity; +import com.glxp.api.entity.sync.SyncDataBustypeEntity; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index aa578152..cb9e6573 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -24,7 +24,7 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.inv.*; -import com.glxp.api.entity.system.SyncDataBustypeEntity; +import com.glxp.api.entity.sync.SyncDataBustypeEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.http.HttpOkClient; diff --git a/src/main/java/com/glxp/api/service/sync/BasicDownloadService.java b/src/main/java/com/glxp/api/service/sync/BasicDownloadService.java new file mode 100644 index 00000000..ea56fd84 --- /dev/null +++ b/src/main/java/com/glxp/api/service/sync/BasicDownloadService.java @@ -0,0 +1,22 @@ +package com.glxp.api.service.sync; + + +import com.glxp.api.entity.sync.BasicDownloadStatusEntity; +import com.glxp.api.req.sync.BasicDownloadRequest; + +import java.util.List; + +public interface BasicDownloadService { + + BasicDownloadStatusEntity findByData(String idDatas, Integer status); + + List filterDownloadStatus(BasicDownloadRequest basicDownloadRequest); + + boolean insertDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity); + + boolean deleteById(String id); + + boolean deleteByTime(); + + boolean updateDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity); +} diff --git a/src/main/java/com/glxp/api/service/sync/BasicExportService.java b/src/main/java/com/glxp/api/service/sync/BasicExportService.java new file mode 100644 index 00000000..3ad25fc6 --- /dev/null +++ b/src/main/java/com/glxp/api/service/sync/BasicExportService.java @@ -0,0 +1,23 @@ +package com.glxp.api.service.sync; + + +import com.glxp.api.entity.sync.BasicExportStatusEntity; +import com.glxp.api.req.sync.BasicExportStatusRequest; + +import java.util.List; + +public interface BasicExportService { + + + BasicExportStatusEntity findByData(String idDatas, Integer status); + + List filterExportStatus(BasicExportStatusRequest basicExportStatusRequest); + + boolean insertExportStatus(BasicExportStatusEntity ioOrderStatusEntity); + + boolean deleteById(String id); + + boolean deleteByTime(); + + boolean updateExportStatus(BasicExportStatusEntity warehouseEntity); +} diff --git a/src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java b/src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java new file mode 100644 index 00000000..36d9a74f --- /dev/null +++ b/src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java @@ -0,0 +1,22 @@ +package com.glxp.api.service.sync; + + +import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; +import com.glxp.api.req.sync.BasicExportTimeRequest; + +import java.util.List; + +public interface BasicExportTimeService { + + + BasicExportStatusTimeEntity findByType(String type); + + List filterExportStatus(BasicExportTimeRequest basicExportStatusRequest); + + boolean insertExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity); + + boolean deleteById(String id); + + boolean updateExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity); + +} diff --git a/src/main/java/com/glxp/api/service/system/SyncDataBustypeService.java b/src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java similarity index 69% rename from src/main/java/com/glxp/api/service/system/SyncDataBustypeService.java rename to src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java index 97b8bf57..80569777 100644 --- a/src/main/java/com/glxp/api/service/system/SyncDataBustypeService.java +++ b/src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java @@ -1,6 +1,6 @@ -package com.glxp.api.service.system; +package com.glxp.api.service.sync; -import com.glxp.api.entity.system.SyncDataBustypeEntity; +import com.glxp.api.entity.sync.SyncDataBustypeEntity; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/system/SyncDataSetService.java b/src/main/java/com/glxp/api/service/sync/SyncDataSetService.java similarity index 71% rename from src/main/java/com/glxp/api/service/system/SyncDataSetService.java rename to src/main/java/com/glxp/api/service/sync/SyncDataSetService.java index 058b45a4..d5dbb3c6 100644 --- a/src/main/java/com/glxp/api/service/system/SyncDataSetService.java +++ b/src/main/java/com/glxp/api/service/sync/SyncDataSetService.java @@ -1,7 +1,7 @@ -package com.glxp.api.service.system; +package com.glxp.api.service.sync; -import com.glxp.api.entity.system.SyncDataSetEntity; +import com.glxp.api.entity.sync.SyncDataSetEntity; import com.glxp.api.res.system.SyncDataSetResponse; public interface SyncDataSetService { diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java new file mode 100644 index 00000000..5fe827dc --- /dev/null +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java @@ -0,0 +1,66 @@ +package com.glxp.api.service.sync.impl; + +import cn.hutool.core.collection.CollUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.sync.BasicDownloadDao; +import com.glxp.api.entity.sync.BasicDownloadStatusEntity; +import com.glxp.api.req.sync.BasicDownloadRequest; +import com.glxp.api.service.sync.BasicDownloadService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +@Transactional(rollbackFor = Exception.class) +public class BasicDownloadServiceImpl implements BasicDownloadService { + + @Resource + BasicDownloadDao basicDownloadDao; + + @Override + public BasicDownloadStatusEntity findByData(String idDatas, Integer status) { + BasicDownloadRequest basicDownloadRequest = new BasicDownloadRequest(); + basicDownloadRequest.setStatus(status); + basicDownloadRequest.setIdDatas(idDatas); + List basicDownloadStatusEntities = basicDownloadDao.filterDownloadStatus(basicDownloadRequest); + if (CollUtil.isNotEmpty(basicDownloadStatusEntities)) { + return basicDownloadStatusEntities.get(0); + } + return null; + } + + @Override + public List filterDownloadStatus(BasicDownloadRequest basicDownloadRequest) { + if (basicDownloadRequest == null) { + return Collections.emptyList(); + } + if (basicDownloadRequest.getPage() != null) { + int offset = (basicDownloadRequest.getPage() - 1) * basicDownloadRequest.getLimit(); + PageHelper.offsetPage(offset, basicDownloadRequest.getLimit()); + } + return basicDownloadDao.filterDownloadStatus(basicDownloadRequest); + } + + @Override + public boolean insertDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity) { + return basicDownloadDao.insertDownloadStatus(basicDownloadStatusEntity); + } + + @Override + public boolean deleteById(String id) { + return basicDownloadDao.deleteById(id); + } + + @Override + public boolean deleteByTime() { + return basicDownloadDao.deleteByTime(); + } + + @Override + public boolean updateDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity) { + return basicDownloadDao.updateDownloadStatus(basicDownloadStatusEntity); + } +} diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java new file mode 100644 index 00000000..a4a94d3a --- /dev/null +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java @@ -0,0 +1,66 @@ +package com.glxp.api.service.sync.impl; + +import cn.hutool.core.collection.CollUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.sync.BasicExportDao; +import com.glxp.api.entity.sync.BasicExportStatusEntity; +import com.glxp.api.req.sync.BasicExportStatusRequest; +import com.glxp.api.service.sync.BasicExportService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +@Transactional(rollbackFor = Exception.class) +public class BasicExportServiceImpl implements BasicExportService { + + @Resource + BasicExportDao basicExportDao; + + @Override + public BasicExportStatusEntity findByData(String idDatas, Integer status) { + BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest(); + basicExportStatusRequest.setStatus(status); + basicExportStatusRequest.setIdDatas(idDatas); + List basicExportStatusEntities = basicExportDao.filterExportStatus(basicExportStatusRequest); + if (CollUtil.isNotEmpty(basicExportStatusEntities)) { + return basicExportStatusEntities.get(0); + } + return null; + } + + @Override + public List filterExportStatus(BasicExportStatusRequest basicExportStatusRequest) { + if (basicExportStatusRequest == null) { + return Collections.emptyList(); + } + if (basicExportStatusRequest.getPage() != null) { + int offset = (basicExportStatusRequest.getPage() - 1) * basicExportStatusRequest.getLimit(); + PageHelper.offsetPage(offset, basicExportStatusRequest.getLimit()); + } + return basicExportDao.filterExportStatus(basicExportStatusRequest); + } + + @Override + public boolean insertExportStatus(BasicExportStatusEntity basicExportStatusEntity) { + return basicExportDao.insertExportStatus(basicExportStatusEntity); + } + + @Override + public boolean deleteById(String id) { + return basicExportDao.deleteById(id); + } + + @Override + public boolean deleteByTime() { + return basicExportDao.deleteByTime(); + } + + @Override + public boolean updateExportStatus(BasicExportStatusEntity basicExportStatusEntity) { + return basicExportDao.updateExportStatus(basicExportStatusEntity); + } +} diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java new file mode 100644 index 00000000..af59e17d --- /dev/null +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java @@ -0,0 +1,59 @@ +package com.glxp.api.service.sync.impl; + +import cn.hutool.core.collection.CollUtil; +import com.glxp.api.dao.sync.BasicExportTimeDao; +import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; +import com.glxp.api.req.sync.BasicExportTimeRequest; +import com.glxp.api.service.sync.BasicExportTimeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class BasicExportTimeServiceImpl implements BasicExportTimeService { + + @Resource + BasicExportTimeDao basicExportTimeDao; + + @Override + public BasicExportStatusTimeEntity findByType(String type) { + BasicExportTimeRequest basicExportTimeRequest = new BasicExportTimeRequest(); + basicExportTimeRequest.setKey(type); + List basicExportStatusTimeEntities = basicExportTimeDao.filterExportStatus(basicExportTimeRequest); + if (CollUtil.isNotEmpty(basicExportStatusTimeEntities)) { + return basicExportStatusTimeEntities.get(0); + } + + BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); + basicExportStatusTimeEntity.setKey(type); + basicExportStatusTimeEntity.setLastUpdateTime("1949-01-01 00:00:00"); + return basicExportStatusTimeEntity; + } + + @Override + public List filterExportStatus(BasicExportTimeRequest basicExportStatusRequest) { + if (basicExportStatusRequest == null) { + return Collections.emptyList(); + } + return basicExportTimeDao.filterExportStatus(basicExportStatusRequest); + } + + @Override + public boolean insertExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity) { + return basicExportTimeDao.insertExportStatus(basicExportStatusTimeEntity); + + } + + @Override + public boolean deleteById(String id) { + return basicExportTimeDao.deleteById(id); + } + + @Override + public boolean updateExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity) { + return basicExportTimeDao.updateExportStatus(basicExportStatusTimeEntity); + + } +} diff --git a/src/main/java/com/glxp/api/service/system/impl/SyncDataBustypeServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java similarity index 81% rename from src/main/java/com/glxp/api/service/system/impl/SyncDataBustypeServiceImpl.java rename to src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java index 17a3df4f..7e128f73 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SyncDataBustypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java @@ -1,8 +1,8 @@ -package com.glxp.api.service.system.impl; +package com.glxp.api.service.sync.impl; import com.glxp.api.dao.system.SyncDataBustypeDao; -import com.glxp.api.entity.system.SyncDataBustypeEntity; -import com.glxp.api.service.system.SyncDataBustypeService; +import com.glxp.api.entity.sync.SyncDataBustypeEntity; +import com.glxp.api.service.sync.SyncDataBustypeService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/system/impl/SyncDataSetServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java similarity index 79% rename from src/main/java/com/glxp/api/service/system/impl/SyncDataSetServiceImpl.java rename to src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java index 8135011c..4f424c14 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SyncDataSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java @@ -1,11 +1,11 @@ -package com.glxp.api.service.system.impl; +package com.glxp.api.service.sync.impl; -import com.glxp.api.dao.system.SyncDataSetDao; -import com.glxp.api.entity.system.SyncDataBustypeEntity; -import com.glxp.api.entity.system.SyncDataSetEntity; +import com.glxp.api.dao.sync.SyncDataSetDao; +import com.glxp.api.entity.sync.SyncDataBustypeEntity; +import com.glxp.api.entity.sync.SyncDataSetEntity; import com.glxp.api.res.system.SyncDataSetResponse; -import com.glxp.api.service.system.SyncDataBustypeService; -import com.glxp.api.service.system.SyncDataSetService; +import com.glxp.api.service.sync.SyncDataBustypeService; +import com.glxp.api.service.sync.SyncDataSetService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/system/SyncUploadDataBustypeService.java b/src/main/java/com/glxp/api/service/system/SyncUploadDataBustypeService.java index 09c0f9b9..f5134cce 100644 --- a/src/main/java/com/glxp/api/service/system/SyncUploadDataBustypeService.java +++ b/src/main/java/com/glxp/api/service/system/SyncUploadDataBustypeService.java @@ -1,6 +1,6 @@ package com.glxp.api.service.system; -import com.glxp.api.entity.system.SyncDataBustypeEntity; +import com.glxp.api.entity.sync.SyncDataBustypeEntity; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataBustypeServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataBustypeServiceImpl.java index 1c08b6d6..59adadae 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataBustypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataBustypeServiceImpl.java @@ -2,7 +2,7 @@ package com.glxp.api.service.system.impl; import cn.hutool.core.util.StrUtil; import com.glxp.api.dao.system.SyncUploadDataBustypeDao; -import com.glxp.api.entity.system.SyncDataBustypeEntity; +import com.glxp.api.entity.sync.SyncDataBustypeEntity; import com.glxp.api.service.system.SyncUploadDataBustypeService; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java index 85550994..c90722e2 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java @@ -1,7 +1,7 @@ package com.glxp.api.service.system.impl; import com.glxp.api.dao.system.SyncUploadDataSetDao; -import com.glxp.api.entity.system.SyncDataBustypeEntity; +import com.glxp.api.entity.sync.SyncDataBustypeEntity; import com.glxp.api.entity.system.SyncUploadDataSetEntity; import com.glxp.api.service.system.SyncUploadDataBustypeService; import com.glxp.api.service.system.SyncUploadDataSetService; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java index f05c9804..2ebc215f 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java @@ -8,21 +8,19 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.config.WebSocketServer; import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.Constant; -import com.glxp.api.entity.system.SyncDataSetEntity; +import com.glxp.api.entity.sync.SyncDataSetEntity; import com.glxp.api.entity.thrsys.*; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.http.HttpOkClient; import com.glxp.api.req.thrsys.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrCorpsResponse; -import com.glxp.api.res.thrsys.ThrProductsResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.system.SyncDataSetService; +import com.glxp.api.service.sync.SyncDataSetService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.ExcelUtil; import com.glxp.api.util.RedisUtil; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java index d3627f0e..2ad63028 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java @@ -6,7 +6,7 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.config.WebSocketServer; import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.Constant; -import com.glxp.api.entity.system.SyncDataSetEntity; +import com.glxp.api.entity.sync.SyncDataSetEntity; import com.glxp.api.entity.thrsys.*; import com.glxp.api.http.ErpOrderClient; import com.glxp.api.http.HttpOkClient; @@ -16,7 +16,7 @@ import com.glxp.api.req.thrsys.PostThrOrderRequest; import com.glxp.api.req.thrsys.ThrOrderExportRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrOrderResponse; -import com.glxp.api.service.system.SyncDataSetService; +import com.glxp.api.service.sync.SyncDataSetService; import com.glxp.api.util.RedisUtil; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java index a4f7ffbb..91f7de95 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java @@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.constant.BasicProcessStatus; -import com.glxp.api.entity.system.SyncDataSetEntity; +import com.glxp.api.entity.sync.SyncDataSetEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; @@ -17,7 +17,7 @@ import com.glxp.api.req.thrsys.PostThrProductsRequest; import com.glxp.api.req.thrsys.ThrProductsExportRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrProductsResponse; -import com.glxp.api.service.system.SyncDataSetService; +import com.glxp.api.service.sync.SyncDataSetService; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/src/main/resources/mybatis/mapper/sync/BasicDownloadDao.xml b/src/main/resources/mybatis/mapper/sync/BasicDownloadDao.xml new file mode 100644 index 00000000..3665bae5 --- /dev/null +++ b/src/main/resources/mybatis/mapper/sync/BasicDownloadDao.xml @@ -0,0 +1,89 @@ + + + + + + + + + replace + INTO basic_download_status(id, taskId, idDatas, status, type, updateTime, scheduleType, startTime, + endTime, remark) + values (#{id}, + #{taskId}, + #{idDatas}, + #{status}, + #{type}, + #{updateTime}, + #{scheduleType}, + #{startTime}, + #{endTime}, #{remark}) + + + + UPDATE basic_download_status + + + idDatas=#{idDatas}, + + + status=#{status}, + + + type=#{type}, + + + updateTime=#{updateTime}, + + + scheduleType=#{scheduleType}, + + + startTime=#{startTime}, + + + endTime=#{endTime}, + + + remark=#{remark}, + + + WHERE id = #{id} + + + DELETE + FROM basic_download_status + WHERE id = #{id} + + + Delete + From basic_download_status + where date(startTime) <= date(DATE_SUB(NOW(), INTERVAL 30 day)) + + diff --git a/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml b/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml new file mode 100644 index 00000000..7e0bc7c1 --- /dev/null +++ b/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml @@ -0,0 +1,97 @@ + + + + + + + + + replace + INTO basic_export_status(id, idDatas, status, `type`, updateTime, scheduleType, startTime, endTime, + remark, receiveStatus) + values (#{id}, + #{idDatas}, + #{status}, + #{type}, + #{updateTime}, + #{scheduleType}, + #{startTime}, + #{endTime}, + #{remark}, + #{receiveStatus}) + + + + UPDATE basic_export_status + + + idDatas=#{idDatas}, + + + status=#{status}, + + + `type`=#{type}, + + + updateTime=#{updateTime}, + + + scheduleType=#{scheduleType}, + + + startTime=#{startTime}, + + + endTime=#{endTime}, + + + remark=#{remark}, + + + receiveStatus=#{receiveStatus}, + + + WHERE id = #{id} + + + DELETE + FROM basic_export_status + WHERE id = #{id} + + + Delete + From basic_export_status + where date(startTime) <= date(DATE_SUB(NOW(), INTERVAL 30 day)) + + diff --git a/src/main/resources/mybatis/mapper/sync/BasicExportTimeDao.xml b/src/main/resources/mybatis/mapper/sync/BasicExportTimeDao.xml new file mode 100644 index 00000000..04cffd34 --- /dev/null +++ b/src/main/resources/mybatis/mapper/sync/BasicExportTimeDao.xml @@ -0,0 +1,47 @@ + + + + + + + + + replace + INTO basic_export_status_time(`key`, lastUpdateTime, remark) + values (#{key}, + #{lastUpdateTime}, + #{remark}) + + + + UPDATE basic_export_status_time + + + lastUpdateTime=#{lastUpdateTime}, + + + remark=#{remark}, + + + WHERE `key` = #{key} + + + + DELETE + FROM basic_export_status_time + WHERE id = #{id} + + diff --git a/src/main/resources/mybatis/mapper/sync/SyncDataSetDao.xml b/src/main/resources/mybatis/mapper/sync/SyncDataSetDao.xml new file mode 100644 index 00000000..2a1b69b2 --- /dev/null +++ b/src/main/resources/mybatis/mapper/sync/SyncDataSetDao.xml @@ -0,0 +1,48 @@ + + + + + + + + + replace + INTO sync_data_set(id, typeBus, typeScan, + typeThird, basicProducts, basicCorp, basicInv, basicThirdProducts, basicThirdCorp, + basicThirdInv + , basicThirdBusOrder, orderScanFinish, dbDiProducts, downstreamEnable, syncTime, + orderUnReceive, orderUnCheck, busTypes, sysUser, orderSyncTime, orderSyncStart, + basicSyncStart, entrustAction + , unCheckCert, checkedCert, companyCert, manufacturerCert, productCert) + values (#{id}, + #{typeBus}, + #{typeScan}, + #{typeThird}, + #{basicProducts}, + #{basicCorp}, + #{basicInv}, + #{basicThirdProducts}, + #{basicThirdCorp}, + #{basicThirdInv}, + #{basicThirdBusOrder}, + #{orderScanFinish}, + #{dbDiProducts}, + #{downstreamEnable}, + #{syncTime}, + #{orderUnReceive}, + #{orderUnCheck}, + #{busTypes}, + #{sysUser}, + #{orderSyncTime}, + #{orderSyncStart}, + #{basicSyncStart}, + #{entrustAction}, + #{unCheckCert}, + #{checkedCert}, #{companyCert}, #{manufacturerCert}, #{productCert}) + + diff --git a/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml b/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml index 2b1f7a96..494431b0 100644 --- a/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml +++ b/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml @@ -5,7 +5,7 @@ @@ -16,7 +16,7 @@ FROM sync_data_bustypes - + insert INTO sync_data_bustypes ( `action`, `name`, outChange) values @@ -30,4 +30,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml b/src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml deleted file mode 100644 index 533e2e06..00000000 --- a/src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - replace - INTO sync_data_set(id,typeBus, typeScan, - typeThird, basicProducts, basicCorp, basicInv, basicThirdProducts, basicThirdCorp, basicThirdInv - , basicThirdBusOrder, orderScanFinish, dbDiProducts,downstreamEnable,syncTime,syncDownloadTime, - orderUnReceive,orderUnCheck,busTypes,sysUser,syncIp,orderSyncTime,orderSyncStart,basicSyncStart,entrustAction - ,unCheckCert,checkedCert,companyCert,manufacturerCert,productCert) - values ( - #{id}, - #{typeBus}, - #{typeScan}, - #{typeThird}, - #{basicProducts}, - #{basicCorp}, - #{basicInv}, - #{basicThirdProducts}, - #{basicThirdCorp}, - #{basicThirdInv}, - #{basicThirdBusOrder}, - #{orderScanFinish}, - #{dbDiProducts}, - #{downstreamEnable}, - #{syncTime}, - #{syncDownloadTime}, - #{orderUnReceive}, - #{orderUnCheck}, - #{busTypes}, - #{sysUser}, - #{syncIp}, - #{orderSyncTime}, - #{orderSyncStart}, - #{basicSyncStart}, - #{entrustAction}, - #{unCheckCert}, - #{checkedCert}, #{companyCert}, #{manufacturerCert}, #{productCert} - ) - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/system/SyncUploadDataBustypeDao.xml b/src/main/resources/mybatis/mapper/system/SyncUploadDataBustypeDao.xml index 4f226adb..6dbd52da 100644 --- a/src/main/resources/mybatis/mapper/system/SyncUploadDataBustypeDao.xml +++ b/src/main/resources/mybatis/mapper/system/SyncUploadDataBustypeDao.xml @@ -5,7 +5,7 @@ @@ -16,7 +16,7 @@ FROM thr_order_upload_bustypes - + insert INTO thr_order_upload_bustypes ( `action`, `name`) values @@ -32,4 +32,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml index 0818ed0a..bcd5bf54 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -36,7 +36,7 @@ AND thirdSysFk = #{thirdSysFk} - AND thirdSys = #{thirdSys} + AND thirdSysFk = #{thirdSys} AND supName LIKE concat('%',#{supName},'%')