1.修改下载第三方系统数据判断逻辑，根据配置是否启用及是否使用接口本地缓存判断是否下载数据

api-admin/src/main/java/com/glxp/api/admin/constant/ThirdSysConstant.java

@@ -0,0 +1,43 @@
+package com.glxp.api.admin.constant;
+
+/**
+ * 第三方系统配置参数实体
+ */
+public interface ThirdSysConstant {
+
+    /**
+     * 仓库货位码查询
+     */
+    public static final String WAREHOUSE_QUERY_URL = "warehouseQueryUrl";
+
+    /**
+     * 业务单据提交
+     */
+    public static final String ORDER_SUBMIT_URL = "orderSubmitUrl";
+
+    /**
+     * 业务单据查询
+     */
+    public static final String ORDER_QUERY_URL = "orderQueryUrl";
+
+    /**
+     * 单据类型查询
+     */
+    public static final String BUS_TYPE_QUERY_URL = "busTypeQueryUrl";
+
+    /**
+     * 仓库/科室查询
+     */
+    public static final String invPiUrl = "invPiUrl";
+
+    /**
+     * 往来单位查询
+     */
+    public static final String CORP_URL = "corpUrl";
+
+    /**
+     * 产品信息查询
+     */
+    public static final String PI_QUERY_URL = "piQueryUrl";
+
+}

api-admin/src/main/java/com/glxp/api/admin/thread/DownloadThirdSysDataTask.java

@@ -3,10 +3,13 @@ package com.glxp.api.admin.thread;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import com.glxp.api.admin.constant.BasicProcessStatus;
+import com.glxp.api.admin.constant.ThirdSysConstant;
 import com.glxp.api.admin.dao.basic.BasicThirdSysDao;
+import com.glxp.api.admin.dao.basic.BasicThirdSysDetailDao;
 import com.glxp.api.admin.dao.schedule.ScheduledDao;
 import com.glxp.api.admin.dao.schedule.SystemParamConfigDao;
 import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity;
+import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
 import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity;
 import com.glxp.api.admin.entity.info.ScheduledEntity;
 import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
@@ -62,6 +65,8 @@ public class DownloadThirdSysDataTask implements SchedulingConfigurer {
     private ErpBasicClient erpBasicClient;
     @Resource
     private BussinessOriginTypeService bussinessOriginTypeService;
+    @Resource
+    private BasicThirdSysDetailDao basicThirdSysDetailDao;
 
     @Override
     public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
@@ -90,7 +95,9 @@ public class DownloadThirdSysDataTask implements SchedulingConfigurer {
         List<String> thirdIds = basicThirdSysDao.selectEnabledThirdId();
         if (CollUtil.isNotEmpty(thirdIds)) {
             for (String thirdId : thirdIds) {
-
+                //查询此系统的仓库仓位码配置详情
+                BasicThirdSysDetailEntity warehouseConfig = basicThirdSysDetailDao.selectByKey(ThirdSysConstant.WAREHOUSE_QUERY_URL, thirdId);
+                if (null != warehouseConfig && warehouseConfig.getFromType().equals(3) && warehouseConfig.getEnabled()) {
                     log.info("自动下载第三方系统为：{} 的基础数据", thirdId);
                     log.info("开始下载第三方系统的仓库数据");
                     BaseResponse baseResponse = thrInvWarehouseService.downloadThirdWarehouse(thirdId);
@@ -100,7 +107,10 @@ public class DownloadThirdSysDataTask implements SchedulingConfigurer {
                         log.info(thirdId + " 仓库数据下载失败");
                         log.error(JSONUtil.toJsonStr(baseResponse));
                     }
+                }
 
+                BasicThirdSysDetailEntity corpConfig = basicThirdSysDetailDao.selectByKey(ThirdSysConstant.CORP_URL, thirdId);
+                if (null != corpConfig && corpConfig.getFromType().equals(3) && corpConfig.getEnabled()) {
                     log.info("开始下载第三方系统的往来单位数据");
                     ThrCorpImportLogEntity thrCorpImportLogEntity = new ThrCorpImportLogEntity();
                     String genKey = CustomUtil.getId();
@@ -112,7 +122,10 @@ public class DownloadThirdSysDataTask implements SchedulingConfigurer {
                     thrCorpImportLogService.insertImportLog(thrCorpImportLogEntity);
                     thrCorpsDlService.importCorps(genKey, null, thirdId);
                     log.info("第三方系统往来单位数据下载完成");
+                }
 
+                BasicThirdSysDetailEntity productConfig = basicThirdSysDetailDao.selectByKey(ThirdSysConstant.PI_QUERY_URL, thirdId);
+                if (null != productConfig && productConfig.getFromType().equals(3) && productConfig.getEnabled()) {
                     log.info("开始下载第三方系统的产品信息数据");
                     ThrProductsImportLogEntity thrProductsImportLogEntity = new ThrProductsImportLogEntity();
                     String genKey1 = CustomUtil.getId();
@@ -129,7 +142,10 @@ public class DownloadThirdSysDataTask implements SchedulingConfigurer {
                     filterThrProductsRequest.setLimit(100);
                     thrProductsDlService.importProducrs(genKey1, filterThrProductsRequest);
                     log.info("第三方系统往来产品信息数据下载完成");
+                }
 
+                BasicThirdSysDetailEntity busConfig = basicThirdSysDetailDao.selectByKey(ThirdSysConstant.BUS_TYPE_QUERY_URL, thirdId);
+                if (null != busConfig && busConfig.getFromType().equals(3) && busConfig.getEnabled()) {
                     log.info("开始下载第三方系统单据类型");
                     FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest = new FilterBasicThirdSysDetailRequest();
                     filterBasicThirdSysDetailRequest.setThirdSysFk(thirdId);
@@ -167,6 +183,8 @@ public class DownloadThirdSysDataTask implements SchedulingConfigurer {
                         log.info("第三方系统往来产品信息数据下载完成");
                     }
                 }
+
+            }
         }
 
     }