Merge branch '20240416_sun' of sckj/mz-cloud into master

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/YlServer.java

@@ -43,32 +43,32 @@ public class YlServer {
 //        System.out.println(YlServer.httpsRequest(YlServer.Map2JSONStr(map)));
 
         // 查询
-//        InLnstLrxx lrxx = new InLnstLrxx();
-////        lrxx.setYlcode("1100302424");
-//        lrxx.setLrZjhm("220822195404025593");
-//        TreeMap<String, Object> lr = new TreeMap<>();
-//        TreeMap<String, Object> map = new TreeMap<>();
-//        if (StringUtils.isNotEmpty(lrxx.getYlcode())) {
-//            lr.put("memberCode", lrxx.getYlcode());
-//            map = YlServer.publicSupport(ResourceUtil.getConfigByName("yl.hycx"), null,
-//                    null, lr);
-//        } else {
-//            lr.put("memberUniqueId", lrxx.getLrZjhm());
-//            map = YlServer.publicSupport(ResourceUtil.getConfigByName("yl.hycx"), lrxx.getMchntCode(),
-//                    null, lr);
-//        }
-//        System.out.println( YlServer.httpsRequest(YlServer.Map2JSONStr(map)));
-
+        InLnstLrxx lrxx = new InLnstLrxx();
+//        lrxx.setYlcode("1100302424");
+        lrxx.setLrZjhm("152326197904090050");
         TreeMap<String, Object> lr = new TreeMap<>();
-        lr.put("storeCode", "");
-        lr.put("startDate", "2024-04-10 00:00:00");
-        lr.put("endDate", "2024-04-12 00:00:00");
-        lr.put("transType", "");
-        lr.put("transState", "");
-        lr.put("startRecId", "0");
-        TreeMap<String, Object> map = YlServer.publicSupport(ResourceUtil.getConfigByName("yl.syncYc"), null,
-                null, lr);
-        System.out.println(YlServer.httpsRequest(YlServer.Map2JSONStr(map)));
+        TreeMap<String, Object> map = new TreeMap<>();
+        if (StringUtils.isNotEmpty(lrxx.getYlcode())) {
+            lr.put("memberCode", lrxx.getYlcode());
+            map = YlServer.publicSupport(ResourceUtil.getConfigByName("yl.hycx"), null,
+                    null, lr);
+        } else {
+            lr.put("memberUniqueId", lrxx.getLrZjhm());
+            map = YlServer.publicSupport(ResourceUtil.getConfigByName("yl.hycx"), lrxx.getMchntCode(),
+                    null, lr);
+        }
+        System.out.println( YlServer.httpsRequest(YlServer.Map2JSONStr(map)));
+
+//        TreeMap<String, Object> lr = new TreeMap<>();
+//        lr.put("storeCode", "");
+//        lr.put("startDate", "2024-04-10 00:00:00");
+//        lr.put("endDate", "2024-04-12 00:00:00");
+//        lr.put("transType", "");
+//        lr.put("transState", "");
+//        lr.put("startRecId", "0");
+//        TreeMap<String, Object> map = YlServer.publicSupport(ResourceUtil.getConfigByName("yl.syncYc"), null,
+//                null, lr);
+//        System.out.println(YlServer.httpsRequest(YlServer.Map2JSONStr(map)));
         // 人脸采集状态同步
 //        TreeMap<String, Object> lr = new TreeMap<>();
 //        lr.put("memberCode", "1100302372");

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/ZwywLrJbxxServiceImpl.java

@@ -615,7 +615,7 @@ public class ZwywLrJbxxServiceImpl implements IZwywLrJbxxService {
 
     private void insertShxx(InLnstShxx shxx) {
         InLnstShxx lr = zwywJclrShxxMapper.selectOne(new LambdaQueryWrapper<InLnstShxx>()
-                .eq(InLnstShxx::getLrId, shxx.getLrId()).eq(InLnstShxx::getState, "1"));
+                .eq(InLnstShxx::getLrId, shxx.getLrId()).ne(InLnstShxx::getState, "99"));
         if (ObjectUtils.isEmpty(lr)) {
             zwywJclrShxxMapper.insert(shxx);
         } else {