diff --git a/src/main/java/com/glxp/api/constant/BasicProcessStatus.java b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java index ec0c5da9c..04e16bc8d 100644 --- a/src/main/java/com/glxp/api/constant/BasicProcessStatus.java +++ b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java @@ -28,6 +28,10 @@ public class BasicProcessStatus { public static final String NEW_ALL_DATA = "7"; //所有最新数据 public static final String NEW_ALL_BUS = "8"; public static final String NEW_ALL_ORDER = "9"; + /** + * 基础数据 + */ + public static final String BASIC_DATA = "21"; public static final String ALL_BUS_ORDER = "11"; public static final String NEW_ALL_DI = "10"; public static final String NEW_ALL_THR_DATA = "12"; //所有第三方基础数据 diff --git a/src/main/java/com/glxp/api/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java index ed092c876..1cd6559c4 100644 --- a/src/main/java/com/glxp/api/constant/ConstantStatus.java +++ b/src/main/java/com/glxp/api/constant/ConstantStatus.java @@ -228,13 +228,15 @@ public class ConstantStatus { //自动下载所有数据 - public static final String SYNC_DOWNLOAD_BASIC_DATA = "AutoDownloadAllData"; + public static final String SYNC_DOWNLOAD_ALL_DATA = "AutoDownloadAllData"; //自动下载单据数据 public static final String SYNC_DOWNLOAD_BUS_TYPE = "AutoDownloadBusType"; //自动下载单据数据 public static final String SYNC_DOWNLOAD_SCAN_ORDER = "AutoDownloadOrder"; //自动下载DI数据 public static final String SYNC_DOWNLOAD_DI_PRODUCTS = "AutoDownloadDiProducts"; + //自动下载基础数据 + public static final String SYNC_DOWNLOAD_BASIC_DATA = "AutoDownloadBasicData"; public static final int SYNC_STATUS_SUCCESS = 1; //处理成功 public static final int SYNC_STATUS_FAIL = 2; //处理失败 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 9f0a685d4..3a2b2135b 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.basic; +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.ThrCorpsResponse; @@ -11,16 +12,16 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface BasicCorpDao { +public interface BasicCorpDao extends BaseMapperPlus { List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity); boolean insertThrUnitMaintainignore(ThrUnitMaintainResponse thrUnitMaintainResponse); - boolean insert(BasicCorpEntity basicUnitMaintainEntity); + int insert(BasicCorpEntity basicUnitMaintainEntity); - boolean updateById(BasicCorpEntity basicUnitMaintainSaveRequest); + int updateById(BasicCorpEntity basicUnitMaintainSaveRequest); BasicCorpEntity selectByThirdId(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); 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 40ac9bb68..af66599e2 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 new file mode 100644 index 000000000..3e4ff8923 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/basic/BasicProductsDao.java @@ -0,0 +1,9 @@ +package com.glxp.api.dao.basic; + +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.basic.BasicProductsEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BasicProductsDao extends BaseMapperPlus { +} diff --git a/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java new file mode 100644 index 000000000..b8bc5a16e --- /dev/null +++ b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java @@ -0,0 +1,10 @@ +package com.glxp.api.dao.basic; + +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.basic.BasicProductsEntity; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CompanyProductRelevanceDao extends BaseMapperPlus { +} 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 b41da274e..1a880f472 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 3e9d9ffcc..4b189a6b4 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupCertSetDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupCertSetDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.purchase; +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; @@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface SupCertSetDao { +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 4ed837eb6..181dcb407 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java @@ -1,6 +1,8 @@ package com.glxp.api.dao.purchase; +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.purchase.SupCertEntity; 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.Param; import java.util.List; @Mapper -public interface SupCompanyDao { +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 8f02b9f31..80457b723 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupManufacturerDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupManufacturerDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.purchase; +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; @@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface SupManufacturerDao { +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 5d8a7441c..14483eb33 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.purchase; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.SupProductEntity; import com.glxp.api.req.purchase.FilterPoductRequest; import com.glxp.api.res.purchase.SupProductResponse; @@ -10,7 +11,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface SupProductDao { +public interface SupProductDao extends BaseMapperPlus { SupProductEntity findRegistration(Long id); diff --git a/src/main/java/com/glxp/api/entity/basic/BasicHospTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicHospTypeEntity.java index b68b8d93c..f5245f9a0 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicHospTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicHospTypeEntity.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + import java.util.Date; + import lombok.Data; @Data @@ -61,21 +63,30 @@ public class BasicHospTypeEntity { @TableField(value = "updateUser") private String updateUser; + @TableField(exist = false) public static final String COL_ID = "id"; + @TableField(exist = false) public static final String COL_CODE = "code"; + @TableField(exist = false) public static final String COL_PARENTCODE = "parentCode"; + @TableField(exist = false) public static final String COL_NAME = "name"; + @TableField(exist = false) public static final String COL_REMARK = "remark"; + @TableField(exist = false) public static final String COL_CREATETIME = "createTime"; + @TableField(exist = false) public static final String COL_UPDATETIME = "updateTime"; + @TableField(exist = false) public static final String COL_CREATEUSER = "createUser"; + @TableField(exist = false) public static final String COL_UPDATEUSER = "updateUser"; } \ No newline at end of file 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 74d8ef8ba..a0101a41b 100644 --- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java @@ -1,5 +1,6 @@ package com.glxp.api.http.sync; +import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; @@ -44,7 +45,7 @@ public class SpGetHttpClient { } public String[] buildHeader() { - String[] headers = {"apiKey", apiKey, "apiSecret", apiSecret}; + String[] headers = {"api_key", apiKey, "secret_key", apiSecret}; return headers; } @@ -237,6 +238,26 @@ public class SpGetHttpClient { return response; } + /** + * 拉取UDI自助平台基础数据 + * + * @return + */ + public String pullBasicData() { + + String result = okHttpCli.doGet(getIpUrl() + "/sps/sync/basicData", null, buildHeader()); + return result; + + } + + public void finishTask(String id) { + BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest(); + basicExportStatusRequest.setId(id); + String result = okHttpCli.doPostJson(getIpUrl() + "/spssync/basic/udiinfo/finishTask" + , JSONUtil.toJsonStr(basicExportStatusRequest), buildHeader()); + + } + /** * 上传第三方基础信息数据 * diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncBasicDataResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncBasicDataResponse.java new file mode 100644 index 000000000..8f3badf37 --- /dev/null +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncBasicDataResponse.java @@ -0,0 +1,23 @@ +package com.glxp.api.res.sync; + +import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.purchase.*; +import lombok.Data; + +import java.util.List; + +@Data +public class SpsSyncBasicDataResponse extends BaseSyncResponse { + + + List hospTypeList; + List udiRelevanceList; + List productsList; + List relevanceList; + List corpList; + List supCertList; + List supCertSetList; + List supCompanyList; + List supManufacturerList; + List supProductList; +} diff --git a/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java b/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java index a767600e8..2f6e3963c 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.basic.BasicHospTypeEntity; import com.glxp.api.req.basic.BasicHospTypeFilterRequest; import com.glxp.api.req.basic.BasicHospTypeRequest; @@ -10,7 +11,7 @@ import com.glxp.api.res.basic.UdiRelevanceResponse; import java.util.List; -public interface BasicHospTypeService { +public interface BasicHospTypeService extends IService { List filterHospTypeList(BasicHospTypeFilterRequest basicHospTypeFilterRequest); diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java index 3ecf7a8ad..f615fa9d5 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java @@ -50,13 +50,13 @@ public class BasicCorpServiceImpl implements BasicCorpService { @Override public boolean insert(BasicCorpEntity basicUnitMaintainEntity) { - return basicCorpDao.insert(basicUnitMaintainEntity); + return basicCorpDao.insert(basicUnitMaintainEntity)>0?true:false; } @Override public boolean updateById(BasicCorpEntity basicUnitMaintainSaveRequest) { basicUnitMaintainSaveRequest.setUpdateTime(new Date()); - return basicCorpDao.updateById(basicUnitMaintainSaveRequest); + return basicCorpDao.updateById(basicUnitMaintainSaveRequest)>0?true:false; } @Override diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java index 24c3884c8..7c14d28ab 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.basic.impl; 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.dao.basic.BasicHospTypeDao; import com.glxp.api.dao.basic.UdiRelevanceDao; @@ -24,7 +25,7 @@ import java.util.Date; import java.util.List; @Service -public class BasicHospTypeServiceImpl implements BasicHospTypeService { +public class BasicHospTypeServiceImpl extends ServiceImpl implements BasicHospTypeService { @Resource BasicHospTypeDao basicHospTypeDao; 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 91da593c0..39ad7a5bc 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -7,12 +7,19 @@ import java.util.List; import javax.annotation.Resource; import cn.hutool.core.bean.BeanUtil; -import com.glxp.api.dao.basic.ProductInfoDao; -import com.glxp.api.dao.basic.UdiCompanyDao; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; +import com.glxp.api.dao.basic.*; import com.glxp.api.dao.inout.*; +import com.glxp.api.dao.purchase.*; +import com.glxp.api.entity.basic.BasicProductsEntity; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.entity.basic.UdiCompanyEntity; import com.glxp.api.entity.inout.*; +import com.glxp.api.entity.purchase.SupManufacturerEntity; import com.glxp.api.res.sync.*; import com.glxp.api.service.inout.*; import lombok.extern.slf4j.Slf4j; @@ -34,12 +41,31 @@ 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.*; +import com.glxp.api.service.basic.BasicHospTypeService; +import com.glxp.api.service.inout.*; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; +import lombok.RequiredArgsConstructor; +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 org.springframework.transaction.annotation.Isolation; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + @Slf4j @Service +@RequiredArgsConstructor public class HeartService { @Resource BasicExportService basicExportService; @@ -493,6 +519,81 @@ public class HeartService { } + 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; + + /** + * 从UDI自助平台拉取基础数据 + */ + @Transactional(rollbackFor = Exception.class) + public void pullBasicData() { + String data = spGetHttp.pullBasicData(); + cn.hutool.json.JSONObject obj = JSONUtil.parseObj(data); + SpsSyncBasicDataResponse bean = obj.get("data", SpsSyncBasicDataResponse.class); + this.insertBasicData(bean); + String taskId = obj.getStr("taskId"); + BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); + basicDownloadStatusEntity.setId(CustomUtil.getId()); + basicDownloadStatusEntity.setTaskId(taskId); + basicDownloadStatusEntity.setStartTime(new Date()); + basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_BASIC_DATA); + basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); //下载完成 + basicDownloadStatusEntity.setType(BasicProcessStatus.BASIC_DATA); + basicDownloadStatusEntity.setScheduleType(1); + basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); + if (StrUtil.isNotBlank(taskId)) { + //通知自助平台任务已完成 + spGetHttp.finishTask(taskId); + } + } + + /** + * 设置嵌套事物 + * + * @param bean + */ + @Transactional(propagation = Propagation.NESTED) + public void insertBasicData(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()); + } + } + public void insetOrderDb(SpsSyncOrderResponse syncDataResponse, IoOrderEntity orderEntity) { //更新码详情 if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailCodeEntities())) { diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index d7a13dec7..dee034dcb 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -65,14 +65,17 @@ public class SyncHeartTask implements SchedulingConfigurer { lastTime1 = System.currentTimeMillis(); redisUtil.set("SPS_SYNC_UPLOAD_DATA", lastTime1); } - if (curTime1 - lastTime1 > timeInterval1) { - heartService.uploadAllBus(null); - heartService.uploadAllUserData(null); -// heartService.uploadScheduleList(); - heartService.uploadThrData(null); - heartService.uploadThrProducts(null); - heartService.uploadSysSetting(null); - redisUtil.set("SPS_SYNC_UPLOAD_DATA", curTime1); + try { + if (curTime1 - lastTime1 > timeInterval1) { + heartService.uploadAllBus(null); + heartService.uploadAllUserData(null); + // heartService.uploadScheduleList(); + heartService.uploadThrData(null); + heartService.uploadThrProducts(null); + heartService.uploadSysSetting(null); + redisUtil.set("SPS_SYNC_UPLOAD_DATA", curTime1); + } + } catch (Exception e) { } @@ -101,6 +104,7 @@ public class SyncHeartTask implements SchedulingConfigurer { } if (curTime - lastTime > timeInterval) { heartService.dlAllOrder(); + heartService.pullBasicData(); redisUtil.set("SPS_SYNC_DOWNLOAD_DATA", curTime); } diff --git a/src/main/java/com/glxp/api/util/OkHttpCli.java b/src/main/java/com/glxp/api/util/OkHttpCli.java index 7821a73c2..25bc943a1 100644 --- a/src/main/java/com/glxp/api/util/OkHttpCli.java +++ b/src/main/java/com/glxp/api/util/OkHttpCli.java @@ -171,6 +171,7 @@ public class OkHttpCli { } } catch (Exception e) { log.error(ExceptionUtils.getStackTrace(e)); + throw new RuntimeException(e); } finally { if (response != null) { response.close();