add

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

@@ -386,7 +386,8 @@ public class GLPPGFWebsit {
 
         // 提取大类字典数据  sysDictService
         List<SysDict> oldSysDictRec =  sysDictService.lambdaQuery()
-                .eq(SysDict::getDictType, DictTypeEnum.DICT_TYPE_MAIN_TYPE.getCode()).list();
+                .eq(SysDict::getDictType, DictTypeEnum.DICT_TYPE_MAIN_TYPE.getCode())
+                .eq(SysDict::getStatus, DictTypeEnum.DICT_TYPE_ON.getCode()).list();
 
         // 取门户对应关系
         List<Belongcompany> bcs =   belongcompanyService.lambdaQuery()

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

@@ -27,7 +27,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * 格力品牌固障代码基础资料下载  这里不再使用
+ * 格力品牌固障代码基础资料下载  同步一次不再使用
  */
 @Slf4j
 @Component
@@ -50,10 +50,10 @@ public class GLPPGuZhandDaiMa {
 
 
     /**
-     * 格力品牌固障代码资料信息同步 这里不再使用
+     * 格力品牌固障代码资料信息同步 同步一次不再使用
      * @return
      */
-    @Scheduled(fixedDelay = 1 * 60 * 1000)
+    @Scheduled(fixedDelayString = "${guzdm}")
     @Transactional(rollbackFor = Exception.class)
     public void processGZDMTask() throws Exception {
         if (1==1){
@@ -107,14 +107,20 @@ public class GLPPGuZhandDaiMa {
         List<RepairBug> addRepairBug = new ArrayList<>();
         List<RepairBug> updateRepairBug = new ArrayList<>();
         // 提取小类字典数据
-        List<SysDict> oldSysDictRec =  sysDictService.lambdaQuery().eq(SysDict::getDictType, DictTypeEnum.DICT_TYPE_SMALL_TYPE.getCode()).list();
+        List<SysDict> oldSysDictRec =  sysDictService.lambdaQuery()
+                .eq(SysDict::getDictType, DictTypeEnum.DICT_TYPE_SMALL_TYPE.getCode())
+                .eq(SysDict::getStatus, DictTypeEnum.DICT_TYPE_ON.getCode())
+                .list();
         // 小类名称
         List<String> oldSysDictReclist = oldSysDictRec.stream().map(SysDict::getDictValue).collect(Collectors.toList());
         // 小类编号
         Map<String, List<SysDict>> oldSysDictRecMap = oldSysDictRec.stream().collect(Collectors.groupingBy(SysDict::getDictValue));
 
         // 提取大类字典数据
-        List<SysDict> oldDSysDictRec =  sysDictService.lambdaQuery().eq(SysDict::getDictType, DictTypeEnum.DICT_TYPE_MAIN_TYPE.getCode()).list();
+        List<SysDict> oldDSysDictRec =  sysDictService.lambdaQuery()
+                .eq(SysDict::getDictType, DictTypeEnum.DICT_TYPE_MAIN_TYPE.getCode())
+                .eq(SysDict::getStatus, DictTypeEnum.DICT_TYPE_ON.getCode())
+                .eq(SysDict::getStatus, DictTypeEnum.DICT_TYPE_ON.getCode()).list();
         // 大类名称
         List<String> oldSysDictReclistDL = oldDSysDictRec.stream().map(SysDict::getDictValue).collect(Collectors.toList());
         // 大类编号
@@ -132,7 +138,7 @@ public class GLPPGuZhandDaiMa {
             for (ItfTblAssignGzdmDowload item : addRec){
                 // 类别不存在不新增 这里的类别为类别名称，可能是大类也可能是小类
                 // 大类的处理
-                addDL(brandRec, addRepairBug, oldSysDictReclistDL, oldDSysDictRecMapN, oldDSysDictRecMap, item);
+                // addDL(brandRec, addRepairBug, oldSysDictReclistDL, oldDSysDictRecMapN, oldDSysDictRecMap, item);
                 // 小类的处理
                 addXL(brandRec, addRepairBug, oldSysDictReclist, oldSysDictRecMap, oldDSysDictRecMap, item);
             }
@@ -143,7 +149,7 @@ public class GLPPGuZhandDaiMa {
         if (updateRec.size()>0){
             for (ItfTblAssignGzdmDowload item : updateRec){
                 // 大类修改
-                upDL(updateRepairBug, oldSysDictRecMap, oldSysDictReclistDL, oldDSysDictRecMapN, oldDSysDictRecMap, oldRepairBugRecMap, item);
+                // upDL(updateRepairBug, oldSysDictRecMap, oldSysDictReclistDL, oldDSysDictRecMapN, oldDSysDictRecMap, oldRepairBugRecMap, item);
                 // 小类修改
                 upXL(updateRepairBug, oldSysDictReclist, oldSysDictRecMap, oldDSysDictRecMap, oldRepairBugRecMap, item);
             }
@@ -164,64 +170,94 @@ public class GLPPGuZhandDaiMa {
     private void upXL(List<RepairBug> updateRepairBug, List<String> oldSysDictReclist, Map<String, List<SysDict>> oldSysDictRecMap, Map<String, List<SysDict>> oldDSysDictRecMap, Map<String, List<RepairBug>> oldRepairBugRecMap, ItfTblAssignGzdmDowload item) {
         Boolean flag;
         flag = Boolean.FALSE;
-        // 类别不存在不修改
+        // 类别存在的修改
         if (oldSysDictReclist.contains(item.getLeib())){
-            SysDict v = oldSysDictRecMap.get(item.getLeib()).get(0);
-            RepairBug old = oldRepairBugRecMap.get(item.getGzid()).get(0);
+            upRepairBug(updateRepairBug, oldSysDictRecMap, oldDSysDictRecMap, oldRepairBugRecMap, item, flag);
+        } else {
+            // 类别不存在的修改
+            upRepairBugT(updateRepairBug, oldRepairBugRecMap, item, flag);
+        }
+    }
 
-            if (oldSysDictRecMap.get(item.getLeib()).get(0)!=null){
-                if (!old.getSmallId().equals(oldSysDictRecMap.get(item.getLeib()).get(0).getDictCode())){
-                    flag = Boolean.TRUE;
-                    old.setSmallId(oldSysDictRecMap.get(item.getLeib()).get(0).getDictCode());
-                    old.setSmallName(oldSysDictRecMap.get(item.getLeib()).get(0).getDictValue());
-                    old.setMainId(oldSysDictRecMap.get(item.getLeib()).get(0).getParentDictCode());
-                    old.setMainName(oldDSysDictRecMap.get(old.getMainId()).get(0).getDictValue());
-                    old.setMainFlag(oldDSysDictRecMap.get(old.getMainId()).get(0).getFlag());
-                }
+    private void upRepairBugT(List<RepairBug> updateRepairBug, Map<String, List<RepairBug>> oldRepairBugRecMap, ItfTblAssignGzdmDowload item, Boolean flag) {
+        RepairBug old = oldRepairBugRecMap.get(String.valueOf(item.getGzid())).get(0);
+        if (!old.getBugObj().equals(item.getGzmc())){
+            old.setBugObj(item.getGzmc());
+            flag = Boolean.TRUE;
+        }
+        if (!old.getBugObjCode().equals(item.getGzno())){
+            old.setBugObjCode(item.getGzmc());
+            flag = Boolean.TRUE;
+        }
+
+        // 修改的为有效
+        if (item.getFlag().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
+            if (old.getStatus().equals(DictTypeEnum.DICT_TYPE_OFF.getCode())){
+                old.setStatus(DictTypeEnum.DICT_TYPE_ON.getCode());
+                flag = Boolean.TRUE;
             }
-            if (!old.getBugObj().equals(item.getGzmc())){
-                old.setBugObj(item.getGzmc());
+        } else {
+            if (old.getStatus().equals(DictTypeEnum.DICT_TYPE_ON.getCode())){
+                old.setStatus(DictTypeEnum.DICT_TYPE_OFF.getCode());
                 flag = Boolean.TRUE;
             }
-            if (item.getGzno() !=null || old.getBugObjCode() !=null ){
-                if (item.getGzno() !=null && old.getBugObjCode() !=null){
-                    if (!item.getGzno().equals(old.getBugObjCode())){
-                        old.setBugObjCode(item.getGzno());
-                        flag = Boolean.TRUE;
-                    }
-                } else {
-                    flag = Boolean.TRUE;
-                    if (item.getGzno() !=null){
-                        old.setBugObjCode(item.getGzno());
-                    } else {
-                        old.setBugObjCode(null);
-                    }
-                }
+        }
+        if (flag){
+            old.setUpdateBy("system");
+            old.setUpdateTime(new Date());
+            if (item.getLastModifiedBy() !=null ){
+                old.setUpdateBy(item.getLastModifiedBy());
+            }
+            if (item.getLastModifiedDate() !=null ){
+                old.setUpdateTime(item.getLastModifiedDate());
             }
+            updateRepairBug.add(old);
+        }
+    }
 
-            // 修改的为有效
-            if (item.getFlag().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
-                if (old.getStatus().equals(DictTypeEnum.DICT_TYPE_OFF.getCode())){
-                    old.setStatus(DictTypeEnum.DICT_TYPE_ON.getCode());
-                    flag = Boolean.TRUE;
-                }
-            } else {
-                if (old.getStatus().equals(DictTypeEnum.DICT_TYPE_ON.getCode())){
-                    old.setStatus(DictTypeEnum.DICT_TYPE_OFF.getCode());
-                    flag = Boolean.TRUE;
-                }
+    private void upRepairBug(List<RepairBug> updateRepairBug, Map<String, List<SysDict>> oldSysDictRecMap, Map<String, List<SysDict>> oldDSysDictRecMap, Map<String, List<RepairBug>> oldRepairBugRecMap, ItfTblAssignGzdmDowload item, Boolean flag) {
+        RepairBug old = oldRepairBugRecMap.get(String.valueOf(item.getGzid())).get(0);
+
+        if (oldSysDictRecMap.get(item.getLeib()).get(0)!=null){
+            if (!old.getSmallId().equals(oldSysDictRecMap.get(item.getLeib()).get(0).getDictCode())){
+                flag = Boolean.TRUE;
+                old.setSmallId(oldSysDictRecMap.get(item.getLeib()).get(0).getDictCode());
+                old.setSmallName(oldSysDictRecMap.get(item.getLeib()).get(0).getDictValue());
+                old.setMainId(oldSysDictRecMap.get(item.getLeib()).get(0).getParentDictCode());
+                old.setMainName(oldDSysDictRecMap.get(old.getMainId()).get(0).getDictValue());
+                old.setMainFlag(oldDSysDictRecMap.get(old.getMainId()).get(0).getFlag());
             }
-            if (flag){
-                old.setUpdateBy("system");
-                old.setUpdateTime(new Date());
-                if (item.getLastModifiedBy() !=null ){
-                    old.setUpdateBy(item.getLastModifiedBy());
-                }
-                if (item.getLastModifiedDate() !=null ){
-                    old.setUpdateTime(item.getLastModifiedDate());
-                }
-                updateRepairBug.add(old);
+        }
+        if (!old.getBugObjCode().equals(item.getGzno())){
+            old.setBugObjCode(item.getGzno());
+            flag = Boolean.TRUE;
+        }
+        if (!old.getBugObj().equals(item.getGzmc())){
+            old.setBugObj(item.getGzmc());
+            flag = Boolean.TRUE;
+        }
+        // 修改的为有效
+        if (item.getFlag().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
+            if (old.getStatus().equals(DictTypeEnum.DICT_TYPE_OFF.getCode())){
+                old.setStatus(DictTypeEnum.DICT_TYPE_ON.getCode());
+                flag = Boolean.TRUE;
+            }
+        } else {
+            if (old.getStatus().equals(DictTypeEnum.DICT_TYPE_ON.getCode())){
+                old.setStatus(DictTypeEnum.DICT_TYPE_OFF.getCode());
+                flag = Boolean.TRUE;
+            }
+        }
+        if (flag){
+            old.setUpdateBy("system");
+            old.setUpdateTime(new Date());
+            if (item.getLastModifiedBy() !=null ){
+                old.setUpdateBy(item.getLastModifiedBy());
+            }
+            if (item.getLastModifiedDate() !=null ){
+                old.setUpdateTime(item.getLastModifiedDate());
             }
+            updateRepairBug.add(old);
         }
     }
 
@@ -319,43 +355,73 @@ public class GLPPGuZhandDaiMa {
     }
 
     private void addXL(Brand brandRec, List<RepairBug> addRepairBug, List<String> oldSysDictReclist, Map<String, List<SysDict>> oldSysDictRecMap, Map<String, List<SysDict>> oldDSysDictRecMap, ItfTblAssignGzdmDowload item) {
+        // leib为小类的名称
         if (oldSysDictReclist.contains(item.getLeib())){
-            RepairBug v = new RepairBug();
-            v.setBugId(UUID.randomUUID().toString());
-            v.setGzid(String.valueOf(item.getGzid()));
-            v.setBrandId(brandRec.getBrandId());
-            v.setBrandName(brandRec.getBrand());
-            // 类别不为空时
-            if (oldSysDictRecMap.get(item.getLeib()).get(0)!=null){
-                // 小类编号
-                v.setSmallId(oldSysDictRecMap.get(item.getLeib()).get(0).getDictCode());
-                // 小类名称
-                v.setSmallName(oldSysDictRecMap.get(item.getLeib()).get(0).getDictValue());
-                // 小类有对应的父类时 提取父类信息
-                if (!StringUtils.isEmpty(oldSysDictRecMap.get(item.getLeib()).get(0).getParentDictCode())){
-                    v.setMainId(oldSysDictRecMap.get(item.getLeib()).get(0).getParentDictCode());
-                    v.setMainName(oldDSysDictRecMap.get(v.getMainId()).get(0).getDictValue());
-                    v.setMainFlag(oldDSysDictRecMap.get(v.getMainId()).get(0).getFlag());
-                }
-            }
-            v.setBugObj(item.getGzmc());
-            if (item.getGzno() !=null ){
-                v.setBugObjCode(item.getGzno());
-            }
-            v.setStatus(DictTypeEnum.DICT_TYPE_OFF.getCode());
-            if (item.getFlag().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
-                v.setStatus(DictTypeEnum.DICT_TYPE_ON.getCode());
-            }
-            v.setCreateBy("system");
-            v.setCreateTime(new Date());
-            if (item.getCjren() !=null){
-                v.setCreateBy(item.getCjren());
-            }
-            if (item.getCjdt() != null){
-                v.setCreateTime(item.getCjdt());
+            addRepairBugCheck(brandRec, addRepairBug, oldSysDictRecMap, oldDSysDictRecMap, item);
+        } else {
+            // 无小类信息直接添加
+            addRepairBug(brandRec, addRepairBug, item);
+        }
+    }
+
+    private void addRepairBugCheck(Brand brandRec, List<RepairBug> addRepairBug, Map<String, List<SysDict>> oldSysDictRecMap, Map<String, List<SysDict>> oldDSysDictRecMap, ItfTblAssignGzdmDowload item) {
+        RepairBug v = new RepairBug();
+        v.setBugId(UUID.randomUUID().toString());
+        v.setGzid(String.valueOf(item.getGzid()));
+        v.setBrandId(brandRec.getBrandId());
+        v.setBrandName(brandRec.getBrand());
+        // 类别不为空时
+        if (oldSysDictRecMap.get(item.getLeib()).get(0)!=null){
+            // 小类编号
+            v.setSmallId(oldSysDictRecMap.get(item.getLeib()).get(0).getDictCode());
+            // 小类名称
+            v.setSmallName(oldSysDictRecMap.get(item.getLeib()).get(0).getDictValue());
+            // 小类有对应的父类时 提取父类信息
+            if (!StringUtils.isEmpty(oldSysDictRecMap.get(item.getLeib()).get(0).getParentDictCode())){
+                v.setMainId(oldSysDictRecMap.get(item.getLeib()).get(0).getParentDictCode());
+                v.setMainName(oldDSysDictRecMap.get(v.getMainId()).get(0).getDictValue());
+                v.setMainFlag(oldDSysDictRecMap.get(v.getMainId()).get(0).getFlag());
             }
-            addRepairBug.add(v);
         }
+        v.setBugObj(item.getGzmc());
+        v.setBugObjCode(item.getGzno());
+        v.setStatus(DictTypeEnum.DICT_TYPE_OFF.getCode());
+        if (item.getFlag().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
+            v.setStatus(DictTypeEnum.DICT_TYPE_ON.getCode());
+        }
+        v.setCreateBy("system");
+        v.setCreateTime(new Date());
+        if (item.getCjren() !=null){
+            v.setCreateBy(item.getCjren());
+        }
+        if (item.getCjdt() != null){
+            v.setCreateTime(item.getCjdt());
+        }
+        addRepairBug.add(v);
+    }
+
+    private void addRepairBug(Brand brandRec, List<RepairBug> addRepairBug, ItfTblAssignGzdmDowload item) {
+        RepairBug v = new RepairBug();
+        v.setBugId(UUID.randomUUID().toString());
+        v.setGzid(String.valueOf(item.getGzid()));
+        v.setBrandId(brandRec.getBrandId());
+        v.setBrandName(brandRec.getBrand());
+        v.setMainId("");
+        v.setBugObj(item.getGzmc());
+        v.setBugObjCode(item.getGzno());
+        v.setStatus(DictTypeEnum.DICT_TYPE_OFF.getCode());
+        if (item.getFlag().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
+            v.setStatus(DictTypeEnum.DICT_TYPE_ON.getCode());
+        }
+        v.setCreateBy("system");
+        v.setCreateTime(new Date());
+        if (item.getCjren() !=null){
+            v.setCreateBy(item.getCjren());
+        }
+        if (item.getCjdt() != null){
+            v.setCreateTime(item.getCjdt());
+        }
+        addRepairBug.add(v);
     }
 
     private void extractedGZDMAddOrUpdate(JSONArray jsonArray, List<ItfTblAssignGzdmDowload> addRec, List<ItfTblAssignGzdmDowload> updateRec) {
@@ -369,25 +435,33 @@ public class GLPPGuZhandDaiMa {
             flag = Boolean.FALSE;
             JSONObject aData = jsonArray.getJSONObject(i);
             ItfTblAssignGzdmDowload item = JSON.toJavaObject(aData,ItfTblAssignGzdmDowload.class);
+            if (StringUtils.isEmpty(item.getGzno())){
+                item.setGzno("");
+            }
             // 新增或修改数据
+            if (StringUtils.isEmpty(item.getLeib())){
+                item.setLeib("");
+            }
+            if (StringUtils.isEmpty(item.getGzmc())){
+                item.setGzmc("");
+            }
+            if (StringUtils.isEmpty(item.getFlag())){
+                item.setFlag("有效");
+            }
+            if (StringUtils.isEmpty(item.getCjwdno())){
+                item.setCjwdno("");
+            }
+            if (item.getPxdj()==null){
+                item.setPxdj(0);
+            }
+
 
             // 修改
             if (oldRecId.contains(item.getGzid())){
                 ItfTblAssignGzdmDowload old = oldRecMap.get(item.getGzid()).get(0);
-                if (old.getGzno() !=null || item.getGzno() !=null){
-                    if (old.getGzno() !=null && item.getGzno() !=null){
-                        if (!old.getGzno().equals(item.getGzno())){
-                            old.setGzno(item.getGzno());
-                            flag = Boolean.TRUE;
-                        }
-                    } else {
-                        flag = Boolean.TRUE;
-                        if (item.getGzno() !=null) {
-                            old.setGzno(item.getGzno());
-                        } else {
-                            old.setGzno("");
-                        }
-                    }
+                if (!old.getGzno().equals(item.getGzno())){
+                    old.setGzno(item.getGzno());
+                    flag = Boolean.TRUE;
                 }
 
                 if (!old.getGzmc().equals(item.getGzmc())){
@@ -406,20 +480,9 @@ public class GLPPGuZhandDaiMa {
                     old.setLeib(item.getLeib());
                     flag = Boolean.TRUE;
                 }
-                if (old.getCjwdno() !=null || item.getCjwdno() !=null){
-                    if (old.getCjwdno() !=null && item.getCjwdno() !=null){
-                        if (!old.getCjwdno().equals(item.getCjwdno())){
-                            old.setCjwdno(item.getCjwdno());
-                            flag = Boolean.TRUE;
-                        }
-                    } else {
-                        flag = Boolean.TRUE;
-                        if (item.getCjwdno() !=null) {
-                            old.setCjwdno(item.getCjwdno());
-                        } else {
-                            old.setCjwdno("");
-                        }
-                    }
+                if (!old.getCjwdno().equals(item.getCjwdno())){
+                    old.setCjwdno(item.getCjwdno());
+                    flag = Boolean.TRUE;
                 }
                 if (flag){
                     old.setLastModifiedBy("system");

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

@@ -1325,7 +1325,8 @@ public class GLPPLeiBie {
         List<SysDict> updateSysDict = new ArrayList<>();
 
         // 提取小类字典数据  sysDictService
-        List<SysDict> oldSysDictRec =  sysDictService.lambdaQuery().eq(SysDict::getDictType,DictTypeEnum.DICT_TYPE_SMALL_TYPE.getCode()).list();
+        List<SysDict> oldSysDictRec =  sysDictService.lambdaQuery()
+                .eq(SysDict::getDictType,DictTypeEnum.DICT_TYPE_SMALL_TYPE.getCode()).list();
         Map<String, List<SysDict>> oldSysDictRecMap = oldSysDictRec.stream().collect(Collectors.groupingBy(SysDict::getDictCode));
 
         Boolean flag = Boolean.FALSE;
@@ -1470,7 +1471,9 @@ public class GLPPLeiBie {
         List<SysDict> updateSysDict = new ArrayList<>();
 
         // 提取大类字典数据  sysDictService
-        List<SysDict> oldSysDictRec =  sysDictService.lambdaQuery().eq(SysDict::getDictType,DictTypeEnum.DICT_TYPE_MAIN_TYPE.getCode()).list();
+        List<SysDict> oldSysDictRec =  sysDictService.lambdaQuery()
+                .eq(SysDict::getDictType,DictTypeEnum.DICT_TYPE_MAIN_TYPE.getCode())
+                .eq(SysDict::getStatus, DictTypeEnum.DICT_TYPE_ON.getCode()).list();
         Map<String, List<SysDict>> oldSysDictRecMap = oldSysDictRec.stream().collect(Collectors.groupingBy(SysDict::getDictCode));
 
         Boolean flag = Boolean.FALSE;

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

@@ -1,34 +1,27 @@
 package com.zfire.jiasm.syncdata.download.basedata;
 
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.zfire.jiasm.syncdata.data.Token;
 import com.zfire.jiasm.syncdata.plus.entity.Brand;
 import com.zfire.jiasm.syncdata.plus.entity.ItfGreeToFaDownloadTask;
 import com.zfire.jiasm.syncdata.plus.service.BrandService;
 import com.zfire.jiasm.syncdata.plus.service.ItfGreeToFaDownloadTaskService;
 import com.zfire.jiasm.syncdata.service.MasterDownloadService;
-import com.zfire.jiasm.syncdata.utils.DataUtil;
-import com.zfire.jiasm.syncdata.utils.HttpUtil;
-import com.zfire.jiasm.syncdata.utils.JSONResult;
 import com.zfire.jiasm.syncdata.utils.TokenCenter;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 
 @Slf4j
 @Component
 public class MasterDownloadTask {
-    @Value("${masterbaseurl}")
-    private String masterbaseurl = "";
-
     @Resource
     MasterDownloadService masterDownloadService;
     @Resource
@@ -66,7 +59,7 @@ public class MasterDownloadTask {
                     String[] arySrcTabName = srcTabNames.split("\\Q|\\E");
                     String[] aryDestTabName = destTabNames.split("\\Q|\\E");
 
-                    batchDownload(token, arySrcTabName, aryDestTabName,belongCompany,reqId,brandRec);
+                    masterDownloadService.batchDownload(token, arySrcTabName, aryDestTabName,belongCompany,reqId,brandRec);
                     log.info("格力品牌基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
                 } catch (Exception ex) {
                     log.error("执行基础资料下载任务[" + reqId + "]发生错误:"+ex.getMessage());
@@ -77,59 +70,5 @@ public class MasterDownloadTask {
         }
     }
 
-    public void batchDownload(Token token, String[] arySrcTabName,
-                              String[] aryDestTabName,
-                              String belongCompany, int reqId,Brand brandRec) throws Exception {
-
-        String synTaskNo = UUID.randomUUID().toString();
-
-        for (int i = 0; i < arySrcTabName.length; i++) {
-            String srcTabName = arySrcTabName[i].trim();
-            String serviceName = DataUtil.fromDbName2ServiceName(srcTabName);
-            String url = masterbaseurl + serviceName + "/querylist";
-            Map<String, String> paramMap = new HashMap<String, String>();
-            if(belongCompany!=null && belongCompany.trim().length()>0) {
-                paramMap.put("belongCompany", belongCompany);
-            }
-            String paramJson= JSON.toJSONString(paramMap);
-            JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-            JSONArray jsonArray = (JSONArray) jsonResult.getData();
-            if (jsonArray != null) {
-                log.info("["+url+"]下载了["+jsonArray.size()+"]条数据");
-
-                if (aryDestTabName[i].equals("itf_tbl_wx_cpgz_download")){
-                    // 维修－产品故障基表下载记录 + 故障现象(repair_bug)
-                    masterDownloadService.addItfTblWxCpgzDownload(synTaskNo, jsonArray,brandRec);
-                } else if (aryDestTabName[i].equals("itf_tbl_wx_gzdm_wxxmjc_download")){
-                    // 故障代码与维修项目基础表下载记录 OK 有故障代码 维修项目(商用空调｜家用空调)
-                    masterDownloadService.addItfTblWxGzdmWxxmjcDownload(synTaskNo, jsonArray, brandRec);
-                } else if (aryDestTabName[i].equals("itf_tbl_wx_wxxmjc_download")){
-                    // 维修项目基础表下载记录 + (repair_project) + 维修项目分组取 无故障代码  维修项目(商用空调) OK
-                    masterDownloadService.addItfTblWxWxxmjcDownload(synTaskNo, jsonArray,brandRec);
-                } else if (aryDestTabName[i].equals("itf_jh_azd_cause_sort_new_download")){
-                    // 晶弘冰箱故障代码基础表下载记录  OK
-                    masterDownloadService.addItfJhAzdCauseSortNewDownload(synTaskNo, jsonArray,brandRec);
-                } else if (aryDestTabName[i].equals("itf_jh_azd_cause_atter_download")){
-                    // 晶弘冰箱维修项目基础表下载记录 + (repair_project) OK 有故障代码 维修项目(晶弘冰箱)
-                    masterDownloadService.addItfJhAzdCauseAtterDownload(synTaskNo, jsonArray,brandRec);
-                } else if (aryDestTabName[i].equals("itf_tbl_wx_cpgz_xjd_download")){
-                    // 小家电故障现象基础表下载记录 select * from itf_tbl_wx_cpgz_xjd_download;
-                    masterDownloadService.addItfTblWxCpgzXjdDownload(synTaskNo, jsonArray,brandRec);
-                } else if (aryDestTabName[i].equals("itf_tbl_wx_wxxm_xjd_download")){
-                    // 小家电维修项目基础表下载记录 + (repair_project)  这里给了小类信息  OK  维修项目(生活电器)
-                    masterDownloadService.addItfTblWxWxxmXjdDownload(synTaskNo, jsonArray,brandRec);
-                }
-                log.info("["+url+"]插入了["+jsonArray.size()+"]条数据");
-            }else {
-                log.info("["+url+"]无数据");
-            }
-        }
-
-        ItfGreeToFaDownloadTask up = new ItfGreeToFaDownloadTask();
-        up.setId(reqId);
-        up.setNeedDownload(0);
-        up.setLastDownloadTime(new Date());
-        itfGreeToFaDownloadTaskService.updateById(up);
-    }
 
 }

src/main/java/com/zfire/jiasm/syncdata/download/basedata/说明文档.txt

@@ -5,13 +5,18 @@ SELECT * FROM itf_gree_to_fa_syn_rule order by id 定时同步
 // 可配置一次 同步
  select * from itf_gree_to_fa_download_task where src_tab_name like '%tbl_az_assign_xslx%';
 
+
+
+
+－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－
+下载数据后执行 TL_fa_download_task_aftr 过程
 -- TL_fa_download_task_aftr
 SELECT a.id,a.syn_task_no,b.syn_proc_name,b.syn_task_type,b.syn_task_type_name
 FROM itf_gree_to_fa_syn_task_list a,itf_gree_to_fa_syn_task_type b
 where a.syn_task_type=b.syn_task_type and a.syn_task_type=9002;
 
+-- TL_SynData_to_fa_order_repair_malfunction_and_project
 
-－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－
 -- 维修－产品故障基表下载记录
 select * from itf_tbl_wx_cpgz_download;
 -- 维修－维修项目基础表下载记录

src/main/java/com/zfire/jiasm/syncdata/download/order/InstallDownload.java

@@ -1264,7 +1264,7 @@ public class InstallDownload {
         boolean duplicate = (oldRec.size() > 0);
         // 下载记录表中存在数据
         if (duplicate) {
-            // 相同修改时间、相同订单存在待同步的数据，不再插入
+            // 相同修改时间、相同订单存在不再插入
             if (!recHasNoUploadStatus(oldRec)) {
                 // 数据处理失败的 插一条新数据再次同步并做说明
                 ItfInstallBatchDownloadRec item = getItfInstallBatchDownloadRec(Boolean.TRUE,aData, downloadBatchNo, downloadTaskNo, salesWebsitNumber);

src/main/java/com/zfire/jiasm/syncdata/gree/recycle/RecycleAssignLogic.java

@@ -12,6 +12,7 @@ import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
 import io.jsonwebtoken.lang.Collections;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -94,7 +95,7 @@ public class RecycleAssignLogic {
 		// 工单信息pgid|pgguid、反馈信息pgguid、回收的产品pgguid
 		List<RecycleAssignDownloadBean> responseBeanList = mapper.readValue(dataStr, new TypeReference<List<RecycleAssignDownloadBean>>() {} );
 
-		if(null != responseBeanList && !responseBeanList.isEmpty()) {
+		if(CollectionUtils.isNotEmpty(responseBeanList)) {
 			// 提取工单主键
 			LinkedHashSet<String> pguuidLhs = new LinkedHashSet<>(); 
 			responseBeanList.forEach(o->pguuidLhs.add(o.getPgguid()));
@@ -108,7 +109,7 @@ public class RecycleAssignLogic {
 						.in(ItfTblRecycleAssignBatchDownloadRec::getPgguid, pguuidLhs)
 						.in(ItfTblRecycleAssignBatchDownloadRec::getGreeStatSynStatus, 0, Constant.SynStatus.FAIL.getCode()).list();
 				// 已下载记录表中存在数据时
-				if(null != recList && !recList.isEmpty()) {
+				if(CollectionUtils.isNotEmpty(recList)) {
 					// 按状态分组0-99
 					recMap = recList.stream().collect(Collectors.groupingBy(ItfTblRecycleAssignBatchDownloadRec::getGreeStatSynStatus));
 					// 已下载未处理的-0
@@ -120,6 +121,7 @@ public class RecycleAssignLogic {
 					nnMap = (null != nnList && !nnList.isEmpty()) ? (nnList.stream().collect(Collectors.groupingBy(ItfTblRecycleAssignBatchDownloadRec::getPgguid))) : null;
 				}
 
+				// 回收工数据处理
 				for (RecycleAssignDownloadBean o:responseBeanList){
 					try{
 						// 已存在为0的任务不做任何处理 说明本次下载了上次同样的数据
@@ -1072,8 +1074,9 @@ public class RecycleAssignLogic {
 				.eq(OrderRecycleUploadEvent::getOrderType, Constant.RecycleOrderType.RECYCLE_ASSIGN_FKMX)
 				.eq(OrderRecycleUploadEvent::getSynStatus, Constant.SynStatus.UN_SYN.getCode()).list();
 
-		if(null != eventList && !eventList.isEmpty()) {
-			final Map<Integer, List<OrderRecycleUploadEvent>> eventMap = eventList.stream().collect(Collectors.groupingBy(OrderRecycleUploadEvent::getId));
+		if(CollectionUtils.isNotEmpty(eventList)) {
+			final Map<Integer, List<OrderRecycleUploadEvent>> eventMap = eventList.stream()
+					.collect(Collectors.groupingBy(OrderRecycleUploadEvent::getId));
 			// 提取本次同步的过程反馈明细表对应的id
 			LinkedHashSet<Integer> ids = new LinkedHashSet<>();
 			eventList.stream().forEach(event->{
@@ -1082,15 +1085,17 @@ public class RecycleAssignLogic {
 
 			if(!ids.isEmpty()) {
 				// 反馈明细表内根据id提取对应的数据
-				List<OrderRecycleAssignFkmx> feedbackList = orderRecycleAssignFkmxService.lambdaQuery().in(OrderRecycleAssignFkmx::getId, ids).list();
-				if( null != feedbackList &&  !feedbackList.isEmpty()) {
+				List<OrderRecycleAssignFkmx> feedbackList = orderRecycleAssignFkmxService.lambdaQuery()
+						.in(OrderRecycleAssignFkmx::getId, ids).list();
+				if(CollectionUtils.isNotEmpty(feedbackList)) {
 					LinkedHashSet<Integer> orderIds = new LinkedHashSet<>();
 					// 提取回收单id
 					feedbackList.stream().forEach(feedback->{
 						orderIds.add(feedback.getOrderId());
 					});
 					// 提取对应的回收工单主表数据
-					List<OrderRecycleAssign> orderRecycleAssignList = orderRecycleAssignService.lambdaQuery().in(OrderRecycleAssign::getId, orderIds).list();
+					List<OrderRecycleAssign> orderRecycleAssignList = orderRecycleAssignService.lambdaQuery()
+							.in(OrderRecycleAssign::getId, orderIds).list();
 					String batchNo = java.util.UUID.randomUUID().toString();
 					// 逐条处理反馈明细表数据同步
 					feedbackList.stream().forEach(feedback->{

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminFastEntryPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/admin-fast-entry")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminFieldPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/admin-field")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminModuleFavoritesPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/admin-module-favorites")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminModulePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/admin-module")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminRolePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/admin-role")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserModuleRelaPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/admin-user-module-rela")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/admin-user")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserRoleRelaPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/admin-user-role-rela")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/admin-websit")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitProductTypeRelaPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/admin-websit-product-type-rela")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitSlavePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/admin-websit-slave")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AreaPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/area")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandLbsRelatePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/brand-lbs-relate")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/brand")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandWebsitPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/brand-websit")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/CityPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/city")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComDetailLogPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/com-detail-log")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComDetailPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/com-detail")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComListPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/com-list")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/CommonFilePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/common-file")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/CompanyCaAuthPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/company-ca-auth")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/CompanyRecordManagePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/company-record-manage")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ContractTemplatePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/contract-template")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationCategoryPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/customer-information-category")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/customer-information")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationWebsitPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/customer-information-websit")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ImgCarouselManagePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/img-carousel-manage")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/InstallChargeConfigPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/install-charge-config")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureAgreePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/insure-agree")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureEmailPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/insure-email")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureEmailRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/insure-email-record")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsurePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/insure")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureRangePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/insure-range")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerCommercialFilePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/insure-worker-commercial-file")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerCommercialPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/insure-worker-commercial")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/insure-worker-record")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralDoublePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/integral-double")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeConfigurePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/integral-grade-configure")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeExplainPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/integral-grade-explain")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeSkillPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/integral-grade-skill")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralOffsetPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/integral-offset")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralScorePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/integral-score")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralSkillLabelPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/integral-skill-label")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralWorkerApplyPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/integral-worker-apply")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfGreeToFaDownloadTaskPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-gree-to-fa-download-task")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignGzdmDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-gzdm-dowload")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXqxlDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xqxl-dowload")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxlbDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xxlb-dowload")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxlyDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xxly-dowload")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxqdDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xxqd-dowload")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignYhsxWxDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-yhsx-wx-dowload")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAzAssignXslxDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-az-assign-xslx-dowload")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCityDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-city-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCityJdxzDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-city-jdxz-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCountyDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-county-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblProvinceDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-province-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbDaleiDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-dalei-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbJixinDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-jixin-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbXiaoleiDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-xiaolei-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbXilieDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-xilie-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblWangdianWxgDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-wangdian-wxg-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblXinWangdianDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-xin-wangdian-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblYhsxViprankDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-yhsx-viprank-dowload")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/LabelCurrencyPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/label-currency")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/LabelPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/label")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/LbsAmapPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/lbs-amap")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/NoticePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/notice")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/NoticeRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/notice-record")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/OperationLogPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/operation-log")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProductPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/product")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProductSeriesPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/product-series")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProvincePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/province")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/QualificationsManagePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/qualifications-manage")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/RepairBugPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-21
+ * @since 2023-06-26
  */
 @Controller
 @RequestMapping("/plus/repair-bug")