调整synctask功能

ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogService.java

@@ -184,14 +184,26 @@ public class ModifyLogService {
                         params.add(obj.get("id"));
                     } else if (modify_type.contains("manualWeight_" + Enums.CtrlFlowEnum.R.name())) {
                         String first_weight = String.format("%.2f", obj.getBigDecimal("first_weight"));
+
+                        if (obj.get("first_weight_old") != null) {
                             String first_weight_old = String.format("%.2f", obj.getBigDecimal("first_weight_old"));
                             record.set("content", "手动将入场重量由 " + first_weight_old + " 改为：" + first_weight);
+                        } else {
+                            record.set("content", "手动设定入场重量 " + first_weight);
+                        }
+
                         sqlparams.add("?");
                         params.add(obj.get("id"));
                     } else if (modify_type.contains("manualWeight_" + Enums.CtrlFlowEnum.C.name())) {
                         String second_weight = String.format("%.2f", obj.getBigDecimal("second_weight"));
+
+                        if (obj.get("second_weight_old") != null) {
                             String second_weight_old = String.format("%.2f", obj.getBigDecimal("second_weight_old"));
                             record.set("content", "手动将出场重量由 " + second_weight_old + " 改为：" + second_weight);
+                        } else {
+                            record.set("content", "手动设定出场重量 " + second_weight);
+                        }
+
                         sqlparams.add("?");
                         params.add(obj.get("id"));
                     }

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/actioncmdlog/ActionCmdLogSyncService.java

@@ -9,6 +9,7 @@ import com.jfinal.kit.StrKit;
 import com.jfinal.log.Log;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.IAtom;
