add

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

@@ -357,6 +357,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
     @Override
     public void extractedAddCategory() throws Exception {
         List<WorkerBrandAccount> workerBrandAccounts = new ArrayList<>();
+        Map<String, List<WorkerBrandAccount>> workerBrandAccountsMap = new HashMap<>();
         Map<String,List<Worker>> Worker_Idcards = new HashMap<>();
         Map<String, List<WorkerServiceCategoryDetail>> workerServiceCategoryDetailMap = new HashMap<>();
         Map<String, List<SysDictRef>> sysDictRefMap = new HashMap<>();
@@ -407,6 +408,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                         ItfTblWangdianWxgDownload::getYddh,
                         ItfTblWangdianWxgDownload::getFlag)
                 // .eq(ItfTblWangdianWxgDownload::getWdno,"S21A0365")// 测试用
+                .eq(ItfTblWangdianWxgDownload::getSfzen,"441229197909100475")// 测试用
                 .eq(ItfTblWangdianWxgDownload::getFlag,DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())
                 .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
 
@@ -419,6 +421,12 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                 .isNotNull(WorkerBrandAccount::getBrandWorkerNumber)
                 .isNotNull(WorkerBrandAccount::getBrandWebsitId)
                 .list();
+        if (CollectionUtils.isNotEmpty(workerBrandAccounts)){
+            workerBrandAccountsMap = workerBrandAccounts.stream().collect(Collectors.groupingBy(WorkerBrandAccount::getBrandWorkerId));
+            workerBrandAccounts.clear();
+        }
+
+
         // 这里提取对应的商户网点信息
 
         // 提取所有师傅的服务大类信息 先内存中查询
@@ -428,6 +436,9 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         }
 
         for (ItfTblWangdianWxgDownload wxgDownload :wxgRecs){
+            if (!workerBrandAccountsMap.containsKey(wxgDownload.getWxgid())){
+                continue;
+            }
             // 状态无效不处理
             if (wxgDownload.getFlag() != null){
                 if (!wxgDownload.getFlag().trim().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
@@ -439,17 +450,18 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
             if (workerId.length()<1) {
                 continue;
             }
-            wxgCategoryQueryAdd(wxgDownload,workerBrandAccounts,workerServiceCategoryDetailMap,sysDict,
+
+            wxgCategoryQueryAdd(wxgDownload,workerBrandAccountsMap,workerServiceCategoryDetailMap,sysDict,
                     sysDictRefMap, workerServiceCategoryDetailList);
         }
 
-        workerBrandAccounts.clear();
         Worker_Idcards.clear();
         workerServiceCategoryDetailMap.clear();
         sysDictRefMap.clear();
         sysDictRef.clear();
         wxgCategoryRec.clear();
         workerServiceCategoryDetailList.clear();
+        workerBrandAccountsMap.clear();
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -1332,7 +1344,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
     @Transactional(rollbackFor = Exception.class)
     public void wxgCategoryQueryAdd(ItfTblWangdianWxgDownload wxgDownload,
-                                    List<WorkerBrandAccount> workerBrandAccounts,
+                                    Map<String, List<WorkerBrandAccount>> workerBrandAccountsMap,
                                     Map<String,List<WorkerServiceCategoryDetail>> workerServiceCategoryDetailMap,
                                     SysDict sysDict,Map<String, List<SysDictRef>> sysDictRefMap,
                                     List<String> workerServiceCategoryDetailList) throws Exception {
@@ -1345,12 +1357,9 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         String brandWorkerIdo = "294773";
         String brandWorkerIdt = "990003185";
 
-        for (WorkerBrandAccount i:workerBrandAccounts){
-            // 提取本地商户师傅信息 网点｜师傅编号不存在不处理 修改处已做了处理 这里只新增(前提是找到师傅所在网点信息)
-            WorkerBrandAccount workerBrandAccount = getWorkerBrandAccountData(workerBrandAccounts, wxgDownload);
-            if (workerBrandAccount == null){
-                continue;
-            }
+        // 提取本地商户师傅信息 网点｜师傅编号不存在不处理 修改处已做了处理 这里只新增(前提是找到师傅所在网点信息)
+        for (WorkerBrandAccount workerBrandAccount:workerBrandAccountsMap.get(wxgDownload.getWxgid())){
+
             // 师傅对应的网点服务类目信息已存在不处理 只做插入
             if (workerServiceCategoryDetailMap.containsKey(workerBrandAccount.getWebsitWorkerId())){
                 continue;
@@ -1361,7 +1370,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                 continue;
             }
 
-            if (brandWorkerIdo.equals(i.getBrandWorkerId()) || brandWorkerIdt.equals(i.getBrandWorkerId())){
+            if (brandWorkerIdo.equals(workerBrandAccount.getBrandWorkerId()) || brandWorkerIdt.equals(workerBrandAccount.getBrandWorkerId())){
                 log.info("workerBrandAccount {}",workerBrandAccount);
                 log.info("wxgDownload {}",wxgDownload);
             }
@@ -1372,7 +1381,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                 // 格力总部查询工程师信息
                 GreeResponseHelper response = greeLogic.greePost(wdqyapi, JSONObject.toJSONString(req), publicService.getCompanyId(wxgDownload.getWdno()));
 
-                if (brandWorkerIdo.equals(i.getBrandWorkerId()) || brandWorkerIdt.equals(i.getBrandWorkerId())){
+                if (brandWorkerIdo.equals(workerBrandAccount.getBrandWorkerId()) || brandWorkerIdt.equals(workerBrandAccount.getBrandWorkerId())){
                     log.info("response {}",JSONObject.toJSONString(response));
                 }
 
@@ -1407,7 +1416,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                     getServiceCategory(wvos, wscList, wscdList, sysDict, wxgDownload, wxgCategoryTypeRecs,
                             sysDictRefMap, workerBrandAccount, workerServiceCategoryDetailList);
 
-                    if (brandWorkerIdo.equals(i.getBrandWorkerId()) || brandWorkerIdt.equals(i.getBrandWorkerId())){
+                    if (brandWorkerIdo.equals(workerBrandAccount.getBrandWorkerId()) || brandWorkerIdt.equals(workerBrandAccount.getBrandWorkerId())){
                         log.info("wscList {}",JSONObject.toJSONString(wscList));
                         log.info("wscdList {}",JSONObject.toJSONString(wscdList));
                     }

src/main/resources/bootstrap-dev.properties

@@ -371,7 +371,7 @@ wxzjsc=FALSE
 wxzjscxc=FALSE
 #网点维修工 证件照，服务类目，位置、新增同步到本地、修改、保险、总部下载的采集图
 zjzxxc=FALSE
-lmxxc=FALSE
+lmxxc=TRUE
 wxgwzc=FALSE
 wxgxgc=FALSE
 wxgwztc=FALSE
@@ -388,7 +388,7 @@ glscc=FALSE
 #天猫商城
 tmscc=FALSE
 #安装工单上传  生成需要上传的数据、生成上传任务清单列表
-azuploadyscc=TRUE
+azuploadyscc=FALSE
 azuploadscc=FALSE
 #维修工单上传  生成需要上传的数据、生成上传任务清单列表
 wxuploadyscc=FALSE