yaozhixue 1 year ago
parent
commit
4ebad0d5bd
100 changed files with 131 additions and 1343 deletions
  1. 15 0
      src/main/java/com/zfire/jiasm/syncdata/download/basedata/websitworker.txt
  2. 13 768
      src/main/java/com/zfire/jiasm/syncdata/download/worker/GLPPWXGQueryAdd.java
  3. 6 478
      src/main/java/com/zfire/jiasm/syncdata/download/worker/GLPPWXGQueryUpdate.java
  4. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminFastEntryPlusTempController.java
  5. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminFieldPlusTempController.java
  6. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminModuleFavoritesPlusTempController.java
  7. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminModulePlusTempController.java
  8. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminRolePlusTempController.java
  9. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserModuleRelaPlusTempController.java
  10. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserPlusTempController.java
  11. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserRoleRelaPlusTempController.java
  12. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitPlusTempController.java
  13. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitProductTypeRelaPlusTempController.java
  14. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitSlavePlusTempController.java
  15. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AreaPlusTempController.java
  16. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandLbsRelatePlusTempController.java
  17. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandPlusTempController.java
  18. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandWebsitPlusTempController.java
  19. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CityPlusTempController.java
  20. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComDetailLogPlusTempController.java
  21. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComDetailPlusTempController.java
  22. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComListPlusTempController.java
  23. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CommonFilePlusTempController.java
  24. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CompanyCaAuthPlusTempController.java
  25. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CompanyRecordManagePlusTempController.java
  26. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ContractTemplatePlusTempController.java
  27. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationCategoryPlusTempController.java
  28. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationPlusTempController.java
  29. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationWebsitPlusTempController.java
  30. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ImgCarouselManagePlusTempController.java
  31. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InstallChargeConfigPlusTempController.java
  32. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureAgreePlusTempController.java
  33. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureEmailPlusTempController.java
  34. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureEmailRecordPlusTempController.java
  35. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsurePlusTempController.java
  36. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureRangePlusTempController.java
  37. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerCommercialFilePlusTempController.java
  38. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerCommercialPlusTempController.java
  39. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerRecordPlusTempController.java
  40. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralDoublePlusTempController.java
  41. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeConfigurePlusTempController.java
  42. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeExplainPlusTempController.java
  43. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeSkillPlusTempController.java
  44. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralOffsetPlusTempController.java
  45. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralScorePlusTempController.java
  46. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralSkillLabelPlusTempController.java
  47. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralWorkerApplyPlusTempController.java
  48. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfGreeToFaDownloadTaskPlusTempController.java
  49. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignGzdmDowloadPlusTempController.java
  50. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXqxlDowloadPlusTempController.java
  51. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxlbDowloadPlusTempController.java
  52. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxlyDowloadPlusTempController.java
  53. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxqdDowloadPlusTempController.java
  54. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignYhsxWxDowloadPlusTempController.java
  55. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAzAssignXslxDowloadPlusTempController.java
  56. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCityDownloadPlusTempController.java
  57. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCityJdxzDownloadPlusTempController.java
  58. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCountyDownloadPlusTempController.java
  59. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblProvinceDownloadPlusTempController.java
  60. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbDaleiDownloadPlusTempController.java
  61. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbJixinDownloadPlusTempController.java
  62. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbXiaoleiDownloadPlusTempController.java
  63. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbXilieDownloadPlusTempController.java
  64. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblWangdianWxgDownloadPlusTempController.java
  65. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblXinWangdianDownloadPlusTempController.java
  66. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblYhsxViprankDowloadPlusTempController.java
  67. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/LabelCurrencyPlusTempController.java
  68. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/LabelPlusTempController.java
  69. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/LbsAmapPlusTempController.java
  70. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/NoticePlusTempController.java
  71. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/NoticeRecordPlusTempController.java
  72. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/OperationLogPlusTempController.java
  73. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProductPlusTempController.java
  74. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProductSeriesPlusTempController.java
  75. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProvincePlusTempController.java
  76. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/QualificationsManagePlusTempController.java
  77. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/RepairBugPlusTempController.java
  78. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/RepairProjectPlusTempController.java
  79. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/SmsRecordPlusTempController.java
  80. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/StreetPlusTempController.java
  81. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictPlusTempController.java
  82. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictRefPlusTempController.java
  83. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictTypePlusTempController.java
  84. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ToolPlusTempController.java
  85. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/UserFeedbackPlusTempController.java
  86. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/UserPlusTempController.java
  87. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitEnclosureFilePlusTempController.java
  88. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitExamineRecordPlusTempController.java
  89. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitFilePlusTempController.java
  90. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitMainInfoChangeDataPlusTempController.java
  91. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitMainInfoChangePlusTempController.java
  92. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitOrderSignPlusTempController.java
  93. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitPlusTempController.java
  94. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitServiceCategoryDetailPlusTempController.java
  95. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitServiceCategoryPlusTempController.java
  96. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerBrandAccountPlusTempController.java
  97. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerCertPlusTempController.java
  98. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerChangeIntegralRecordPlusTempController.java
  99. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerComListPlusTempController.java
  100. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerComListWorkerPlusTempController.java

+ 15 - 0
src/main/java/com/zfire/jiasm/syncdata/download/basedata/websitworker.txt

@@ -0,0 +1,15 @@
+-- 有对应关系
+select * from websit_order_sign where brand_websit_id='S2102276';
+-- 网点有6个师傅
+select * from itf_tbl_wangdian_wxg_download where wdno='S2102276';-- 6
+-- 需要添加 6 个师傅信息 正确
+select * from worker where idcard in (select sfzen from itf_tbl_wangdian_wxg_download where wdno='S2102276')
+-- 平台对应的商户网点需要生成6个师傅信息
+select * from worker_brand_account where brand_websit_id='S2102276';
+-- 平台网点需要添加6个师傅
+select * from websit_worker where worker_id in (select worker_id from worker where idcard in (select sfzen from itf_tbl_wangdian_wxg_download where wdno='S2102276') );
+
+
+select * from worker where sync_flag=0;
+delete from  worker_brand_account where worker_id not in (select worker_id from worker where sync_flag=0);
+delete from  websit_worker where worker_id not in (select worker_id from worker where sync_flag=0);

+ 13 - 768
src/main/java/com/zfire/jiasm/syncdata/download/worker/GLPPWXGQueryAdd.java

@@ -1,38 +1,16 @@
 package com.zfire.jiasm.syncdata.download.worker;
 
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.zfire.jiasm.syncdata.base.BaseService;
-import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
-import com.zfire.jiasm.syncdata.constant.ServiceCategoryEnum;
 import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
-import com.zfire.jiasm.syncdata.gree.GreeLogic;
-import com.zfire.jiasm.syncdata.helper.GreeResponseHelper;
-import com.zfire.jiasm.syncdata.plus.entity.*;
-import com.zfire.jiasm.syncdata.plus.service.*;
-import com.zfire.jiasm.syncdata.request.SignSplb;
-import com.zfire.jiasm.syncdata.request.ZJInfo;
-import com.zfire.jiasm.syncdata.response.WangdianWxgVos;
-import com.zfire.jiasm.syncdata.response.WxgQueryInfo;
 import com.zfire.jiasm.syncdata.service.GLPPWXGQueryAddService;
