From 70481518ade9d98b1988bff8d64a85babe99d152 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Fri, 21 Apr 2023 15:27:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B1=E5=86=85=E5=90=91=E5=A4=96=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/common/enums/ResultEnum.java | 2 +- .../com/glxp/api/config/TaskPoolConfig.java | 38 +++++ .../api/constant/BasicExportStatusEnum.java | 3 + .../constant/BasicExportStatusTimeEnum.java | 3 + .../api/constant/BasicExportTypeEnum.java | 8 + .../sync/SpsSyncDownloadController.java | 154 ++++++++++++++++-- .../com/glxp/api/dao/basic/BasicCorpDao.java | 3 +- .../glxp/api/dao/basic/BasicHospTypeDao.java | 5 +- .../glxp/api/dao/basic/BasicProductsDao.java | 3 +- .../glxp/api/dao/inout/IoCodeRelMapper.java | 3 +- .../com/glxp/api/dao/purchase/SupCertDao.java | 3 +- .../glxp/api/dao/purchase/SupCertSetDao.java | 3 +- .../glxp/api/dao/purchase/SupCompanyDao.java | 4 +- .../api/dao/purchase/SupManufacturerDao.java | 3 +- .../glxp/api/dao/purchase/SupProductDao.java | 3 +- .../sync/BasicDownloadStatusEntity.java | 6 + .../glxp/api/req/sync/SyncUpLoadRequest.java | 22 +++ .../basic/IBasicBussinessTypeService.java | 3 +- .../impl/BasicBussinessTypeServiceImpl.java | 3 +- .../service/sync/SpsSyncDownloadService.java | 7 +- 20 files changed, 251 insertions(+), 28 deletions(-) create mode 100644 src/main/java/com/glxp/api/config/TaskPoolConfig.java create mode 100644 src/main/java/com/glxp/api/req/sync/SyncUpLoadRequest.java diff --git a/src/main/java/com/glxp/api/common/enums/ResultEnum.java b/src/main/java/com/glxp/api/common/enums/ResultEnum.java index 7889eef6..f19fc0ed 100644 --- a/src/main/java/com/glxp/api/common/enums/ResultEnum.java +++ b/src/main/java/com/glxp/api/common/enums/ResultEnum.java @@ -8,7 +8,7 @@ import lombok.Getter; @Getter public enum ResultEnum { - SUCCESS(0, "success"), + SUCCESS(20000, "success"), NOT_NETWORK(1, "系统繁忙，请稍后再试。"), LOGIN_VERIFY_FALL(2, "登录失效"), PARAM_VERIFY_FALL(3, "参数验证错误"), diff --git a/src/main/java/com/glxp/api/config/TaskPoolConfig.java b/src/main/java/com/glxp/api/config/TaskPoolConfig.java new file mode 100644 index 00000000..06f72207 --- /dev/null +++ b/src/main/java/com/glxp/api/config/TaskPoolConfig.java @@ -0,0 +1,38 @@ +package com.glxp.api.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +import java.util.concurrent.ThreadPoolExecutor; + +/** + * 配置线程池 + */ +@Configuration +@EnableAsync +public class TaskPoolConfig { + + @Bean(name = "taskExecutor") + public ThreadPoolTaskExecutor taskExecutor() { + // 获取当前主机的cpu核心数 + int threadCount = Runtime.getRuntime().availableProcessors(); + ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); + //核心池的大小 + taskExecutor.setCorePoolSize(threadCount); + //线程池最大线程数 + taskExecutor.setMaxPoolSize(threadCount * 2); + //队列最大长度 + taskExecutor.setQueueCapacity(200); + //线程空闲时间 + taskExecutor.setKeepAliveSeconds(60); + //配置线程前缀 + taskExecutor.setThreadNamePrefix("custom_executor"); + //配置拒绝策略 + taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); + //执行初始化 + taskExecutor.initialize(); + return taskExecutor; + } +} diff --git a/src/main/java/com/glxp/api/constant/BasicExportStatusEnum.java b/src/main/java/com/glxp/api/constant/BasicExportStatusEnum.java index 6f3aad8d..ad7ce73e 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportStatusEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportStatusEnum.java @@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.annotation.EnumValue; import lombok.AllArgsConstructor; import lombok.Getter; +/** + * task任务状态 + */ @Getter @AllArgsConstructor public enum BasicExportStatusEnum { diff --git a/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java index 489e176c..ed199d85 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java @@ -5,6 +5,9 @@ import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.beans.factory.annotation.Value; +/** + * task最后执行时间key + */ @Getter @AllArgsConstructor public enum BasicExportStatusTimeEnum { diff --git a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java index 8a158260..cd7237d5 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java @@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.annotation.EnumValue; import lombok.AllArgsConstructor; import lombok.Getter; +/** + * 任务类型 + */ @Getter @AllArgsConstructor public enum BasicExportTypeEnum { @@ -18,6 +21,11 @@ public enum BasicExportTypeEnum { */ COUNTRY_DI_DATA("country_di_data", "国家库DI数据"), + /** + * 单据类型 + */ + DOCUMENT_TYPE("document_type", "单据类型"), + /** * 其他数据 */ diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index cfb94249..a5a19141 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -1,32 +1,28 @@ package com.glxp.api.controller.sync; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.glxp.api.annotation.AuthRuleAnnotation; 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.*; -import com.glxp.api.controller.purchase.PurOrderController; +import com.glxp.api.constant.BasicExportStatusEnum; +import com.glxp.api.constant.BasicExportTypeEnum; import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.dao.auth.*; -import com.glxp.api.dao.basic.BasicBusTypeChangeDao; -import com.glxp.api.dao.basic.BasicBusTypePreDao; -import com.glxp.api.dao.basic.BasicBussinessTypeDao; -import com.glxp.api.dao.basic.EntrustReceDao; +import com.glxp.api.dao.basic.*; import com.glxp.api.dao.inout.*; +import com.glxp.api.dao.purchase.*; import com.glxp.api.dao.schedule.SystemParamConfigDao; import com.glxp.api.dao.system.*; import com.glxp.api.dao.thrsys.*; import com.glxp.api.entity.auth.*; -import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; -import com.glxp.api.entity.basic.BasicBusTypePreEntity; -import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.basic.EntrustReceEntity; import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.purchase.*; @@ -35,7 +31,9 @@ import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.system.*; import com.glxp.api.entity.thrsys.*; import com.glxp.api.req.sync.SpsSyncDataRequest; +import com.glxp.api.req.sync.SyncUpLoadRequest; import com.glxp.api.res.sync.*; +import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.IoAddInoutService; import com.glxp.api.service.inout.IoCheckInoutService; import com.glxp.api.service.inout.IoOrderService; @@ -45,10 +43,10 @@ import com.glxp.api.service.sync.BasicDownloadService; import com.glxp.api.service.sync.BasicExportService; import com.glxp.api.service.sync.SpsSyncDownloadService; import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.DateUtil; import com.glxp.api.util.JsonUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; @@ -64,10 +62,12 @@ import javax.validation.Valid; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; -import java.util.*; +import java.util.Date; +import java.util.List; @RestController @Api(tags = "同步下载相关") +@RequiredArgsConstructor public class SpsSyncDownloadController { @Resource @@ -321,6 +321,134 @@ public class SpsSyncDownloadController { return baseResponse; } + + @ApiOperation("上传同步数据") + @PostMapping("sps/sync/upload/data") + public Object uploadData(@RequestBody SyncUpLoadRequest upLoadRequest) { + try { + JSONObject obj = JSONUtil.parseObj(upLoadRequest.getData()); + switch (upLoadRequest.getExportType()) { + case BASIC_DATA: + saveUploadBasicData(JSONUtil.toBean(obj, SpsSyncBasicDataResponse.class)); + break; + case OTHER_DATA: + saveUploadOtherData(JSONUtil.toBean(obj, SpsSyncOtherDataResponse.class)); + break; + case DOCUMENT_TYPE: + saveUploadDocumentTypeData(JSONUtil.toBean(obj, SpsSyncBusResponse.class)); + break; + case COUNTRY_DI_DATA: + } + String taskId = obj.getStr("taskId"); + BasicDownloadStatusEntity downloadStatus = BasicDownloadStatusEntity.builder() + .id(taskId) + .taskId(taskId) + .startTime(new Date()) + .endTime(new Date()) + .updateTime(new Date()) + .type(upLoadRequest.getExportType().getRemark()) + .idDatas(upLoadRequest.getExportType().getKey()) + .scheduleType(1) + .build(); + basicDownloadService.insertDownloadStatus(downloadStatus); + return ResultVOUtils.success(); + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(ResultEnum.NOT_NETWORK, e.getMessage()); + } + + } + + private final BasicBussinessTypeDao basicBussinessTypeDao; + private final BasicBusTypeChangeDao busTypeChangeDao; + private final ThrBusTypeOriginDao thrBusTypeOriginDao; + + + /** + * 保存上传的单据类型数据 + * + * @param bean + */ + private void saveUploadDocumentTypeData(SpsSyncBusResponse bean) { + if (CollectionUtil.isNotEmpty(bean.getBussinessTypeEntities())) { + basicBussinessTypeDao.insertOrUpdateBatch(bean.getBussinessTypeEntities()); + } + if (CollectionUtil.isNotEmpty(bean.getBusTypeChangeEntities())) { + busTypeChangeDao.insertOrUpdateBatch(bean.getBusTypeChangeEntities()); + } + if (CollectionUtil.isNotEmpty(bean.getThrBusTypeOriginEntities())) { + thrBusTypeOriginDao.insertOrUpdateBatch(bean.getThrBusTypeOriginEntities()); + } + } + + + private final IoCodeLostMapper ioCodeLostMapper; + private final IoCodeRelMapper ioCodeRelMapper; + + /** + * 保存上传的其他数据 + * + * @param bean + */ + private void saveUploadOtherData(SpsSyncOtherDataResponse bean) { + if (CollectionUtil.isNotEmpty(bean.getIoCodeLostList())) { + ioCodeLostMapper.insertOrUpdateBatch(bean.getIoCodeLostList()); + } + if (CollectionUtil.isNotEmpty(bean.getIoCodeRelList())) { + ioCodeRelMapper.insertOrUpdateBatch(bean.getIoCodeRelList()); + } + + } + + private final BasicHospTypeDao basicHospTypeDao; + private final UdiRelevanceDao udiRelevanceDao; + private final BasicProductsDao basicProductsDao; + private final CompanyProductRelevanceDao relevanceDao; + private final BasicCorpDao corpDao; + private final SupCertDao supCertDao; + private final SupCertSetDao supCertSetDao; + private final SupCompanyDao supCompanyDao; + private final SupManufacturerDao supManufacturerDao; + private final SupProductDao supProductDao; + + /** + * 保存上传的基础数据 + * + * @param bean + */ + private void saveUploadBasicData(SpsSyncBasicDataResponse bean) { + if (CollectionUtil.isNotEmpty(bean.getHospTypeList())) { + basicHospTypeDao.insertOrUpdateBatch(bean.getHospTypeList()); + } + if (CollectionUtil.isNotEmpty(bean.getUdiRelevanceList())) { + udiRelevanceDao.insertOrUpdateBatch(bean.getUdiRelevanceList()); + } + if (CollectionUtil.isNotEmpty(bean.getProductsList())) { + basicProductsDao.insertOrUpdateBatch(bean.getProductsList()); + } + if (CollectionUtil.isNotEmpty(bean.getRelevanceList())) { + relevanceDao.insertOrUpdateBatch(bean.getRelevanceList()); + } + if (CollectionUtil.isNotEmpty(bean.getCorpList())) { + corpDao.insertOrUpdateBatch(bean.getCorpList()); + } + if (CollectionUtil.isNotEmpty(bean.getSupCertList())) { + supCertDao.insertOrUpdateBatch(bean.getSupCertList()); + } + if (CollectionUtil.isNotEmpty(bean.getSupCertSetList())) { + supCertSetDao.insertOrUpdateBatch(bean.getSupCertSetList()); + } + if (CollectionUtil.isNotEmpty(bean.getSupCompanyList())) { + supCompanyDao.insertOrUpdateBatch(bean.getSupCompanyList()); + } + if (CollectionUtil.isNotEmpty(bean.getSupManufacturerList())) { + supManufacturerDao.insertOrUpdateBatch(bean.getSupManufacturerList()); + } + if (CollectionUtil.isNotEmpty(bean.getSupProductList())) { + supProductDao.insertOrUpdateBatch(bean.getSupProductList()); + } + } + //接收中继服务、UDI管理系统上传单据 @AuthRuleAnnotation("sps/sync/order/upload") @PostMapping("/sps/sync/order/upload") diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java index 62293dcb..183559c1 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -2,6 +2,7 @@ package com.glxp.api.dao.basic; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; @@ -11,7 +12,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface BasicCorpDao extends BaseMapper { +public interface BasicCorpDao extends BaseMapperPlus { List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity); diff --git a/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java index a2fbf15b..d37e3dad 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java @@ -1,14 +1,17 @@ package com.glxp.api.dao.basic; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicHospTypeEntity; + import java.util.List; import com.glxp.api.res.basic.BasicHospTypeResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; + @Mapper -public interface BasicHospTypeDao extends BaseMapper { +public interface BasicHospTypeDao extends BaseMapperPlus { List getTreeList(); diff --git a/src/main/java/com/glxp/api/dao/basic/BasicProductsDao.java b/src/main/java/com/glxp/api/dao/basic/BasicProductsDao.java index 0239553d..bd239e83 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicProductsDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicProductsDao.java @@ -2,6 +2,7 @@ package com.glxp.api.dao.basic; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicProductSetEntity; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.req.basic.FilterBasicProductSetrequest; @@ -10,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface BasicProductsDao extends BaseMapper { +public interface BasicProductsDao extends BaseMapperPlus { } diff --git a/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java b/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java index 6e25c869..8be0ca5a 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java +++ b/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.inout; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inout.IoCodeRelEntity; import com.glxp.api.req.inout.IoOrderRelRequest; import com.glxp.api.res.inout.IoCodeRelResponse; @@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface IoCodeRelMapper extends BaseMapper { +public interface IoCodeRelMapper extends BaseMapperPlus { List selectIoCodeRelList(IoOrderRelRequest ioOrderRelRequest); diff --git a/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java b/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java index 7b6b053b..0672ddb3 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java @@ -2,6 +2,7 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.SupCertEntity; import com.glxp.api.req.purchase.FilterSupCertRequest; import com.glxp.api.req.purchase.purPlanPrintRequest; @@ -11,7 +12,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface SupCertDao extends BaseMapper { +public interface SupCertDao extends BaseMapperPlus { List filterCompanyCert(FilterSupCertRequest filterSupCertRequest); diff --git a/src/main/java/com/glxp/api/dao/purchase/SupCertSetDao.java b/src/main/java/com/glxp/api/dao/purchase/SupCertSetDao.java index 9f9dcdd3..85cd2745 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupCertSetDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupCertSetDao.java @@ -2,6 +2,7 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.SupCertSetEntity; import com.glxp.api.req.purchase.FilterCertSetsRequest; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface SupCertSetDao extends BaseMapper { +public interface SupCertSetDao extends BaseMapperPlus { List filterCertSets(FilterCertSetsRequest filterCertSetsRequest); boolean insertCertSet(SupCertSetEntity supCertSetEntity); diff --git a/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java b/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java index 0ddded8a..7a254c3f 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java @@ -2,6 +2,8 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.purchase.SupCertSetEntity; import com.glxp.api.entity.purchase.SupCompanyEntity; import com.glxp.api.req.purchase.FilterSupCompanyRequest; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface SupCompanyDao extends BaseMapper { +public interface SupCompanyDao extends BaseMapperPlus { SupCompanyEntity findCompany(String CustomerId); diff --git a/src/main/java/com/glxp/api/dao/purchase/SupManufacturerDao.java b/src/main/java/com/glxp/api/dao/purchase/SupManufacturerDao.java index 3d5e4858..b9111aca 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupManufacturerDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupManufacturerDao.java @@ -2,6 +2,7 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.SupManufacturerEntity; import com.glxp.api.req.purchase.FilterSupManufacturerRequest; import org.apache.ibatis.annotations.Mapper; @@ -10,7 +11,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface SupManufacturerDao extends BaseMapper { +public interface SupManufacturerDao extends BaseMapperPlus { SupManufacturerEntity findCompany(Long id); diff --git a/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java b/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java index 29055f83..1d32a67a 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java @@ -2,6 +2,7 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.PurDeliveryDetailEntity; import com.glxp.api.entity.purchase.SupProductEntity; import com.glxp.api.req.purchase.FilterPoductRequest; @@ -12,7 +13,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface SupProductDao extends BaseMapper { +public interface SupProductDao extends BaseMapperPlus { SupProductEntity findRegistration(Long id); diff --git a/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java index d91f106f..d0f4a6f1 100644 --- a/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java @@ -1,10 +1,16 @@ package com.glxp.api.entity.sync; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.Date; @Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class BasicDownloadStatusEntity { /** diff --git a/src/main/java/com/glxp/api/req/sync/SyncUpLoadRequest.java b/src/main/java/com/glxp/api/req/sync/SyncUpLoadRequest.java new file mode 100644 index 00000000..1e4f5fef --- /dev/null +++ b/src/main/java/com/glxp/api/req/sync/SyncUpLoadRequest.java @@ -0,0 +1,22 @@ +package com.glxp.api.req.sync; + +import com.glxp.api.constant.BasicExportTypeEnum; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class SyncUpLoadRequest { + + @ApiParam("数据类型") + private BasicExportTypeEnum exportType; + + @ApiParam("数据内容") + private Object data; + +} diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java b/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java index c3f4f048..e2f43b65 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.req.basic.FilterBussinessTypeRequest; import com.glxp.api.res.basic.BasicBussinessTypeResponse; @@ -9,7 +10,7 @@ import java.util.List; /** * 单据类型Service */ -public interface IBasicBussinessTypeService { +public interface IBasicBussinessTypeService extends IService { /** * 查询单据类型列表 diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java index d7d4dc58..e994ac3b 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java @@ -3,6 +3,7 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; @@ -27,7 +28,7 @@ import java.util.stream.Collectors; @Slf4j @Service @Transactional(rollbackFor = Exception.class) -public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService { +public class BasicBussinessTypeServiceImpl extends ServiceImpl implements IBasicBussinessTypeService { @Resource private CustomerService customerService; diff --git a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java index 45ef8a49..256362fc 100644 --- a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java +++ b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java @@ -266,6 +266,7 @@ public class SpsSyncDownloadService { exportStatus = BasicExportStatusEntity.builder() .id(CustomUtil.getId()) .status(BasicExportStatusEnum.WAIT_TRIGGERED.getCode()) + .idDatas(BasicExportTypeEnum.BASIC_DATA.getKey()) .type(BasicExportTypeEnum.BASIC_DATA.getRemark()) .scheduleType(0) .updateTime(cn.hutool.core.date.DateUtil.date()) @@ -291,7 +292,7 @@ public class SpsSyncDownloadService { Map> totalTimeMap = new WeakHashMap<>(10); try { //确认有开启物资字典由外向内同步 - if (info.getBasicProducts() == 2) { + if (needExec(info.getBasicProducts())) { Map map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_PRODUCTS, createFile); totalTimeMap.put(BasicExportStatusTimeEnum.BASIC_PRODUCTS, map); List hospTypeList = hospTypeService.list(Wrappers.lambdaQuery(BasicHospTypeEntity.class) @@ -328,7 +329,7 @@ public class SpsSyncDownloadService { } } //确认有开启往来单位字典同步 - if (info.getBasicCorp() == 2) { + if (needExec(info.getBasicCorp())) { Map map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_CORP, createFile); totalTimeMap.put(BasicExportStatusTimeEnum.BASIC_CORP, map); List corpList = corpService.list(Wrappers.lambdaQuery(BasicCorpEntity.class) @@ -342,7 +343,7 @@ public class SpsSyncDownloadService { } //确认有开启首营资质同步 - if (info.getSupCert() == 2) { + if (needExec(info.getSupCert())) { Map map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SUP_CERT, createFile); totalTimeMap.put(BasicExportStatusTimeEnum.SUP_CERT, map); List supCertList = supCertService.list(Wrappers.lambdaQuery(SupCertEntity.class)