add

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPGuZhandDaiMa.java

@@ -6,7 +6,9 @@ import com.zfire.jiasm.syncdata.constant.InterFaceTypeEnum;
 import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.data.Token;
 import com.zfire.jiasm.syncdata.plus.entity.Brand;
+import com.zfire.jiasm.syncdata.plus.entity.ItfGreeToFaDownloadPcgzdmTask;
 import com.zfire.jiasm.syncdata.plus.service.BrandService;
+import com.zfire.jiasm.syncdata.plus.service.ItfGreeToFaDownloadPcgzdmTaskService;
 import com.zfire.jiasm.syncdata.service.GLPPGuZhandDaiMaService;
 import com.zfire.jiasm.syncdata.utils.HttpUtil;
 import com.zfire.jiasm.syncdata.utils.JSONResult;
@@ -30,8 +32,6 @@ import java.util.Map;
 public class GLPPGuZhandDaiMa {
     @Value("${baseurl}")
     private String baseurl = "";
-    @Value("${guzdmc}")
-    private String guzdmc = "";
 
     @Resource
     TokenCenter tokenCenter;
@@ -39,6 +39,9 @@ public class GLPPGuZhandDaiMa {
     BrandService brandService;
     @Resource
     GLPPGuZhandDaiMaService glppGuZhandDaiMaService;
+    @Resource
+    ItfGreeToFaDownloadPcgzdmTaskService itfGreeToFaDownloadPcgzdmTaskService;
+
 
 
 
@@ -47,16 +50,18 @@ public class GLPPGuZhandDaiMa {
      * 格力品牌固障代码资料信息同步 同步一次不再使用
      * @return
      */
-
     @Scheduled(fixedDelayString = "${guzdm}")
     public void processGZDMTask() throws Exception {
-        if (guzdmc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
-        }
-
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map<String, String> paramMap = new HashMap<String, String>();
 
+        ItfGreeToFaDownloadPcgzdmTask itfpct =  itfGreeToFaDownloadPcgzdmTaskService.lambdaQuery()
+                .eq(ItfGreeToFaDownloadPcgzdmTask::getNeedDownload,1)
+                .eq(ItfGreeToFaDownloadPcgzdmTask::getSrcTabName,"tbl_assign_gzdm").one();
+        if (itfpct == null){
+            return;
+        }
+
         log.info("开始下载格力品牌固障代码信息: \uF0B7{}",sdf.format(new Date()));
 
         // 提取品牌信息
@@ -80,7 +85,7 @@ public class GLPPGuZhandDaiMa {
         if (jsonArray != null) {
             log.info("下载了{}条数据",jsonArray.size());
 
-            glppGuZhandDaiMaService.extractedGZDMPC(brandRec,jsonArray);
+            glppGuZhandDaiMaService.extractedGZDMPC(brandRec,jsonArray,itfpct);
 
             jsonArray.clear();
             log.info("格力品牌固障代码处理完成: \uF0B7{}",sdf.format(new Date()));

src/main/java/com/zfire/jiasm/syncdata/service/GLPPGuZhandDaiMaService.java

@@ -2,8 +2,9 @@ package com.zfire.jiasm.syncdata.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.zfire.jiasm.syncdata.plus.entity.Brand;
+import com.zfire.jiasm.syncdata.plus.entity.ItfGreeToFaDownloadPcgzdmTask;
 
 public interface GLPPGuZhandDaiMaService {
 
-    void extractedGZDMPC(Brand brandRec,JSONArray jsonArray);
+    void extractedGZDMPC(Brand brandRec, JSONArray jsonArray, ItfGreeToFaDownloadPcgzdmTask itfpct);
 }

src/main/java/com/zfire/jiasm/syncdata/service/impl/BaseDownServiceImpl.java

@@ -36,8 +36,6 @@ public class BaseDownServiceImpl implements BaseDownService {
     private String netfsxc = "";
     @Value("${fsxwxgc}")
     private String fsxwxgc = "";
-    @Value("${guzdmc}")
-    private String guzdmc = "";
     @Value("${lbdlc}")
     private String lbdlc = "";
     @Value("${azxslxc}")
@@ -390,45 +388,6 @@ public class BaseDownServiceImpl implements BaseDownService {
         log.info("格力产品类别基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
     }
 
-    public void processGLPPGuZhandDaiMa() throws Exception {
-        if (guzdmc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, String> paramMap = new HashMap<String, String>();
-
-        log.info("开始下载格力品牌固障代码信息: \uF0B7{}",sdf.format(new Date()));
-
-        // 提取品牌信息
-        Brand brandRec = baseService.getBrand();
-        if (brandRec == null){
-            log.info("格力品牌信息不存在【brand】");
-            return;
-        }
-
-        Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GELI_GZDM.getCode() + "/querylist";
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载格力品牌固障代码信息失败！: {}",jsonResult.getMessage());
-            return;
-        }
-
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-        if (jsonArray != null) {
-            log.info("下载了{}条数据",jsonArray.size());
-
-            glppGuZhandDaiMaService.extractedGZDMPC(brandRec,jsonArray);
-
-            jsonArray.clear();
-            log.info("格力品牌固障代码处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
-    }
 
     public void processGLPPGFWebsitWorker() throws Exception {
         if (fsxwxgc.equals(TaskConfigEnum.FALSE.getCode())){

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPGuZhandDaiMaServiceImpl.java

@@ -5,10 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
-import com.zfire.jiasm.syncdata.plus.entity.Brand;
-import com.zfire.jiasm.syncdata.plus.entity.ItfTblAssignGzdmDowload;
-import com.zfire.jiasm.syncdata.plus.entity.RepairBug;
-import com.zfire.jiasm.syncdata.plus.entity.SysDict;
+import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.ItfTblAssignGzdmDowloadService;
 import com.zfire.jiasm.syncdata.plus.service.RepairBugService;
 import com.zfire.jiasm.syncdata.plus.service.SysDictService;
@@ -37,7 +34,7 @@ public class GLPPGuZhandDaiMaServiceImpl implements GLPPGuZhandDaiMaService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void extractedGZDMPC(Brand brandRec,JSONArray jsonArray) {
+    public void extractedGZDMPC(Brand brandRec,JSONArray jsonArray, ItfGreeToFaDownloadPcgzdmTask itfpct) {
         List<ItfTblAssignGzdmDowload> addRec = new ArrayList<>();
         List<ItfTblAssignGzdmDowload> updateRec = new ArrayList<>();
 
@@ -58,6 +55,9 @@ public class GLPPGuZhandDaiMaServiceImpl implements GLPPGuZhandDaiMaService {
             log.info("格力品牌固障代码信息同步新增插入了{}条数据", addRec.size());
             addRec.clear();
         }
+
+        itfpct.setNeedDownload(0);
+        itfpct.updateById();
     }
 
     private void addRepairBugCheck(Brand brandRec, List<RepairBug> addRepairBug, Map<String, List<SysDict>> xlMap,

src/main/resources/bootstrap-dev.properties

@@ -198,7 +198,7 @@ repairone=5000
 #故障维修
 masterdownloadrate=10000
 masterrate=10000
-guzdm=7200000
+guzdm=300000
 #网点 佛山销售网点|售后网点、广州销售网点|售后网点
 netfsx=600000
 netfss=60000
@@ -311,7 +311,6 @@ repaironec=FALSE
 #故障维修
 masterdownloadratec=FALSE
 masterratec=FALSE
-guzdmc=FALSE
 #网点 佛山销售网点|售后网点、广州销售网点|售后网点
 netfsxc=FALSE
 netfssc=FALSE

src/main/resources/bootstrap-prd.properties

@@ -307,7 +307,6 @@ repaironec=TRUE
 #故障维修
 masterdownloadratec=TRUE
 masterratec=TRUE
-guzdmc=TRUE
 #网点 佛山销售网点|售后网点、广州销售网点|售后网点
 netfsxc=TRUE
 netfssc=TRUE

src/main/resources/bootstrap-test.properties

@@ -199,7 +199,7 @@ repairone=60000
 #故障维修
 masterdownloadrate=7200000
 masterrate=7200000
-guzdm=7200000
+guzdm=300000
 #网点 佛山销售网点|售后网点、广州销售网点|售后网点
 netfsx=600000
 netfss=600000
@@ -312,7 +312,6 @@ repaironec=TRUE
 #故障维修
 masterdownloadratec=FALSE
 masterratec=FALSE
-guzdmc=FALSE
 #网点 佛山销售网点|售后网点、广州销售网点|售后网点
 netfsxc=FALSE
 netfssc=TRUE