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 dc49fe2..f995f5c 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 @@ -585,14 +585,14 @@ public class SyncTaskService { String sn = o.getStr("sn"); Record first = Db.findFirst("select * from " + tablename + " where sn = ?", sn); 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); - } + log.info("==============================================="); + log.info("主键冲突"); + log.info(tablename); + log.info(JSONObject.toJSONString(o)); + log.info("==============================================="); + + removeList.add(o); } } } @@ -604,16 +604,14 @@ public class SyncTaskService { Record first = Db.findFirst("select * from " + tablename + " where id = ?", id); 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); - } + log.info("==============================================="); + log.info("主键冲突"); + log.info(tablename); + log.info(JSONObject.toJSONString(o)); + log.info("==============================================="); + + removeList.add(o); } } } @@ -625,12 +623,14 @@ public class SyncTaskService { Record first = Db.findFirst("select * from " + tablename + " where id = ?", id); if (first != null ) { - Object create_time = first.get("create_time"); - System.out.println(String.valueOf(create_time)); - if (o.toJson().equals(first.toJson())){ - removeList.add(o); - } + log.info("==============================================="); + log.info("主键冲突"); + log.info(tablename); + log.info(JSONObject.toJSONString(o)); + log.info("==============================================="); + + removeList.add(o); } } } @@ -641,16 +641,14 @@ public class SyncTaskService { String id = o.getStr("id"); Record first = Db.findFirst("select * from " + tablename + " where id = ?", id); 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); - } + log.info("==============================================="); + log.info("主键冲突"); + log.info(tablename); + log.info(JSONObject.toJSONString(o)); + log.info("==============================================="); + + removeList.add(o); } } }