no message

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

@@ -325,11 +325,8 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         Map<String,List<Worker>> workerIdcardMap = new HashMap<>();
         Map<String,List<Worker>> workerWorkeridMap = new HashMap<>();
         List<ItfTblWangdianWxgDownload> wxgDownladRecs = new ArrayList<>();
-        Map<String,String> workerIdCertNamesIdMaps = new HashMap<>();
         Map<String,WorkerCert> workerIdCertNamesObjMaps = new HashMap<>();
-        List<String> bxWorkerIdWebsitIds = new ArrayList<>();
         Map<String,WebsitWorker> websitWorderwidwdidMap = new HashMap<>();
-        Map<String,List<WebsitWorker>> addBxWorkers = new HashMap<>();
         List<WebsitWorker> upWebsitWorkers = new ArrayList<>();
 
         // 提取品牌信息
@@ -338,13 +335,10 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
             return;
         }
 
-
-
         // 提取现有的师傅证件信息
         List<WorkerCert> wcs = workerCertService.lambdaQuery().list();
         if (CollectionUtils.isNotEmpty(wcs)){
             wcs.stream().forEach(event->{
-                workerIdCertNamesIdMaps.put(event.getWorkerId() + event.getCertName(),event.getId());
                 workerIdCertNamesObjMaps.put(event.getWorkerId() + event.getCertName(),event);
             });
             wcs.clear();
@@ -358,32 +352,6 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
             oldWorkerRec.clear();
         }
 
