add

src/main/java/com/zfire/jiasm/syncdata/gree/GreeLogic.java

@@ -153,11 +153,7 @@ public class GreeLogic {
         forms.put("client_id", Collections.singletonList(clientFileId));
         forms.put("client_secret", Collections.singletonList(clientFileSecert));
         forms.put("grant_type", Collections.singletonList("client_credentials"));
-        //log.info("【获取总部文件token】参数:{}",forms);
-        //log.info("【获取总部文件 】tokenFileUrl:{}",tokenFileUrl);
         String s = HttpUtils.requestXwww(tokenFileUrl, forms);
-        //String s = HttpUtils.requestPostForm(tokenUrl, map, null);
-        //log.info("【获取总部文件token】response:{}",s);
         JSONObject jsonObject = JSONObject.parseObject(s);
         String accessToken = jsonObject.getString("access_token");
         /*if(StringUtils.isNotEmpty(accessToken)) {

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

@@ -168,8 +168,8 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                     wxgs.add(wxg.getSfzen() + wxg.getWxgmc().trim() + wxg.getYddh());
                     log.info("工程师证件照信息同步成功-师傅证件信息:{}", wxg.getSfzen());
                 } else {
-                    log.info("获取工程师证件照信息失败-师傅证件信息:{}", response.getMsg());
                     log.info("获取工程师证件照信息失败-师傅证件信息:{}", wxg.getSfzen());
+                    log.info("msg:{}", response.getMsg());
                 }
             } catch (Exception ex) {
                 ex.printStackTrace();
@@ -714,34 +714,33 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
             // 参数 获取网点维修工信息
             getParameter(wxgDownload.getWdno(), wxgDownload.getWxgno(), req);
-            log.info("req: {}",req);
-            // 格力总部查询工程师信息
-            GreeResponseHelper response = greeLogic.greePost(wdqyapi, JSONObject.toJSONString(req), publicService.getCompanyId(wxgDownload.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 {
+                // 格力总部查询工程师信息
+                GreeResponseHelper response = greeLogic.greePost(wdqyapi, JSONObject.toJSONString(req), publicService.getCompanyId(wxgDownload.getWdno()));
+                if (response.getStatus() == 200){
+                    WxgQueryInfo resultDatax = JSONObject.parseObject(response.getData().toString(), WxgQueryInfo.class);
+                    // 无信息不处理
+                    if ( resultDatax.getWangdianWxgVos().size()<1){
+                        continue;
+                    }
 
-                // 提取师傅的服务大类信息 先内存中查询
-                if (workerServiceCategoryDetailMap.containsKey(wxgDownload.getWxgid())){
-                    wxgCategoryTypeRecs = workerServiceCategoryDetailMap.get(workerBrandAccount.getWebsitWorkerId()).stream().
-                            collect(Collectors.groupingBy(WorkerServiceCategoryDetail::getType));
-                } else {
-                    List<WorkerServiceCategoryDetail> wxgCategoryRecs = workerServiceCategoryDetailService.lambdaQuery()
-                            .eq(WorkerServiceCategoryDetail::getWebsitWorkerId, workerBrandAccount.getWebsitWorkerId()).list();
+                    wvos = resultDatax.getWangdianWxgVos().get(0);
 
-                    // 服务类型 INSTALL=安装 REPAIR=维修  DELIVERY=配送
-                    if (CollectionUtils.isNotEmpty(wxgCategoryRecs)){
-                        wxgCategoryTypeRecs = wxgCategoryRecs.stream().
+                    // 提取师傅的服务大类信息 先内存中查询
+                    if (workerServiceCategoryDetailMap.containsKey(wxgDownload.getWxgid())){
+                        wxgCategoryTypeRecs = workerServiceCategoryDetailMap.get(workerBrandAccount.getWebsitWorkerId()).stream().
                                 collect(Collectors.groupingBy(WorkerServiceCategoryDetail::getType));
+                    } else {
+                        List<WorkerServiceCategoryDetail> wxgCategoryRecs = workerServiceCategoryDetailService.lambdaQuery()
+                                .eq(WorkerServiceCategoryDetail::getWebsitWorkerId, workerBrandAccount.getWebsitWorkerId()).list();
+
+                        // 服务类型 INSTALL=安装 REPAIR=维修  DELIVERY=配送
+                        if (CollectionUtils.isNotEmpty(wxgCategoryRecs)){
+                            wxgCategoryTypeRecs = wxgCategoryRecs.stream().
+                                    collect(Collectors.groupingBy(WorkerServiceCategoryDetail::getType));
+                        }
                     }
-                }
 
-                try {
                     // 同步-师傅服务的类目信息 无则插入
                     getServiceCategory(wvos, wscList, wscdList, sysDict, wxgDownload, wxgCategoryTypeRecs, sysDictRefMap);
 
@@ -750,11 +749,14 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
                     // 清理缓存，把新增的服务类目加到缓存中
                     extractedCaretory(wscList, wscdList, workerServiceCategoryDetailMap, wxgDownload);
-
-                } catch (Exception ex) {
-                    log.info("工程师信息同步失败:{}", ex);
+                }  else {
+                    log.info("工程师信息同步失败:{}", JSONObject.toJSONString(req));
+                    log.info("msg:{}", response.getMsg());
                 }
+            } catch (Exception ex) {
+                log.info("工程师信息同步失败:{}", ex);
             }
+
         }
     }
 

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

@@ -57,18 +57,18 @@ public class InstallProduceUploadListServiceImpl implements InstallProduceUpload
         log.info("开始预处理需要上传的工单数据: \uF0B7{}",sdf.format(new Date()));
 
         //测试使用
-        Test orderno = testService.lambdaQuery()
+        /*Test orderno = testService.lambdaQuery()
                 .eq(Test::getFlag,1)
                 .last("limit 1").one();
         if (orderno==null){
             return;
-        }
+        }*/
 
         // 从需要上传的订单数据表中提取数据
         taskResults = outJiasmToGreeUploadnotifylistService.lambdaQuery()
                 .eq(OutJiasmToGreeUploadnotifylist::getSynStatus, SynStatusEnum.UN_SYN.getCode())
                 // .eq(OutJiasmToGreeUploadnotifylist::getSynReqId, 20916)// 测试用
-                .eq(OutJiasmToGreeUploadnotifylist::getOrderNo, orderno.getId())// 测试用
+                // .eq(OutJiasmToGreeUploadnotifylist::getOrderNo, orderno.getId())// 测试用
                 .orderByAsc(OutJiasmToGreeUploadnotifylist::getSynReqId)
                 .list();
         try {

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

@@ -70,19 +70,19 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
         log.info("开始预处理需要上传的维修工单数据: \uF0B7{}",sdf.format(new Date()));
 
         //测试使用
-        Test orderno = testService.lambdaQuery()
+        /*Test orderno = testService.lambdaQuery()
                 .eq(Test::getFlag,1)
                 .last("limit 1").one();
         if (orderno==null){
             return;
-        }
+        }*/
 
 
         // 从需要上传的订单数据表中提取数据
         List<OutJiasmToGreeUploadnotifylist> taskResults = outJiasmToGreeUploadnotifylistService.lambdaQuery()
                 .eq(OutJiasmToGreeUploadnotifylist::getSynStatus,0)
                 // .eq(OutJiasmToGreeUploadnotifylist::getSynReqId,20916)// 测试用
-                .eq(OutJiasmToGreeUploadnotifylist::getOrderNo, orderno.getId())// 测试用
+                // .eq(OutJiasmToGreeUploadnotifylist::getOrderNo, orderno.getId())// 测试用
                 .orderByAsc(OutJiasmToGreeUploadnotifylist::getSynReqId).list();
         try{
             Token token = tokenCenter.getCurrentToken();