Merge branch 'developer' into 'master'

fix:好办通讯录同步更改

See merge request !171

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java

@@ -112,7 +112,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
             if (syncTask.getTaskType().equals(0)) {
                 operationMap.get("groupSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
             } else {
-                operationMap.get("qywxGroupSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
+                operationMap.get("qywxDeptSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
             }
             //门店处理
         } else if (dataPre.getDataType().equals(PreDealTypeEnum.store.getVal())) {
@@ -124,7 +124,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
             if (syncTask.getTaskType().equals(0)) {
                 operationMap.get("clerkSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
             } else {
-                operationMap.get("qywxClerkSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
+                operationMap.get("qywxStaffSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
             }
         } else if (dataPre.getDataType().equals(PreDealTypeEnum.friend_clerk.getVal())) {
             logger.info("好友导购处理：{}", params);

haoban-manage3-service/src/test/java/test.java

@@ -20,34 +20,45 @@ import org.apache.commons.lang3.time.DateUtils;
 public class test {
     private static final TimedCache<String, TestQo> cache = CacheUtil.newTimedCache(3000L);
 
-    public static void main(String[] args) throws InterruptedException {
-        Date date = new Date();
-        Date tomrrow = DateUtils.addDays(date, 1);
-        Date yestory = DateUtils.addDays(date, -1);
-        long l = DateUtil.betweenDay(tomrrow, date, true);
+    public static void main(String[] args) throws Exception {
 
-        long l2 = DateUtil.betweenDay(date, tomrrow, true);
-        TestQo qo=new TestQo();
-        qo.setName("test");
-        System.out.println(l + "=" + l2);
-
-        cache.put("test",qo);
-        Thread.sleep(1000L);
-        TestQo test = cache.get("test");
-        System.out.println(JSONObject.toJSONString(test));
-
-        Thread.sleep(2000L);
-        System.out.println(JSONObject.toJSONString(test));
-        Thread.sleep(2000L);
-        System.out.println(JSONObject.toJSONString(test));
-        test = cache.get("test");
-        System.out.println(JSONObject.toJSONString(test));
-
-        int i=20;
-        while (i-->0) {
-            Thread.sleep(2000L);
+        try{
+            System.out.println("start");
+            throw new Exception("111");
+        }catch (Exception e) {
+            System.out.println("ex");
+            throw e;
+        }finally {
+            System.out.println("end1");
         }
-//        String key = "3.2.1";
+
+//        Date date = new Date();
+//        Date tomrrow = DateUtils.addDays(date, 1);
+//        Date yestory = DateUtils.addDays(date, -1);
+//        long l = DateUtil.betweenDay(tomrrow, date, true);
+//
+//        long l2 = DateUtil.betweenDay(date, tomrrow, true);
+//        TestQo qo=new TestQo();
+//        qo.setName("test");
+//        System.out.println(l + "=" + l2);
+//
+//        cache.put("test",qo);
+//        Thread.sleep(1000L);
+//        TestQo test = cache.get("test");
+//        System.out.println(JSONObject.toJSONString(test));
+//
+//        Thread.sleep(2000L);
+//        System.out.println(JSONObject.toJSONString(test));
+//        Thread.sleep(2000L);
+//        System.out.println(JSONObject.toJSONString(test));
+//        test = cache.get("test");
+//        System.out.println(JSONObject.toJSONString(test));
+//
+//        int i=20;
+//        while (i-->0) {
+//            Thread.sleep(2000L);
+//        }
+////        String key = "3.2.1";
 //        String[] split = key.split(".");
 //
 //        System.out.println(split[1]);