From 365b15fe786b174d623757884ab8bc491073924a Mon Sep 17 00:00:00 2001
From: wuwenxiong <646448316@qq.com>
Date: Wed, 8 Sep 2021 14:54:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=9E=8B=E5=8F=B7=E9=99=90?=
 =?UTF-8?q?=E9=87=8D=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A2=9E=E5=88=A0=E6=94=B9=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/BaseTruckWeightLimitModifyLog.java   | 22 +++++++
 .../TruckWeightLimitModifyLogService.java     |  1 +
 .../TruckWeightLimitController.java           |  4 +-
 .../TruckWeightLimitSyncService.java          | 66 +++++++------------
 4 files changed, 47 insertions(+), 46 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 aa12570..471a6d5 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
@@ -108,6 +108,28 @@ public abstract class BaseTruckWeightLimitModifyLog<M extends BaseTruckWeightLim
         return getStr("attachment");
     }
 
+    /**
+     * name: state
+     * type: TINYINT(3)
+     * isNullable: NO
+     * isPrimaryKey: NO
+     * defaultValue: 1
+     * @param state
+     */
+    @JSONField(name="state")
+    public void setState(Integer state) {
+        set("state", state);
+    }
+
+
+    /**
+     * @return state
+     */
+    @JSONField(name="state")
+    public Integer getState() {
+        return getInt("state");
+    }
+
     /**
      * name: change_user_id
      * type: INT(10)
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogService.java
index cf567be..ec93ed1 100644
--- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogService.java
+++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogService.java
@@ -75,6 +75,7 @@ public class TruckWeightLimitModifyLogService extends BaseService {
             sql += " and t.change_time <= ?";
             paraList.add(etm);
         }
+        sql += " order by t.change_time desc";
 
         return Db.find(sql, paraList.toArray());
     }
diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitController.java
index e178628..37119ec 100644
--- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitController.java
+++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitController.java
@@ -75,8 +75,8 @@ public class TruckWeightLimitController extends Controller {
             return;
         }
 
-        TruckWeightLimit model = getModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段
-        renderJson(TruckWeightLimitSyncService.me.delete(model, tokenuser));
+        String truck_license = get("truck_license");
+        renderJson(TruckWeightLimitSyncService.me.delete(truck_license, tokenuser));
     }
 
     /**
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 49bcbec..b975afa 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
@@ -1,10 +1,7 @@
 package com.cowr.local.ssjygl.truck.truckweightlimit;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.cowr.common.Const;
 import com.cowr.common.enums.Enums;
-import com.cowr.common.oss.OSSKit;
 import com.cowr.common.view.PageParam;
 import com.cowr.common.view.Result;
 import com.cowr.local.ssjygl.base.BaseSyncService;
@@ -52,6 +49,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
                 modifyLog.setTruckLicense(model.getTruckLicense());
                 modifyLog.setWeightLimit(model.getWeightLimit());
                 modifyLog.setAttachment(model.getAttachment());
+                modifyLog.setState(1);
                 modifyLog.setChangeUserId(sysuser.getId());
                 modifyLog.setChangeUserName(sysuser.getName());
                 modifyLog.setChangeTime(new Date());
@@ -90,8 +88,6 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
         }
 
         model.setChangeTime(new Date());
-
-        String attachment = oldobj.getAttachment();
         TruckWeightLimit saveold = oldobj.clone();
         // 将修改后的对象返回
         String[] keys = model._getAttrNames();
@@ -110,6 +106,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
                 modifyLog.setTruckLicense(model.getTruckLicense());
                 modifyLog.setWeightLimit(model.getWeightLimit());
                 modifyLog.setAttachment(model.getAttachment());
+                modifyLog.setState(2);
                 modifyLog.setChangeUserId(sysuser.getId());
                 modifyLog.setChangeUserName(sysuser.getName());
                 modifyLog.setChangeTime(new Date());
@@ -119,21 +116,6 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
                     if (!ret) {
                         return false;
                     }
-                    if (!StrKit.isBlank(attachment)) {
-                        JSONArray jsonArray = JSONObject.parseArray(attachment);
-                        if (jsonArray.size() > 0) {
-                            int j = 0;
-                            for (int i = 0; i < jsonArray.size(); i++) {
-                                JSONObject obj = jsonArray.getJSONObject(i);
-                                String ossKey = obj.getString("ossKey");
-                                if (!StrKit.isBlank(ossKey)) {
-                                    boolean flag = OSSKit.delObject(ossKey);
-                                    if (flag) j++;
-                                }
-                            }
-                            if (j != jsonArray.size()) return false;
-                        }
-                    }
 
                     synctask.addUpdateData(oldobj); // 有自增长主键的，在保存 model 后会自动填充主键的值，然后才能加到 synctask 里面
                     synctask.addSaveData(modifyLog);
@@ -155,44 +137,40 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
         return ret ? Result.object(oldobj) : Result.failed(false, "修改失败");
     }
 
-    public Result delete(TruckWeightLimit model, Sysuser sysuser) {
-        if (!model.checkExistsByPk()) {
+    public Result delete(String truck_license, Sysuser sysuser) {
+        TruckWeightLimit model = TruckWeightLimit.dao.findById(truck_license);
+        if (model == null) {
             return Result.failed(false, "按主键未找到对应记录");
         }
 
-       String truck_license = model.getTruckLicense();
-       List<TruckWeightLimitModifyLog> modifyLogList = TruckWeightLimitModifyLog.dao.find("select * from truck_weight_limit_modify_log where truck_license = ?", truck_license);
-
        SyncTask synctask = new SyncTask();
        boolean ret = Db.tx(new IAtom() {
            @Override
            public boolean run() {
               try {
+                  List<TruckWeightLimitModifyLog> modifyLogList = TruckWeightLimitModifyLog.dao.find("select * from truck_weight_limit_modify_log where truck_license = ?", truck_license);
                   if (modifyLogList.size() > 0) {
-                     int s = Db.delete("delete from truck_weight_limit_modify_log where truck_license = ?", truck_license);
-                     if (s != modifyLogList.size()) return false;
-                  }
-                  // 删除附件
-                  String attachment = model.getAttachment();
-                  if (!StrKit.isBlank(attachment)) {
-                      JSONArray jsonArray = JSONObject.parseArray(attachment);
-                      if (jsonArray.size() > 0) {
-                          int j = 0;
-                          for (int i = 0; i < jsonArray.size(); i++) {
-                              JSONObject obj = jsonArray.getJSONObject(i);
-                              String ossKey = obj.getString("ossKey");
-                              if (!StrKit.isBlank(ossKey)) {
-                                 boolean flag = OSSKit.delObject(ossKey);
-                                 if (flag) j ++;
-                              }
-                          }
-                          if (j != jsonArray.size()) return false;
+                      modifyLogList.stream().forEach(s -> s.setState(3));
+                      int[] ret = Db.batchUpdate(modifyLogList, modifyLogList.size());
+
+                      // 没有的记录更新影响的行数应该是 0
+                      if (ret.length != modifyLogList.size()) {
+                          return false;
                       }
+
+                      for (int i : ret) {
+                          // 必须是每条 sql 修改一条记录
+                          if (i != 1) {
+                              return false;
+                          }
+                      }
+
+                    modifyLogList.stream().forEach(s -> synctask.addUpdateData(s));
                   }
+
                   boolean ret = model.delete();
                   if (!ret) return false;
 
-                  modifyLogList.stream().forEach(s -> synctask.addDeleteData(s));
                   synctask.addDeleteData(model);
 
                   return SyncTaskService.me.save(synctask)