海康数据同步

src/main/java/com/xjrsoft/module/hikvision/util/DataUtil.java

@@ -311,7 +311,7 @@ public class DataUtil {
             String id = objectMap.get("id").toString();
 
             JsonObject paramJson = new JsonObject();
-            paramJson.addProperty("clientId", i);
+//            paramJson.addProperty("clientId", i);
             paramJson.addProperty("personId", id);
             paramJson.addProperty("personName", objectMap.get("name").toString());
             paramJson.addProperty("orgIndexCode", objectMap.get("orgIndexCode").toString());
@@ -337,27 +337,13 @@ public class DataUtil {
 
             if (historyMap.containsKey(id)) {
                 if (!paramJson.toString().equals(historyMap.get(id))) {
+                    paramJson.addProperty("personId", tableData.get(id));
                     updateList.add(paramJson);
                 }
                 continue;
             }
 
             addList.add(paramJson);
-
-//            if(tableData != null && tableData.containsKey(id)){
-//                apiPath = "/api/resource/v1/person/single/update";
-//                apiUtil.doPost(apiPath, paramJson.toString(), null, header);
-//                continue;
-//            }
-//
-//            clientMap.put(i, id);
-//            String result = apiUtil.doPost(apiPath, paramJson.toString(), null, header);
-//            JsonElement parse = jsonParser.parse(result);
-//            JsonObject resultJson = parse.getAsJsonObject();
-//            if("0".equals(resultJson.get("code").getAsString()) && "success".equals(resultJson.get("msg").getAsString())){
-//                JsonObject array = resultJson.get("data").getAsJsonObject();
-//                idMap.put(id, array.get("personId").getAsString());
-//            }
         }
 
         String apiPath = "/api/resource/v1/person/single/add";
@@ -402,7 +388,7 @@ public class DataUtil {
                 Entity entity = Entity.create(tableName);
                 entity.set("send_data", paramJson.toString());
                 Entity where = Entity.create(tableName);
-                where.set("source_id", paramJson.get("personId").getAsString());
+                where.set("hikvision_id", paramJson.get("personId").getAsString());
                 SqlRunnerAdapter.db().dynamicUpdate(tableName, entity, where);
             }
         }

src/test/java/com/xjrsoft/module/job/HikvisionBaseDataTaskTest2.java

@@ -100,13 +100,13 @@ class HikvisionBaseDataTaskTest2 {
 //            }
 
 
-            tableName = "base_class";
-            Map<String, String> baseClass = dataMap.get(tableName);
-            try {
-                dataUtil.insertClass(tableName, baseClass);
-            } catch (Exception e) {
-                System.out.println(e);
-            }
+//            tableName = "base_class";
+//            Map<String, String> baseClass = dataMap.get(tableName);
+//            try {
+//                dataUtil.insertClass(tableName, baseClass);
+//            } catch (Exception e) {
+//                System.out.println(e);
+//            }
 
 
             tableName = "base_student";

src/test/java/com/xjrsoft/module/schedule/util/DataUtilTest.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.schedule.util;
 
+import com.google.gson.JsonObject;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -19,5 +20,20 @@ class DataUtilTest {
         String sign = ScheduleUtil.createSign(timestamp);
 
         System.out.println("sign --> " + sign);
+
+        JsonObject paramJson = new JsonObject();
+        paramJson.addProperty("clientId", 1);
+        paramJson.addProperty("personId", 1);
+        paramJson.addProperty("personName", 1);
+        paramJson.addProperty("orgIndexCode", 1);
+        paramJson.addProperty("phoneNo", 1);
+        paramJson.addProperty("jobNo", 1);
+        paramJson.addProperty("birthday", 1);
+        paramJson.addProperty("personType", 2);
+
+        if(!paramJson.toString().equals(null)){
+            System.out.println(11);
+        }
+
     }
 }