yaozhixue 1 年之前
父节点
当前提交
eeda68e333

+ 0 - 2
src/main/java/com/zfire/jiasm/syncdata/base/BaseService.java

@@ -103,7 +103,6 @@ public class BaseService {
             }
             fos.flush();
         } catch (Exception e){
-            log.info("id = {}",id);
             e.printStackTrace();
             throw new RemoteServiceException(e.getMessage());
         } finally {
@@ -112,7 +111,6 @@ public class BaseService {
                 bis.close();
                 httpUrl.disconnect();
             }catch (Exception e){
-                log.info("id = {}",id);
                 e.printStackTrace();
                 throw new RemoteServiceException(e.getMessage());
             }

+ 10 - 5
src/main/java/com/zfire/jiasm/syncdata/download/worker/GLPPWXGQueryAdd.java

@@ -46,12 +46,21 @@ public class GLPPWXGQueryAdd {
         wxgQueryAddCertInfo();
 
         // 新增 师傅服务类目信息
-        wxgQueryAddCategory();
+        // wxgQueryAddCategory();
 
         // 新增格力网点维修工数据
         wxgQueryAddWXGInfo();
     }
 
+    @Scheduled(fixedDelayString = "${lmxx}")
+    public void processLM() throws Exception {
+        if (lmxxc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        // 新增 师傅服务类目信息
+        wxgQueryAddCategory();
+    }
 
 
     /**
@@ -83,10 +92,6 @@ public class GLPPWXGQueryAdd {
      * 新增 师傅服务类目信息 这里只做新增(只新增从格力总部过来的师傅服务的类目信息)
      */
     public void wxgQueryAddCategory() throws Exception {
-        if (lmxxc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
-        }
-
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         log.info("开始同步网点师傅服务类目信息: \uF0B7{}",sdf.format(new Date()));

+ 21 - 15
src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPWXGQueryAddServiceImpl.java

@@ -110,7 +110,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                         ItfTblWangdianWxgDownload::getWxgmc,
                         ItfTblWangdianWxgDownload::getYddh,
                         ItfTblWangdianWxgDownload::getFlag)
-                .eq(ItfTblWangdianWxgDownload::getSfzen,"440281197906113814")// 测试用
+                // .eq(ItfTblWangdianWxgDownload::getSfzen,"440281197906113814")// 测试用
                 .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
 
         // 提取现有已存在的证件信息的师傅信息
@@ -146,18 +146,20 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
             // 参数 获取网点维修工信息
             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 {
+                // 格力总部查询工程师信息
+                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 {
                     log.info("总部获取的工程师证件照信息wvos:{}", JSONObject.toJSONString(wvos));
                     // 同步-新增证件信息
                     getCertInfo(wvos, addList, workerId, workerWorkeridMap.get(workerId).get(0).getWorkerName());
@@ -165,11 +167,15 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                     addDataCert(addList);
                     wxgs.add(wxg.getSfzen() + wxg.getWxgmc().trim() + wxg.getYddh());
                     log.info("工程师证件照信息同步成功-师傅证件信息:{}", wxg.getSfzen());
-                } catch (Exception ex) {
-                    ex.printStackTrace();
-                    log.info("工程师证件照信息同步失败-师傅证件信息:{}", wxg.getSfzen());
+                } else {
+                    log.info("获取工程师证件照信息失败-师傅证件信息:{}", response.getMsg());
+                    log.info("获取工程师证件照信息失败-师傅证件信息:{}", wxg.getSfzen());
                 }
+            } catch (Exception ex) {
+                ex.printStackTrace();
+                log.info("工程师证件照信息同步失败-师傅证件信息:{}", wxg.getSfzen());
             }
+
         }
 
         wxgs.clear();
@@ -623,7 +629,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
     @NotNull
     private String putCert(String image) throws Exception {
-        String id = IdWorker.getIdStr()+".jpg";
+        String id = IdWorker.getIdStr();
         baseService.saveToFile(greeLogic.greeFileUrl(image), id);
         ossUtil.uploadFile(id, new File(id));
         return id;