+
 import java.util.Date;
 
 /**
@@ -36,17 +37,26 @@ public class ActionCmdLogSyncService extends BaseSyncService {
         cmd.setCreateTime(new Date());
         cmd.setContent(content);
 
-        return Db.tx(new IAtom() {
+        SyncTask synctask = new SyncTask();
+        synctask.addSaveData(cmd);
+
+        boolean ret = Db.tx(new IAtom() {
             @Override
             public boolean run() {
                 try {
-                    return cmd.save() && SyncTaskService.me.save(new SyncTask().addSaveData(cmd));
+                    return cmd.save() && SyncTaskService.me.save(synctask);
                 } catch (Exception e) {
                     log.error(e.getMessage(), e);
                     return false;
                 }
             }
         });
+
+        if (ret) {
+            SyncTaskService.me.send(synctask);
+        }
+
+        return ret;
     }
 
 }

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseSyncService.java

@@ -74,7 +74,7 @@ public class AuthLicenseSyncService extends BaseService {
                 synctask.addSaveData(entry.getValue());
             }
 
-            Db.tx(new IAtom() {
+            boolean ret = Db.tx(new IAtom() {
                 @Override
                 public boolean run() {
                     try {
@@ -85,14 +85,17 @@ public class AuthLicenseSyncService extends BaseService {
 
                         log.debug("auth_license 插入[" + map.size() + "]条");
 
-                        SyncTaskService.me.save(synctask);
+                        return SyncTaskService.me.save(synctask);
-                        return true;
                     } catch (Exception e) {
                         log.error(e.getMessage(), e);
                         return false;
                     }
                 }
             });
+
+            if (ret) {
+                SyncTaskService.me.send(synctask);
+            }
         }
     }
 
@@ -109,11 +112,12 @@ public class AuthLicenseSyncService extends BaseService {
             return;
         }
 
-        Db.tx(new IAtom() {
+        SyncTask synctask = new SyncTask();
+
+        boolean ret = Db.tx(new IAtom() {
             @Override
             public boolean run() {
                 try {
-                    SyncTask synctask = new SyncTask();
                     int size = 500;
                     int page = Math.round(cnt.floatValue() / size);
                     for (int p = 0; p < page; p++) {
@@ -160,6 +164,10 @@ public class AuthLicenseSyncService extends BaseService {
                 }
             }
         });
+
+        if (ret) {
+            SyncTaskService.me.send(synctask);
+        }
     }
 
     public Result batchDel(String trucks, Sysuser sysuser) {
@@ -199,6 +207,10 @@ public class AuthLicenseSyncService extends BaseService {
             }
         });
 
+        if (ret) {
+            SyncTaskService.me.send(synctask);
+        }
+
         return ret ? Result.success() : Result.failed("批量删除失败");
     }
 

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/base/BaseSyncService.java

@@ -39,12 +39,21 @@ public class BaseSyncService extends BaseService {
                 return Result.failed(false, "主键冲突");
             }
 
+            SyncTask synctask = new SyncTask();
+
             boolean ret = Db.tx(new IAtom() {
                 @Override
                 public boolean run() {
                     try {
-                        return model.save()
+                        boolean ret = model.save();
-                                && SyncTaskService.me.save(new SyncTask().addSaveData(model))
+
+                        if (!ret) {
+                            return false;
+                        }
+
+                        synctask.addSaveData(model); // 有自增长主键的，在保存 model 后会自动填充主键的值，然后才能加到 synctask 里面
+
+                        return SyncTaskService.me.save(synctask)
                                 && ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser);
                     } catch (Exception e) {
                         log.error(e.getMessage(), e);
@@ -53,6 +62,10 @@ public class BaseSyncService extends BaseService {
                 }
             });
 
+            if (ret) {
+                SyncTaskService.me.send(synctask);
+            }
+
             return ret ? Result.object(model) : Result.failed(false, "新增失败");
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -82,12 +95,21 @@ public class BaseSyncService extends BaseService {
                 return Result.failed(false, "按主键未找到对应记录");
             }
 
+            SyncTask synctask = new SyncTask();
+
             boolean ret = Db.tx(new IAtom() {
                 @Override
                 public boolean run() {
                     try {
-                        return model.delete()
+                        boolean ret = model.delete();
-                                && SyncTaskService.me.save(new SyncTask().addDeleteData(model))
+
+                        if (!ret) {
+                            return false;
+                        }
+
+                        synctask.addDeleteData(model);
+
+                        return SyncTaskService.me.save(synctask)
                                 && ModifyLogSyncService.me.save(model, (BaseModel) model.findByPk(), Enums.DataOpType.DELETE.getId(), sysuser);
                     } catch (Exception e) {
                         log.error(e.getMessage(), e);
@@ -96,6 +118,10 @@ public class BaseSyncService extends BaseService {
                 }
             });
 
+            if (ret) {
+                SyncTaskService.me.send(synctask);
+            }
+
             return Result.object(ret);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -126,12 +152,21 @@ public class BaseSyncService extends BaseService {
                 oldobj.set(key, model.get(key));
             }
 
+            SyncTask synctask = new SyncTask();
+
             boolean ret = Db.tx(new IAtom() {
                 @Override
                 public boolean run() {
                     try {
-                        return oldobj.update()
+                        boolean ret = oldobj.update();
-                                && SyncTaskService.me.save(new SyncTask().addUpdateData(oldobj))
+
+                        if (!ret) {
+                            return false;
+                        }
+
+                        synctask.addUpdateData(oldobj);
+
+                        return SyncTaskService.me.save(synctask)
                                 && ModifyLogSyncService.me.save(model, saveold, Enums.DataOpType.UPDATE.getId(), sysuser);
                     } catch (Exception e) {
                         log.error(e.getMessage(), e);
@@ -140,6 +175,10 @@ public class BaseSyncService extends BaseService {
                 }
             });
 
+            if (ret) {
+                SyncTaskService.me.send(synctask);
+            }
+
             return ret ? Result.object(oldobj) : Result.failed(false, "修改失败");
         } catch (Exception e) {
             log.error(e.getMessage(), e);

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistSyncService.java

@@ -70,6 +70,10 @@ public class BlacklistSyncService extends BaseSyncService {
                 }
             });
 
+            if (ret) {
+                SyncTaskService.me.send(synctask);
+            }
+
             return ret ? Result.object(model) : Result.failed(false, "新增失败");
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -84,6 +88,7 @@ public class BlacklistSyncService extends BaseSyncService {
     /**
      * 从黑名单中移除
      * 标记为移除，记录不删除
+     *
      * @param id
      * @param sysuser
      * @return
@@ -136,6 +141,10 @@ public class BlacklistSyncService extends BaseSyncService {
                 }
             });
 
+            if (ret) {
+                SyncTaskService.me.send(synctask);
+            }
+
             return ret ? Result.object(model) : Result.failed(false, "修改失败");
         } catch (Exception e) {
             log.error(e.getMessage(), e);

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/CameraController.java

@@ -10,6 +10,7 @@ import com.jfinal.core.Controller;
 import com.jfinal.kit.HttpKit;
 import com.jfinal.kit.StrKit;
 import com.jfinal.log.Log;
+
 import java.io.File;
 
 @Clear(AuthInterceptor.class)

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LEDThread.java

@@ -159,7 +159,8 @@ public class LEDThread extends Device implements Runnable {
             } catch (Exception e) {
                 if (e.getMessage().contains("Socket is not connected")) {
                     log.error("LED %s %s 连接已断开", getId(), getIp());
-                } if(e.getMessage().contains("Read timed out")){
+                }
+                if (e.getMessage().contains("Read timed out")) {
                     log.error("LED %s %s 连接超时", getId(), getIp());
                 } else {
                     log.error(e.getMessage(), e);

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/XiShuiScale.java

@@ -13,6 +13,7 @@ import java.util.stream.Collectors;
 
 public class XiShuiScale extends AbsScale {
     private static Log log = Log.getLog(XiShuiScale.class);
+
     public XiShuiScale(String id, String ip, int port) {
         super(id, ip, port);
     }

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/jobs/SyncJob.java

@@ -8,6 +8,7 @@ import org.quartz.JobExecutionContext;
 
 public class SyncJob implements Job {
     private static Log log = Log.getLog(SyncJob.class);
+
     @Override
     public void execute(JobExecutionContext jobExecutionContext) {
         try {

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/modifylog/ModifyLogSyncService.java

@@ -37,17 +37,33 @@ public class ModifyLogSyncService {
         modify.setCreateUserId(sysuser.getId());
         modify.setCreateUserName(sysuser.getName());
 
-        return Db.tx(new IAtom() {
+        SyncTask synctask = new SyncTask();
+
+        boolean ret = Db.tx(new IAtom() {
             @Override
             public boolean run() {
                 try {
-                    return modify.save() && SyncTaskService.me.save(new SyncTask().addSaveData(modify));
+                    boolean ret = modify.save();
+
+                    if (!ret) {
+                        return false;
+                    }
+
+                    synctask.addSaveData(modify);
+
+                    return SyncTaskService.me.save(synctask);
                 } catch (Exception e) {
                     log.error(e.getMessage(), e);
                     return false;
                 }
             }
         });
+
+        if (ret) {
+            SyncTaskService.me.send(synctask);
+        }
+
+        return ret;
     }
 
     /**
@@ -73,16 +89,32 @@ public class ModifyLogSyncService {
         modify.setCreateUserId(sysuser.getId());
         modify.setCreateUserName(sysuser.getName());
 
-        return Db.tx(new IAtom() {
+        SyncTask synctask = new SyncTask();
+
+        boolean ret = Db.tx(new IAtom() {
             @Override
             public boolean run() {
                 try {
-                    return modify.save() && SyncTaskService.me.save(new SyncTask().addSaveData(modify));
+                    boolean ret = modify.save();
+
+                    if (!ret) {
+                        return false;
+                    }
+
+                    synctask.addSaveData(modify);
+
+                    return SyncTaskService.me.save(synctask);
                 } catch (Exception e) {
                     log.error(e.getMessage(), e);
                     return false;
                 }
             }
         });
+
+        if (ret) {
+            SyncTaskService.me.send(synctask);
+        }
+
+        return ret;
     }
 }

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/EndPoint.java

@@ -5,12 +5,14 @@ import java.net.InetSocketAddress;
 public interface EndPoint {
     /**
      * 获取本地服务地址
+     *
      * @return
      */
     InetSocketAddress getLocalAddress() throws Exception;
 
     /**
      * 获取远端服务地址
+     *
      * @return
      */
     InetSocketAddress getRemoteAddress();

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/SocketIOService.java

