From 36b27b95b1f22cf61a9bcad2105ee196f032d5dd Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Wed, 17 Apr 2024 10:58:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=AE=A2=E5=8D=95=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E7=94=B3=E8=AF=B7=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ssjygl/synctask/SyncTaskService.java      | 65 ++++++++++++-------
 1 file changed, 42 insertions(+), 23 deletions(-)

diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java
index ef97f0a..dc49fe2 100644
--- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java
+++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java
@@ -577,61 +577,80 @@ public class SyncTaskService {
     // 过滤新增数据
     private List<Record> listFilter(String tablename, List<Record> list) {
 
-        System.out.println();
-        System.out.println();
-        System.out.println(tablename);
-        System.out.println(JSONObject.toJSONString(list));
-        System.out.println();
-        System.out.println();
-
         List<Record> removeList = new ArrayList<>();
+
         if ("order_temp".equals(tablename)) {
             // sn
             for (Record o : list) {
                 String sn = o.getStr("sn");
                 Record first = Db.findFirst("select * from " + tablename + " where sn = ?", sn);
-                if (o.toJson().equals(first.toJson())) {
-                    removeList.add(o);
+                if (first != null ) {
+                    Object create_time = first.get("create_time");
+                    Object change_time = first.get("change_time");
+                    System.out.println(String.valueOf(create_time));
+                    System.out.println(String.valueOf(change_time));
+
+                    if (o.toJson().equals(first.toJson())){
+                        removeList.add(o);
+                    }
                 }
             }
         }
+
         if ("ticket_log".equals(tablename)) {
             // id
             for (Record o : list) {
                 String id = o.getStr("id");
                 Record first = Db.findFirst("select * from " + tablename + " where id = ?", id);
-                if (o.toJson().equals(first.toJson())) {
-                    removeList.add(o);
+
+                if (first != null ) {
+                    Object create_time = first.get("create_time");
+                    Object change_time = first.get("change_time");
+                    Object invalid_time = first.get("invalid_time");
+                    System.out.println(String.valueOf(create_time));
+                    System.out.println(String.valueOf(change_time));
+                    System.out.println(String.valueOf(invalid_time));
+
+                    if (o.toJson().equals(first.toJson())){
+                        removeList.add(o);
+                    }
                 }
             }
         }
+
         if ("action_cmd_log".equals(tablename)) {
             // id
             for (Record o : list) {
                 String id = o.getStr("id");
                 Record first = Db.findFirst("select * from " + tablename + " where id = ?", id);
-                boolean equals = o.toJson().equals(first.toJson());
 
-                System.out.println();
-                System.out.println();
-                System.out.println(equals);
-                System.out.println(JSONObject.toJSONString(o));
-                System.out.println(JSONObject.toJSONString(first));
-                System.out.println();
-                System.out.println();
+                if (first != null ) {
+                    Object create_time = first.get("create_time");
+                    System.out.println(String.valueOf(create_time));
 
-                if (equals) {
-                    removeList.add(o);
+                    if (o.toJson().equals(first.toJson())){
+                        removeList.add(o);
+                    }
                 }
             }
         }
+
         if ("transport".equals(tablename)) {
             // id
             for (Record o : list) {
                 String id = o.getStr("id");
                 Record first = Db.findFirst("select * from " + tablename + " where id = ?", id);
-                if (o.toJson().equals(first.toJson())) {
-                    removeList.add(o);
+                if (first != null ) {
+                    Object inTime = first.get("in_time");
+                    Object outTime = first.get("out_time");
+                    Object changeTime = first.get("change_time");
+                    System.out.println(String.valueOf(inTime));
+                    System.out.println(String.valueOf(outTime));
+                    System.out.println(String.valueOf(changeTime));
+
+                    if (o.toJson().equals(first.toJson())){
+                        removeList.add(o);
+                    }
                 }
             }
         }