.

ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistService.java

@@ -1,10 +1,10 @@
 package com.cowr.ssjygl.blacklist;
 
+import com.alibaba.fastjson.JSONObject;
 import com.cowr.common.Const;
 import com.cowr.common.base.BaseService;
 import com.cowr.common.view.PageParam;
 import com.cowr.model.Blacklist;
-import com.cowr.model.Truck;
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Page;
@@ -73,4 +73,22 @@ public class BlacklistService extends BaseService {
                 " and truck_license = ? \n" +
                 " limit 0,1 ", license);
     }
+
+    public Blacklist json2model(JSONObject obj) {
+        Blacklist blacklist = new Blacklist();
+        blacklist.setId(obj.getString("id"));
+        blacklist.setTruckLicense(obj.getString("truck_license"));
+        blacklist.setDriverName(obj.getString("driver_name"));
+        blacklist.setDriverPhone(obj.getString("driver_phone"));
+        blacklist.setOrderSn(obj.getString("order_sn"));
+        blacklist.setSetTime(obj.getDate("set_time"));
+        blacklist.setSetUserId(obj.getInteger("set_user_id"));
+        blacklist.setSetUserName(obj.getString("set_user_name"));
+        blacklist.setRemoveTime(obj.getDate("remove_time"));
+        blacklist.setRemoveUserId(obj.getInteger("remove_user_id"));
+        blacklist.setRemoveUserName(obj.getString("remove_user_name"));
+        blacklist.setReasonType(obj.getInteger("reason_type"));
+        blacklist.setReasonDetail(obj.getString("reason_detail"));
+        return blacklist;
+    }
 }

ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java

@@ -8,6 +8,7 @@ import com.cowr.model.*;
 import com.cowr.service.ssjygl.main.Config;
 import com.cowr.service.ssjygl.main.SvrCacheData;
 import com.cowr.ssjygl.CacheData;
+import com.cowr.ssjygl.blacklist.BlacklistService;
 import com.jfinal.kit.StrKit;
 import com.jfinal.log.Log;
 import com.jfinal.plugin.activerecord.Db;
@@ -294,15 +295,13 @@ public class SyncTaskService {
                                     list.add(new Record().setColumns(obj.getInnerMap()));
 
                                     // 分发黑名单
-                                    if(Blacklist.dao.getTablename().equals(tablename)) {
+                                    if (Blacklist.dao.getTablename().equals(tablename)) {
-                                        Blacklist blacklist = new Blacklist();
+                                        synctask.addSaveData(BlacklistService.me.json2model(obj));
-                                        blacklist._setAttrs(obj.getInnerMap());
-                                        synctask.addSaveData(blacklist);
                                     }
                                 }
 
                                 // 分发黑名单
-                                if(Blacklist.dao.getTablename().equals(tablename)){
+                                if (Blacklist.dao.getTablename().equals(tablename)) {
                                     for (Map.Entry<Integer, Supermarket> entry : SvrCacheData.SUP_CACHE.entrySet()) {
                                         Supermarket supermarket = entry.getValue();
 
@@ -315,6 +314,7 @@ public class SyncTaskService {
                                         SyncTask newsynctask = synctask.clone();
                                         newsynctask.setId(StrKit.getRandomUUID());
                                         newsynctask.setSupermarketId(supermarket.getId());
+                                        newsynctask.setJson();
 
                                         sts.add(newsynctask);
                                     }
@@ -342,10 +342,10 @@ public class SyncTaskService {
                                 JSONArray    arr  = data.getJSONArray("data");
                                 List<Record> list = new ArrayList<>();
 
-                                if(Transport.tablename.equals(tablename)){
+                                if (Transport.tablename.equals(tablename)) {
                                     arr = filtrateTransport(arr);
 
-                                    if(arr.isEmpty()){
+                                    if (arr.isEmpty()) {
                                         log.debug("%s 数据都被过滤了", tablename);
                                         continue;
                                     }
@@ -360,15 +360,13 @@ public class SyncTaskService {
                                     list.add(new Record().setColumns(obj.getInnerMap()));
 
                                     // 分发黑名单
-                                    if(Blacklist.dao.getTablename().equals(tablename)) {
+                                    if (Blacklist.dao.getTablename().equals(tablename)) {
-                                        Blacklist blacklist = new Blacklist();
+                                        synctask.addUpdateData(BlacklistService.me.json2model(obj));
-                                        blacklist._setAttrs(obj.getInnerMap());
-                                        synctask.addUpdateData(blacklist);
                                     }
                                 }
 
                                 // 分发黑名单
-                                if(Blacklist.dao.getTablename().equals(tablename)){
+                                if (Blacklist.dao.getTablename().equals(tablename)) {
                                     for (Map.Entry<Integer, Supermarket> entry : SvrCacheData.SUP_CACHE.entrySet()) {
                                         Supermarket supermarket = entry.getValue();
 
@@ -381,6 +379,7 @@ public class SyncTaskService {
                                         SyncTask newsynctask = synctask.clone();
                                         newsynctask.setId(StrKit.getRandomUUID());
                                         newsynctask.setSupermarketId(supermarket.getId());
+                                        newsynctask.setJson();
 
                                         sts.add(newsynctask);
                                     }
@@ -487,6 +486,7 @@ public class SyncTaskService {
                                 synctask.setIncrementData(recvdata.getString("increment_data"));
                                 synctask.setSupermarketId(supermarket.getId());
                                 synctask.setCreateTime(now);
+                                synctask.setJson();
 
                                 sts.add(synctask);
                             }
@@ -563,6 +563,7 @@ public class SyncTaskService {
             synctask.setDeleteData(JSONObject.toJSONString(new JSONObject().put(AuthLicense.dao.getTablename(), deletearr)));
             synctask.setSupermarketId(supermarket.getId());
             synctask.setCreateTime(now);
+            synctask.setJson();
 
             sts.add(synctask);
         }
@@ -580,6 +581,7 @@ public class SyncTaskService {
      * 过滤 transport 的数据更新
      * 1.如果传上来的数据中 state 是 5 ，表示记录已完成，可以直接更新
      * 2.如果传上来的数据中 state 不是 5，就需要查询数据库，看看数据库中是不是已经是 5 了，避免 state 被回退更新
+     *
      * @param arr
      * @return
      */