diff --git a/src/main/java/com/glxp/api/constant/BasicProcessStatus.java b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java index 2139f78e0..ed797e892 100644 --- a/src/main/java/com/glxp/api/constant/BasicProcessStatus.java +++ b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java @@ -30,6 +30,9 @@ public class BasicProcessStatus { public static final String NEW_ALL_ORDER = "9"; public static final String ALL_BUS_ORDER = "11"; public static final int NEW_ALL_DI = 10; + public static final String NEW_ALL_THR_DATA = "12"; //所有第三方基础数据 + public static final String NEW_ALL_THR_PRODUCTS = "13"; //所有第三方产品数据 + public static final String NEW_ALL_SYS_SETTING = "14"; //所有系统设置数据 public static final int SCHEDULE_NORMAL = 1; //常规任务 public static final int SCHEDULE_TRANSFER = 2; //需要传递任务 diff --git a/src/main/java/com/glxp/api/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java index 8509f47d1..ed092c876 100644 --- a/src/main/java/com/glxp/api/constant/ConstantStatus.java +++ b/src/main/java/com/glxp/api/constant/ConstantStatus.java @@ -222,6 +222,10 @@ public class ConstantStatus { public static final String SYNC_BUS_TYPE = "AutoUploadBusType"; public static final String SYNC_SCAN_ORDER = "AutoUploadOrder"; public static final String SYNC_BUS_ORDER = "AutoUploadBusOrder"; + public static final String SYNC_THR_DATA = "AutoUploadThrData"; + public static final String SYNC_THR_PRODUCTS = "AutoUploadThrProducts"; + public static final String SYNC_SYS_SETTING = "AutoUploadSysSetting"; + //自动下载所有数据 public static final String SYNC_DOWNLOAD_BASIC_DATA = "AutoDownloadAllData"; diff --git a/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java b/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java index c19df8550..e8e75a5cf 100644 --- a/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java +++ b/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java @@ -6,6 +6,7 @@ import com.glxp.api.req.system.SysParamConfigSaveRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; @Mapper @@ -29,4 +30,5 @@ public interface SystemParamConfigDao { boolean insert(SystemParamConfigEntity systemParamConfigEntity); + List selectByLastTime(@Param("lastUpdateTime") Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java index 094b2b3e7..07254727c 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java +++ b/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java @@ -4,7 +4,9 @@ import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.req.system.FilterPdfModuleRequest; import com.glxp.api.req.system.SysPdfModuleSaveRequest; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; @Mapper @@ -25,4 +27,6 @@ public interface SystemPDFModuleDao { boolean insert(SystemPDFModuleEntity systemPDFModuleEntity); boolean deleteById(Integer id); + + List selectByLastTime(@Param("lastUpdateTime") Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java index 3dff5d4ff..bc9e8fa2f 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java +++ b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java @@ -4,7 +4,9 @@ import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.req.system.FilterPdfTemplateRequest; import com.glxp.api.req.system.SysPdfTemplateSaveRequest; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; @Mapper @@ -23,4 +25,6 @@ public interface SystemPDFTemplateDao { boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity); boolean deleteById(Integer id); + + List selectByLastTime(@Param("lastUpdateTime") Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrCorpDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpDao.java index a75bc5034..4e435cd66 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrCorpDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpDao.java @@ -10,6 +10,7 @@ import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; @Mapper @@ -36,4 +37,6 @@ public interface ThrCorpDao { ThrSystemDetailEntity selectByKey(@Param("key") String key, @Param("thirdSys") String thirdSys); + List selectByLastTime(@Param("lastUpdateTime") Date lastUpdateTime); + } diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrDeptDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrDeptDao.java index 32e8f7ced..e2eabe7e7 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrDeptDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrDeptDao.java @@ -5,6 +5,7 @@ import com.glxp.api.req.thrsys.FilterThrDeptRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; @Mapper @@ -30,4 +31,12 @@ public interface ThrDeptDao { ThrDeptEntity selectByCode(@Param("code") String code); ThrDeptEntity selectMaxCode(FilterThrDeptRequest filterThrDeptRequest); + + /** + * 查询指定日期之后更新的部门信息 + * + * @param lastUpdateTime + * @return + */ + List selectByLastTime(@Param("lastUpdateTime") Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java index df1b16eda..0b77c9319 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java @@ -6,6 +6,7 @@ import com.glxp.api.res.thrsys.ThrInvWarehouseResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; @Mapper @@ -33,4 +34,5 @@ public interface ThrInvWarehouseDao { List filterThrInvWarehouseResponse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest); + List selectByLastTime(@Param("lastUpdateTime") Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java index c28a80873..e228b9aa7 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java @@ -1,12 +1,11 @@ package com.glxp.api.dao.thrsys; import com.glxp.api.entity.thrsys.ThrProductsEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.res.thrsys.ThrProductsResponse; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; /** @@ -32,4 +31,5 @@ public interface ThrProductsDao { boolean insertThrProducts(ThrProductsEntity thrProductsEntity); + List selectByLastTime(@Param("lastUpdateTime") Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java b/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java index 14e9f7400..f7345f2a2 100644 --- a/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java @@ -15,6 +15,7 @@ public class SyncDataSetEntity { private int basicCorp; //往来单位字典 private int basicDept; //部门字典 private int basicInv; //仓库字典 + private int basicThirdDept; //第三方那个部门信息 private int basicThirdProducts; //第三方产品信息 private int basicThirdCorp; //第三方往来信息 private int basicThirdInv; //第三方仓库信息 diff --git a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceBizEntity.java b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceBizEntity.java index 614cea497..f60a5cb4a 100644 --- a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceBizEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceBizEntity.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.util.Date; + /** * PDF用户对应表 */ @@ -59,4 +61,8 @@ public class SysPdfTemplateRelevanceBizEntity { @TableField(value = "`modelKey`") private String modelKey; + + @TableField(value = "updateTime") + private Date updateTime; + } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java index 0e6739f49..fd7fdd974 100644 --- a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.util.Date; + /** * PDF用户对应表 */ @@ -60,4 +62,7 @@ public class SysPdfTemplateRelevanceCodeEntity { @TableField(value = "`modelKey`") private String modelKey; + + @TableField(value = "updateTime") + private Date updateTime; } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceLabelEntity.java b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceLabelEntity.java index b6d10c733..4026052fb 100644 --- a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceLabelEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceLabelEntity.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.util.Date; + /** * PDF用户对应表 */ @@ -59,4 +61,7 @@ public class SysPdfTemplateRelevanceLabelEntity { @TableField(value = "`modelKey`") private String modelKey; + + @TableField(value = "updateTime") + private Date updateTime; } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceStatemenEntity.java b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceStatemenEntity.java index 4b05c2848..aa7436ba9 100644 --- a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceStatemenEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceStatemenEntity.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.util.Date; + /** * PDF用户对应表 */ @@ -62,4 +64,7 @@ public class SysPdfTemplateRelevanceStatemenEntity { @TableField(value = "`modelKey`") private String modelKey; + + @TableField(value = "updateTime") + private Date updateTime; } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java b/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java index 58f733d6e..03c43d551 100644 --- a/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java @@ -2,6 +2,8 @@ package com.glxp.api.entity.system; import lombok.Data; +import java.util.Date; + @Data public class SystemParamConfigEntity { @@ -13,4 +15,6 @@ public class SystemParamConfigEntity { private int paramStatus; private int paramType; private String paramExplain; + + private Date updateTime; } diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrInvWarehouseEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrInvWarehouseEntity.java index 1cdb56b07..ef66da1e3 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrInvWarehouseEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrInvWarehouseEntity.java @@ -2,6 +2,8 @@ package com.glxp.api.entity.thrsys; import lombok.Data; +import java.util.Date; + @Data public class ThrInvWarehouseEntity { @@ -14,5 +16,7 @@ public class ThrInvWarehouseEntity { private String thirdSysFk; private String parentName; + private Date updateTime; + } diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java index 880668c46..8098630da 100644 --- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java @@ -235,5 +235,48 @@ public class SpGetHttpClient { return response; } + /** + * 上传第三方基础信息数据 + * + * @param spsSyncThrDataResponse + * @return + */ + public BaseResponse postThrData(SpsSyncThrDataResponse spsSyncThrDataResponse) { + String json = JSONUtil.toJsonStr(spsSyncThrDataResponse); + String result = okHttpCli.doPostJson(getIpUrl() + "/sps/sync/thrData/upload", json, buildHeader()); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } + + /** + * 上传第三方产品信息数据 + * + * @param spsSyncThrProductsResponse + * @return + */ + public BaseResponse postThrProducts(SpsSyncThrProductsResponse spsSyncThrProductsResponse) { + String json = JSONUtil.toJsonStr(spsSyncThrProductsResponse); + String result = okHttpCli.doPostJson(getIpUrl() + "/sps/sync/thrData/products/upload", json, buildHeader()); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } + /** + * 上传系统设置数据 + * + * @param spsSyncSysSettingResponse + * @return + */ + public BaseResponse postSysSetting(SpsSyncSysSettingResponse spsSyncSysSettingResponse) { + String json = JSONUtil.toJsonStr(spsSyncSysSettingResponse); + String result = okHttpCli.doPostJson(getIpUrl() + "/sps/sync/sys/setting", json, buildHeader()); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } } diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java index 93b1874d8..c8b787586 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java @@ -41,19 +41,32 @@ import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.idc.service.IdcService; import com.glxp.api.idc.utils.DBAUtils; import com.glxp.api.idc.utils.IDCUtils; +import com.glxp.api.idc.utils.TableUtils; import com.glxp.api.req.system.ScheduledRequest; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; import com.glxp.api.util.FileUtils; - import lombok.extern.slf4j.Slf4j; -import okhttp3.MediaType; -import okhttp3.MultipartBody; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; +import okhttp3.*; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.text.WordUtils; +import org.apache.tools.ant.util.DateUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.scheduling.annotation.Async; +import org.springframework.scheduling.support.CronSequenceGenerator; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.util.*; +import java.util.concurrent.TimeUnit; /*数据中继数据中心(接收)*/ @Slf4j diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncSysSettingResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncSysSettingResponse.java new file mode 100644 index 000000000..0dc4f3fd7 --- /dev/null +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncSysSettingResponse.java @@ -0,0 +1,80 @@ +package com.glxp.api.res.sync; + +import cn.hutool.core.collection.CollUtil; +import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; +import com.glxp.api.entity.basic.BasicBusTypePreEntity; +import com.glxp.api.entity.basic.EntrustReceEntity; +import com.glxp.api.entity.system.*; +import lombok.Data; + +import java.util.List; + +/** + * 同步系统设置数据 + */ +@Data +public class SpsSyncSysSettingResponse extends BaseSyncResponse { + + private List systemParamConfigEntities; + + private List entrustReceEntities; + + private List systemPDFModuleEntities; + + private List systemPDFTemplateEntities; + + private List sysPdfTemplateRelevanceCodeEntities; + + private List sysPdfTemplateRelevanceBizEntities; + + private List sysPdfTemplateRelevanceLabelEntities; + + private List sysPdfTemplateRelevanceStatemenEntities; + + private List basicBusTypePreEntities; + + private List basicBusTypeChangeEntities; + + + /** + * 拼接日志 + * + * @return + */ + public String logs() { + StringBuilder logs = new StringBuilder(); + if (CollUtil.isNotEmpty(this.systemParamConfigEntities)) { + logs.append("系统运行参数:").append(this.systemParamConfigEntities.size()).append("条\n"); + } + if (CollUtil.isNotEmpty(this.entrustReceEntities)) { + logs.append("委托验收设置:").append(this.entrustReceEntities.size()).append("条\n"); + } + if (CollUtil.isNotEmpty(this.systemPDFModuleEntities)) { + logs.append("打印模块:").append(this.systemPDFModuleEntities.size()).append("条\n"); + } + if (CollUtil.isNotEmpty(this.systemPDFTemplateEntities)) { + logs.append("打印模板:").append(this.systemPDFTemplateEntities.size()).append("条\n"); + } + if (CollUtil.isNotEmpty(this.sysPdfTemplateRelevanceCodeEntities)) { + logs.append("扫码单据关联表:").append(this.sysPdfTemplateRelevanceCodeEntities.size()).append("条\n"); + } + if (CollUtil.isNotEmpty(this.sysPdfTemplateRelevanceBizEntities)) { + logs.append("业务单据关联表:").append(this.sysPdfTemplateRelevanceBizEntities.size()).append("条\n"); + } + if (CollUtil.isNotEmpty(this.sysPdfTemplateRelevanceLabelEntities)) { + logs.append("内部码打印关联表:").append(this.sysPdfTemplateRelevanceLabelEntities.size()).append("条\n"); + } + if (CollUtil.isNotEmpty(this.sysPdfTemplateRelevanceStatemenEntities)) { + logs.append("资质证书打印关联表:").append(this.sysPdfTemplateRelevanceStatemenEntities.size()).append("条\n"); + } + if (CollUtil.isNotEmpty(this.basicBusTypePreEntities)) { + logs.append("自动建出入库单设置:").append(this.basicBusTypePreEntities.size()).append("条\n"); + } + if (CollUtil.isNotEmpty(this.basicBusTypeChangeEntities)) { + logs.append("自动建业务单设置:").append(this.basicBusTypeChangeEntities.size()).append("条\n"); + } + return logs.toString(); + } + + +} diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncThrDataResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncThrDataResponse.java new file mode 100644 index 000000000..670d9eab5 --- /dev/null +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncThrDataResponse.java @@ -0,0 +1,30 @@ +package com.glxp.api.res.sync; + +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.entity.thrsys.ThrDeptEntity; +import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; +import lombok.Data; + +import java.util.List; + +/** + * 同步第三方基础数据 + */ +@Data +public class SpsSyncThrDataResponse extends BaseSyncResponse { + + /** + * 部门信息 + */ + private List deptEntities; + + /** + * 仓库信息 + */ + private List invWarehouseEntities; + + /** + * 往来单位信息 + */ + private List corpEntities; +} diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncThrProductsResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncThrProductsResponse.java new file mode 100644 index 000000000..367003634 --- /dev/null +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncThrProductsResponse.java @@ -0,0 +1,19 @@ +package com.glxp.api.res.sync; + +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import lombok.Data; + +import java.util.List; + +/** + * 同步第三方产品数据 + */ +@Data +public class SpsSyncThrProductsResponse extends BaseSyncResponse { + + /** + * 产品信息 + */ + private List productsEntities; + +} 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 7e1a53c83..2fad45b10 100644 --- a/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java +++ b/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java @@ -1,8 +1,7 @@ package com.glxp.api.res.system; -import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; import com.glxp.api.entity.system.SyncDataBustypeEntity; -import com.glxp.api.entity.system.SyncDataPurTypeEntity; +import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; import lombok.Data; import java.util.List; @@ -17,6 +16,7 @@ public class SyncDataSetResponse { private int basicCorp; private int basicInv; private int basicDept; + private int basicThirdDept; private int basicThirdProducts; private int basicThirdCorp; private int basicThirdInv; diff --git a/src/main/java/com/glxp/api/service/basic/EntrustReceService.java b/src/main/java/com/glxp/api/service/basic/EntrustReceService.java index 6843ac24c..abf42527a 100644 --- a/src/main/java/com/glxp/api/service/basic/EntrustReceService.java +++ b/src/main/java/com/glxp/api/service/basic/EntrustReceService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.basic.EntrustReceEntity; import com.glxp.api.req.basic.BasicEntrustRecRequest; import com.glxp.api.res.basic.EntrustReceResponse; +import java.util.Date; import java.util.List; public interface EntrustReceService { @@ -29,4 +30,5 @@ public interface EntrustReceService { int updateEntrustRec(EntrustReceEntity warehouseEntity); + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java index 8c3aa4c01..3822a371d 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -5,6 +5,7 @@ import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.req.basic.FilterBusTypePreRequest; import com.glxp.api.res.basic.BasicBusTypePreResponse; +import java.util.Date; import java.util.List; /** @@ -79,4 +80,6 @@ public interface IBasicBusTypePreService { * @return */ boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity); + + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 2b898f0d9..1fb71d32e 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -105,6 +105,11 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { return false; } + @Override + public List findByLastTime(Date lastUpdateTime) { + return basicBusTypePreDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); + } + /** * 设置创建/更新信息 * diff --git a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java index dfccaac6f..8baa6c206 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.basic.EntrustReceDao; @@ -14,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; +import java.util.Date; import java.util.List; @Service @@ -114,4 +116,10 @@ public class EntrustReceServiceImpl implements EntrustReceService { public int updateEntrustRec(EntrustReceEntity entrustReceEntity) { return entrustReceDao.updateById(entrustReceEntity); } + + @Override + public List findByLastTime(Date lastUpdateTime) { + return entrustReceDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); + } + } diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 75cbb5c05..abf0cd76b 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -1,41 +1,34 @@ package com.glxp.api.service.sync; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.annotation.Resource; - -import com.glxp.api.dao.inout.*; -import com.glxp.api.entity.inout.*; -import com.glxp.api.res.sync.SpsSyncBusResponse; -import com.glxp.api.res.sync.SpsSyncDataResponse; -import com.glxp.api.service.inout.*; -import org.apache.ibatis.session.ExecutorType; -import org.apache.ibatis.session.SqlSession; -import org.apache.ibatis.session.SqlSessionFactory; -import org.apache.ibatis.session.TransactionIsolationLevel; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; 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.constant.BasicProcessStatus; import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.inout.*; import com.glxp.api.entity.sync.BasicDownloadStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.req.sync.SpsSyncDataRequest; -import com.glxp.api.res.sync.SpsSyncBusOrderResponse; -import com.glxp.api.res.sync.SpsSyncOrderResponse; +import com.glxp.api.res.sync.*; +import com.glxp.api.service.inout.*; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.session.SqlSessionFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; -import cn.hutool.core.collection.CollUtil; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +@Slf4j @Service public class HeartService { @Resource @@ -56,6 +49,8 @@ public class HeartService { IoAddInoutService addInoutService; @Resource IoCheckInoutService ioCheckInoutService; + @Resource + private UpThrDataService upThrDataService; //上传最近更新扫码单据 public BaseResponse uploadAllOrder(String syncTime) { @@ -482,4 +477,193 @@ public class HeartService { } + /** + * 同步第三方基础数据 + * + * @param syncTime 同步时间 + */ + public BaseResponse uploadThrData(String syncTime) { + SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); + if (syncTime == null) { + BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_THR_DATA); + if (basicExportStatusTimeEntity == null) { + basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); + basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00"); + } + spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime()); + } else { + spsSyncDataRequest.setLastUpdateTime(syncTime); + } + SpsSyncThrDataResponse spsSyncThrDataResponse = upThrDataService.upThrData(spsSyncDataRequest); + if (CollUtil.isEmpty(spsSyncThrDataResponse.getDeptEntities()) && CollUtil.isEmpty(spsSyncThrDataResponse.getInvWarehouseEntities()) + && CollUtil.isEmpty(spsSyncThrDataResponse.getCorpEntities())) { + //无数据不记录 + log.info("无第三方基础数据需要同步"); + return ResultVOUtils.success("无数据"); + } + + BasicExportStatusEntity basicExportStatusEntity1 = basicExportService.findByData(ConstantStatus.SYNC_THR_DATA, 0); + if (basicExportStatusEntity1 == null) { + BasicExportStatusEntity thrDataStatusEntity = new BasicExportStatusEntity(); + thrDataStatusEntity.setId(CustomUtil.getId()); + thrDataStatusEntity.setIdDatas(ConstantStatus.SYNC_THR_DATA); + thrDataStatusEntity.setType(BasicProcessStatus.NEW_ALL_THR_DATA); + thrDataStatusEntity.setUpdateTime(new Date()); + thrDataStatusEntity.setStartTime(new Date()); + thrDataStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); + thrDataStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); + basicExportService.insertExportStatus(thrDataStatusEntity); + basicExportStatusEntity1 = thrDataStatusEntity; + } + + BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); + basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")); + basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_THR_DATA); + spsSyncThrDataResponse.setTaskId(basicExportStatusEntity1.getId()); + BaseResponse baseResponse = spGetHttp.postThrData(spsSyncThrDataResponse); + if (baseResponse.getCode() == 20000) { + basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); + } else { + basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_FAIL); + } + basicExportStatusEntity1.setEndTime(new Date()); + basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); + + //拼接日志 + StringBuilder logs = new StringBuilder(); + if (CollUtil.isNotEmpty(spsSyncThrDataResponse.getDeptEntities())) { + logs.append("第三方部门信息:").append(spsSyncThrDataResponse.getDeptEntities().size()).append("条\n"); + } + if (CollUtil.isNotEmpty(spsSyncThrDataResponse.getInvWarehouseEntities())) { + logs.append("第三方仓库信息:").append(spsSyncThrDataResponse.getInvWarehouseEntities().size()).append("条\n"); + } + if (CollUtil.isNotEmpty(spsSyncThrDataResponse.getCorpEntities())) { + logs.append("第三方往来单位信息:").append(spsSyncThrDataResponse.getCorpEntities().size()).append("条\n"); + } + basicExportStatusEntity1.setRemark(logs.toString()); + basicExportStatusEntity1.setUpdateTime(new Date()); + basicExportService.updateExportStatus(basicExportStatusEntity1); + return ResultVOUtils.success(); + } + + /** + * 同步系统设置 + * + * @param syncTime 同步时间 + * @return + */ + public BaseResponse uploadSysSetting(String syncTime) { + SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); + if (syncTime == null) { + BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_SYS_SETTING); + if (basicExportStatusTimeEntity == null) { + basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); + basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00"); + } + spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime()); + } else { + spsSyncDataRequest.setLastUpdateTime(syncTime); + } + SpsSyncSysSettingResponse spsSyncSysSettingResponse = upBasicService.upSysSetting(spsSyncDataRequest); + if (BeanUtil.isEmpty(spsSyncSysSettingResponse)) { + //无数据不记录 + log.info("无第系统设置需要同步"); + return ResultVOUtils.success("无数据"); + } + + BasicExportStatusEntity basicExportStatusEntity1 = basicExportService.findByData(ConstantStatus.SYNC_SYS_SETTING, 0); + if (basicExportStatusEntity1 == null) { + BasicExportStatusEntity thrDataStatusEntity = new BasicExportStatusEntity(); + thrDataStatusEntity.setId(CustomUtil.getId()); + thrDataStatusEntity.setIdDatas(ConstantStatus.SYNC_SYS_SETTING); + thrDataStatusEntity.setType(BasicProcessStatus.NEW_ALL_SYS_SETTING); + thrDataStatusEntity.setUpdateTime(new Date()); + thrDataStatusEntity.setStartTime(new Date()); + thrDataStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); + thrDataStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); + basicExportService.insertExportStatus(thrDataStatusEntity); + basicExportStatusEntity1 = thrDataStatusEntity; + } + + BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); + basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")); + basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_SYS_SETTING); + spsSyncSysSettingResponse.setTaskId(basicExportStatusEntity1.getId()); + BaseResponse baseResponse = spGetHttp.postSysSetting(spsSyncSysSettingResponse); + if (baseResponse.getCode() == 20000) { + basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); + } else { + basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_FAIL); + } + basicExportStatusEntity1.setEndTime(new Date()); + basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); + + basicExportStatusEntity1.setRemark(spsSyncSysSettingResponse.logs()); + basicExportStatusEntity1.setUpdateTime(new Date()); + basicExportService.updateExportStatus(basicExportStatusEntity1); + return ResultVOUtils.success(); + } + + /** + * 同步第三方产品数据 + * + * @param syncTime + * @return + */ + public BaseResponse uploadThrProducts(String syncTime) { + SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); + if (syncTime == null) { + BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_THR_PRODUCTS); + if (basicExportStatusTimeEntity == null) { + basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); + basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00"); + } + spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime()); + } else { + spsSyncDataRequest.setLastUpdateTime(syncTime); + } + SpsSyncThrProductsResponse spsSyncThrProductsResponse = upThrDataService.upThrProducts(spsSyncDataRequest); + if (CollUtil.isEmpty(spsSyncThrProductsResponse.getProductsEntities())) { + //无数据不记录 + log.info("无第三方产品数据需要同步"); + return ResultVOUtils.success("无数据"); + } + + BasicExportStatusEntity basicExportStatusEntity1 = basicExportService.findByData(ConstantStatus.SYNC_THR_PRODUCTS, 0); + if (basicExportStatusEntity1 == null) { + BasicExportStatusEntity thrDataStatusEntity = new BasicExportStatusEntity(); + thrDataStatusEntity.setId(CustomUtil.getId()); + thrDataStatusEntity.setIdDatas(ConstantStatus.SYNC_THR_PRODUCTS); + thrDataStatusEntity.setType(BasicProcessStatus.NEW_ALL_THR_PRODUCTS); + thrDataStatusEntity.setUpdateTime(new Date()); + thrDataStatusEntity.setStartTime(new Date()); + thrDataStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); + thrDataStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); + basicExportService.insertExportStatus(thrDataStatusEntity); + basicExportStatusEntity1 = thrDataStatusEntity; + } + + BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); + basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")); + basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_THR_PRODUCTS); + spsSyncThrProductsResponse.setTaskId(basicExportStatusEntity1.getId()); + BaseResponse baseResponse = spGetHttp.postThrProducts(spsSyncThrProductsResponse); + if (baseResponse.getCode() == 20000) { + basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); + } else { + basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_FAIL); + } + basicExportStatusEntity1.setEndTime(new Date()); + basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); + + //拼接日志 + StringBuilder logs = new StringBuilder(); + if (CollUtil.isNotEmpty(spsSyncThrProductsResponse.getProductsEntities())) { + logs.append("第三方产品信息:").append(spsSyncThrProductsResponse.getProductsEntities().size()).append("条\n"); + } + basicExportStatusEntity1.setRemark(logs.toString()); + basicExportStatusEntity1.setUpdateTime(new Date()); + basicExportService.updateExportStatus(basicExportStatusEntity1); + return ResultVOUtils.success(); + } } diff --git a/src/main/java/com/glxp/api/service/sync/UpBasicService.java b/src/main/java/com/glxp/api/service/sync/UpBasicService.java index 2dca7ef66..9cfecdfa4 100644 --- a/src/main/java/com/glxp/api/service/sync/UpBasicService.java +++ b/src/main/java/com/glxp/api/service/sync/UpBasicService.java @@ -3,40 +3,32 @@ package com.glxp.api.service.sync; import cn.hutool.core.collection.CollUtil; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.auth.*; -import com.glxp.api.entity.basic.*; +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.inout.*; -import com.glxp.api.entity.purchase.*; -import com.glxp.api.entity.system.SyncDataBustypeEntity; -import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; -import com.glxp.api.entity.system.SyncDataPurTypeEntity; -import com.glxp.api.entity.thrsys.*; +import com.glxp.api.entity.purchase.PurOrderDetailEntity; +import com.glxp.api.entity.purchase.PurOrderEntity; +import com.glxp.api.entity.system.*; +import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; import com.glxp.api.req.auth.*; -import com.glxp.api.req.basic.BasicEntrustRecRequest; -import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; -import com.glxp.api.req.basic.FilterUdiInfoRequest; import com.glxp.api.req.inout.FilterOrderRequest; -import com.glxp.api.req.purchase.FilterPoductRequest; -import com.glxp.api.req.purchase.FilterSupCompanyRequest; -import com.glxp.api.req.purchase.FilterSupManufacturerRequest; import com.glxp.api.req.sync.SpsSyncDataRequest; -import com.glxp.api.req.thrsys.*; -import com.glxp.api.res.sync.SpsSyncBusOrderResponse; -import com.glxp.api.res.sync.SpsSyncBusResponse; -import com.glxp.api.res.sync.SpsSyncDataResponse; -import com.glxp.api.res.sync.SpsSyncOrderResponse; +import com.glxp.api.res.sync.*; import com.glxp.api.res.system.SyncDataSetResponse; import com.glxp.api.service.auth.*; +import com.glxp.api.service.basic.EntrustReceService; import com.glxp.api.service.basic.IBasicBusTypeChangeService; +import com.glxp.api.service.basic.IBasicBusTypePreService; import com.glxp.api.service.basic.IBasicBussinessTypeService; -import com.glxp.api.service.basic.impl.BasicBussinessTypeServiceImpl; import com.glxp.api.service.inout.*; import com.glxp.api.service.purchase.PurOrderDetailService; import com.glxp.api.service.purchase.PurOrderService; +import com.glxp.api.service.system.*; import com.glxp.api.service.thrsys.IThrBusTypeOriginService; import com.glxp.api.util.DateUtil; import org.springframework.beans.BeanUtils; -import org.springframework.data.annotation.Reference; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -68,6 +60,24 @@ public class UpBasicService { PurOrderDetailService purOrderDetailService; @Resource IoOrderInvoiceService orderInvoiceService; + @Resource + private SystemParamConfigService systemParamConfigService; + @Resource + private EntrustReceService entrustReceService; + @Resource + private SystemPDFModuleService systemPDFModuleService; + @Resource + private SystemPDFTemplateService systemPDFTemplateService; + @Resource + private SystemPDFTemplateRelevanceCodeService systemPDFTemplateRelevanceCodeService; + @Resource + private SystemPDFTemplateRelevanceBizService systemPDFTemplateRelevanceBizService; + @Resource + private SystemPDFTemplateRelevanceLabelService systemPDFTemplateRelevanceLabelService; + @Resource + private SystemPDFTemplateRelevanceStatemenService systemPDFTemplateRelevanceStatemenService; + @Resource + private IBasicBusTypePreService basicBusTypePreService; //上传最近更新扫码单据 public SpsSyncOrderResponse upAllOrder(SpsSyncDataRequest spsSyncDataRequest) { @@ -285,4 +295,60 @@ public class UpBasicService { return syncDataResponse; } + /** + * 上传最近更新的系统设置数据 + * + * @param spsSyncDataRequest + * @return + */ + public SpsSyncSysSettingResponse upSysSetting(SpsSyncDataRequest spsSyncDataRequest) { + SpsSyncSysSettingResponse spsSyncSysSettingResponse = new SpsSyncSysSettingResponse(); + //查询数据同步设置 + SyncDataSetResponse syncDataSet = syncDataSetService.selectSet(); + + //系统运行参数 + if (syncDataSet.getSystemConfig() == 1) { + List systemParamConfigEntities = systemParamConfigService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + spsSyncSysSettingResponse.setSystemParamConfigEntities(systemParamConfigEntities); + } + + //委托验收设置 + if (syncDataSet.getEntrustAction() == 1) { + List entrustReceEntities = entrustReceService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + spsSyncSysSettingResponse.setEntrustReceEntities(entrustReceEntities); + } + + //打印设置 + if (syncDataSet.getPrintConfig() == 1) { + List systemPDFModuleEntities = systemPDFModuleService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List systemPDFTemplateEntities = systemPDFTemplateService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List sysPdfTemplateRelevanceCodeEntities = systemPDFTemplateRelevanceCodeService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List sysPdfTemplateRelevanceBizEntities = systemPDFTemplateRelevanceBizService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List sysPdfTemplateRelevanceLabelEntities = systemPDFTemplateRelevanceLabelService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List sysPdfTemplateRelevanceStatemenEntities = systemPDFTemplateRelevanceStatemenService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + + spsSyncSysSettingResponse.setSystemPDFModuleEntities(systemPDFModuleEntities); + spsSyncSysSettingResponse.setSystemPDFTemplateEntities(systemPDFTemplateEntities); + spsSyncSysSettingResponse.setSysPdfTemplateRelevanceCodeEntities(sysPdfTemplateRelevanceCodeEntities); + spsSyncSysSettingResponse.setSysPdfTemplateRelevanceBizEntities(sysPdfTemplateRelevanceBizEntities); + spsSyncSysSettingResponse.setSysPdfTemplateRelevanceLabelEntities(sysPdfTemplateRelevanceLabelEntities); + spsSyncSysSettingResponse.setSysPdfTemplateRelevanceStatemenEntities(sysPdfTemplateRelevanceStatemenEntities); + } + + //自动建出入库单 + if (syncDataSet.getScanChangeConfig() == 1) { + List basicBusTypePreEntities = basicBusTypePreService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + spsSyncSysSettingResponse.setBasicBusTypePreEntities(basicBusTypePreEntities); + } + + //自动建业务单设置 + if (syncDataSet.getBusChangeConfig() == 1) { + List basicBusTypeChangeEntities = basicBusTypeChangeService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + spsSyncSysSettingResponse.setBasicBusTypeChangeEntities(basicBusTypeChangeEntities); + } + + return spsSyncSysSettingResponse; + } + + } diff --git a/src/main/java/com/glxp/api/service/sync/UpThrDataService.java b/src/main/java/com/glxp/api/service/sync/UpThrDataService.java new file mode 100644 index 000000000..89356bfcf --- /dev/null +++ b/src/main/java/com/glxp/api/service/sync/UpThrDataService.java @@ -0,0 +1,89 @@ +package com.glxp.api.service.sync; + +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.entity.thrsys.ThrDeptEntity; +import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.req.sync.SpsSyncDataRequest; +import com.glxp.api.res.sync.SpsSyncThrDataResponse; +import com.glxp.api.res.sync.SpsSyncThrProductsResponse; +import com.glxp.api.res.system.SyncDataSetResponse; +import com.glxp.api.service.thrsys.ThrCorpService; +import com.glxp.api.service.thrsys.ThrDeptService; +import com.glxp.api.service.thrsys.ThrInvWarehouseService; +import com.glxp.api.service.thrsys.ThrProductsService; +import com.glxp.api.util.DateUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 上传第三方基础数据到自助平台 + */ +@Service +public class UpThrDataService { + + @Resource + private SyncDataSetService syncDataSetService; + @Resource + private ThrDeptService thrDeptService; + @Resource + private ThrInvWarehouseService thrInvWarehouseService; + @Resource + private ThrProductsService thrProductsService; + @Resource + private ThrCorpService thrCorpService; + + /** + * 上传最近更新的第三方基础信息数据 + * + * @param spsSyncDataRequest + * @return + */ + public SpsSyncThrDataResponse upThrData(SpsSyncDataRequest spsSyncDataRequest) { + SpsSyncThrDataResponse spsSyncThrDataResponse = new SpsSyncThrDataResponse(); + //查询数据同步设置 + SyncDataSetResponse syncDataSet = syncDataSetService.selectSet(); + + //第三方部门信息 + if (syncDataSet.getBasicThirdDept() == 1) { + List deptEntities = thrDeptService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + spsSyncThrDataResponse.setDeptEntities(deptEntities); + } + + //第三方仓库信息 + if (syncDataSet.getBasicThirdInv() == 1) { + List invWarehouseEntities = thrInvWarehouseService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + spsSyncThrDataResponse.setInvWarehouseEntities(invWarehouseEntities); + } + + //第三方往来单位信息 + if (syncDataSet.getBasicThirdCorp() == 1) { + List corpEntities = thrCorpService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + spsSyncThrDataResponse.setCorpEntities(corpEntities); + } + return spsSyncThrDataResponse; + } + + /** + * 上传最近更新的第三方产品信息数据 + * + * @param spsSyncDataRequest + * @return + */ + public SpsSyncThrProductsResponse upThrProducts(SpsSyncDataRequest spsSyncDataRequest) { + SpsSyncThrProductsResponse spsSyncThrProductsResponse = new SpsSyncThrProductsResponse(); + //查询数据同步设置 + SyncDataSetResponse syncDataSet = syncDataSetService.selectSet(); + + //第三方产品信息 + if (syncDataSet.getBasicThirdProducts() == 1) { + List thrProductsEntities = thrProductsService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + spsSyncThrProductsResponse.setProductsEntities(thrProductsEntities); + } + + return spsSyncThrProductsResponse; + } + +} diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java b/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java index b04f6429d..cfcdf4a9f 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.req.system.FilterPdfModuleRequest; import com.glxp.api.req.system.SysPdfModuleSaveRequest; +import java.util.Date; import java.util.List; @@ -23,4 +24,6 @@ public interface SystemPDFModuleService { boolean insert(SystemPDFModuleEntity systemPDFModuleEntity); boolean deleteById(Integer id); + + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java index b65840785..2cb617907 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; +import java.util.Date; import java.util.List; public interface SystemPDFTemplateRelevanceBizService { @@ -18,6 +19,5 @@ public interface SystemPDFTemplateRelevanceBizService { boolean insert(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity); - - + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java index 9eafd92da..221c69ca0 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; +import java.util.Date; import java.util.List; public interface SystemPDFTemplateRelevanceCodeService { @@ -22,7 +23,5 @@ public interface SystemPDFTemplateRelevanceCodeService { SysPdfTemplateRelevanceCodeEntity selectNameAndAction(String name,String localAction); - - - + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java index 72d6fecb4..68dc43569 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; +import java.util.Date; import java.util.List; public interface SystemPDFTemplateRelevanceLabelService { @@ -16,6 +17,5 @@ public interface SystemPDFTemplateRelevanceLabelService { boolean udpateRl(SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity); - - + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java index 2b3ded350..bb6afb255 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; +import java.util.Date; import java.util.List; public interface SystemPDFTemplateRelevanceStatemenService { @@ -16,6 +17,5 @@ public interface SystemPDFTemplateRelevanceStatemenService { boolean udpateRl(SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity); - - + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java index 3f2df73b6..d01a20417 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.req.system.FilterPdfTemplateRequest; import com.glxp.api.req.system.SysPdfTemplateSaveRequest; +import java.util.Date; import java.util.List; @@ -23,4 +24,6 @@ public interface SystemPDFTemplateService { boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity); boolean deleteById(Integer id); + + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java b/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java index 32cb6c2d3..8265bc4df 100644 --- a/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java +++ b/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.system.FilterParamConfigRequest; import com.glxp.api.req.system.SysParamConfigSaveRequest; +import java.util.Date; import java.util.List; import java.util.Map; @@ -34,4 +35,5 @@ public interface SystemParamConfigService { Map findBasicAll(); + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java index 920d26cdf..a9734e635 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -61,4 +62,9 @@ public class SystemPDFModuleServiceImpl implements SystemPDFModuleService { public boolean deleteById(Integer id) { return systemPDFModuleDao.deleteById(id); } + + @Override + public List findByLastTime(Date lastUpdateTime) { + return systemPDFModuleDao.selectByLastTime(lastUpdateTime); + } } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java index 0b3f039c9..1fa040276 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java @@ -9,6 +9,7 @@ import com.glxp.api.service.system.SystemPDFTemplateRelevanceBizService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -54,4 +55,9 @@ public class SystemPDFTemplateRelevanceBizServiceImpl implements SystemPDFTempla return true; } + + @Override + public List findByLastTime(Date lastUpdateTime) { + return sysPdfTemplateRelevanceBizDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); + } } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java index 6eafd6cd7..28fdd08e2 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java @@ -9,6 +9,7 @@ import com.glxp.api.service.system.SystemPDFTemplateRelevanceCodeService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -68,4 +69,9 @@ public class SystemPDFTemplateRelevanceCodeServiceImpl implements SystemPDFTempl public SysPdfTemplateRelevanceCodeEntity selectNameAndAction(String name, String localAction) { return sysPdfTemplateRelevanceCodeDao.selectNameAndAction(name,localAction); } + + @Override + public List findByLastTime(Date lastUpdateTime) { + return sysPdfTemplateRelevanceCodeDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); + } } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java index 5cb6ebf8d..713cfbbcc 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java @@ -9,6 +9,7 @@ import com.glxp.api.service.system.SystemPDFTemplateRelevanceLabelService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -46,4 +47,10 @@ public class SystemPDFTemplateRelevanceLabelServiceImpl implements SystemPDFTemp return false; } } + + @Override + public List findByLastTime(Date lastUpdateTime) { + return sysPdfTemplateRelevanceLabelDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); + } + } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java index 5ccd934a2..e060234ca 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java @@ -9,6 +9,7 @@ import com.glxp.api.service.system.SystemPDFTemplateRelevanceStatemenService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -46,4 +47,9 @@ public class SystemPDFTemplateRelevanceStatemenServiceImpl implements SystemPDFT return false; } } + + @Override + public List findByLastTime(Date lastUpdateTime) { + return sysPdfTemplateRelevanceStatemenDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); + } } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java index 4f2cccc66..eb0ea7533 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -61,4 +62,10 @@ public class SystemPDFTemplateServiceImpl implements SystemPDFTemplateService { public boolean deleteById(Integer id) { return systemPDFTemplateDao.deleteById(id); } + + @Override + public List findByLastTime(Date lastUpdateTime) { + return systemPDFTemplateDao.selectByLastTime(lastUpdateTime); + } + } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java index 242794772..f7e12492b 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -105,4 +106,9 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService { return systemParamConfigEntityMap; } + + @Override + public List findByLastTime(Date lastUpdateTime) { + return systemParamConfigDao.selectByLastTime(lastUpdateTime); + } } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java index 3e37496e2..bf14238dc 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java @@ -1,14 +1,13 @@ package com.glxp.api.service.thrsys; - import com.glxp.api.entity.thrsys.ThrCorpEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.req.thrsys.FilterThrCorpRequest; -import com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest; import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; +import java.util.Date; import java.util.List; public interface ThrCorpService { @@ -31,4 +30,5 @@ public interface ThrCorpService { ThrSystemDetailEntity selectByKey(String key, String thirdSys); + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java b/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java index bc031d578..99abbb784 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java @@ -5,12 +5,14 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.entity.thrsys.ThrDeptEntity; import com.glxp.api.req.thrsys.FilterThrDeptRequest; +import java.util.Date; import java.util.List; public interface ThrDeptService { ThrDeptEntity findDefault(Boolean advaceType, Boolean isDefault); + List filterThrInvWarehouse(FilterThrDeptRequest filterThrDeptRequest); List filterGroupInvWarehouse(FilterThrDeptRequest filterThrDeptRequest); @@ -44,4 +46,12 @@ public interface ThrDeptService { * @return */ BaseResponse deleteInvById(String id); + + /** + * 根据最近更新时间查询部门列表 + * + * @param lastUpdateTime + * @return + */ + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java index 073a23ba3..7ab3d0864 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest; import com.glxp.api.res.thrsys.ThrInvWarehouseResponse; +import java.util.Date; import java.util.List; public interface ThrInvWarehouseService { @@ -33,4 +34,5 @@ public interface ThrInvWarehouseService { */ List filterThrInvWarehouseResponse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest); + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java index a422aa291..e6ae6cb15 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.res.thrsys.ThrProductsResponse; +import java.util.Date; import java.util.List; /** @@ -33,4 +34,5 @@ public interface ThrProductsService { boolean insertThrProducts(ThrProductsEntity thrProductsEntity); + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java index d3d58d6d2..117f1c53e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java @@ -14,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; +import java.util.Date; import java.util.List; @Service @@ -89,4 +90,9 @@ public class ThrCorpServiceImpl implements ThrCorpService { return thrCorpDao.selectByKey(key,thirdSys); } + @Override + public List findByLastTime(Date lastUpdateTime) { + return thrCorpDao.selectByLastTime(lastUpdateTime); + } + } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java index edf61e192..a831e93cc 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java @@ -183,4 +183,9 @@ public class ThrDeptServiceImpl implements ThrDeptService { return ResultVOUtils.success("删除成功"); } + + @Override + public List findByLastTime(Date lastUpdateTime) { + return thrDeptDao.selectByLastTime(lastUpdateTime); + } } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java index af40e60fe..ad2ffd491 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java @@ -13,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; +import java.util.Date; import java.util.List; @Service @@ -109,4 +110,9 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService { return thrInvWarehouseDao.filterThrInvWarehouseResponse(filterThrSubInvWarehouseRequest); } + @Override + public List findByLastTime(Date lastUpdateTime) { + return thrInvWarehouseDao.selectByLastTime(lastUpdateTime); + } + } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java index 5d2fa6479..9f84eeace 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java @@ -2,19 +2,18 @@ package com.glxp.api.service.thrsys.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; -import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.dao.thrsys.ThrProductsDao; +import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.res.thrsys.ThrProductsResponse; import com.glxp.api.service.thrsys.ThrProductsService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; +import java.util.Date; import java.util.List; /** @@ -98,5 +97,9 @@ public class ThrProductsServiceImpl implements ThrProductsService { return thrProductsDao.insertThrProducts(thrProductsEntity); } + @Override + public List findByLastTime(Date lastUpdateTime) { + return thrProductsDao.selectByLastTime(lastUpdateTime); + } } diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index 4dc6326f9..d7a13dec7 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -6,7 +6,6 @@ import com.glxp.api.entity.system.ScheduledEntity; import com.glxp.api.entity.system.SyncDataSetEntity; import com.glxp.api.req.system.ScheduledRequest; import com.glxp.api.service.sync.HeartService; -import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.RedisUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,6 +69,9 @@ public class SyncHeartTask implements SchedulingConfigurer { heartService.uploadAllBus(null); heartService.uploadAllUserData(null); // heartService.uploadScheduleList(); + heartService.uploadThrData(null); + heartService.uploadThrProducts(null); + heartService.uploadSysSetting(null); redisUtil.set("SPS_SYNC_UPLOAD_DATA", curTime1); } diff --git a/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml index 6c99e5ebe..4121263bd 100644 --- a/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml +++ b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml @@ -78,4 +78,8 @@ + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml index 21924892a..c4cec8f5a 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml @@ -92,4 +92,8 @@ from sys_pdf_module where id = #{id} + + diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml index f024c5cc9..1d5299913 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml @@ -78,4 +78,8 @@ from sys_pdf_template where id = #{id} + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml index dd0c5b319..a297e26f5 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml @@ -171,4 +171,7 @@ and basic_third_sys.enabled = 1 + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml index aed99624a..0681dd883 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml @@ -192,4 +192,8 @@ #{item.thirdSysFk}) + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml index fa340e07e..034bc08bb 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml @@ -122,5 +122,7 @@ WHERE id = #{id} - + \ 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 bdc13e045..bac14b4ef 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -192,4 +192,7 @@ ) + diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 0387239b7..9aa1cff3d 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -155,6 +155,13 @@ CALL Pro_Temp_ColumnWork('sync_data_set', 'systemConfig', 'tinyint', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'printConfig', 'tinyint', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'scanChangeConfig', 'tinyint', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'busChangeConfig', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('sync_data_set', 'basicThirdDept', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('sys_param_config', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_code', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_biz', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_label', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_statemen', 'updateTime', 'datetime', 1); # CALL Pro_Temp_ColumnWork('sup_cert_set', 'foreign', 'tinyint', 3); # CALL Pro_Temp_ColumnWork('sup_cert_set', 'needForeign', 'tinyint', 1);