From d1fcd5564fbf5e6adc84013d80937f65ab199fd4 Mon Sep 17 00:00:00 2001
From: wuwenxiong <646448316@qq.com>
Date: Tue, 14 Sep 2021 11:19:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E9=99=90=E9=87=8D=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=97=A5=E5=BF=97=E8=A1=A8=E4=B8=BB=E9=94=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAuuid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/BaseTruckWeightLimitModifyLog.java   | 27 ++++++++++---------
 .../TruckWeightLimitModifyLogPKValidator.java |  4 +--
 .../TruckWeightLimitModifyLogValidator.java   |  5 ++--
 .../TruckWeightLimitSyncService.java          |  6 ++++-
 .../ssjygl/synctask/SyncTaskService.java      | 18 ++++++++-----
 5 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimitModifyLog.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimitModifyLog.java
index 471a6d5..47c13a0 100644
--- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimitModifyLog.java
+++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimitModifyLog.java
@@ -21,25 +21,26 @@ public abstract class BaseTruckWeightLimitModifyLog<M extends BaseTruckWeightLim
     }
 
     /**
-     * name: id
-     * type: INT UNSIGNED(10)
+     * name: uuid
+     * type: CHAR(32)
      * isNullable: NO
-     * isPrimaryKey: YES
-     * defaultValue: 
-     * @param id 主键
+     * isPrimaryKey: NO
+     * defaultValue:
+     *
+     * @param uuid UUID 唯一验证
      */
-    @JSONField(name="id")
-    public void setId(Long id) {
-        set("id", id);
+    @JSONField(name = "uuid")
+    public void setUuid(String uuid) {
+        set("uuid", uuid);
     }
-    
+
 
     /**
-     * @return id 主键
+     * @return uuid UUID 唯一验证
      */
-    @JSONField(name="id")
-    public Long getId() {
-        return getLong("id");
+    @JSONField(name = "uuid")
+    public String getUuid() {
+        return getStr("uuid");
     }
 
     /**
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogPKValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogPKValidator.java
index 059b6ea..95e6bbf 100644
--- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogPKValidator.java
+++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogPKValidator.java
@@ -15,8 +15,8 @@ import com.jfinal.core.Controller;
 public class TruckWeightLimitModifyLogPKValidator extends CrudParamValidator {
     @Override
     protected void validate(Controller c) {
-        validateRequired("id", "id", "id 必填");
-        validateLong("id", 1, 2147483647, "id", "id 范围 1~2147483647");
+        validateRequired("uuid", "uuid", "uuid 必填");
+        validateString("uuid", 32, 32, "uuid", "uuid 长度 32，必填");
     }
 
     protected void handleError(Controller c) {
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogValidator.java
index abdcb92..d5d684b 100644
--- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogValidator.java
+++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogValidator.java
@@ -17,9 +17,8 @@ public class TruckWeightLimitModifyLogValidator extends CrudParamValidator {
     protected void validate(Controller c) {
         // 默认新增时，前端不需要传主键。若需要前端传主键，需要去掉这个判断
         if (!"save".equals(getActionMethodName())) {
-            validateRequired("id", "id", "id 必填");
-
-            validateLong("id", 1, 2147483647, "id", "id 范围 1~2147483647");
+            validateRequired("uuid", "uuid", "uuid 必填");
+            validateString("uuid", 32, 32, "uuid", "uuid 长度 32，必填");
         }
         
         validateString("truck_license", 1, 10, "truck_license", "truck_license 长度 1~10");
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 dd3220d..4b6d667 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
@@ -49,6 +49,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
             @Override
             public boolean run() {
                 TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog();
+                modifyLog.setUuid(StrKit.getRandomUUID());
                 modifyLog.setTruckLicense(model.getTruckLicense());
                 modifyLog.setWeightLimit(model.getWeightLimit());
                 modifyLog.setAttachment(model.getAttachment());
@@ -63,7 +64,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
                         return false;
                     }
 
-                    synctask.addSaveData(model); // 有自增长主键的，在保存 model 后会自动填充主键的值，然后才能加到 synctask 里面
+                    synctask.addSaveData(model);
                     synctask.addSaveData(modifyLog);
 
                     return SyncTaskService.me.save(synctask)
@@ -106,6 +107,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
             @Override
             public boolean run() {
                 TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog();
+                modifyLog.setUuid(StrKit.getRandomUUID());
                 modifyLog.setTruckLicense(model.getTruckLicense());
                 modifyLog.setWeightLimit(model.getWeightLimit());
                 modifyLog.setAttachment(model.getAttachment());
@@ -159,6 +161,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
            public boolean run() {
               try {
                   TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog();
+                  modifyLog.setUuid(StrKit.getRandomUUID());
                   modifyLog.setTruckLicense(model.getTruckLicense());
                   modifyLog.setWeightLimit(model.getWeightLimit());
                   modifyLog.setAttachment(model.getAttachment());
@@ -213,6 +216,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
                 public boolean run() {
                     try {
                         TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog();
+                        modifyLog.setUuid(StrKit.getRandomUUID());
                         modifyLog.setTruckLicense(model.getTruckLicense());
                         modifyLog.setWeightLimit(model.getWeightLimit());
                         modifyLog.setAttachment(model.getAttachment());
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 3c647f6..db48100 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
@@ -281,10 +281,10 @@ public class SyncTaskService {
                                 JSONArray    arr  = data.getJSONArray("data");
                                 List<Record> list = new ArrayList<>();
 
-                                if (AuthLicense.dao.getTablename().equals(tablename)) {
-                                    saveauthlics.addAll(arr);
-                                    continue;
-                                }
+//                                if (AuthLicense.dao.getTablename().equals(tablename)) {
+//                                    saveauthlics.addAll(arr);
+//                                    continue;
+//                                }
 
                                 SyncTask synctask = new SyncTask();
                                 synctask.setCreateTime(now);
@@ -301,7 +301,10 @@ public class SyncTaskService {
                                 }
 
                                 // 分发黑名单
-                                if (Blacklist.dao.getTablename().equals(tablename)) {
+                                if (Blacklist.dao.getTablename().equals(tablename)
+                                        || "truck_weight_limit".equals(tablename)
+                                        || "truck_weight_limit_modify_log".equals(tablename)
+                                        ) {
                                     for (Map.Entry<Integer, Supermarket> entry : SvrCacheData.SUP_CACHE.entrySet()) {
                                         Supermarket supermarket = entry.getValue();
 
@@ -366,7 +369,10 @@ public class SyncTaskService {
                                 }
 
                                 // 分发黑名单
-                                if (Blacklist.dao.getTablename().equals(tablename)) {
+                                if (Blacklist.dao.getTablename().equals(tablename)
+                                        || "truck_weight_limit".equals(tablename)
+                                        || "truck_weight_limit_modify_log".equals(tablename)
+                                        ) {
                                     for (Map.Entry<Integer, Supermarket> entry : SvrCacheData.SUP_CACHE.entrySet()) {
                                         Supermarket supermarket = entry.getValue();