-        // 提取待同步获取保险信息的师傅数据
-        List<WebsitWorker> wwrecords = websitWorkerService.lambdaQuery()
-                .isNull(WebsitWorker::getOutZjlj)
-                .list();
-        if (CollectionUtils.isNotEmpty(wwrecords)){
-            addBxWorkers = wwrecords.stream().collect(Collectors.groupingBy(WebsitWorker::getWorkerId));
-
-            /*wwrecords.stream().forEach(event->{
-                bxWorkerIdWebsitIds.add(event.getWorkerId()+event.getWebsitId());
-            });*/
-
-            wwrecords.clear();
-        }
-
-
-
-        /*List<WebsitWorker> iwcs = websitWorkerService.lambdaQuery()
-                .eq(WebsitWorker::getInsureStatus,2).list();
-        if (CollectionUtils.isNotEmpty(iwcs)){
-            iwcs.stream().forEach(event->{
-                bxWorkerIdWebsitIds.add(event.getWorkerId()+event.getWebsitId());
-            });
-            iwcs.clear();
-        }*/
-
-
         List<WebsitWorker> wws = websitWorkerService.lambdaQuery().list();
         if (CollectionUtils.isNotEmpty(wws)){
             wws.stream().forEach(event->{
@@ -404,36 +372,14 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                 // .eq(ItfTblWangdianWxgDownload::getSfzen,"430421198107039037")// 测试用
                 .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
 
-        // 提取现有已存在的证件信息的师傅信息(待回传同步的证件不处理)
-        /*List<WorkerCert> wc = workerCertService.lambdaQuery()
-                .eq(WorkerCert::getOutSyncStatus,1).list();
-        Map<String,List<WorkerCert>> WorkerCertWorkerIdMaps = new HashMap<>();
-        if (CollectionUtils.isNotEmpty(wc)){
-            WorkerCertWorkerIdMaps = wc.stream().collect(Collectors.groupingBy(WorkerCert::getWorkerId));
-            wc.clear();
-        }*/
-
 
         for (ItfTblWangdianWxgDownload wxg :wxgDownladRecs){
-            // 无效的数据不新增
-            /*if (wxg.getFlag() != null){
-                if (!wxg.getFlag().trim().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
-                    continue;
-                }
-            }*/
-
             // 平台师傅信息不包含格力总部的数据不处理(包含的为格力的师傅信息同步时已生成了worker)
             // 这里用身份证来做包含关系(测试环境身份证隐藏* 需加名称及手机号)
             String workerId = checkIsGreeWroker(workerIdcardMap, wxg);
             if (workerId.length()<1) {
                 continue;
             }
-
-            // 有证件信息的师傅不再新增
-            /*if (WorkerCertWorkerIdMaps.containsKey(workerId)){
-                continue;
-            }*/
-
             // 参数 获取网点维修工信息
             getParameter(wxg.getWdno(), wxg.getWxgno(), req);
             // log.info("总部获取的工程师证件照信息wdno :{}", wxg.getWdno());
@@ -441,10 +387,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
             try {
                 // 格力总部查询工程师信息
                 GreeResponseHelper response = greeLogic.greePost(wdqyapi, JSONObject.toJSONString(req), publicService.getCompanyId(wxg.getWdno()));
-
                 // log.info("总部获取的工程师证件照信息 response :{}", JSONObject.toJSONString(response));
-
-
                 // 失败不处理
                 if (response.getStatus() == 200){
                     WxgQueryInfo resultDatax = JSONObject.parseObject(response.getData().toString(), WxgQueryInfo.class);
@@ -458,8 +401,12 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
                     // 同步-新增证件信息
                     getCertInfo(wvos, addList, workerId, wxg.getWdno(),
-                            workerWorkeridMap, bxWorkerIdWebsitIds,
-                            websitWorderwidwdidMap, addBxWorkers, upWebsitWorkers, workerIdCertNamesObjMaps);
+                            workerWorkeridMap, websitWorderwidwdidMap,
+                            upWebsitWorkers, workerIdCertNamesObjMaps);
+
+
+
+
                     // 新增或修改(证件)
                     addDataCert(addList);
                     // 修改保险信息
@@ -1389,9 +1336,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
     private void getCertInfo(WangdianWxgVos wvos, List<WorkerCert> addList, String workerId,
                              String wdno, Map<String,List<Worker>> workerWorkeridMap,
-                             List<String> bxWorkerIdWebsitIds,
                              Map<String,WebsitWorker> websitWorderwidwdidMap,
-                             Map<String,List<WebsitWorker>> addBxWorkers,
                              List<WebsitWorker> upWebsitWorkers, Map<String,WorkerCert> workerIdCertNamesObjMaps) throws ParseException {
         // 同步-新增证件信息
         for (ZJInfo zj: wvos.getZjInfoList()){
@@ -1402,9 +1347,11 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                     continue;
                 }*/
 
+
+                // 同家用、同总包、同自建或合作共用保除数据
+
                 // 获取保险证件数据
-                produceBXInfo(workerId, wdno, bxWorkerIdWebsitIds, zj,websitWorderwidwdidMap,
-                        addBxWorkers, upWebsitWorkers);
+                produceBXInfo(workerId, wdno,  zj,websitWorderwidwdidMap, upWebsitWorkers);
 
                 continue;
             }
@@ -1530,10 +1477,8 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         return false;
     }
 
-    private void produceBXInfo(String workerId, String wdno,
-                                  List<String> bxWorkerIdWebsitIds, ZJInfo zj,
+    private void produceBXInfo(String workerId, String wdno, ZJInfo zj,
                                   Map<String, WebsitWorker> websitWorderwidwdidMap,
-                                  Map<String,List<WebsitWorker>> addBxWorkers,
                                   List<WebsitWorker> upWebsitWorkers) throws ParseException {
         // 提取商户售后网点对应的平台售后网点信息 存在一对多的关系 无对应关系退出不处理
         List<WebsitOrderSign> wos = publicService.shShwdToptshwdByBrandWebsitNo(wdno);
@@ -1571,6 +1516,9 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                 continue;
             }
 
+            // 家用、同总包、同自建共用一份保险
+
+
             // 获取师傅保险信息
             getWebsitWorkerInfo(zj, upWebsitWorkers, ww, websitWorderwidwdidMap);
             //////////////////////////////////////////////////////