@@ -29,6 +29,7 @@ public class SocketIOService {
 
     /**
      * 刷新硬件数据
+     *
      * @param record
      */
     public void pubRefreshReal(Record record) {
@@ -37,6 +38,7 @@ public class SocketIOService {
 
     /**
      * 刷新已入场车辆
+     *
      * @param record
      */
     public void pubRefreshInSup(Record record) {
@@ -45,13 +47,16 @@ public class SocketIOService {
 
     /**
      * 其他消息
+     *
      * @param record
      */
     public void pubMessage(Record record) {
         pub("message", record);
     }
+
     /**
      * 银行结算完成
+     *
      * @param record
      */
     public void pubBankPayComplete(Record record) {

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseSyncService.java

@@ -175,6 +175,10 @@ public class OrderPurchaseSyncService {
             }
         });
 
+        if (ret) {
+            SyncTaskService.me.send(synctask);
+        }
+
         return LocalOrderService.me.orderPayComplete(ret, order.toRecord(), transport, printerId);
     }
 
@@ -210,6 +214,8 @@ public class OrderPurchaseSyncService {
         logrecord.set("sn", sn);
         logrecord.set("state", OrderStateEnum.INVALID.getStateid());
 
+        SyncTask synctask = new SyncTask();
+
         boolean ret = Db.tx(new IAtom() {
             @Override
             public boolean run() {
@@ -222,7 +228,6 @@ public class OrderPurchaseSyncService {
 
                     stock.setStockWeight(stock.getStockWeight().subtract(order.getWeight())); // 取消转运减库存
 
-                    SyncTask synctask = new SyncTask();
                     synctask.addUpdateData(order);
                     synctask.addUpdateData(stock);
 
@@ -236,6 +241,10 @@ public class OrderPurchaseSyncService {
             }
         });
 
+        if (ret) {
+            SyncTaskService.me.send(synctask);
+        }
+
         return ret ? Result.success(order) : Result.failed("取消失败");
     }
 }

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleController.java

@@ -62,6 +62,7 @@ public class OrderSaleController extends BaseController {
 
         renderJson(OrderSaleSyncService.me.pay(uuid, transport_id, ordercluster_id, driver_name, driver_phone, memo, printer, tokenuser));
     }
+
     /**
      * 订单支付
      */

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java

@@ -218,6 +218,10 @@ public class OrderSaleSyncService {
             }
         });
 
+        if (ret) {
+            SyncTaskService.me.send(synctask);
+        }
+
         return LocalOrderService.me.orderPayComplete(ret, order.toRecord(), transport, printerId);
     }
 
@@ -518,6 +522,10 @@ public class OrderSaleSyncService {
             }
         });
 