-import com.zfire.jiasm.syncdata.service.PublicService;
-import com.zfire.jiasm.syncdata.utils.oss.OSSUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.io.File;
 import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Date;
 
 /**
  * 格力品牌网点维修工 证件照,服务类目,新增同步 初始化进来
@@ -48,145 +26,37 @@ import java.util.stream.Collectors;
 @Slf4j
 @Component
 public class GLPPWXGQueryAdd {
-    String wdqyapi = "/outapp/wxg/list";
-
     @Value("${wxgwzc}")
     private String wxgwzc = "";
     @Value("${lmxxc}")
     private String lmxxc = "";
     @Value("${zjzxxc}")
     private String zjzxxc = "";
+    @Value("${wxgwztc}")
+    private String wxgwztc = "";
 
-
-    @Resource
-    BaseService baseService;
-    @Resource
-    GreeLogic greeLogic;
-    @Resource
-    OSSUtil ossUtil;
-    @Resource
-    ItfTblWangdianWxgDownloadService itfTblWangdianWxgDownloadService;
-    @Resource
-    ItfTblXinWangdianDownloadService itfTblXinWangdianDownloadService;
-    @Resource
-    WorkerBrandAccountService workerBrandAccountService;
-    @Resource
-    WorkerCertService workerCertService;
-    @Resource
-    WorkerStreetService workerStreetService;
-    @Resource
-    ProvinceService provinceService;
-    @Resource
-    BrandLbsRelateService brandLbsRelateService;
-    @Resource
-    WorkerServiceCategoryService workerServiceCategoryService;
-    @Resource
-    WorkerServiceCategoryDetailService workerServiceCategoryDetailService;
-    @Resource
-    SysDictRefService sysDictRefService;
-    @Resource
-    SysDictService sysDictService;
-    @Resource
-    CustomerInformationWebsitService customerInformationWebsitService;
-    @Resource
-    WebsitService websitService;
-    @Resource
-    WorkerService workerService;
-    @Resource
-    ItfTblWangdianPositionDownloadService itfTblWangdianPositionDownloadService;
-    @Resource
-    PublicService publicService;
     @Resource
     GLPPWXGQueryAddService glppwxgQueryAddService;
 
+
     /**
-     * 同步师傅的证件照 新增
-     *   师傅状态离职不同步
+     * 从格力总部同步师傅的证件照 只用来新增
+     * 师傅状态离职不同步
      * 师傅在平台中不存在不同步
-     *
+     * 已同步过的不再同步
      */
     @Scheduled(fixedDelayString = "${zjzxx}")
     public void wxgQueryAddCertInfo() throws Exception {
-
-
         if (zjzxxc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        WangdianWxgVos wvos = new WangdianWxgVos();
-        List<WorkerCert> addList = new ArrayList<>();
-        Map<String,Object> req = new HashMap<>();
-        Map<String,List<Worker>> Worker_Idcards = new HashMap<>();
-
-
-        // 提取品牌信息
-        Brand brand = baseService.getBrand();
-        if (brand == null) {
-            return;
-        }
-
-        List<Worker> oldWorkerRec =  workerService.lambdaQuery()
-                .select(Worker::getIdcard,Worker::getWorkerId).list();
-        if (CollectionUtils.isNotEmpty(oldWorkerRec)){
-            Worker_Idcards = oldWorkerRec.stream().collect(Collectors.groupingBy(Worker::getIdcard));
-        }
-
-        // 提取格力现有的网点师傅数据信息
-        List<ItfTblWangdianWxgDownload> wxgDownladRecs =  itfTblWangdianWxgDownloadService.lambdaQuery()
-                .select(ItfTblWangdianWxgDownload::getWxgid,
-                        ItfTblWangdianWxgDownload::getWxgno,
-                        ItfTblWangdianWxgDownload::getWdno,
-                        ItfTblWangdianWxgDownload::getSfzen)
-                .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
-
-        // 提取现有已存在的证件信息的师傅信息
-        List<WorkerCert> wc = workerCertService.lambdaQuery().list();
-        Map<String,List<WorkerCert>> WorkerCertMaps = wc.stream().collect(Collectors.groupingBy(WorkerCert::getWorkerId));
 
         log.info("开始同步师傅证件照信息: \uF0B7{}",sdf.format(new Date()));
 
-        for (ItfTblWangdianWxgDownload wxg :wxgDownladRecs){
-            // 无效的数据不新增
-            if (wxg.getFlag() != null){
-                if (!wxg.getFlag().trim().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
-                    continue;
-                }
-            }
-            // 本地表师傅信息不包含格力总部的数据 不处理 包含的为格力的师傅信息同步时已生成了worker
-            // 这里用身份证来做包含关系
-            if (!Worker_Idcards.containsKey(wxg.getSfzen())){
-                continue;
-            }
-
-            // 有证件信息的师傅不再新增
-            if (WorkerCertMaps.containsKey(Worker_Idcards.get(wxg.getSfzen()).get(0).getWorkerId())){
-                continue;
-            }
+        glppwxgQueryAddService.extractedCertInfo();
 
-            // 参数 获取网点维修工信息
-            getParameter(wxg.getWdno(), wxg.getWxgno(), req);
-            // 格力总部查询工程师信息
-            GreeResponseHelper response = greeLogic.greePost(wdqyapi, JSONObject.toJSONString(req), publicService.getCompanyId(wxg.getWdno()));
-            if (response.getStatus() == 200){
-                WxgQueryInfo resultDatax = JSONObject.parseObject(response.getData().toString(), WxgQueryInfo.class);
-                // 无证件不处理
-                if ( resultDatax.getWangdianWxgVos().size()<1){
-                    continue;
-                }
-
-                wvos = resultDatax.getWangdianWxgVos().get(0);
-
-                try {
-                    // 同步-新增证件信息
-                    getCertInfo(wvos, addList, Worker_Idcards.get(wxg.getSfzen()).get(0).getWorkerId());
-                    // 新增或修改(证件)
-                    addDataCert(addList);
-                } catch (Exception ex) {
-                    log.info("工程师证件照信息同步失败-师傅证件信息:{}", wxg.getSfzen());
-                }
-            }
-        }
         log.info("同步师傅证件照信息结束: \uF0B7{}",sdf.format(new Date()));
     }
 
@@ -196,93 +66,16 @@ public class GLPPWXGQueryAdd {
      */
     @Scheduled(fixedDelayString = "${lmxx}")
     public void wxgQueryAddCategory() throws Exception {
-
-
         if (lmxxc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
-        List<WorkerBrandAccount> workerBrandAccounts = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String,List<Worker>> Worker_Idcards = new HashMap<>();
-        Map<String, List<WorkerServiceCategoryDetail>> workerServiceCategoryDetailMap = new HashMap<>();
-        Map<String, List<SysDictRef>> sysDictRefMap = new HashMap<>();
-
-        // 提取品牌信息
-        Brand brand = baseService.getBrand();
-        if (brand == null) {
-            return;
-        }
-
-        // 提取品牌商对应的大类信息
-        List<SysDictRef> sysDictRef =  sysDictRefService.lambdaQuery()
-                .select(SysDictRef::getDictCode,SysDictRef::getDictValue,SysDictRef::getRefDictCode)
-                .eq(SysDictRef::getBrandId, brand.getBrandId())
-                .eq(SysDictRef::getDictType, DictTypeEnum.DICT_TYPE_MAIN_TYPE.getCode())
-                .list();
-        if (CollectionUtils.isNotEmpty(sysDictRef)){
-            sysDictRefMap = sysDictRef.stream().
-                    collect(Collectors.groupingBy(SysDictRef::getRefDictCode));
-        }
-
-        // 字典表中查出ID 格力只有-家电售后
-        SysDict sysDict =  sysDictService.lambdaQuery()
-                .eq(SysDict::getDictType, ServiceCategoryEnum.DICT_TYPE_SERVICE_CATEGORY.getCode())
-                .eq(SysDict::getDictValue,ServiceCategoryEnum.DICT_TYPE_SERVICE_CATEGORY.getText()).one();
-        if (sysDict == null) {
-            return;
-        }
-
-        List<Worker> oldWorkerRec =  workerService.lambdaQuery()
-                .select(Worker::getIdcard,Worker::getWorkerId).list();
-        if (CollectionUtils.isNotEmpty(oldWorkerRec)){
-            Worker_Idcards = oldWorkerRec.stream().collect(Collectors.groupingBy(Worker::getIdcard));
-        }
-
-        // 提取格力现有的网点师傅数据信息
-        List<ItfTblWangdianWxgDownload> wxgRecs =  itfTblWangdianWxgDownloadService.lambdaQuery()
-                .select(ItfTblWangdianWxgDownload::getWxgid,
-                        ItfTblWangdianWxgDownload::getWxgno,
-                        ItfTblWangdianWxgDownload::getWdno,
-                        ItfTblWangdianWxgDownload::getSfzen)
-                // .eq(ItfTblWangdianWxgDownload::getWxgno,"S21A00200023")// 测试用 todo
-                .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
-
-
-        //本地提取商户师傅网点信息  商户网点对应平台网点存在一对多关系
-        workerBrandAccounts = workerBrandAccountService.lambdaQuery()
-                .eq(WorkerBrandAccount::getGroupCompanyId, brand.getBrandId())
-                .eq(WorkerBrandAccount::getBrandWorkerStatus,"ON")
-                .eq(WorkerBrandAccount::getDel,0)
-                .isNotNull(WorkerBrandAccount::getBrandWorkerNumber)
-                .isNotNull(WorkerBrandAccount::getBrandWebsitId)
-                .list();
-        // 这里提取对应的商户网点信息
-
-        // 提取所有师傅的服务大类信息 先内存中查询
-        List<WorkerServiceCategoryDetail> wxgCategoryRec = workerServiceCategoryDetailService.lambdaQuery().list();
-        if (CollectionUtils.isNotEmpty(wxgCategoryRec)){
-            workerServiceCategoryDetailMap = wxgCategoryRec.stream().collect(Collectors.groupingBy(WorkerServiceCategoryDetail::getWebsitWorkerId));
-        }
 
         log.info("开始同步网点师傅服务类目信息: \uF0B7{}",sdf.format(new Date()));
 
-        for (ItfTblWangdianWxgDownload wxgDownload :wxgRecs){
-            // 无效的数据不新增
-            if (wxgDownload.getFlag() != null){
-                if (!wxgDownload.getFlag().trim().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
-                    continue;
-                }
-            }
-
-            // 师傅在平台中不存在时不处理
-            if (!Worker_Idcards.containsKey(wxgDownload.getSfzen())){
-                continue;
-            }
+        glppwxgQueryAddService.extractedAddCategory();
 
-            glppwxgQueryAddService.wxgCategoryQueryAdd(Worker_Idcards, wxgDownload,
-                    workerBrandAccounts,workerServiceCategoryDetailMap,sysDict,sysDictRefMap);
-        }
         log.info("同步网点师傅服务类目信息结束: \uF0B7{}",sdf.format(new Date()));
     }
 
@@ -292,153 +85,16 @@ public class GLPPWXGQueryAdd {
      */
     @Scheduled(fixedDelayString = "${wxgwz}")
     public void wxgQueryAdd() throws Exception {
-
-
         if (wxgwzc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
-        WangdianWxgVos wvos = new WangdianWxgVos();
-        List<WorkerBrandAccount> wbaaddList = new ArrayList<>();
-        List<WorkerBrandAccount> wbarecs = new ArrayList<>();
-        Map<String,Object> req = new HashMap<>();
-        List<WorkerStreet> ws = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, List<WorkerServiceCategoryDetail>> wxgCategoryTypeRecs = new HashMap<>();
-
-        // 提取品牌信息
-        Brand brand = baseService.getBrand();
-        if (brand == null) {
-            return;
-        }
-
-        // 网点对应关系
-        List<CustomerInformationWebsit> ciws = customerInformationWebsitService.lambdaQuery()
-                .select(CustomerInformationWebsit::getWebsitId,
-                        CustomerInformationWebsit::getRefWebsitId).list();
-        if (ciws ==null || ciws.size()<1){
-            return;
-        }
-
-
-
-
-
-        List<Worker> oldWorkerRec =  workerService.lambdaQuery()
-                .select(Worker::getWorkerId).list();
-        List<String> oldWorkers = oldWorkerRec.stream().map(Worker::getWorkerId).collect(Collectors.toList());
-
-        // 提取对应的服务商网点信息
-        List<Websit> websits = websitService.lambdaQuery()
-                .select(Websit::getWebsitId,
-                        Websit::getWebsitName)
-                .in(Websit::getWebsitId,ciws.stream().map(CustomerInformationWebsit::getWebsitId).collect(Collectors.toList()))
-                .list();
-
-        // 提取格力所有的网点信息
-        List<ItfTblXinWangdianDownload> wdRecs = itfTblXinWangdianDownloadService.lambdaQuery()
-                .select(ItfTblXinWangdianDownload::getPkGuid,
-                        ItfTblXinWangdianDownload::getWdno).list();
-        Map<String, List<ItfTblXinWangdianDownload>> mapWdRes = wdRecs.stream().
-                collect(Collectors.groupingBy(ItfTblXinWangdianDownload::getWdno));
-
-        // 提取格力现有的网点师傅数据信息
-        List<ItfTblWangdianWxgDownload> wxgRecs =  itfTblWangdianWxgDownloadService.lambdaQuery()
-                .select(ItfTblWangdianWxgDownload::getWxgid,
-                        ItfTblWangdianWxgDownload::getWxgno,
-                        ItfTblWangdianWxgDownload::getWdno,
-                        ItfTblWangdianWxgDownload::getSfzen)
-                // .eq(ItfTblWangdianWxgDownload::getWxgno,"S21A00200023")// 测试用 todo
-                .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
-
-        //本地提取商户师傅网点信息
-        wbarecs = workerBrandAccountService.lambdaQuery()
-                .eq(WorkerBrandAccount::getGroupCompanyId, brand.getBrandId())
-                .eq(WorkerBrandAccount::getBrandWorkerStatus,"ON")
-                .eq(WorkerBrandAccount::getDel,0)
-                .isNotNull(WorkerBrandAccount::getBrandWorkerNumber)
-                .isNotNull(WorkerBrandAccount::getBrandWebsitId)
-                .list();
-
-        // 提取品牌商对应的大类信息
-        List<SysDictRef> sysDictRef =  sysDictRefService.lambdaQuery()
-                .select(SysDictRef::getDictCode,SysDictRef::getDictValue,SysDictRef::getRefDictCode)
-                .eq(SysDictRef::getBrandId, brand.getBrandId())
-                .eq(SysDictRef::getDictType, DictTypeEnum.DICT_TYPE_MAIN_TYPE.getCode())
-                .list();
-        Map<String, List<SysDictRef>> sysDictRefMap = sysDictRef.stream().
-                collect(Collectors.groupingBy(SysDictRef::getRefDictCode));
-
-        // 提取所有师傅的服务大类信息 先内存中查询
-        List<WorkerServiceCategoryDetail> wxgCategoryRec = workerServiceCategoryDetailService.lambdaQuery().list();
-        Map<String, List<WorkerServiceCategoryDetail>> oldWxgCategoryRecMap = wxgCategoryRec.stream().collect(Collectors.groupingBy(WorkerServiceCategoryDetail::getWorkerId));
 
         log.info("开始同步网点师傅地理位置信息: \uF0B7{}",sdf.format(new Date()));
 
-        for (ItfTblWangdianWxgDownload wxg :wxgRecs){
-            // 无效的数据不新增
-            if (wxg.getFlag() != null){
-                if (!wxg.getFlag().trim().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
-                    continue;
-                }
-            }
-            if (!oldWorkers.contains(wxg.getSfzen())){
-                continue;
-            }
-
-            // 提取本地商户师傅信息 按品牌,网点,师傅编号  存在对象不处理
-            WorkerBrandAccount workerBrandAccount = getWorkerBrandAccountData(wbarecs, wxg);
-            if (workerBrandAccount != null) {
-                continue;
-            }
+        glppwxgQueryAddService.extractedwxgQueryAdd();
 
-            // 参数 获取网点维修工信息
-            getParameter(wxg.getWdno(), wxg.getWxgno(), req);
-            // 格力总部查询工程师信息
-            GreeResponseHelper response = greeLogic.greePost(wdqyapi, JSONObject.toJSONString(req), 1);
-            if (response.getStatus() == 200){
-                WxgQueryInfo resultDatax = JSONObject.parseObject(response.getData().toString(), WxgQueryInfo.class);
-                // 无信息不处理
-                if ( resultDatax.getWangdianWxgVos().size()<1){
-                    continue;
-                }
-
-                wvos = resultDatax.getWangdianWxgVos().get(0);
-
-                // 提取师傅的服务大类信息 先内存中查询
-                if (oldWxgCategoryRecMap.containsKey(wxg.getSfzen())){
-                    wxgCategoryTypeRecs = oldWxgCategoryRecMap.get(wxg.getSfzen()).stream().
-                            collect(Collectors.groupingBy(WorkerServiceCategoryDetail::getType));
-
-                } else {
-                    List<WorkerServiceCategoryDetail> wxgCategoryRecs = workerServiceCategoryDetailService.lambdaQuery()
-                            .eq(WorkerServiceCategoryDetail::getWorkerId, wxg.getSfzen()).list();
-
-                    // 服务类型 INSTALL=安装 REPAIR=维修  DELIVERY=配送
-                    wxgCategoryTypeRecs = wxgCategoryRecs.stream().
-                            collect(Collectors.groupingBy(WorkerServiceCategoryDetail::getType));
-                }
-
-                try {
-
-                    // 生成师傅所在品牌商网点信息
-                    if (getwbaInfo(wvos, wbaaddList, brand, ciws, websits, wxg, mapWdRes)) {
-                        continue;
-                    }
-
-                    // 同步-新增师傅地理位置 生成对象失败不处理
-                    if (getwz(wvos, ws, brand, wxg.getSfzen())){
-                        continue;
-                    }
-
-                    // 新增或修改(证件,师傅地理位置,师傅服务的类目)
-                    addData(wbaaddList, ws);
-
-                } catch (Exception ex) {
-                    log.info("工程师信息同步失败:{}", ex);
-                }
-            }
-        }
         log.info("同步网点师傅地理位置信息结束: \uF0B7{}",sdf.format(new Date()));
     }
 
@@ -446,430 +102,19 @@ public class GLPPWXGQueryAdd {
     /**
      * 新增格力网点维修工数据
      */
-    @Scheduled(fixedDelay = 1 * 60 * 1000)
+    @Scheduled(fixedDelayString = "${wxgwzt}")
     public void wxgQueryAddWXGInfo() throws Exception {
-        if (1 == 1) {
+        if (wxgwztc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String,Object> req = new HashMap<>();
-        WangdianWxgVos wvos = new WangdianWxgVos();
-        List<ItfTblWangdianPositionDownload> wdwxgadd = new ArrayList<>();
-
-        List<Worker> oldWorkerRec =  workerService.lambdaQuery()
-                .select(Worker::getWorkerId).list();
-        List<String> oldWorkers = oldWorkerRec.stream().map(Worker::getWorkerId).collect(Collectors.toList());
-
-        // 提取格力现有的网点师傅数据信息
-        List<ItfTblWangdianWxgDownload> wxgRecs =  itfTblWangdianWxgDownloadService.lambdaQuery()
-                .select(ItfTblWangdianWxgDownload::getWxgid,
-                        ItfTblWangdianWxgDownload::getWxgno,
-                        ItfTblWangdianWxgDownload::getWdno,
-                        ItfTblWangdianWxgDownload::getSfzen)
-                .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
 
         log.info("开始同步网点维修工数据信息: \uF0B7{}",sdf.format(new Date()));
-        try {
-            for (ItfTblWangdianWxgDownload wxg :wxgRecs) {
-                // 无效的数据不新增
-                if (wxg.getFlag() != null) {
-                    if (!wxg.getFlag().trim().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())) {
-                        continue;
-                    }
-                }
-                if (!oldWorkers.contains(wxg.getSfzen())) {
-                    continue;
-                }
-                // 参数 获取网点维修工信息
-                getParameter(wxg.getWdno(), wxg.getWxgno(), req);
-                // 格力总部查询工程师信息
-                GreeResponseHelper response = greeLogic.greePost(wdqyapi, JSONObject.toJSONString(req), 1);
-                if (response.getStatus() == 200) {
-                    WxgQueryInfo resultDatax = JSONObject.parseObject(response.getData().toString(), WxgQueryInfo.class);
-                    // 无信息不处理
-                    if (resultDatax.getWangdianWxgVos().size() < 1) {
-                        continue;
-                    }
-                    wvos = resultDatax.getWangdianWxgVos().get(0);
-
-                    // 新增
-                    getwdwxdInfo(wvos, wdwxgadd);
 
-                }
-            }
-            // 新增
-            if (wdwxgadd.size() > 0) {
-                itfTblWangdianPositionDownloadService.saveBatch(wdwxgadd);
-                wdwxgadd.clear();
-            }
-        } catch (Exception ex) {
-            log.info("同步网点维修工数据信息失败:{}", ex);
-        }
+        glppwxgQueryAddService.extracteWxgQueryAddWXGInfo();
 
         log.info("同步网点维修工数据信息结束: \uF0B7{}",sdf.format(new Date()));
     }
 
-    private void getwdwxdInfo(WangdianWxgVos wvos, List<ItfTblWangdianPositionDownload> wdwxgadd) {
-        ItfTblWangdianPositionDownload item = new ItfTblWangdianPositionDownload();
-        BeanUtils.copyProperties(wvos,item);
-        wdwxgadd.add(item);
-        if (wdwxgadd.size()>100){
-            itfTblWangdianPositionDownloadService.saveBatch(wdwxgadd);
-            wdwxgadd.clear();
-        }
-    }
-
-
-    private void getParameter(String wdno, String wxgno, Map<String, Object> req) {
-        req.put("wdno", wdno);
-        req.put("wxgno", wxgno);
-        req.put("page", 1);
-        req.put("size", 20);
-        req.put("xsgsshstat", 2);
-    }
-
-    private void getCertInfo(WangdianWxgVos wvos, List<WorkerCert> addList, String workerId) throws Exception {
-        // 同步-新增证件信息
-        for (ZJInfo zj: wvos.getZjInfoList()){
-            workercertAdd(wvos, addList, workerId, zj);
-        }
-    }
-
-    private void workercertAdd(WangdianWxgVos wvos, List<WorkerCert> addList, String workerId, ZJInfo zj) throws Exception {
-        // 新增
-        WorkerCert add = new WorkerCert();
-        add.setId(UUID.randomUUID().toString());
-        add.setWorkerId(workerId);
-        add.setCertName(zj.getZjmc());
-
-        if (zj.getZjlj().contains(",")){
-            List<String> result = Arrays.asList(zj.getZjlj().split(","));
-            add.setOutFileUrl(result.get(0));
-            add.setOutFileUrl2(result.get(1));
-            // 上传图片
-            String id = putCert(result.get(0));
-            add.setFileUrl(id);
-            String id2 = putCert(result.get(1));
-            add.setFileUrl2(id2);
-            new File(id).delete();
-            new File(id2).delete();
-        } else {
-            add.setOutFileUrl(zj.getZjlj());
-            String id = putCert(zj.getZjlj());
-            add.setFileUrl(id);
-            new File(id).delete();
-        }
-        if (zj.getZjbh().contains("/")){
-            List<String> result = Arrays.asList(zj.getZjbh().split("/"));
-            add.setCertNo(result.get(1));
-        } else {
-            add.setCertNo(zj.getZjbh());
-        }
-        if (StringUtils.isNotEmpty(zj.getZjyxq())){
-            add.setExpireTime(baseService.utcToDateStr(zj.getZjyxq()));
-        }
-        if (StringUtils.isNotEmpty(zj.getZjfssj())){
-            add.setReviewTime(baseService.utcToDateStr(zj.getZjfssj()));
-        }
-
-        add.setExamineStatus("OK");
-        add.setSex(wvos.getXingb());
-        add.setOutSyncStatus(1);
-        add.setOutSyncTime(new Date());
-
-        addList.add(add);
-    }
-
-    @NotNull
-    private String putCert(String image) throws Exception {
-        String id = IdWorker.getIdStr()+".jpeg";
-        baseService.saveToFile(greeLogic.greeFileUrl(image), id);
-        String file = id;
-        ossUtil.uploadFile(id, new File(file));
-
-        return id;
-    }
-
-    public void addDataCert(List<WorkerCert> addList) {
-        // 证件同步
-        if (addList.size()>0){
-            workerCertService.saveBatch(addList);
-            addList.clear();
-        }
-    }
-
-    private WorkerBrandAccount getWorkerBrandAccountData(List<WorkerBrandAccount> wbarecs, ItfTblWangdianWxgDownload wxg){
-        WorkerBrandAccount workerBrandAccount = null;
-
-        for (WorkerBrandAccount wba: wbarecs){
-            if (wba.getBrandWebsitId().equals(wxg.getWdno())
-                    && wba.getBrandWorkerNumber().equals(wxg.getWxgno())){
-                workerBrandAccount = wba;
-                break;
-            }
-        }
-
-        return workerBrandAccount;
-    }
-
-    private void getServiceCategory(WangdianWxgVos wvos, List<WorkerServiceCategory> wscList, List<WorkerServiceCategoryDetail> wscdList,
-                                    SysDict sysDict, ItfTblWangdianWxgDownload wxg,
-                                    Map<String,List<WorkerServiceCategoryDetail>> wxgCategoryTypeRecs,
-                                    Map<String, List<SysDictRef>> sysDictRefMap) {
-        List<String> complete = new ArrayList<>();
-        // 先处理商用
-        for (SignSplb syitem: wvos.getSySignSplbList()){
-            // 扫描每个大类
-            for (String s :syitem.getFwlbList()){
-                // 师傅服务的大类中查看是否存在 不存在新增
-                extracted(wscList, wscdList, complete, sysDict, wxg, wxgCategoryTypeRecs,
-                        syitem, s,ServiceCategoryEnum.COMMERCIAL_TYPE.getCode(), sysDictRefMap);
-            }
-        }
-        complete.clear();
-
-        // 处理家用
-        for (SignSplb syitem: wvos.getJySignSplbList()){
-            // 扫描每个大类
-            for (String s :syitem.getFwlbList()){
-                // 师傅服务的大类中查看是否存在 不存在新增
-                extracted(wscList, wscdList, complete, sysDict, wxg, wxgCategoryTypeRecs,
-                        syitem, s,ServiceCategoryEnum.HOME_TYPE.getCode(), sysDictRefMap);
-            }
-        }
-    }
-
-    private void extracted(List<WorkerServiceCategory> wscList, List<WorkerServiceCategoryDetail> wscdList,
-                           List<String> complete, SysDict sysDict, ItfTblWangdianWxgDownload wxg,
-                           Map<String,List<WorkerServiceCategoryDetail>> wxgCategoryTypeRecs, SignSplb syitem,
-                           String s, String type,Map<String, List<SysDictRef>> sysDictRefMap) {
-        if ( !complete.contains(s + syitem.getSpdl())){
-            // 提取品牌商对应的大类信息
-            SysDictRef sysDictRef = sysDictRefMap.get(String.valueOf(syitem.getSpdl())).get(0);
-
-            if (s.equals(ServiceCategoryEnum.INSTALL_TYPE.getText())){
-                getAddInfo(wscList, wscdList, sysDict, wxg, wxgCategoryTypeRecs,
-                        sysDictRef,ServiceCategoryEnum.INSTALL_TYPE.getCode(),type);
-            } else if (s.equals(ServiceCategoryEnum.REPAIR_TYPE.getText())){
-                getAddInfo(wscList, wscdList, sysDict, wxg, wxgCategoryTypeRecs,
-                        sysDictRef,ServiceCategoryEnum.REPAIR_TYPE.getCode(),type);
-            } else if (s.equals(ServiceCategoryEnum.DELIVERY_TYPE.getText())){
-                getAddInfo(wscList, wscdList, sysDict, wxg, wxgCategoryTypeRecs,
-                        sysDictRef,ServiceCategoryEnum.DELIVERY_TYPE.getCode(),type);
-            }
-            // 新增过的无需再次新增
-            complete.add(s + syitem.getSpdl());
-        }
-    }
-
-    private void getAddInfo(List<WorkerServiceCategory> wscList, List<WorkerServiceCategoryDetail> wscdList, SysDict sysDict,
-                            ItfTblWangdianWxgDownload wxg, Map<String, List<WorkerServiceCategoryDetail>> wxgCategoryTypeRecs,
-                            SysDictRef sysDictRef, String code, String type) {
-        Boolean include = Boolean.FALSE;
-        // 看师傅是否已有(服务类型 INSTALL=安装 REPAIR=维修  DELIVERY=配送)对应的大类信息 如有不做任何处理
-        if (wxgCategoryTypeRecs !=null && wxgCategoryTypeRecs.size()>0){
-            if (wxgCategoryTypeRecs.containsKey(code)){
-                for (WorkerServiceCategoryDetail category : wxgCategoryTypeRecs.get(code)){
-                    if (category.getMainId().equals(sysDictRef.getDictCode())){
-                        include = Boolean.TRUE;
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (!include){
-            // 新增
-            // 看 worker_service_category 有无数据,无数据新增
-            if (wxgCategoryTypeRecs ==null || wxgCategoryTypeRecs.size()<1 || !wxgCategoryTypeRecs.containsKey(code) ){
-                WorkerServiceCategory wsc = new WorkerServiceCategory();
-                wsc.setId(IdWorker.getIdStr());
-                wsc.setWorkerId(String.valueOf(wxg.getSfzen()));
-                wsc.setServiceCategoryId(sysDict.getDictCode());
-                wsc.setServiceCategoryName(sysDict.getDictValue());
-                wsc.setFlag(type);
-                wsc.setType(code);
-                wsc.setCreateTime(new Date());
-                wscList.add(wsc);
-
-                // WorkerServiceCategoryDetail 新增
-                WorkerServiceCategoryDetail wscd = new WorkerServiceCategoryDetail();
-                wscd.setId(IdWorker.getIdStr());
-                wscd.setWorkerServiceCategoryId(wsc.getId());
-                wscd.setWorkerId(String.valueOf(wxg.getSfzen()));
-                wscd.setServiceCategoryId(sysDict.getDictCode());
-                wscd.setServiceCategoryName(sysDict.getDictValue());
-                wscd.setFlag(type);
-                wscd.setType(code);
-                wscd.setMainId(sysDictRef.getDictCode());
-                wscd.setMainName(sysDictRef.getDictValue());
-                wscd.setCreateTime(new Date());
-
-                wscdList.add(wscd);
-
-            } else {
-                // WorkerServiceCategoryDetail 新增
-                WorkerServiceCategoryDetail wscd = new WorkerServiceCategoryDetail();
-                wscd.setId(IdWorker.getIdStr());
-                wscd.setWorkerServiceCategoryId(wxgCategoryTypeRecs.get(code).get(0).getServiceCategoryId());
-                wscd.setWorkerId(String.valueOf(wxg.getSfzen()));
-                wscd.setServiceCategoryId(sysDict.getDictCode());
-                wscd.setServiceCategoryName(sysDict.getDictValue());
-                wscd.setFlag(type);
-                wscd.setType(code);
-                wscd.setMainId(sysDictRef.getDictCode());
-                wscd.setMainName(sysDictRef.getDictValue());
-                wscd.setCreateTime(new Date());
-                wscdList.add(wscd);
-            }
-        }
-    }
-
-    public void addDataCategory(List<WorkerServiceCategory> wscList, List<WorkerServiceCategoryDetail> wscdList) {
-
-        // 师傅服务类目新增
-        if (wscList.size()>0){
-            workerServiceCategoryService.saveBatch(wscList);
-        }
-        if (wscdList.size()>0){
-            workerServiceCategoryDetailService.saveBatch(wscdList);
-        }
-    }
-
-    private void extractedCaretory(List<WorkerServiceCategory> wscList, List<WorkerServiceCategoryDetail> wscdList,
-                                   Map<String, List<WorkerServiceCategoryDetail>> oldWxgCategoryRecMap, ItfTblWangdianWxgDownload wxg) {
-        if (oldWxgCategoryRecMap.containsKey(wxg.getSfzen())){
-            oldWxgCategoryRecMap.get(wxg.getSfzen()).addAll(wscdList);
-        }
-
-        wscList.clear();
-        wscdList.clear();
-    }
-
-    private boolean getwbaInfo(WangdianWxgVos wvos, List<WorkerBrandAccount> wbaaddList, Brand brand,
-                               List<CustomerInformationWebsit> ciws, List<Websit> websits,
-                               ItfTblWangdianWxgDownload wxg, Map<String, List<ItfTblXinWangdianDownload>> mapWdRes) {
-        String websitId ="";
-        String websitName ="";
-
-        // 品牌网点与商户网点对关系表中提取品牌方的网点信息  无数据不处理,对应关系需要人为操作
-        for (CustomerInformationWebsit wd: ciws){
-            if (wd.getRefWebsitId().equals(wxg.getWdno())){
-                websitId=wd.getWebsitId();
-            }
-        }
-        if (StringUtils.isEmpty(websitId)){
-            return true;
-        }
-
-        for (Websit wets: websits){
-            if (wets.getWebsitId().equals(websitId)){
-                websitName = wets.getWebsitName();
-                break;
-            }
-        }
-
-        // 新增 WorkerBrandAccount todo
-        WorkerBrandAccount n = new WorkerBrandAccount();
-        n.setId(IdWorker.getIdStr());
-        n.setWorkerId(wxg.getSfzen());
-        n.setWebsitId(websitId);
-        n.setWebsitName(websitName);
-        n.setGroupCompanyId(brand.getBrandId());
-        n.setBrandWorkerId(String.valueOf(wxg.getWxgid()));
-        n.setBrandWorkerNumber(wxg.getWxgno());
-        if (mapWdRes.get(wxg.getWdno()).size()>0){
-            n.setBrandWebsitName(mapWdRes.get(wxg.getWdno()).get(0).getWdmc());
-        }
-        n.setBrandWebsitId(wxg.getWdno());
-        n.setBrandWorkerStatus("ON");
-        if (wvos.getFlag().equals("无效")){
-            n.setBrandWorkerStatus("OFF");
-        }
-        n.setExpireTime(new Date());
-        n.setCreateTime(new Date());
-        n.setCreateBy("system");
-        wbaaddList.add(n);
-        return false;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    public void addData(List<WorkerBrandAccount> wbaaddList, List<WorkerStreet> ws) {
-        // 师傅所在品牌商网点信息同步
-        if (wbaaddList.size()>0){
-            workerBrandAccountService.saveBatch(wbaaddList);
-        }
-
-        // 同步-师傅地理位置
-        if (ws.size()>0){
-            workerStreetService.saveBatch(ws);
-        }
-
-        wbaaddList.clear();
-        ws.clear();
-    }
-
-    private Boolean getwz(WangdianWxgVos wvos, List<WorkerStreet> ws, Brand brand, String sfzen) {
-        // 师傅省市区街道信息
-        List<WorkerStreet> wsOld = workerStreetService.lambdaQuery()
-                .eq(WorkerStreet::getWorkerId, sfzen).list();
-        // 不存在新增
-        if (wsOld ==null || wsOld.size()<1){
-            addWorkerStreet(wvos, brand.getBrandId(), ws,sfzen);
-            if (ws.size()<1){
-                return Boolean.TRUE;
-            }
-        }
-        return Boolean.FALSE;
-    }
-
-
-    private void addWorkerStreet(WangdianWxgVos wvos, String brandId, List<WorkerStreet> ws, String sfzen) {
-        WorkerStreet n = new WorkerStreet();
-        n.setId(UUID.randomUUID().toString());
-        n.setProvinceId("");
-        n.setCityId("");
-        n.setAreaId("");
-        n.setStreetId("");
-        n.setWorkerId(sfzen);
-        n.setCreateTime(new Date());
-        n.setCreateBy("system");
-
-
-        // 提取省信息
-        if (StringUtils.isNotEmpty(wvos.getSfen())){
-            Province province = provinceService.lambdaQuery()
-                    .eq(Province::getProvince, wvos.getSfen()).one();
-            if (province !=null){
-                List<BrandLbsRelate> bra = brandLbsRelateService.lambdaQuery()
-                        .eq(BrandLbsRelate::getProvinceId,province.getProvinceId())
-                        .eq(BrandLbsRelate::getDel,0)
-                        .eq(BrandLbsRelate::getBrandId,brandId).list();
-                if (bra != null && bra.size()>0){
-                    for (BrandLbsRelate br :bra){
-                        if (StringUtils.isNotEmpty(br.getLbsProvinceId()) && StringUtils.isEmpty(n.getProvinceId())){
-                            n.setProvinceId(br.getLbsProvinceId());
-                            n.setProvince(br.getLbsProvinceName());
-                        }
-                        if (StringUtils.isNotEmpty(br.getLbsCityId()) && StringUtils.isEmpty(n.getCityId())){
-                            n.setCityId(br.getLbsCityId());
-                            n.setCity(br.getLbsCityName());
-                        }
-                        if (StringUtils.isNotEmpty(br.getLbsDistrictId()) && StringUtils.isEmpty(n.getAreaId())){
-                            n.setAreaId(br.getLbsDistrictId());
-                            n.setArea(br.getLbsDistrictName());
-                        }
-                        if (StringUtils.isNotEmpty(br.getLbsStreetId()) && StringUtils.isEmpty(n.getStreetId())){
-                            n.setStreet(br.getLbsStreetId());
-                            n.setStreetId(br.getLbsStreetName());
-                            break;
-                        }
-                    }
-                    ws.add(n);
-                }
-            }
-        }
-    }
-
 }

+ 6 - 478
src/main/java/com/zfire/jiasm/syncdata/download/worker/GLPPWXGQueryUpdate.java

@@ -1,34 +1,15 @@
 package com.zfire.jiasm.syncdata.download.worker;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.zfire.jiasm.syncdata.base.BaseService;
-import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
-import com.zfire.jiasm.syncdata.constant.ServiceCategoryEnum;
 import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
-import com.zfire.jiasm.syncdata.gree.GreeLogic;
-import com.zfire.jiasm.syncdata.helper.GreeResponseHelper;
-import com.zfire.jiasm.syncdata.plus.entity.*;
-import com.zfire.jiasm.syncdata.plus.service.*;
-import com.zfire.jiasm.syncdata.request.SignSplb;
-import com.zfire.jiasm.syncdata.request.ZJInfo;
-import com.zfire.jiasm.syncdata.response.WangdianWxgVos;
-import com.zfire.jiasm.syncdata.response.WxgQueryInfo;
-import com.zfire.jiasm.syncdata.utils.oss.OSSUtil;
+import com.zfire.jiasm.syncdata.service.GLPPWXGQueryUpdateService;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
-import java.io.File;
 import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Date;
 
 /**
  * 格力品牌维修工证件照、地理位置、服务类目修改同步
@@ -37,36 +18,11 @@ import java.util.stream.Collectors;
 @Slf4j
 @Component
 public class GLPPWXGQueryUpdate {
-    String wdqyapi = "/outapp/wxg/list";
     @Value("${wxgxgc}")
     private String wxgxgc = "";
 
-
-    @Resource
-    BaseService baseService;
-    @Resource
-    GreeLogic greeLogic;
-    @Resource
-    OSSUtil ossUtil;
-    @Resource
-    ItfTblWangdianWxgDownloadService itfTblWangdianWxgDownloadService;
-    @Resource
-    ItfTblXinWangdianDownloadService itfTblXinWangdianDownloadService;
-    @Resource
-    WorkerBrandAccountService workerBrandAccountService;
-    @Resource
-    WorkerCertService workerCertService;
-    @Resource
-    WorkerStreetService workerStreetService;
-    @Resource
-    WorkerServiceCategoryService workerServiceCategoryService;
-    @Resource
-    WorkerServiceCategoryDetailService workerServiceCategoryDetailService;
-    @Resource
-    SysDictRefService sysDictRefService;
-    @Resource
-    SysDictService sysDictService;
-
+    @Autowired
+    GLPPWXGQueryUpdateService glppwxgQueryUpdateService;
 
 
     /** 只处理存在的-即师傅在商户网点信息已存本地数据中 WorkerBrandAccount   师傅地理位置不再处理
@@ -77,446 +33,18 @@ public class GLPPWXGQueryUpdate {
      */
     @Scheduled(fixedDelayString = "${wxgxg}")
     public void wxgQueryUpdate() throws Exception {
-
-
         if (wxgxgc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
-        WangdianWxgVos wvos = new WangdianWxgVos();
-        List<WorkerCert> updateList = new ArrayList<>();
-        List<WorkerCert> addList = new ArrayList<>();
-        List<WorkerBrandAccount> wbarecs = new ArrayList<>();
-        Map<String,Object> req = new HashMap<>();
-        List<WorkerServiceCategory> wscList = new ArrayList<>();
-        List<WorkerServiceCategoryDetail> wscdList = new ArrayList<>();
-        List<WorkerStreet> ws = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-        // 提取品牌信息
-        Brand brand = baseService.getBrand();
-        if (brand == null) {
-            return;
-        }
-
-        // 字典表中查出ID 格力只有-家电售后
-        SysDict sysDict =  sysDictService.lambdaQuery().
-                eq(SysDict::getDictType,ServiceCategoryEnum.DICT_TYPE_SERVICE_CATEGORY.getCode())
-                .eq(SysDict::getDictValue,ServiceCategoryEnum.DICT_TYPE_SERVICE_CATEGORY.getText()).one();
-        if (sysDict == null) {
-            return;
-        }
-
-        // 提取品牌商对应的大类信息
-        List<SysDictRef> sysDictRef =  sysDictRefService.lambdaQuery()
-                .select(SysDictRef::getDictCode,SysDictRef::getDictValue,SysDictRef::getRefDictCode)
-                .eq(SysDictRef::getBrandId, brand.getBrandId())
-                .eq(SysDictRef::getDictType, DictTypeEnum.DICT_TYPE_MAIN_TYPE.getCode())
-                .list();
-        Map<String, List<SysDictRef>> sysDictRefMap = sysDictRef.stream().
-                collect(Collectors.groupingBy(SysDictRef::getRefDictCode));
-
-        // 提取现有的师傅数据信息 师傅离职的情况不再处理
-        List<ItfTblWangdianWxgDownload> wxgRecs =  itfTblWangdianWxgDownloadService.lambdaQuery()
-                .select(ItfTblWangdianWxgDownload::getWxgno,
-                        ItfTblWangdianWxgDownload::getWdno,
-                        ItfTblWangdianWxgDownload::getSfzen)
-                //.eq(ItfTblWangdianWxgDownload::getWxgno,"S21A00200023")// 测试用
-                .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
-
-        //本地提取商户师傅网点信息 一个师傅可多网点 格力最多3个网点
-        wbarecs = workerBrandAccountService.lambdaQuery()
-                .eq(WorkerBrandAccount::getBrandWorkerStatus,"ON")
-                .eq(WorkerBrandAccount::getDel,0)
-                .eq(WorkerBrandAccount::getGroupCompanyId, brand.getBrandId()).list();
-
         log.info("开始同步网点师傅信息: \uF0B7{}",sdf.format(new Date()));
 
-        // 遍历格力总部的所有师傅信息
-        for (ItfTblWangdianWxgDownload wxg :wxgRecs){
-            // 本地提取商户师傅信息 按品牌,网点,师傅编号 不存在不处理
-            WorkerBrandAccount workerBrandAccount = getWorkerBrandAccount(wbarecs, wxg);
-            if (workerBrandAccount == null) {
-                continue;
-            }
-
-            // 参数
-            getParameter(wxg.getWdno(), wxg.getWxgno(), req);
-            // 格力总部查询工程师信息
-            GreeResponseHelper response = greeLogic.greePost(wdqyapi, JSONObject.toJSONString(req), 1);
-            if (response.getStatus() == 200){
-                WxgQueryInfo resultDatax = JSONObject.parseObject(response.getData().toString(), WxgQueryInfo.class);
-                // 无数据不处理
-                if (resultDatax.getWangdianWxgVos().size()<1){
-                    continue;
-                }
-                wvos = resultDatax.getWangdianWxgVos().get(0);
-
-                // 提取师傅的服务大类信息
-                List<WorkerServiceCategoryDetail> wxgCategoryRecs = workerServiceCategoryDetailService.lambdaQuery()
-                        .eq(WorkerServiceCategoryDetail::getWorkerId, wxg.getSfzen()).list();
-
-                // 服务类型 INSTALL=安装 REPAIR=维修  DELIVERY=配送
-                Map<String, List<WorkerServiceCategoryDetail>> wxgCategoryTypeRecs = wxgCategoryRecs.stream().
-                        collect(Collectors.groupingBy(WorkerServiceCategoryDetail::getType));
-
-
-                try {
-                    // 证件同步
-                    for (ZJInfo zj:wvos.getZjInfoList()){
-                        // 同步-新增或修改证件信息
-                        workercertUpdataOrAdd(wvos, updateList, addList, workerBrandAccount, zj);
-                    }
-                    // 同步-师傅地理位置
-                    // updateWorkerStreet(wvos,workerBrandAccount.getWorkerId(),brand.getBrandId(),ws);
+        glppwxgQueryUpdateService.extractedQueryUpdate();
 
-                    // 同步-师傅服务的类目信息 无则插入
-                    getServiceCategory(wvos, wscList, wscdList, sysDict, wxg, wxgCategoryTypeRecs, sysDictRefMap);
-
-                    // 新增或修改(证件,师傅地理位置,师傅服务的类目)
-                    addOrUpdate(updateList, addList, wscList, wscdList, ws);
-                } catch (Exception ex) {
-                    log.info("工程师信息同步失败:{}", ex);
-                }
-            }
-        }
         log.info("同步网点师傅信息结束: \uF0B7{}",sdf.format(new Date()));
     }
 
 
-    @Nullable
-    private WorkerBrandAccount getWorkerBrandAccount(List<WorkerBrandAccount> wbarecs, ItfTblWangdianWxgDownload wxg) {
-        WorkerBrandAccount workerBrandAccount = null;
-
-        // 平台师傅信息未同步到格力总部时不处理
-        for (WorkerBrandAccount wba: wbarecs){
-            if (StringUtils.isEmpty(wba.getBrandWebsitId()) || StringUtils.isEmpty(wba.getBrandWorkerNumber()) ||
-                    StringUtils.isEmpty(wxg.getWdno()) || StringUtils.isEmpty(wxg.getWxgno())){
-                continue;
-            }
-            if (wba.getBrandWebsitId().equals(wxg.getWdno())
-                    && wba.getBrandWorkerNumber().equals(wxg.getWxgno())){
-                workerBrandAccount = wba;
-                break;
-            }
-        }
-
-        if (workerBrandAccount == null){
-            return null;
-        }
-
-        // 师傅离职的情况不再处理
-        if (wxg.getFlag() != null){
-            if (!wxg.getFlag().trim().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())
-            && workerBrandAccount.getBrandWorkerStatus().equals("OFF")){
-                return null;
-            }
-        }
-        return workerBrandAccount;
-    }
-
-
-    @Transactional(rollbackFor = Exception.class)
-    public void addData(List<WorkerBrandAccount> wbaaddList,List<WorkerCert> updateList, List<WorkerCert> addList,
-                        List<WorkerServiceCategory> wscList, List<WorkerServiceCategoryDetail> wscdList,
-                        List<WorkerStreet> ws) {
-        // 师傅所在品牌商网点信息同步
-        if (wbaaddList.size()>0){
-            workerBrandAccountService.saveBatch(wbaaddList);
-        }
-        // 证件同步
-        if (updateList.size()>0){
-            workerCertService.saveBatch(updateList);
-        }
-        if (addList.size()>0){
-            workerCertService.saveBatch(addList);
-        }
-
-        // 同步-师傅地理位置
-        if (ws.size()>0){
-            workerStreetService.saveBatch(ws);
-        }
-
-        // 师傅服务类目新增
-        if (wscList.size()>0){
-            workerServiceCategoryService.saveBatch(wscList);
-        }
-        if (wscdList.size()>0){
-            workerServiceCategoryDetailService.saveBatch(wscdList);
-        }
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    public void addOrUpdate(List<WorkerCert> updateList, List<WorkerCert> addList, List<WorkerServiceCategory> wscList, List<WorkerServiceCategoryDetail> wscdList, List<WorkerStreet> ws) {
-        // 证件同步
-        if (updateList.size()>0){
-            workerCertService.saveBatch(updateList);
-        }
-        if (addList.size()>0){
-            workerCertService.saveBatch(addList);
-        }
-
-        // 同步-师傅地理位置
-        if (ws.size()>0){
-            workerStreetService.updateBatchById(ws);
-        }
-
-        // 师傅服务类目新增
-        if (wscList.size()>0){
-            workerServiceCategoryService.saveBatch(wscList);
-        }
-        if (wscdList.size()>0){
-            workerServiceCategoryDetailService.saveBatch(wscdList);
-        }
-
-        updateList.clear();
-        addList.clear();
-        ws.clear();
-        wscList.clear();
-        wscdList.clear();
-    }
-
-    private void getServiceCategory(WangdianWxgVos wvos, List<WorkerServiceCategory> wscList, List<WorkerServiceCategoryDetail> wscdList,
-                                    SysDict sysDict, ItfTblWangdianWxgDownload wxg,
-                                    Map<String,List<WorkerServiceCategoryDetail>> wxgCategoryTypeRecs,
-                                    Map<String, List<SysDictRef>> sysDictRefMap) {
-        List<String> complete = new ArrayList<>();
-        // 先处理商用
-        for (SignSplb syitem: wvos.getSySignSplbList()){
-            // 扫描每个大类
-            for (String s :syitem.getFwlbList()){
-                // 师傅服务的大类中查看是否存在 不存在新增
-                extracted(wscList, wscdList, complete, sysDict, wxg, wxgCategoryTypeRecs,
-                        syitem, s,ServiceCategoryEnum.COMMERCIAL_TYPE.getCode(), sysDictRefMap);
-            }
-        }
-        complete.clear();
-
-        // 处理家用
-        for (SignSplb syitem: wvos.getJySignSplbList()){
-            // 扫描每个大类
-            for (String s :syitem.getFwlbList()){
-                // 师傅服务的大类中查看是否存在 不存在新增
-                extracted(wscList, wscdList, complete, sysDict, wxg, wxgCategoryTypeRecs,
-                        syitem, s,ServiceCategoryEnum.HOME_TYPE.getCode(), sysDictRefMap);
-            }
-        }
-    }
-
-    private void extracted(List<WorkerServiceCategory> wscList, List<WorkerServiceCategoryDetail> wscdList,
-                           List<String> complete, SysDict sysDict, ItfTblWangdianWxgDownload wxg,
-                           Map<String,List<WorkerServiceCategoryDetail>> wxgCategoryTypeRecs, SignSplb syitem,
-                           String s, String type,Map<String, List<SysDictRef>> sysDictRefMap) {
-        if ( !complete.contains(s + syitem.getSpdl())){
-            // 提取品牌商对应的大类信息
-            SysDictRef sysDictRef = sysDictRefMap.get(String.valueOf(syitem.getSpdl())).get(0);
-
-            if (s.equals(ServiceCategoryEnum.INSTALL_TYPE.getText())){
-                getAddInfo(wscList, wscdList, sysDict, wxg, wxgCategoryTypeRecs,
-                        sysDictRef,ServiceCategoryEnum.INSTALL_TYPE.getCode(),type);
-            } else if (s.equals(ServiceCategoryEnum.REPAIR_TYPE.getText())){
-                getAddInfo(wscList, wscdList, sysDict, wxg, wxgCategoryTypeRecs,
-                        sysDictRef,ServiceCategoryEnum.REPAIR_TYPE.getCode(),type);
-            } else if (s.equals(ServiceCategoryEnum.DELIVERY_TYPE.getText())){
-                getAddInfo(wscList, wscdList, sysDict, wxg, wxgCategoryTypeRecs,
-                        sysDictRef,ServiceCategoryEnum.DELIVERY_TYPE.getCode(),type);
-            }
-            // 新增过的无需再次新增
-            complete.add(s + syitem.getSpdl());
-        }
-    }
-
-
-    private void getAddInfo(List<WorkerServiceCategory> wscList, List<WorkerServiceCategoryDetail> wscdList, SysDict sysDict,
-                            ItfTblWangdianWxgDownload wxg, Map<String, List<WorkerServiceCategoryDetail>> wxgCategoryTypeRecs,
-                            SysDictRef sysDictRef, String code, String type) {
-        Boolean include = Boolean.FALSE;
-        // 看师傅是否已有(服务类型 INSTALL=安装 REPAIR=维修  DELIVERY=配送)对应的大类信息 如有不做任何处理
-        if (wxgCategoryTypeRecs !=null && wxgCategoryTypeRecs.size()>0){
-            if (wxgCategoryTypeRecs.containsKey(code)){
-                for (WorkerServiceCategoryDetail category : wxgCategoryTypeRecs.get(code)){
-                    if (category.getMainId().equals(sysDictRef.getDictCode())){
-                        include = Boolean.TRUE;
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (!include){
-            // 新增
-            // 看 worker_service_category 有无数据,无数据新增
-            if (wxgCategoryTypeRecs ==null || wxgCategoryTypeRecs.size()<1 || !wxgCategoryTypeRecs.containsKey(code) ){
-                WorkerServiceCategory wsc = new WorkerServiceCategory();
-                wsc.setId(IdWorker.getIdStr());
-                wsc.setWorkerId(String.valueOf(wxg.getSfzen()));
-                wsc.setServiceCategoryId(sysDict.getDictCode());
-                wsc.setServiceCategoryName(sysDict.getDictValue());
-                wsc.setFlag(type);
-                wsc.setType(code);
-                wsc.setCreateTime(new Date());
-                wscList.add(wsc);
-
-                // WorkerServiceCategoryDetail 新增
-                WorkerServiceCategoryDetail wscd = new WorkerServiceCategoryDetail();
-                wscd.setId(IdWorker.getIdStr());
-                wscd.setWorkerServiceCategoryId(wsc.getId());
-                wscd.setWorkerId(String.valueOf(wxg.getSfzen()));
-                wscd.setServiceCategoryId(sysDict.getDictCode());
-                wscd.setServiceCategoryName(sysDict.getDictValue());
-                wscd.setFlag(type);
-                wscd.setType(code);
-                wscd.setMainId(sysDictRef.getDictCode());
-                wscd.setMainName(sysDictRef.getDictValue());
-                wscd.setCreateTime(new Date());
-
-                wscdList.add(wscd);
-
-            } else {
-                // WorkerServiceCategoryDetail 新增
-                WorkerServiceCategoryDetail wscd = new WorkerServiceCategoryDetail();
-                wscd.setId(IdWorker.getIdStr());
-                wscd.setWorkerServiceCategoryId(wxgCategoryTypeRecs.get(code).get(0).getServiceCategoryId());
-                wscd.setWorkerId(String.valueOf(wxg.getSfzen()));
-                wscd.setServiceCategoryId(sysDict.getDictCode());
-                wscd.setServiceCategoryName(sysDict.getDictValue());
-                wscd.setFlag(type);
-                wscd.setType(code);
-                wscd.setMainId(sysDictRef.getDictCode());
-                wscd.setMainName(sysDictRef.getDictValue());
-                wscd.setCreateTime(new Date());
-                wscdList.add(wscd);
-            }
-        }
-    }
-
-    private void workercertUpdataOrAdd(WangdianWxgVos wvos, List<WorkerCert> updateList,
-                                       List<WorkerCert> addList, WorkerBrandAccount workerBrandAccount,
-                                       ZJInfo zj) throws Exception {
-        // 师傅证件信息 按证件名提取
-        WorkerCert old = workerCertService.lambdaQuery()
-                .eq(WorkerCert::getWorkerId, workerBrandAccount.getWorkerId())
-                .eq(WorkerCert::getCertName, zj.getZjmc())
-                .one();
-
-        if (old !=null){
-            // 修改
-            getUpdate(updateList, zj, old);
-        } else {
-            // 新增
-            getAdd(addList, workerBrandAccount.getWorkerId(), zj.getZjmc(), wvos.getXingb(), zj);
-        }
-        // 上传图片
-        /*if (updateList.size()>0){
-            updateUpload(updateList);
-        }
-        if (addList.size()>0){
-            addUload(addList);
-        }*/
-    }
-
-    private void getAdd(List<WorkerCert> addList, String sfzen, String zjmc,String xingb,  ZJInfo zj) throws Exception {
-        WorkerCert add = new WorkerCert();
-        add.setId(UUID.randomUUID().toString());
-        add.setWorkerId(sfzen);
-        add.setCertName(zjmc);
-
-        if (zj.getZjlj().contains(",")){
-            List<String> result = Arrays.asList(zj.getZjlj().split(","));
-            add.setOutFileUrl(result.get(0));
-            add.setOutFileUrl2(result.get(1));
-            // 上传图片
-            String id = putCert(result.get(0));
-            add.setFileUrl(id);
-            String id2 = putCert(result.get(1));
-            add.setFileUrl2(id2);
-            new File(id).delete();
-            new File(id2).delete();
-        } else {
-            add.setOutFileUrl(zj.getZjlj());
-            String id = putCert(zj.getZjlj());
-            add.setFileUrl(id);
-            new File(id).delete();
-        }
-        if (zj.getZjbh().contains("/")){
-            List<String> result = Arrays.asList(zj.getZjbh().split("/"));
-            add.setCertNo(result.get(1));
-        } else {
-            add.setCertNo(zj.getZjbh());
-        }
-        if (StringUtils.isNotEmpty(zj.getZjyxq())){
-            add.setExpireTime(baseService.utcToDateStr(zj.getZjyxq()));
-        }
-        if (StringUtils.isNotEmpty(zj.getZjfssj())){
-            add.setReviewTime(baseService.utcToDateStr(zj.getZjfssj()));
-        }
-
-        add.setExamineStatus("OK");
-        add.setSex(xingb);
-        add.setOutSyncStatus(1);
-        add.setOutSyncTime(new Date());
-
-        addList.add(add);
-    }
-
-    @NotNull
-    private String putCert(String image) throws Exception {
-        String id = IdWorker.getIdStr()+".jpeg";
-        baseService.saveToFile(greeLogic.greeFileUrl(image), id);
-        String file = id;
-        ossUtil.uploadFile(id, new File(file));
-
-
-        return id;
-    }
-
-
-    private void getUpdate(List<WorkerCert> updateList,ZJInfo zj,WorkerCert old) throws Exception {
-        Boolean flag = Boolean.FALSE;
-        WorkerCert up = new WorkerCert();
-        if (zj.getZjlj().contains(",")){
-            List<String> result = Arrays.asList(zj.getZjlj().split(","));
-            if ((!old.getOutFileUrl().equals(result.get(0)) && !old.getOutFileUrl2().equals(result.get(0)))
-                    || (!old.getOutFileUrl().equals(result.get(1)) && !old.getOutFileUrl2().equals(result.get(1)))){
-                up.setId(old.getId());
-                up.setOutFileUrl(result.get(0));
-                up.setOutFileUrl2(result.get(1));
-
-                // 上传图片
-                String id = putCert(result.get(0));
-                up.setFileUrl(id);
-                String id2 = putCert(result.get(1));
-                up.setFileUrl2(id2);
-
-                new File(id).delete();
-                new File(id2).delete();
-
-                flag = Boolean.TRUE;
-            }
-        } else {
-            if (!old.getOutFileUrl().equals(zj.getZjlj()) && !old.getOutFileUrl2().equals(zj.getZjlj())) {
-                up.setId(old.getId());
-                up.setOutFileUrl(zj.getZjlj());
-                // 上传图片
-                String id = putCert(zj.getZjlj());
-                up.setFileUrl(id);
-
-                new File(id).delete();
-                flag = Boolean.TRUE;
-            }
-        }
-        if (flag){
-            up.setOutSyncTime(new Date());
-            updateList.add(up);
-        }
-    }
-
-    private void getParameter(String wdno, String wxgno, Map<String, Object> req) {
-        req.put("wdno", wdno);
-        req.put("wxgno", wxgno);
-        req.put("page", 1);
-        req.put("size", 20);
-        req.put("xsgsshstat", 2);
-    }
-
 }

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/admin-fast-entry")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/admin-field")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/admin-module-favorites")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/admin-module")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/admin-role")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/admin-user-module-rela")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/admin-user")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/admin-user-role-rela")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/admin-websit")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/admin-websit-product-type-rela")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/admin-websit-slave")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/area")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/brand-lbs-relate")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/brand")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/brand-websit")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/city")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/com-detail-log")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/com-detail")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/com-list")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/common-file")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/company-ca-auth")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/company-record-manage")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/contract-template")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/customer-information-category")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/customer-information")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/customer-information-websit")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/img-carousel-manage")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/install-charge-config")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/insure-agree")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/insure-email")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/insure-email-record")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/insure")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/insure-range")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/insure-worker-commercial-file")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/insure-worker-commercial")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/insure-worker-record")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/integral-double")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/integral-grade-configure")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/integral-grade-explain")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/integral-grade-skill")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/integral-offset")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/integral-score")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/integral-skill-label")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/integral-worker-apply")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-gree-to-fa-download-task")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-gzdm-dowload")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xqxl-dowload")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xxlb-dowload")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xxly-dowload")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xxqd-dowload")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-yhsx-wx-dowload")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-az-assign-xslx-dowload")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-city-download")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-city-jdxz-download")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-county-download")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-province-download")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-dalei-download")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-jixin-download")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-xiaolei-download")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-xilie-download")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-wangdian-wxg-download")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-xin-wangdian-download")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-yhsx-viprank-dowload")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/label-currency")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/label")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/lbs-amap")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/notice")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/notice-record")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/operation-log")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/product")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/product-series")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/province")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/qualifications-manage")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/repair-bug")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/repair-project")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/sms-record")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/street")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/sys-dict")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/sys-dict-ref")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/sys-dict-type")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/tool")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/user-feedback")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/user")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/websit-enclosure-file")

+ 1 - 1
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-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/websit-examine-record")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitFilePlusTempController.java

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

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitMainInfoChangeDataPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/websit-main-info-change-data")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitMainInfoChangePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/websit-main-info-change")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitOrderSignPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/websit-order-sign")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitPlusTempController.java

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

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitServiceCategoryDetailPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/websit-service-category-detail")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitServiceCategoryPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/websit-service-category")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerBrandAccountPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/worker-brand-account")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerCertPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/worker-cert")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerChangeIntegralRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-25
+ * @since 2023-07-28
  */
 @Controller
 @RequestMapping("/plus/worker-change-integral-record")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerComListPlusTempController.java

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

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerComListWorkerPlusTempController.java

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

Some files were not shown because too many files changed in this diff