From 33a418516e6d32c17b7c331f9100ddf39a5e418b Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Sat, 16 Oct 2021 22:55:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cowr/local/ssjygl/main/Config.java | 2 +- .../TruckWeightLimitSyncService.java | 2 +- .../ssjygl/synctask/SyncTaskService.java | 34 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java index 7f71cf9..0cbe5b9 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java @@ -103,7 +103,7 @@ public class Config extends JFinalConfig { public static DeviceThread deviceThread = new DeviceThread(); public static SocketIOService socketio = null; private static boolean client_run = true; - public static final String CLINET_VERSION = "20210927"; + public static final String CLINET_VERSION = "20211016"; public static String getRootPath() { return PathKit.getWebRootPath() diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java index 859bbf2..3f8fc80 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java @@ -203,7 +203,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService { return Result.failed(false, "按主键未找到对应记录"); } - if (!model.hasDelKey()) { + if (!oldobj.hasDelKey()) { return Result.failed(false, "不存在逻辑删除字段"); } 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 d8347c4..0d1b584 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 @@ -314,7 +314,7 @@ public class SyncTaskService { if (Blacklist.dao.getTablename().equals(tablename) || "truck_weight_limit".equals(tablename) || "truck_weight_limit_modify_log".equals(tablename) - ) { + ) { for (Map.Entry entry : SvrCacheData.SUP_CACHE.entrySet()) { Supermarket supermarket = entry.getValue(); @@ -390,7 +390,7 @@ public class SyncTaskService { if (Blacklist.dao.getTablename().equals(tablename) || "truck_weight_limit".equals(tablename) || "truck_weight_limit_modify_log".equals(tablename) - ) { + ) { for (Map.Entry entry : SvrCacheData.SUP_CACHE.entrySet()) { Supermarket supermarket = entry.getValue(); @@ -517,24 +517,24 @@ public class SyncTaskService { } if (!sts.isEmpty()) { - for(SyncTask st : sts){ - if(st.getSaveData() == null && st.getUpdateData() == null && st.getDeleteData() == null && st.getIncrementData() == null){ - log.error("错误数据 %s", recvdata.toJSONString()); - } - } - - int[] ret = Db.batchSave(sts, sts.size()); - - if (ret.length != sts.size()) { - return false; - } - - for (int i : ret) { - // 必须是每条 sql 修改一条记录 - if (i != 1) { + for (SyncTask st : sts) { + if (!st.save()) { return false; } } + +// int[] ret = Db.batchSave(sts, sts.size()); +// +// if (ret.length != sts.size()) { +// return false; +// } +// +// for (int i : ret) { +// // 必须是每条 sql 修改一条记录 +// if (i != 1) { +// return false; +// } +// } } // if (!saveauthlics.isEmpty() || !deleteauthlics.isEmpty()) {