+        if (ret) {
+            SyncTaskService.me.send(synctask);
+        }
+
         return LocalOrderService.me.orderPayComplete(ret, order.toRecord(), transport, printerId);
     }
 
@@ -549,6 +557,7 @@ public class OrderSaleSyncService {
 
         order.setState(OrderStateEnum.INVALID.getStateid()); // 将订单状态置为 9
 
+        SyncTask synctask  = new SyncTask();
         Record   logrecord = new Record();
         logrecord.set("sn", sn);
         logrecord.set("state", OrderStateEnum.INVALID.getStateid());
@@ -557,7 +566,6 @@ public class OrderSaleSyncService {
             @Override
             public boolean run() {
                 try {
-                    SyncTask synctask = new SyncTask();
                     synctask.addUpdateData(order);
 
                     boolean ret = order.update()
@@ -624,6 +632,10 @@ public class OrderSaleSyncService {
             }
         });
 
+        if (ret) {
+            SyncTaskService.me.send(synctask);
+        }
+
         return ret ? Result.success(order) : Result.failed("取消失败");
     }
 }

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderseq/OrderSeqService.java

@@ -19,6 +19,7 @@ public class OrderSeqService {
     /**
      * 获取下一个序列号
      * 需要放到事务中使用
+     *
      * @param supermarket_id
      * @param type
      * @return

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java

@@ -894,6 +894,7 @@ public class OrderTempSyncService {
 
         order.setState(OrderStateEnum.INVALID.getStateid()); // 将订单状态置为 9
 
+        SyncTask synctask  = new SyncTask();
         Record   logrecord = new Record();
         logrecord.set("sn", sn);
         logrecord.set("state", OrderStateEnum.INVALID.getStateid());
@@ -902,7 +903,6 @@ public class OrderTempSyncService {
             @Override
             public boolean run() {
                 try {
-                    SyncTask synctask = new SyncTask();
                     synctask.addUpdateData(order);
 
                     boolean ret = order.update();
@@ -1019,6 +1019,10 @@ public class OrderTempSyncService {
             }
         });
 
+        if (ret) {
+            SyncTaskService.me.send(synctask);
+        }
+
         return ret ? Result.success(order) : Result.failed("取消失败");
     }
 

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java

@@ -25,7 +25,6 @@ public class OrderTransferSyncService {
     private static Log                      log = Log.getLog(OrderTransferSyncService.class);
 
     /**
-     *
      * @param uuid          避免重复提交
      * @param transport_id  运输记录id
      * @param sandfarm_id   采砂点id
@@ -188,6 +187,10 @@ public class OrderTransferSyncService {
             }
         });
 
+        if (ret) {
+            SyncTaskService.me.send(synctask);
+        }
+
         return LocalOrderService.me.orderPayComplete(ret, order.toRecord(), transport, printerId);
     }
 
@@ -219,6 +222,7 @@ public class OrderTransferSyncService {
 
         order.setState(OrderStateEnum.INVALID.getStateid()); // 将订单状态置为 9
 
+        SyncTask synctask  = new SyncTask();
         Record   logrecord = new Record();
         logrecord.set("sn", sn);
         logrecord.set("state", OrderStateEnum.INVALID.getStateid());
@@ -235,7 +239,6 @@ public class OrderTransferSyncService {
 
                     stock.setStockWeight(stock.getStockWeight().subtract(order.getWeight())); // 取消转运减库存
 
-                    SyncTask synctask = new SyncTask();
                     synctask.addUpdateData(order);
                     synctask.addUpdateData(stock);
 
@@ -249,6 +252,10 @@ public class OrderTransferSyncService {
             }
         });
 
+        if (ret) {
+            SyncTaskService.me.send(synctask);
+        }
+
         return ret ? Result.success(order) : Result.failed("取消失败");
     }
 }

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashSyncService.java

@@ -164,6 +164,10 @@ public class OrderTrashSyncService {
             }
         });
 
+        if (ret) {
+            SyncTaskService.me.send(synctask);
+        }
+
         return LocalOrderService.me.orderPayComplete(ret, order.toRecord(), transport, printerId);
     }
 
@@ -195,6 +199,7 @@ public class OrderTrashSyncService {
 
         order.setState(OrderStateEnum.INVALID.getStateid()); // 将订单状态置为 9
 
+        SyncTask synctask  = new SyncTask();
         Record   logrecord = new Record();
         logrecord.set("sn", sn);
         logrecord.set("state", OrderStateEnum.INVALID.getStateid());
@@ -211,7 +216,6 @@ public class OrderTrashSyncService {
 
                     stock.setStockWeight(stock.getStockWeight().add(order.getWeight())); // 废料运出取消，加库存
 
-                    SyncTask synctask = new SyncTask();
                     synctask.addUpdateData(order);
                     synctask.addUpdateData(stock);
 
@@ -227,6 +231,10 @@ public class OrderTrashSyncService {
             }
         });
 
+        if (ret) {
+            SyncTaskService.me.send(synctask);
+        }
+
         return ret ? Result.success(order) : Result.failed("取消失败");
     }
 }

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckSyncService.java

@@ -22,9 +22,7 @@ public class PrepayTruckSyncService extends BaseSyncService {
     private static Log                    log = Log.getLog(PrepayTruckSyncService.class);
 
     /**
-     *
+     * @param truckarr [
-     * @param truckarr
-     *  [
      *                 {
      *                 customer_id
      *                 truck_license

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java

@@ -12,7 +12,7 @@ import com.jfinal.core.Controller;
  * Generated by COWR Mon Apr 06 09:50:28 CST 2020
  * TableName: supermarket_sandfarm_distance
  * Remarks: 生产点到销售点的距离配置
-
+ * <p>
  * PrimaryKey: supermarket_id,sandfarm_id
  */
 public class SupermarketSandfarmDistanceController extends Controller {

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/stock/StockSyncService.java

@@ -51,7 +51,7 @@ public class StockSyncService {
         }
 
         if (!newlist.isEmpty()) {
-            Db.tx(new IAtom() {
+            boolean ret = Db.tx(new IAtom() {
                 @Override
                 public boolean run() throws SQLException {
                     int[] ret = Db.batchSave(newlist, newlist.size());
@@ -60,6 +60,10 @@ public class StockSyncService {
                 }
             });
 
+            if (ret) {
+                SyncTaskService.me.send(synctask);
+            }
+
             log.debug("初始化砂场库存信息 ");
         }
     }
@@ -85,8 +89,9 @@ public class StockSyncService {
         }
 
         Date           now       = new Date();
-
+        SyncTask       synctask  = new SyncTask();
         StockModifyLog modifyLog = new StockModifyLog();
+
         modifyLog.setSupermarketId(model.getSupermarketId());
         modifyLog.setProductId(model.getProductId());
         modifyLog.setCreateUserId(sysuser.getId());
@@ -99,7 +104,6 @@ public class StockSyncService {
             public boolean run() {
                 try {
                     boolean ret = false;
-                    SyncTask synctask = new SyncTask();
 
                     if (model.checkExistsByPk()) { // update
                         Stock oldstock = Stock.dao.findByIds(model.getSupermarketId(), model.getProductId());
@@ -126,6 +130,10 @@ public class StockSyncService {
             }
         });
 
+        if (ret) {
+            SyncTaskService.me.send(synctask);
+        }
+
         return ret ? Result.success(model) : Result.failed("修改失败");
     }
 }

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

@@ -62,6 +62,7 @@ public class SyncTaskService {
      * @param model
      */
     public void send(SyncTask model) {
+        try {
             if (!isEnable()) {
                 return;
             }
@@ -71,6 +72,9 @@ public class SyncTaskService {
                     .fluentPut("data", model);
 
             Config.nettyClient.sendMsg(obj.toJSONString());
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
     }
 
     public void syncComplete(String id) {
@@ -301,7 +305,6 @@ public class SyncTaskService {
     }
 
 
-
     /**
      * 将收到的 auth_license 转发到其他砂站
      *

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java

@@ -363,6 +363,7 @@ public class SysuserSyncService extends BaseService {
                 return Result.failed(false, "修改失败");
             }
 
+            SyncTask synctask = new SyncTask();
             String   newmd5   = getPwdMD5(sysuser.getPhone(), newpwd);
 
             sysuser.setPassword(newmd5);
@@ -375,12 +376,17 @@ public class SysuserSyncService extends BaseService {
                     if (!ret) {
                         return false;
                     }
+                    synctask.addUpdateData(sysuser);
 
-                    return SyncTaskService.me.save(new SyncTask().addUpdateData(sysuser))
+                    return SyncTaskService.me.save(synctask)
                             && ModifyLogSyncService.me.save(sysuser, old, Enums.DataOpType.UPDATE.getId(), tokenuser);
                 }
             });
 
+            if (ret) {
+                SyncTaskService.me.send(synctask);
+            }
+
             sysuser.remove("password");
 
             return ret ? Result.object(sysuser) : Result.failed(false, "修改失败");

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportDeviceService.java

@@ -275,6 +275,7 @@ public class TransportDeviceService {
 
     /**
      * 调用相机接口，手动触发识别
+     *
      * @param which
      * @param sysuser
      */

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java

@@ -34,7 +34,7 @@ import java.util.*;
 
 /**
  * 该类下会操作 MySQL 数据，需要将修改的数据同步到服务端
- *
+ * <p>
  * 查询手动输入重量
  * select * from modify_log t
  * where t.`table` = 'transport'
@@ -63,12 +63,21 @@ public class TransportSyncService {
             return Result.success("车辆【" + truck_license + "】已经在系统内");
         }
 
+        SyncTask synctask = new SyncTask();
+
         boolean ret = Db.tx(new IAtom() {
             @Override
             public boolean run() {
                 try {
-                    return authlic.save()
+                    boolean ret = authlic.save();
-                            && SyncTaskService.me.save(new SyncTask().addSaveData(authlic))
+
+                    if (!ret) {
+                        return false;
+                    }
+
+                    synctask.addSaveData(authlic);
+
+                    return SyncTaskService.me.save(synctask)
                             && ModifyLogSyncService.me.save(authlic, null, Enums.DataOpType.SAVE.getId(), sysuser);
                 } catch (Exception e) {
                     log.error(e.getMessage(), e);
@@ -79,6 +88,7 @@ public class TransportSyncService {
 
         if (ret) {
             TransportDeviceService.me.manualTrigger(which, sysuser);
+            SyncTaskService.me.send(synctask);
         }
 
         return ret ? Result.success(authlic) : Result.failed("添加失败");
@@ -359,11 +369,21 @@ public class TransportSyncService {
         transport.setOutWhich(which);
 
         File     finalUploadfile = uploadfile;
+        SyncTask synctask        = new SyncTask();
+
         boolean ret = Db.tx(new IAtom() {
             @Override
             public boolean run() {
                 try {
-                    boolean ret = transport.update() && SyncTaskService.me.save(new SyncTask().addUpdateData(transport));
+                    boolean ret = transport.update();
+
+                    if (!ret) {
+                        return false;
+                    }
+
+                    synctask.addUpdateData(transport);
+
+                    ret = SyncTaskService.me.save(synctask);
 
                     if (ret && finalUploadfile != null) {
                         OssfileLogService.me.save(transport.getId(), transport.getSecondPic(), finalUploadfile.getAbsolutePath());
@@ -380,6 +400,8 @@ public class TransportSyncService {
         if (ret) {
             CliCacheData.nowLicenseMap.put(which, result.getLicense());
             CliCacheData.nowWeightMap.put(which, null);
+
+            SyncTaskService.me.send(synctask);
         }
 
         result.setTransportId(transport.getId());
@@ -502,6 +524,10 @@ public class TransportSyncService {
                 }
             });
 
+            if (ret) {
+                SyncTaskService.me.send(synctask);
+            }
+
             result.setTransportId(transport.getId());
             result.setAccess(ret);
             result.setFlow(Enums.CtrlFlowEnum.C.name());
@@ -549,13 +575,20 @@ public class TransportSyncService {
             }
         }
 
+        SyncTask synctask = new SyncTask();
+
         boolean ret = Db.tx(new IAtom() {
             @Override
             public boolean run() {
                 try {
-                    boolean ret = transport.update() && SyncTaskService.me.save(new SyncTask().addUpdateData(transport));
+                    boolean ret = transport.update();
 
-                    return ret;
+                    if (!ret) {
+                        return false;
+                    }
+                    synctask.addUpdateData(transport);
+
+                    return SyncTaskService.me.save(synctask);
                 } catch (Exception e) {
                     log.error(e.getMessage(), e);
                     return false;
@@ -576,6 +609,7 @@ public class TransportSyncService {
             }
 
             CliCacheData.nowWeightMap.put(which, weight);
+            SyncTaskService.me.send(synctask);
         }
 
         return ret;
@@ -593,13 +627,21 @@ public class TransportSyncService {
         transport.setSecondWeight(new BigDecimal(weight));
         transport.setSecondWeightWhich(which);
 
+        SyncTask synctask = new SyncTask();
+
         boolean ret = Db.tx(new IAtom() {
             @Override
             public boolean run() {
                 try {
-                    boolean ret = transport.update() && SyncTaskService.me.save(new SyncTask().addUpdateData(transport));
+                    boolean ret = transport.update();
 
-                    return ret;
+                    if (!ret) {
+                        return false;
+                    }
+
+                    synctask.addUpdateData(transport);
+
+                    return SyncTaskService.me.save(synctask);
                 } catch (Exception e) {
                     log.error(e.getMessage(), e);
                     return false;
@@ -609,6 +651,7 @@ public class TransportSyncService {
 
         if (ret) {
             CliCacheData.nowWeightMap.put(which, weight);
+            SyncTaskService.me.send(synctask);
         }
 
         return ret;
@@ -862,17 +905,21 @@ public class TransportSyncService {
             }
         }
 
+        SyncTask synctask = new SyncTask();
+
         boolean ret = Db.tx(new IAtom() {
             @Override
             public boolean run() {
                 try {
-                    boolean ret = transport.update() && SyncTaskService.me.save(new SyncTask().addUpdateData(transport));
+                    boolean ret = transport.update();
 
-                    if (ret) {
+                    if (!ret) {
-                        ret = editLog(logrecord.toJson(), sysuser);
+                        return false;
                     }
 
-                    return ret;
+                    synctask.addUpdateData(transport);
+
+                    return SyncTaskService.me.save(synctask) && editLog(logrecord.toJson(), sysuser);
                 } catch (Exception e) {
                     log.error(e.getMessage(), e);
                     return false;
@@ -880,6 +927,10 @@ public class TransportSyncService {
             }
         });
 
+        if (ret) {
+            SyncTaskService.me.send(synctask);
+        }
+
         return ret ? Result.success(transport) : Result.failed("修改失败");
     }
 
@@ -896,6 +947,7 @@ public class TransportSyncService {
 
         transport.setState(OrderStateEnum.INVALID.getStateid()); // 作废
 
+        SyncTask synctask  = new SyncTask();
         Record   logrecord = new Record();
         logrecord.set("transport_id", transport.getId());
         logrecord.set("state", OrderStateEnum.INVALID.getStateid());
@@ -904,8 +956,15 @@ public class TransportSyncService {
             @Override
             public boolean run() {
                 try {
-                    boolean ret = transport.update()
+                    boolean ret = transport.update();
-                            && SyncTaskService.me.save(new SyncTask().addUpdateData(transport))
+
+                    if (!ret) {
+                        return false;
+                    }
+
+                    synctask.addUpdateData(transport);
+
+                    ret = SyncTaskService.me.save(synctask)
                             && ModifyLogSyncService.me.save(transport.tablename, "transport_id", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser);
                     if (ret) {
                         if (StrKit.notBlank(transport.getOrderSn())) {
@@ -937,6 +996,10 @@ public class TransportSyncService {
             }
         });
 
+        if (ret) {
+            SyncTaskService.me.send(synctask);
+        }
+
         return ret ? Result.success(transport) : Result.failed("取消失败");
     }