yaozhixue 1 year ago
parent
commit
05364d73b0

+ 3 - 3
src/main/java/com/zfire/jiasm/syncdata/gree/GreeLogic.java

@@ -153,11 +153,11 @@ 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);
+        //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);
+        //log.info("【获取总部文件token】response:{}",s);
         JSONObject jsonObject = JSONObject.parseObject(s);
         String accessToken = jsonObject.getString("access_token");
         /*if(StringUtils.isNotEmpty(accessToken)) {

+ 5 - 3
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,"412829198906236011")// 测试用
+                // .eq(ItfTblWangdianWxgDownload::getSfzen,"412829198906236011")// 测试用
                 .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
 
         // 提取现有已存在的证件信息的师傅信息
@@ -621,10 +621,12 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
     @NotNull
     private String putCert(String image) throws Exception {
-        String id = IdWorker.getIdStr()+".jpeg";
+        /*String id = IdWorker.getIdStr()+".jpeg";
         if (image.contains(".jpeg")){
             id = IdWorker.getIdStr();
-        }
+        }*/
+
+        String id = IdWorker.getIdStr();
         baseService.saveToFile(greeLogic.greeFileUrl(image), id);
         String file = id;
         ossUtil.uploadFile(id, new File(file));

+ 5 - 9
src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPWXGQueryUpdateServiceImpl.java

@@ -104,7 +104,7 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
                 .select(ItfTblWangdianWxgDownload::getWxgno,
                         ItfTblWangdianWxgDownload::getWdno,
                         ItfTblWangdianWxgDownload::getSfzen)
-                .eq(ItfTblWangdianWxgDownload::getWxgno,"S21A03650250")// 测试用
+                // .eq(ItfTblWangdianWxgDownload::getWxgno,"S21A03650250")// 测试用
                 .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
 
         //本地提取商户师傅网点信息 一个师傅可多网点 格力最多3个网点
@@ -146,7 +146,7 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
                     // 证件同步
                     for (ZJInfo zj:wvos.getZjInfoList()){
                         // 同步-新增或修改证件信息
-                        log.info("wxginfo {}",wxg);
+                        // log.info("wxginfo {}",wxg);
                         workercertUpdataOrAdd(wvos, updateList, addList, workerBrandAccount, zj);
                     }
                     // 同步-师傅地理位置
@@ -416,8 +416,6 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
             new File(id2).delete();
         } else {
             add.setOutFileUrl(zj.getZjlj());
-            log.info("从总部获取的图片参数A:{}",JSONObject.toJSONString(zj));
-            log.info("从总部获取的图片参数B:{}",zj.getZjlj());
             String id = putCert(zj.getZjlj());
             add.setFileUrl(id);
             new File(id).delete();
@@ -445,13 +443,11 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
 
     @NotNull
     private String putCert(String image) throws Exception {
-        String id = IdWorker.getIdStr()+".jpeg";
+        /*String id = IdWorker.getIdStr()+".jpeg";
         if (image.contains(".jpeg")){
             id = IdWorker.getIdStr();
-        }
-        log.info("image :{}",image);
-        log.info("id :{}",id);
-
+        }*/
+        String id = IdWorker.getIdStr();
         baseService.saveToFile(greeLogic.greeFileUrl(image), id);
         String file = id;
         ossUtil.uploadFile(id, new File(file));