add

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

@@ -335,19 +335,22 @@ public class GLPPGFWebsit {
         Map<String, List<BrandWebsit>> oldWebsitRecMap = oldWebsitRec.stream().collect(Collectors.groupingBy(BrandWebsit::getBrandPkId));
 
         // 提取大类字典数据  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()).list();
 
         // 取门户对应关系
         List<Belongcompany> bcs =   belongcompanyService.lambdaQuery()
                 .select(Belongcompany::getId,Belongcompany::getBelongCompanySale,Belongcompany::getBelongCompanyProfession).list();
         Map<String, List<Belongcompany>> bMapxs = bcs.stream().collect(Collectors.groupingBy(Belongcompany::getBelongCompanySale));
         Map<String, List<Belongcompany>> bcMap = bcs.stream().collect(Collectors.groupingBy(Belongcompany::getBelongCompanyProfession));
+        // 销售与售后门户全加载
         bMapxs.forEach((k, v) -> bcMap.merge(k, v, (v1, v2) -> v2));
-        List<String> bcsaList = new ArrayList<>();
-        List<String> bcsList = new ArrayList<>();
-        bcsaList = bcs.stream().map(Belongcompany::getBelongCompanySale).collect(Collectors.toList());
-        bcsList = bcs.stream().map(Belongcompany::getBelongCompanyProfession).collect(Collectors.toList());
-        bcsList.addAll(bcsaList);
+        List<String> saleList = new ArrayList<>();
+        List<String> serviceList = new ArrayList<>();
+        saleList = bcs.stream().map(Belongcompany::getBelongCompanySale).collect(Collectors.toList());
+        serviceList = bcs.stream().map(Belongcompany::getBelongCompanyProfession).collect(Collectors.toList());
+        // 销售与售后的门户信息 'X2300000','S9219807','X2100000','S9219801','X9920000','S9329829'
+        serviceList.addAll(saleList);
 
 
         for (SysDict item :oldSysDictRec){
@@ -364,8 +367,9 @@ public class GLPPGFWebsit {
                 if (InterFaceTypeEnum.SH_WEBSIT_TYPE.getCode().equals("S")){
                     v.setFwlm("家电售后");
                 }
+                // 网点所属销售或售后公司编码赋值 这里可能是销售与可能是售后
                 if (BeanUtil.isNotEmpty(item.getSsxsgs())){
-                    if (bcsList.contains(item.getSsxsgs())){
+                    if (serviceList.contains(item.getSsxsgs())){
                         v.setBelongCompanyId(bcMap.get(item.getSsxsgs()).get(0).getId());
                     }
                     v.setBelongCompany(item.getSsxsgs());
@@ -413,7 +417,7 @@ public class GLPPGFWebsit {
                 if (item.getSsxsgs() != null ){
                     if (!old.getBelongCompany().equals(item.getSsxsgs())){
                         old.setBelongCompanyId(0);
-                        if (bcsList.contains(item.getSsxsgs())){
+                        if (serviceList.contains(item.getSsxsgs())){
                             old.setBelongCompanyId(bcMap.get(item.getSsxsgs()).get(0).getId());
                         }
                         old.setBelongCompany(item.getSsxsgs());

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

@@ -53,6 +53,7 @@ public class GLPPGFWebsitWorker {
         if (1==1){
             return;
         }
+
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map<String, String> paramMap = new HashMap<String, String>();
         List<ItfTblWangdianWxgDownload> addRec = new ArrayList<>();
@@ -182,7 +183,7 @@ public class GLPPGFWebsitWorker {
      * S9219801 广州售后网点维修工基础资料下载
      * @return
      */
-    @Scheduled(fixedDelay = 1 * 10 * 1000)
+    @Scheduled(fixedDelay = 1 * 60 * 1000)
     @Transactional(rollbackFor = Exception.class)
     public void processGZSHWDTask() throws Exception {
         if (1==1){

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

@@ -18,6 +18,7 @@ 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.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -107,19 +108,24 @@ public class GLPPGuZhandDaiMa {
     }
 
     private void extractedGZDMLocalAddOrUpdate(Brand brandRec, List<ItfTblAssignGzdmDowload> addRec, List<ItfTblAssignGzdmDowload> updateRec) {
-        Boolean flag = Boolean.FALSE;
         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<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<String> oldSysDictReclistDL = oldDSysDictRec.stream().map(SysDict::getDictValue).collect(Collectors.toList());
+        // 大类编号
+        Map<String, List<SysDict>> oldDSysDictRecMapN = oldDSysDictRec.stream().collect(Collectors.groupingBy(SysDict::getDictValue));
+        // 大类编号
         Map<String, List<SysDict>> oldDSysDictRecMap = oldDSysDictRec.stream().collect(Collectors.groupingBy(SysDict::getDictCode));
 
-
         // 提取原有数据
         List<RepairBug> oldRepairBugRec =  repairBugService.lambdaQuery()
                 .eq(RepairBug::getBrandId, brandRec.getBrandId()).list();
@@ -128,109 +134,22 @@ public class GLPPGuZhandDaiMa {
         // 获取新增的
         if (addRec.size()>0){
             for (ItfTblAssignGzdmDowload item : addRec){
-                // 类别不存在不新增
-                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());
-                    }
-                    addRepairBug.add(v);
-                }
+                // 类别不存在不新增 这里的类别为类别名称，可能是大类也可能是小类
+                // 大类的处理
+                addDL(brandRec, addRepairBug, oldSysDictReclistDL, oldDSysDictRecMapN, oldDSysDictRecMap, item);
+                // 小类的处理
+                addXL(brandRec, addRepairBug, oldSysDictReclist, oldSysDictRecMap, oldDSysDictRecMap, item);
             }
         }
+
+
         // 获取修改的
         if (updateRec.size()>0){
             for (ItfTblAssignGzdmDowload item : updateRec){
-                flag = Boolean.FALSE;
-                // 类别不存在不修改
-                if (oldSysDictReclist.contains(item.getLeib())){
-                    SysDict v = oldSysDictRecMap.get(item.getLeib()).get(0);
-                    RepairBug old = oldRepairBugRecMap.get(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 (!old.getBugObj().equals(item.getGzmc())){
-                        old.setBugObj(item.getGzmc());
-                        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 (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);
-                    }
-                }
+                // 大类修改
+                upDL(updateRepairBug, oldSysDictRecMap, oldSysDictReclistDL, oldDSysDictRecMapN, oldDSysDictRecMap, oldRepairBugRecMap, item);
+                // 小类修改
+                upXL(updateRepairBug, oldSysDictReclist, oldSysDictRecMap, oldDSysDictRecMap, oldRepairBugRecMap, item);
             }
         }
 
@@ -246,6 +165,203 @@ 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);
+
+            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 (!old.getBugObj().equals(item.getGzmc())){
+                old.setBugObj(item.getGzmc());
+                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 (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);
+            }
+        }
+    }
+
+    @NotNull
+    private void upDL(List<RepairBug> updateRepairBug, Map<String, List<SysDict>> oldSysDictRecMap, List<String> oldSysDictReclistDL, Map<String, List<SysDict>> oldDSysDictRecMapN, Map<String, List<SysDict>> oldDSysDictRecMap, Map<String, List<RepairBug>> oldRepairBugRecMap, ItfTblAssignGzdmDowload item) {
+        Boolean flag;
+        flag = Boolean.FALSE;
+        if (oldSysDictReclistDL.contains(item.getLeib())){
+            SysDict v = oldSysDictRecMap.get(item.getLeib()).get(0);
+            RepairBug old = oldRepairBugRecMap.get(item.getGzid()).get(0);
+
+            if (!old.getMainId().equals(oldDSysDictRecMapN.get(item.getLeib()).get(0).getDictCode())){
+                flag = Boolean.TRUE;
+                // 大类处理
+                old.setMainId(oldDSysDictRecMapN.get(item.getLeib()).get(0).getDictCode());
+                old.setMainName(item.getLeib());
+                old.setMainFlag(oldDSysDictRecMap.get(old.getMainId()).get(0).getFlag());
+            }
+
+            if (!old.getBugObj().equals(item.getGzmc())){
+                old.setBugObj(item.getGzmc());
+                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 (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);
+            }
+        }
+    }
+
+    private void addDL(Brand brandRec, List<RepairBug> addRepairBug, List<String> oldSysDictReclistDL, Map<String, List<SysDict>> oldDSysDictRecMapN, Map<String, List<SysDict>> oldDSysDictRecMap, ItfTblAssignGzdmDowload item) {
+        if (oldSysDictReclistDL.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());
+            // 大类处理
+            v.setMainId(oldDSysDictRecMapN.get(item.getLeib()).get(0).getDictCode());
+            v.setMainName(item.getLeib());
+            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());
+            }
+            addRepairBug.add(v);
+        }
+    }
+
+    private void addXL(Brand brandRec, List<RepairBug> addRepairBug, List<String> oldSysDictReclist, Map<String, List<SysDict>> oldSysDictRecMap, Map<String, List<SysDict>> oldDSysDictRecMap, ItfTblAssignGzdmDowload item) {
+        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());
+            }
+            addRepairBug.add(v);
+        }
+    }
+
     private void extractedGZDMAddOrUpdate(JSONArray jsonArray, List<ItfTblAssignGzdmDowload> addRec, List<ItfTblAssignGzdmDowload> updateRec) {
         Boolean flag = Boolean.FALSE;
         String synTaskNo = UUID.randomUUID().toString();

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

@@ -33,6 +33,10 @@ public class DetailDownloadInstallTask {
 	@Scheduled(fixedDelay = 1 * 3 * 1000)
 	private void process() {
 		try {
+			if (1 == 1) {
+				return;
+			}
+
 			Token token = tokenCenter.getCurrentToken();
 			// 同步规则表中提取数据 itf_gree_to_fa_download_task_type
 			List<Map<String, Object>> types = detailDownloadService.getTaskTypeInstall();

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

@@ -12,6 +12,7 @@ import com.zfire.jiasm.syncdata.parameter.OrderPar;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
 import com.zfire.jiasm.syncdata.response.WebsitFWS;
+import com.zfire.jiasm.syncdata.response.WebsitSH;
 import com.zfire.jiasm.syncdata.service.OrderService;
 import com.zfire.jiasm.syncdata.service.PublicService;
 import lombok.extern.slf4j.Slf4j;
@@ -47,10 +48,6 @@ public class InstallBusiness {
     @Resource
     BaseService baseService;
     @Resource
-    WebsitOrderSignService websitOrderSignService;
-    @Resource
-    CustomerInformationWebsitService customerInformationWebsitService;
-    @Resource
     OrderBaseService orderBaseService;
     @Resource
     OrderWorkerService orderWorkerService;
@@ -170,7 +167,8 @@ public class InstallBusiness {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public void orderUpdate(Map<String, List<SysDictRef>> sysDictRefDLMap, Map<String, List<SysDictRef>> sysDictRefXLMap, Map<String, List<SysDictRef>> sysDictRefXiLieMap, Brand brand, ItfTblAzAssignLcLsDownload item) {
+    public void orderUpdate(Map<String, List<SysDictRef>> sysDictRefDLMap, Map<String, List<SysDictRef>> sysDictRefXLMap,
+                            Map<String, List<SysDictRef>> sysDictRefXiLieMap, Brand brand, ItfTblAzAssignLcLsDownload item) {
         List<Long> synReqYfYyIds = new ArrayList<>();
         List<OrderReAppointment> addoalists = new ArrayList<>();
         List<ItfTblAzAssignMxDownload> mxsynreqids = new ArrayList<>();
@@ -200,7 +198,7 @@ public class InstallBusiness {
         orderProductsUpdate = getOrderProductsUpdate(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, old, newLCLS, item.getDownloadTaskNo(),mxsynreqids);
 
         // 获取操作明细同步数据，即反馈明细
-        addoiolList = getOrderInstallOperatingLogsadd(brand, item, old, newLCLS, synreqids);
+        addoiolList = getOrderInstallOperatingLogsadd(item, old, newLCLS, synreqids);
 
         // 费用清单 放扩展表
         // 提取已同步的数据
@@ -211,7 +209,7 @@ public class InstallBusiness {
                 .eq(ItfTblAzAssignFeeDownload::getDownloadTaskNo, item.getDownloadTaskNo())
                 .eq(ItfTblAzAssignFeeDownload::getSynStatus,0)
                 .list();
-        OrderInstall orderInstall = getOrderInstall(newLCLS, brand, item, fyqd);
+        OrderInstall orderInstall = getOrderInstall(newLCLS, item, fyqd);
         // 已同步的有数据，后期的一定有数据  直接修改
         if (oldOrderInstall != null && orderInstall!=null){
             orderInstall.setId(oldOrderInstall.getId());
@@ -223,7 +221,7 @@ public class InstallBusiness {
         synReqYfYyIds = getYfYyLongs(item, old, newLCLS, addoalists);
 
         // 获取评价同步数据
-        addoalist = getOrderAppraises(sysDictRefDLMap, brand, item, old, newLCLS, getpjSynReqId);
+        addoalist = getOrderAppraises(sysDictRefDLMap, item, old, newLCLS, getpjSynReqId);
 
         // 安装工单数据修改落本地表
         addOrUpdateOrderData(item, upInfo, own, mxsynreqids, orderProductsUpdate, synreqids,
@@ -271,7 +269,7 @@ public class InstallBusiness {
         if (orderInstall !=null){
             orderInstallService.saveOrUpdate(orderInstall);
         }
-        if (fyqd != null){
+        if (CollectionUtils.isNotEmpty(fyqd)){
             upItfTblAzAssignFeeDownload(fyqd);
         }
 
@@ -326,7 +324,7 @@ public class InstallBusiness {
     }
 
     @NotNull
-    private List<OrderAppraise> getOrderAppraises(Map<String, List<SysDictRef>> sysDictRefDLMap, Brand brand, ItfTblAzAssignLcLsDownload item, OrderBase old, OrderBase newLCLS, List<Long> getpjSynReqId) {
+    private List<OrderAppraise> getOrderAppraises(Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAzAssignLcLsDownload item, OrderBase old, OrderBase newLCLS, List<Long> getpjSynReqId) {
         // 提取已同步的
         List<OrderAppraise> oas = orderAppraiseService.lambdaQuery()
                 .select(OrderAppraise::getPid,
@@ -336,7 +334,7 @@ public class InstallBusiness {
 
         // 提取本次获取的
         List<OrderAppraise> oanew = new ArrayList<>();
-        getOrderAppraise(newLCLS, sysDictRefDLMap, oanew, brand, item, getpjSynReqId);
+        getOrderAppraise(newLCLS, sysDictRefDLMap, oanew, item, getpjSynReqId);
 
         // 移除已同步过的
         List<OrderAppraise> addoalist = new ArrayList<>();
@@ -362,7 +360,7 @@ public class InstallBusiness {
     }
 
     @NotNull
-    private List<OrderInstallOperatingLog> getOrderInstallOperatingLogsadd(Brand brand, ItfTblAzAssignLcLsDownload item, OrderBase old,
+    private List<OrderInstallOperatingLog> getOrderInstallOperatingLogsadd(ItfTblAzAssignLcLsDownload item, OrderBase old,
                                                                            OrderBase newLCLS, List<ItfTblAzAssignFkmxDownload> synreqids) {
         // 提取已同步的
         List<OrderInstallOperatingLog> oiols = orderInstallOperatingLogService.lambdaQuery()
@@ -378,7 +376,7 @@ public class InstallBusiness {
                 .orderByAsc(ItfTblAzAssignFkmxDownload::getCreatedDate)
                 .list();
 
-        List<OrderInstallOperatingLog> oiolList = getOrderInstallOperatingLogs(fkmxs, newLCLS, brand, item);
+        List<OrderInstallOperatingLog> oiolList = getOrderInstallOperatingLogs(fkmxs, newLCLS,item);
         // 移除已同步过的
         List<OrderInstallOperatingLog> addoiolList = new ArrayList<>();
         for (OrderInstallOperatingLog ol:oiolList){
@@ -839,7 +837,7 @@ public class InstallBusiness {
         // 获取工单机型
         getOrderProduct(orderBase, orderProducts, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, orderMx);
         // 获取工单操作明细- 操作日志表
-        List<OrderInstallOperatingLog> oiolList = getOrderInstallOperatingLogs(fkmxs, orderBase, brand, item);
+        List<OrderInstallOperatingLog> oiolList = getOrderInstallOperatingLogs(fkmxs, orderBase,item);
         // 获取安装费用清单 - 对应扩展表
         List<ItfTblAzAssignFeeDownload> fyqd = itfTblAzAssignFeeDownloadService.lambdaQuery()
                 .eq(ItfTblAzAssignFeeDownload::getDownloadTaskNo, item.getDownloadTaskNo())
@@ -847,7 +845,7 @@ public class InstallBusiness {
                 .orderByDesc(ItfTblAzAssignFeeDownload::getSynReqId)
                 .list();
         // 获取工单扩展信息  - 费用清单是不能放在扩展表的，这里有误 从订单表取才可以
-        OrderInstall orderInstall = getOrderInstall(orderBase, brand, item, fyqd);
+        OrderInstall orderInstall = getOrderInstall(orderBase, item, fyqd);
         // 获取用户预约改约信息
         List<ItfTblAzAssignAppointmentDownload> appointments = itfTblAzAssignAppointmentDownloadService.lambdaQuery()
                 .eq(ItfTblAzAssignAppointmentDownload::getDownloadTaskNo, item.getDownloadTaskNo())
@@ -859,7 +857,7 @@ public class InstallBusiness {
 
         // 获取用户客户评价信息
         List<Long> getpjSynReqId = new ArrayList<>();
-        getOrderAppraise(orderBase, sysDictRefDLMap, oanew, brand, item, getpjSynReqId);
+        getOrderAppraise(orderBase, sysDictRefDLMap, oanew, item, getpjSynReqId);
 
         // 安装工单数据落本地表
         addOrderData(orderBase, orderWorker, orderInstall, orderProducts, oiolList, oa, oanew,
@@ -996,8 +994,9 @@ public class InstallBusiness {
         itfTblAzAssignLcLsDownloadService.updateById(add);
     }
 
-    private void getOrderAppraise(OrderBase orderBase, Map<String, List<SysDictRef>> sysDictRefDLMap, List<OrderAppraise> oanew, Brand brand,
+    private void getOrderAppraise(OrderBase orderBase, Map<String, List<SysDictRef>> sysDictRefDLMap, List<OrderAppraise> oanew,
                                   ItfTblAzAssignLcLsDownload item, List<Long> getSynReqId) {
+        WebsitFWS websitFWS = new WebsitFWS();
         List<ItfTblAzAssignSatisfactionDownload> sas;
         sas = itfTblAzAssignSatisfactionDownloadService.lambdaQuery()
                 .eq(ItfTblAzAssignSatisfactionDownload::getDownloadTaskNo, item.getDownloadTaskNo())
@@ -1025,30 +1024,13 @@ public class InstallBusiness {
             // 回访人id无
             o.setRvisitNickName(s.getHfren());
             // 回访人网点信息
-
-            // 先从售后网点查
-            CustomerInformationWebsit ciw = null;
-            WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
-                    .eq(WebsitOrderSign::getBrandWebsitId, s.getHfwdno())
-                    .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
-                    .one();
-            if (wos !=null){
-                o.setRvisitWebsitId(wos.getWebsitId());
-            } else {
-                ciw = customerInformationWebsitService.lambdaQuery()
-                        .eq(CustomerInformationWebsit::getRefWebsitId, s.getHfwdno())
-                        .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
-                        .one();
-                if (ciw !=null){
-                    o.setRvisitWebsitId(wos.getWebsitId());
-                }
-            }
-            if (wos !=null || ciw !=null){
-                Websit websit = websitService.lambdaQuery()
-                        .eq(Websit::getWebsitId,o.getRvisitWebsitId())
-                        .one();
-                o.setRvisitWebsitName(websit.getWebsitName());
+            // 售后网点处理
+            websitFWS = publicService.shshwdToptshwd(s.getHfwdno(), orderBase.getMainId());
+            if (StringUtils.isEmpty(websitFWS.getWdId())){
+                websitFWS = publicService.shxswdToptxswd(s.getHfwdno(), orderBase.getMainId());
             }
+            o.setRvisitWebsitId(websitFWS.getWdId());
+            o.setRvisitWebsitName(websitFWS.getWdmc());
 
             o.setRvisitTime(s.getHfsj());
             o.setNegativeType(s.getBmylx());
@@ -1088,14 +1070,13 @@ public class InstallBusiness {
         }
     }
 
-    private OrderInstall getOrderInstall(OrderBase orderBase, Brand brand, ItfTblAzAssignLcLsDownload item,List<ItfTblAzAssignFeeDownload>  fyqd) {
+    private OrderInstall getOrderInstall(OrderBase orderBase, ItfTblAzAssignLcLsDownload item,List<ItfTblAzAssignFeeDownload>  fyqd) {
         OrderInstall orderInstall = new OrderInstall();
         WebsitFWS websitFWS = new WebsitFWS();
 
         if (CollectionUtils.isNotEmpty(fyqd)){
             OrderPar request = new OrderPar();
             request.setSynReqId(fyqd.get(0).getSynReqId());
-            request.setBrandId(brand.getBrandId());
             request.setMainSynReqId(item.getSynReqId());
 
             orderInstall = azGDFYQDDownloadMapper.getOrderFYQD(request);
@@ -1105,7 +1086,7 @@ public class InstallBusiness {
                 orderInstall.setShopNo(websitFWS.getWdId());
                 orderInstall.setShopName(websitFWS.getWdmc());
             } else {
-                websitFWS = publicService.shshwdToptshwd(item.getCjwdno(),orderBase.getMainId(),orderBase);
+                websitFWS = publicService.shshwdToptshwd(item.getCjwdno(),orderBase.getMainId());
                 orderInstall.setShopNo(websitFWS.getWdId());
                 orderInstall.setShopName(websitFWS.getWdmc());
             }
@@ -1121,17 +1102,16 @@ public class InstallBusiness {
     }
 
     @NotNull
-    private List<OrderInstallOperatingLog> getOrderInstallOperatingLogs(List<ItfTblAzAssignFkmxDownload> fkmxs, OrderBase orderBase, Brand brand, ItfTblAzAssignLcLsDownload item) {
+    private List<OrderInstallOperatingLog> getOrderInstallOperatingLogs(List<ItfTblAzAssignFkmxDownload> fkmxs, OrderBase orderBase, ItfTblAzAssignLcLsDownload item) {
         List<OrderInstallOperatingLog> oiolList = new ArrayList<>();
         WebsitFWS websitFWS = new WebsitFWS();
         for (ItfTblAzAssignFkmxDownload fkmx : fkmxs){
             OrderPar orderPar = new OrderPar();
             orderPar.setSynReqId(fkmx.getSynReqId());
-            orderPar.setBrandId(brand.getBrandId());
             OrderInstallOperatingLog oiol = azGDFkMxDownloadMapper.getOrderFkMx(orderPar);
 
             // 反馈网点处理，先从售后网点查看
-            websitFWS = publicService.shshwdToptshwd(oiol.getWebsitNumber(),orderBase.getMainId(),orderBase);
+            websitFWS = publicService.shshwdToptshwd(oiol.getWebsitNumber(),orderBase.getMainId());
             if (StringUtils.isEmpty(websitFWS.getWdId())){
                 websitFWS = publicService.shxswdToptxswd(oiol.getWebsitNumber(),orderBase.getMainId());
             }
@@ -1147,17 +1127,20 @@ public class InstallBusiness {
             oiol.setUploadNotifyFlag(0);
             // websit_number及operate_websit 可能为空，需从销售网点再次查询
             if (StringUtils.isNotEmpty(fkmx.getWdno()) && StringUtils.isEmpty(oiol.getWebsitNumber())){
-                // 从销售网点查
-                CustomerInformationWebsit ciw = customerInformationWebsitService.lambdaQuery()
-                        .eq(CustomerInformationWebsit::getRefWebsitId, fkmx.getWdno())
-                        .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
-                        .one();
-                if (ciw !=null){
-                    oiol.setWebsitNumber(ciw.getWebsitId());// 为售后网点火器
-                    oiol.setOperateWebsit(ciw.getWebsitId());// 为操作人员所属网点
+                websitFWS = publicService.shxswdToptxswd(oiol.getWebsitNumber(),orderBase.getMainId());
+                if (websitFWS !=null){
+                    oiol.setOperateWebsit(websitFWS.getWdId());// 为售后网点
+                    oiol.setWebsitNumber(websitFWS.getWdmc());// 为操作人员所属网点
                 }
             }
 
+
+
+
+
+
+
+
             // 操作前工单状态,操作前派工状态,操作后工单状态,操作后派工状态 这些字段不处理
             oiolList.add(oiol);
         }
@@ -1296,7 +1279,7 @@ public class InstallBusiness {
             orderBase.setIsReservation(1);
         }
         // 重置部分数据
-        orderService.setPar(item, orderBase, brand);
+        orderService.setPar(item, orderBase);
 
         return orderBase;
     }

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

@@ -81,11 +81,11 @@ public class InstallDownload {
     // 1：下载安装工单数据
     @Scheduled(fixedDelay = 1 * 5 * 1000)
     public void download() throws Exception {
-        /*if (1 == 1) {
+        if (1 == 1) {
             return;
-        }*/
+        }
         List<ItfInstallBatchDownloadRec> rec = new ArrayList<>();
-        Boolean flag = Boolean.FALSE;
+
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         log.info("开始下载安装工单: \uF0B7{}",sdf.format(new Date()));
@@ -104,23 +104,14 @@ public class InstallDownload {
         for (int i = 0; i < datas.size(); i++) {
             try{
                 JSONObject sheet = datas.getJSONObject(i);
-                rec.clear();
-
                 // 提取主表数据 主表无数据时不处理
                 JSONArray mainTableData = sheet.getJSONArray("TBL_AZ_ASSIGN_LC_LS");
                 if (mainTableData != null && mainTableData.size() > 0) {
                     String downloadTaskNo = UUID.randomUUID().toString();
+                    // 最后修改日期不能为空处理
                     DataUtil.initLastModifiedDate(mainTableData.getJSONObject(0),"lastModifiedDate");
-
-                    // 查看安装数据批量下载记录内是否已存在
-                    //     已存在不再下载，
-                    //     无数据时落本地表
-                    flag = insertInstallRecData(mainTableData.getJSONObject(0), downloadBatchNo, downloadTaskNo, rec,
-                            ESInstallEnum.SALES_WEBSIT_NUMBER.getCode());
-                    // 历史下载记录中无数据时数据落表,有数据时不再下载
-                    if (flag){
-                        installDownload.parseData(sheet, downloadTaskNo, downloadBatchNo, rec);
-                    }
+                    // 添加数据
+                    installDownload.addData(rec, downloadBatchNo, sheet, mainTableData, downloadTaskNo);
                 } else {
                     log.info("安装工单找不到主表数据不做处理 mainTableData：{}" ,mainTableData);
                 }
@@ -130,11 +121,25 @@ public class InstallDownload {
             }
         }
 
-        log.info("安装工单落表完成");
+        log.info("安装工单下载完成 \uF0B7{}",sdf.format(new Date()));
         updateStatus();
         // log.info("安装工单处理完成: {}",sdf.format(new Date()));
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public void addData(List<ItfInstallBatchDownloadRec> rec, String downloadBatchNo, JSONObject sheet, JSONArray mainTableData, String downloadTaskNo) throws Exception {
+        // 查看安装数据批量下载记录内是否已存在
+        //     已存在不再下载，
+        //     无数据时落本地表
+        Boolean flag = Boolean.FALSE;
+        flag = insertInstallRecData(mainTableData.getJSONObject(0), downloadBatchNo, downloadTaskNo, rec,
+                ESInstallEnum.SALES_WEBSIT_NUMBER.getCode());
+        // 历史下载记录中无数据时数据落表,有数据时不再下载
+        if (flag){
+            parseData(sheet, downloadTaskNo, downloadBatchNo, rec);
+        }
+    }
+
     // 2：与总部同步安装工单下载状态 下次获取时不再拉取数据  单独开任务确保效率更好，
 /*    @Scheduled(fixedDelay = 1 * 60 * 1000)
     public void syncDownStat() throws Exception {
@@ -1089,7 +1094,7 @@ public class InstallDownload {
         log.info(str.toString());
     }
 
-    @Transactional(rollbackFor = Exception.class)
+
     public void parseData(JSONObject sheet, String downloadTaskNo, String downloadBatchNo, List<ItfInstallBatchDownloadRec> rec) throws Exception {
         List<ItfTblAzAssignLcLsDownload> lcls = new ArrayList<>();
         List<ItfTblAzAssignMxDownload> mx = new ArrayList<>();

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

@@ -93,10 +93,9 @@ public class RepairBusiness {
     // 1：工单落入本地表 TL_SynDataFrom_tbl_assign_batch
     @Scheduled(fixedDelay = 1 * 5 * 1000)
     public void inputOrder() {
-        /*if (1 == 1) {
+        if (1 == 1) {
             return;
         }
-       */
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<ItfTblAssignDownload> repairRec = new ArrayList<>();
         List<Long> pgids = new ArrayList<>();
@@ -191,11 +190,11 @@ public class RepairBusiness {
         // 维修单明细表更新 TL_SynDataFrom_tbl_assign_mx
         generateMxUpdate(brand, item, order, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap);
         // 处理维修单过程反馈(只新增不修改)  放入操作日志表 TL_SynDataFrom_tbl_assign_fkmx
-        generateFkmxUpdate(brand, item, order);
+        generateFkmxUpdate(item, order);
         // 处理用户评价数据 TL_SynDataFrom_tbl_assign_satisfaction
-        generateSstisfactionUpdate(brand, item, sysDictRefDLMap, order);
+        generateSstisfactionUpdate(item, sysDictRefDLMap, order);
         // 阅读要求数据处理 TL_SynDataFrom_tbl_assign_xzyd
-        generateXzydUpdate(brand, yds, order);
+        generateXzydUpdate(yds, order);
         // 用户预约改约数据处理 TL_SynDataFrom_tbl_assign_appointment
         generateAppointmentUpdate(item, order);
     }
@@ -248,7 +247,7 @@ public class RepairBusiness {
                     .eq(OrderBase::getOrderType, OrderTypeEnum.ORDER_TYPE_REPAIR.getCode()).one();
         }
         // 网点信息更新
-        updateWebsit(brand, sysDictRefDLMap, item, oldOrder);
+        updateWebsit(sysDictRefDLMap, item, oldOrder);
         // 用户期望上门时间信息更新
         updateYhqwsmsj(item, oldOrder);
         // 状态信息更新
@@ -437,19 +436,19 @@ public class RepairBusiness {
         }
     }
 
-    private void updateWebsit(Brand brand, Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignDownload item, OrderBase oldOrder) {
+    private void updateWebsit(Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignDownload item, OrderBase oldOrder) {
         // 看网点更新的条件
         Boolean flag = getaBoolean(sysDictRefDLMap, item, oldOrder);
         // 更新网点信息
         if (flag){
             // 字段赋值
-            getOrderBase(brand, item, oldOrder);
+            getOrderBase(item, oldOrder);
             orderBaseService.updateById(oldOrder);
         }
     }
 
     @NotNull
-    private void getOrderBase(Brand brand, ItfTblAssignDownload item, OrderBase upOrder) {
+    private void getOrderBase(ItfTblAssignDownload item, OrderBase upOrder) {
         if (StringUtils.isNotEmpty(item.getXxlb())){
             upOrder.setInfoType(item.getXxlb());
         } else {
@@ -467,11 +466,13 @@ public class RepairBusiness {
         } else {
             wdno = item.getWxwdno();
         }
-        WebsitFWS resultData = publicService.WebsitToSH(wdno, brand.getBrandId());
+        WebsitFWS resultData = publicService.shshwdToptshwd(wdno, upOrder.getMainId());
         upOrder.setWebsitId(resultData.getWdId());
         upOrder.setWebsitName(resultData.getWdmc());
+
+
         if (StringUtils.isNotEmpty(item.getXjwdno())){
-            WebsitFWS res = publicService.WebsitToSH(item.getXjwdno(), brand.getBrandId());
+            WebsitFWS res = publicService.shshwdToptshwd(item.getXjwdno(), upOrder.getMainId());
             upOrder.setReceWebsitId(res.getWdId());
             upOrder.setReceWebsitName(res.getWdmc());
         } else {
@@ -560,7 +561,7 @@ public class RepairBusiness {
         // 处理维修单明细表 TL_SynDataFrom_tbl_assign_mx
         generateMx(brand, item, order, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap);
         // 处理维修单过程反馈表 放入操作日志表 TL_SynDataFrom_tbl_assign_fkmx
-        generateFkmx(brand, item, order);
+        generateFkmx(item, order);
         // 处理用户评价数据 TL_SynDataFrom_tbl_assign_satisfaction
         generateSstisfaction(brand, item, sysDictRefDLMap, order);
         // 阅读要求数据处理 TL_SynDataFrom_tbl_assign_xzyd
@@ -631,7 +632,7 @@ public class RepairBusiness {
 
         for (ItfTblAssignXzydDownload yd: yds){
             // 获取阅读要求数据
-            getAddOrderInfor(brand, order, oilist, yd);
+            getAddOrderInfor(order, oilist, yd);
 
             ItfTblAssignXzydDownload up = new ItfTblAssignXzydDownload();
             up.setSynReqId(yd.getSynReqId());
@@ -649,7 +650,7 @@ public class RepairBusiness {
         }
     }
 
-    private void generateXzydUpdate(Brand brand, List<ItfTblAssignXzydDownload> yds, OrderBase order) {
+    private void generateXzydUpdate(List<ItfTblAssignXzydDownload> yds, OrderBase order) {
         List<OrderInformation> oilist = new ArrayList<>();
         List<OrderInformation> oilistUp = new ArrayList<>();
         List<ItfTblAssignXzydDownload> ups = new ArrayList<>();
@@ -663,9 +664,9 @@ public class RepairBusiness {
         for (ItfTblAssignXzydDownload yd: yds){
             // 存在修改，不存在新增
             if (oisMap.containsKey(yd.getXzid())){
-                getUpOrderInfor(brand, oilistUp, yd, order);
+                getUpOrderInfor(oilistUp, yd, order);
             } else {
-                getAddOrderInfor(brand, order, oilist, yd);
+                getAddOrderInfor(order, oilist, yd);
             }
 
             ItfTblAssignXzydDownload up = new ItfTblAssignXzydDownload();
@@ -688,7 +689,7 @@ public class RepairBusiness {
         }
     }
 
-    private void getUpOrderInfor(Brand brand, List<OrderInformation> oilistUp,
+    private void getUpOrderInfor(List<OrderInformation> oilistUp,
                                  ItfTblAssignXzydDownload yd, OrderBase order) {
         OrderInformation up = new OrderInformation();
 
@@ -703,13 +704,13 @@ public class RepairBusiness {
         up.setReadStatus(yd.getYdbz());
         up.setReadTime(yd.getYdsj());
         up.setReadName(yd.getYdrmc());
-        WebsitFWS websitFWS = publicService.WebsitToSH(yd.getWdno(), brand.getBrandId());
+        WebsitFWS websitFWS = publicService.shshwdToptshwd(yd.getWdno(), order.getMainId());
         up.setWebsitId(websitFWS.getWdId());
         up.setWebsitName(websitFWS.getWdmc());
         oilistUp.add(up);
     }
 
-    private void getAddOrderInfor(Brand brand, OrderBase order, List<OrderInformation> oilist, ItfTblAssignXzydDownload yd) {
+    private void getAddOrderInfor(OrderBase order, List<OrderInformation> oilist, ItfTblAssignXzydDownload yd) {
         OrderInformation add = new OrderInformation();
         add.setXzid(yd.getXzid());
         add.setAskCategoryId(yd.getXzyqlb());
@@ -722,7 +723,7 @@ public class RepairBusiness {
         add.setReadStatus(yd.getYdbz());
         add.setReadName(yd.getYdrmc());
         add.setReadTime(yd.getYdsj());
-        WebsitFWS websitFWS = publicService.WebsitToSH(yd.getWdno(), brand.getBrandId());
+        WebsitFWS websitFWS = publicService.shshwdToptshwd(yd.getWdno(), order.getMainId());
         add.setWebsitId(websitFWS.getWdId());
         add.setWebsitName(websitFWS.getWdmc());
         oilist.add(add);
@@ -769,7 +770,7 @@ public class RepairBusiness {
             // 只插入一条sxlx = 0的首评记录
             if (canInsert.equals(1)){
                 // 增加评价记录
-                WebsitFWS websitFWS = addappraise(brand, sysDictRefDLMap, s);
+                WebsitFWS websitFWS = addappraise(order,sysDictRefDLMap, s);
                 // 增加差评短信
                 addcpsms(order, s, websitFWS);
             }
@@ -785,7 +786,7 @@ public class RepairBusiness {
         }
     }
 
-    private void generateSstisfactionUpdate(Brand brand, ItfTblAssignDownload item, Map<String, List<SysDictRef>> sysDictRefDLMap, OrderBase order) {
+    private void generateSstisfactionUpdate(ItfTblAssignDownload item, Map<String, List<SysDictRef>> sysDictRefDLMap, OrderBase order) {
         List<ItfTblAssignSatisfactionDownload> satis = itfTblAssignSatisfactionDownloadService.lambdaQuery()
                 .eq(ItfTblAssignSatisfactionDownload::getDownloadTaskNo, item.getDownloadTaskNo())
                 .orderByAsc(ItfTblAssignSatisfactionDownload::getHfsj)
@@ -826,7 +827,7 @@ public class RepairBusiness {
             // 只插入一条sxlx = 0的首评记录
             if (canInsert.equals(1)){
                 // 增加评价记录
-                WebsitFWS websitFWS = addappraise(brand, sysDictRefDLMap, s);
+                WebsitFWS websitFWS = addappraise(order, sysDictRefDLMap, s);
                 // 增加差评短信
                 addcpsms(order, s, websitFWS);
             }
@@ -862,10 +863,11 @@ public class RepairBusiness {
     }
 
     @NotNull
-    private WebsitFWS addappraise(Brand brand, Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignSatisfactionDownload s) {
+    private WebsitFWS addappraise(OrderBase order, Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignSatisfactionDownload s) {
         Boolean canAppeal = Boolean.TRUE;
         Integer appeal = 0;
         ReAppointment rq = new ReAppointment();
+        WebsitFWS websitFWS = new WebsitFWS();
 
         if(StringUtils.isNotEmpty(s.getPjnr())){
             if (s.getPjnr().equals("1") || s.getPjnr().equals("满意")){
@@ -888,7 +890,10 @@ public class RepairBusiness {
         OrderAppraise add = assignSatisfactionDownloadMapper.getOrderAppraise(rq);
 
         // rvisit_websit_id 单独处理
-        WebsitFWS websitFWS = publicService.WebsitToSH(s.getHfwdno(), brand.getBrandId());
+        websitFWS = publicService.shshwdToptshwd(s.getHfwdno(), order.getMainId());
+        if (StringUtils.isEmpty(websitFWS.getWdId())){
+            websitFWS = publicService.shxswdToptxswd(s.getHfwdno(), order.getMainId());
+        }
         add.setRvisitWebsitId(websitFWS.getWdId());
         add.setRvisitWebsitName(websitFWS.getWdmc());
         // splb 商品大类  单独处理
@@ -938,7 +943,7 @@ public class RepairBusiness {
         itfTblAssignSatisfactionDownloadService.updateById(up);
     }
 
-    private void generateFkmx(Brand brand, ItfTblAssignDownload item, OrderBase order) {
+    private void generateFkmx(ItfTblAssignDownload item, OrderBase order) {
         List<ItfTblAssignFkmxDownload> fkmxRec = new ArrayList<>();
         List<OrderRepairOperatingLog> orols = new ArrayList<>();
         List<ItfTblAssignFkmxDownload> ups = new ArrayList<>();
@@ -950,7 +955,7 @@ public class RepairBusiness {
                 .list();
         for (ItfTblAssignFkmxDownload fkmx :fkmxRec){
             // 获取操作明细数据
-            getoroldata(brand, order, orols, fkmx);
+            getoroldata(order, orols, fkmx);
             ItfTblAssignFkmxDownload u = new ItfTblAssignFkmxDownload();
             u.setSynReqId(fkmx.getSynReqId());
             u.setSynStatus(1);
@@ -965,7 +970,7 @@ public class RepairBusiness {
         }
     }
 
-    private void generateFkmxUpdate(Brand brand, ItfTblAssignDownload item, OrderBase order) {
+    private void generateFkmxUpdate(ItfTblAssignDownload item, OrderBase order) {
         List<ItfTblAssignFkmxDownload> fkmxRec = new ArrayList<>();
         List<OrderRepairOperatingLog> orols = new ArrayList<>();
         List<ItfTblAssignFkmxDownload> ups = new ArrayList<>();
@@ -985,7 +990,7 @@ public class RepairBusiness {
         for (ItfTblAssignFkmxDownload fkmx :fkmxRec){
             // 存在不做更新？过程是这样写的
             if (!orolMap.containsKey(fkmx.getFkid())){
-                getoroldata(brand, order, orols, fkmx);
+                getoroldata(order, orols, fkmx);
             }
             
             ItfTblAssignFkmxDownload u = new ItfTblAssignFkmxDownload();
@@ -1002,8 +1007,9 @@ public class RepairBusiness {
         }
     }
 
-    private void getoroldata(Brand brand, OrderBase order, List<OrderRepairOperatingLog> orols, ItfTblAssignFkmxDownload fkmx) {
+    private void getoroldata(OrderBase order, List<OrderRepairOperatingLog> orols, ItfTblAssignFkmxDownload fkmx) {
         OrderRepairOperatingLog add = new OrderRepairOperatingLog();
+        WebsitFWS websitFWS = new WebsitFWS();
         add.setWebsitName(order.getWebsitName());
         add.setWebsitId(order.getWebsitId());
         add.setOrderBaseId(order.getId());
@@ -1014,7 +1020,10 @@ public class RepairBusiness {
         add.setFeedback(fkmx.getFkjg());
         add.setOperator(fkmx.getFkren());
         add.setOperatorNumber(fkmx.getFkrenmc());
-        WebsitFWS websitFWS = publicService.WebsitToSH(fkmx.getFkwdno(), brand.getBrandId());
+        websitFWS = publicService.shshwdToptshwd(fkmx.getFkwdno(), order.getMainId());
+        if (StringUtils.isEmpty(websitFWS.getWdId())){
+            websitFWS = publicService.shxswdToptxswd(fkmx.getFkwdno(), order.getMainId());
+        }
         add.setOperateWebsit(websitFWS.getWdmc());
         add.setWebsitPhone(websitFWS.getWdlxdh());
         add.setWorkerOrderStatus(order.getOrderStatus());// 反馈时的工单状态
@@ -1116,7 +1125,7 @@ public class RepairBusiness {
             op.setSaleWebsit(websitFWS.getWdId());
 
             // 服务单位处理 service_websit
-            websitFWS = publicService.shshwdToptshwd(op.getServiceWebsit(),order.getMainId(),order);
+            websitFWS = publicService.shshwdToptshwd(op.getServiceWebsit(),order.getMainId());
             op.setServiceWebsit(websitFWS.getWdId());
 
             // 其他部分参数赋值
@@ -1247,7 +1256,7 @@ public class RepairBusiness {
         websitFWS = publicService.shxswdToptxswd(op.getSaleWebsit(),order.getMainId());
         op.setSaleWebsit(websitFWS.getWdId());
         // 服务单位处理 service_websit
-        websitFWS = publicService.shshwdToptshwd(op.getServiceWebsit(),order.getMainId(),order);
+        websitFWS = publicService.shshwdToptshwd(op.getServiceWebsit(),order.getMainId());
         op.setServiceWebsit(websitFWS.getWdId());
 
         op.setOrderBaseId(order.getId());

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

@@ -52,9 +52,9 @@ public class RepairDownload {
     @Scheduled(fixedDelay = 1 * 5 * 1000)
     public void download() throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        /*if (1 == 1) {
+        if (1 == 1) {
             return;
-        }*/
+        }
 
 
         try {

src/main/java/com/zfire/jiasm/syncdata/download/other/install/DataAdd.java

@@ -27,7 +27,6 @@ public class DataAdd {
     @Scheduled(fixedDelay = 1 * 10 * 1000)
     public void add(){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
         if (1==1){
             return;
         }

src/main/java/com/zfire/jiasm/syncdata/download/other/install/DataAddFeedback.java

@@ -28,7 +28,6 @@ public class DataAddFeedback {
     @Scheduled(fixedDelay = 1 * 10 * 1000)
     public void add(){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
         if (1==1){
             return;
         }

src/main/java/com/zfire/jiasm/syncdata/download/worker/GLPPWXGQueryAdd.java

@@ -85,9 +85,9 @@ public class GLPPWXGQueryAdd {
      */
     @Scheduled(fixedDelay = 1 * 60 * 1000)
     public void wxgQueryAddCertInfo() throws Exception {
-        /*if (1==1){
+        if (1==1){
             return;
-        }*/
+        }
 
         WangdianWxgVos wvos = new WangdianWxgVos();
         List<WorkerCert> addList = new ArrayList<>();
@@ -126,10 +126,11 @@ public class GLPPWXGQueryAdd {
                     continue;
                 }
             }
+            // 本地表师傅信息不包含格力总部的数据 不处理
             if (!oldWorkers.contains(wxg.getSfzen())){
                 continue;
             }
-            // 有证件信息的师傅不现新增
+            // 有证件信息的师傅不再新增
             if (wcMaps.contains(wxg.getSfzen())){
                 continue;
             }
@@ -220,10 +221,11 @@ public class GLPPWXGQueryAdd {
 
         //本地提取商户师傅网点信息
         wbarecs = workerBrandAccountService.lambdaQuery()
-                .eq(WorkerBrandAccount::getBrandId, brand.getBrandId())
+                .eq(WorkerBrandAccount::getGroupCompanyId, brand.getBrandId())
                 .isNotNull(WorkerBrandAccount::getBrandWorkerNumber)
-                .isNotNull(WorkerBrandAccount::getBrandWebsitNumber)
+                .isNotNull(WorkerBrandAccount::getBrandWebsitId)
                 .list();
+        // 这里提取对应的商户网点信息
 
         // 提取所有师傅的服务大类信息 先内存中查询
         List<WorkerServiceCategoryDetail> wxgCategoryRec = workerServiceCategoryDetailService.lambdaQuery().list();
@@ -356,9 +358,9 @@ public class GLPPWXGQueryAdd {
 
         //本地提取商户师傅网点信息
         wbarecs = workerBrandAccountService.lambdaQuery()
-                .eq(WorkerBrandAccount::getBrandId, brand.getBrandId())
+                .eq(WorkerBrandAccount::getGroupCompanyId, brand.getBrandId())
                 .isNotNull(WorkerBrandAccount::getBrandWorkerNumber)
-                .isNotNull(WorkerBrandAccount::getBrandWebsitNumber)
+                .isNotNull(WorkerBrandAccount::getBrandWebsitId)
                 .list();
 
         // 提取品牌商对应的大类信息
@@ -604,7 +606,7 @@ public class GLPPWXGQueryAdd {
         WorkerBrandAccount workerBrandAccount = null;
 
         for (WorkerBrandAccount wba: wbarecs){
-            if (wba.getBrandWebsitNumber().equals(wxg.getWdno())
+            if (wba.getBrandWebsitId().equals(wxg.getWdno())
                     && wba.getBrandWorkerNumber().equals(wxg.getWxgno())){
                 workerBrandAccount = wba;
                 break;
@@ -781,13 +783,13 @@ public class GLPPWXGQueryAdd {
         n.setWorkerId(wxg.getSfzen());
         n.setWebsitId(websitId);
         n.setWebsitName(websitName);
-        n.setBrandId(brand.getBrandId());
+        n.setGroupCompanyId(brand.getBrandId());
         n.setBrandWorkerId(String.valueOf(wxg.getWxgid()));
         n.setBrandWorkerNumber(wxg.getWxgno());
         if (mapWdRes.get(wxg.getWdno()).size()>0){
-            n.setBrandSysWebsitNumber(mapWdRes.get(wxg.getWdno()).get(0).getPkGuid());
+            n.setBrandWebsitName(mapWdRes.get(wxg.getWdno()).get(0).getWdmc());
         }
-        n.setBrandWebsitNumber(wxg.getWdno());
+        n.setBrandWebsitId(wxg.getWdno());
         n.setBrandWorkerStatus("ON");
         if (wvos.getFlag().equals("无效")){
             n.setBrandWorkerStatus("OFF");

src/main/java/com/zfire/jiasm/syncdata/download/worker/GLPPWXGQueryUpdate.java

@@ -82,10 +82,10 @@ public class GLPPWXGQueryUpdate {
      */
     @Scheduled(fixedDelay = 1 * 60 * 1000)
     public void wxgQueryUpdate() throws Exception {
-        /*if (1==1){
+        if (1==1){
             return;
         }
-*/
+
         WangdianWxgVos wvos = new WangdianWxgVos();
         List<WorkerCert> updateList = new ArrayList<>();
         List<WorkerCert> addList = new ArrayList<>();
@@ -129,7 +129,7 @@ public class GLPPWXGQueryUpdate {
 
         //本地提取商户师傅网点信息 一个师傅可多网点 格力最多3个网点
         wbarecs = workerBrandAccountService.lambdaQuery()
-                .eq(WorkerBrandAccount::getBrandId, brand.getBrandId()).list();
+                .eq(WorkerBrandAccount::getGroupCompanyId, brand.getBrandId()).list();
 
         log.info("开始同步网点师傅信息: \uF0B7{}",sdf.format(new Date()));
 
@@ -191,11 +191,11 @@ public class GLPPWXGQueryUpdate {
 
         // 平台师傅信息未同步到格力总部时不处理
         for (WorkerBrandAccount wba: wbarecs){
-            if (StringUtils.isEmpty(wba.getBrandWebsitNumber()) || StringUtils.isEmpty(wba.getBrandWorkerNumber()) ||
+            if (StringUtils.isEmpty(wba.getBrandWebsitId()) || StringUtils.isEmpty(wba.getBrandWorkerNumber()) ||
                     StringUtils.isEmpty(wxg.getWdno()) || StringUtils.isEmpty(wxg.getWxgno())){
                 continue;
             }
-            if (wba.getBrandWebsitNumber().equals(wxg.getWdno())
+            if (wba.getBrandWebsitId().equals(wxg.getWdno())
                     && wba.getBrandWorkerNumber().equals(wxg.getWxgno())){
                 workerBrandAccount = wba;
                 break;

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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @Controller
 @RequestMapping("/plus/integral-worker-apply")

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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @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-05-10
+ * @since 2023-05-15
  */
 @Controller
 @RequestMapping("/plus/repair-bug")

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-10
+ * @since 2023-05-15
  */
 @Controller
 @RequestMapping("/plus/repair-project")

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-10
+ * @since 2023-05-15
  */
 @Controller
 @RequestMapping("/plus/sms-record")

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-10
+ * @since 2023-05-15
  */
 @Controller
 @RequestMapping("/plus/street")

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-10
+ * @since 2023-05-15
  */
 @Controller
 @RequestMapping("/plus/sys-dict")

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-10
+ * @since 2023-05-15
  */
 @Controller
 @RequestMapping("/plus/sys-dict-ref")

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-10
+ * @since 2023-05-15
  */
 @Controller
 @RequestMapping("/plus/sys-dict-type")

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-10
+ * @since 2023-05-15
  */
 @Controller
 @RequestMapping("/plus/tool")

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-10
+ * @since 2023-05-15
  */
 @Controller
 @RequestMapping("/plus/user-feedback")

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

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

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-10
+ * @since 2023-05-15
  */
 @Controller
 @RequestMapping("/plus/websit-enclosure-file")

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-10
+ * @since 2023-05-15
  */
 @Controller
 @RequestMapping("/plus/websit-examine-record")