车辆型号限重管理-2

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/file/OssFileController.java

@@ -1,8 +1,10 @@
-package com.cowr.ssjygl.file;
+package com.cowr.local.ssjygl.file;
 
 import com.cowr.common.oss.OSSKit;
 import com.cowr.common.utils.DateTimeUtil;
 import com.cowr.common.view.Result;
+import com.cowr.local.ssjygl.main.AuthInterceptor;
+import com.jfinal.aop.Clear;
 import com.jfinal.core.Controller;
 import com.jfinal.kit.StrKit;
 import com.jfinal.log.Log;
@@ -14,11 +16,13 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-public class OssFileControler extends Controller {
+@Clear(AuthInterceptor.class)
-    private static Log log = Log.getLog(OssFileControler.class);
+public class OssFileController extends Controller {
+    private static Log log = Log.getLog(OssFileController.class);
 
     public void upload() {
         List<UploadFile> fileList = this.getFiles();
+        String dir = get("dir", "images");
         if (fileList == null || fileList.size() == 0) {
             renderJson(Result.failed("文件不能为空"));
             return;
@@ -30,7 +34,7 @@ public class OssFileControler extends Controller {
           File file = null;
           String fileName = "";
           try {
-              String key = StrKit.getRandomUUID();
+              String key = dir + "/" + DateTimeUtil.yMd.get().format(new Date()) + "/" + StrKit.getRandomUUID();
               file = upload.getFile();
               fileName = file.getName();
               String suffix = fileName.substring(fileName.lastIndexOf("."), fileName.length()).toLowerCase();

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java

@@ -21,6 +21,7 @@ import com.cowr.local.ssjygl.devicectrl.common.Const;
 import com.cowr.local.ssjygl.devicectrl.common.DeviceThread;
 import com.cowr.local.ssjygl.devicectrl.device.CameraController;
 import com.cowr.local.ssjygl.driver.DriverController;
+import com.cowr.local.ssjygl.file.OssFileController;
 import com.cowr.local.ssjygl.invoice.invalidverify.InvoiceInvalidVerifyController;
 import com.cowr.local.ssjygl.invoice.log.InvoiceLogController;
 import com.cowr.local.ssjygl.invoice.receive.InvoiceReceiveController;
@@ -66,14 +67,12 @@ import com.cowr.model._MappingKit;
 import com.cowr.ssjygl.CacheData;
 import com.cowr.ssjygl.actioncmdlog.ActionCmdLogController;
 import com.cowr.ssjygl.cctv.CctvController;
-import com.cowr.ssjygl.file.OssFileControler;
 import com.cowr.ssjygl.modifylog.ModifyLogController;
 import com.cowr.ssjygl.stat.invoice.InvoiceUseController;
 import com.cowr.ssjygl.stat.purchase.OrderPurchaseStatController;
 import com.cowr.ssjygl.stat.transfer.OrderTransferStatController;
 import com.cowr.ssjygl.transportcompany.TransportCompanyService;
 import com.cowr.ssjygl.transprice.TransPriceService;
-import com.cowr.ssjygl.truck.weightlimitmodifylog.TruckWeightLimitModifyLogController;
 import com.jfinal.config.*;
 import com.jfinal.json.FastJsonFactory;
 import com.jfinal.kit.PathKit;
@@ -181,7 +180,7 @@ public class Config extends JFinalConfig {
         me.add("/camera", CameraController.class);
         me.add("/supcctv", CctvController.class);
         me.add("/overall", OverallController.class);
-        me.add("/ossFile", OssFileControler.class);
+        me.add("/ossFile", OssFileController.class);
 
         // -- 权限系统
         me.add("/sysuser", SysuserController.class);

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitController.java

@@ -2,8 +2,12 @@ package com.cowr.local.ssjygl.truck.truckweightlimit;
 
 import com.cowr.common.view.PageParam;
 import com.cowr.common.view.Result;
+import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService;
+import com.cowr.model.Sysuser;
 import com.cowr.model.TruckWeightLimit;
+
 import com.cowr.ssjygl.truck.weightlimit.TruckWeightLimitPKValidator;
+import com.cowr.ssjygl.truck.weightlimit.TruckWeightLimitValidator;
 import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
 
@@ -24,10 +28,56 @@ public class TruckWeightLimitController extends Controller {
     @Before(TruckWeightLimitPKValidator.class)
     public void checkExistsByPk(){
         TruckWeightLimit model = getModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段
-        renderJson(TruckWeightLimitService.me.checkExistsByPk(model));
+        renderJson(TruckWeightLimitSyncService.me.checkExistsByPk(model));
     }
 
+    /**
+     * 新增 truck_weight_limit  
+     */
+    @Before(TruckWeightLimitValidator.class)
+    public void save(){
+        Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token"));
 
+        if (tokenuser == null) {
+            renderJson(Result.noauth());
+            return;
+        }
+
+        TruckWeightLimit model = getModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段
+        renderJson(TruckWeightLimitSyncService.me.save(model, tokenuser));
+    }
+
+    /**
+     * 修改 truck_weight_limit
+     */
+    @Before(TruckWeightLimitValidator.class)
+    public void edit(){
+        Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token"));
+
+        if (tokenuser == null) {
+            renderJson(Result.noauth());
+            return;
+        }
+
+        TruckWeightLimit model = getModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段
+        renderJson(TruckWeightLimitSyncService.me.update(model, tokenuser));
+    }
+
+    /**
+     * 删除 truck_weight_limit  
+     */
+    @Before(TruckWeightLimitPKValidator.class)
+    public void del(){
+        Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token"));
+
+        if (tokenuser == null) {
+            renderJson(Result.noauth());
+            return;
+        }
+
+        TruckWeightLimit model = getModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段
+        renderJson(TruckWeightLimitSyncService.me.delete(model, tokenuser));
+    }
 
     /**
      * 分页查找 truck_weight_limit  
@@ -38,22 +88,22 @@ public class TruckWeightLimitController extends Controller {
         String    stm            = get("stm");
         String    etm            = get("etm");
 
-        renderJson(Result.object(TruckWeightLimitService.me.find(pp, truck_license, stm, etm)));
+        renderJson(Result.object(TruckWeightLimitSyncService.me.find(pp, truck_license, stm, etm)));
     }
 
     /**
-     * 按主键查找单个对象 truck_weight_limit
+     * 按主键查找单个对象 truck_weight_limit  
      */
     @Before(TruckWeightLimitPKValidator.class)
     public void get(){
         TruckWeightLimit model = getModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段
-        renderJson(TruckWeightLimitService.me.findByPk(model));
+        renderJson(TruckWeightLimitSyncService.me.findByPk(model));
     }
 
     /**
      * 返回所有 truck_weight_limit  
      */
     public void list(){
-        renderJson(Result.object(TruckWeightLimitService.me.list()));
+        renderJson(Result.object(TruckWeightLimitSyncService.me.list()));
     }
 }

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java

@@ -1,15 +1,18 @@
-package com.cowr.service.ssjygl.truck.truckweightlimit;
+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;
+import com.cowr.local.ssjygl.synctask.SyncTaskService;
 import com.cowr.model.SyncTask;
 import com.cowr.model.Sysuser;
 import com.cowr.model.TruckWeightLimit;
 import com.cowr.model.TruckWeightLimitModifyLog;
-import com.cowr.service.ssjygl.base.BaseSyncService;
-import com.cowr.service.ssjygl.synctask.SyncTaskService;
 import com.cowr.ssjygl.modifylog.ModifyLogService;
 import com.jfinal.kit.StrKit;
 import com.jfinal.log.Log;
@@ -65,7 +68,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
                     return SyncTaskService.me.save(synctask)
                            && ModifyLogService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser)
                            && ModifyLogService.me.save(modifyLog, null, Enums.DataOpType.SAVE.getId(), sysuser);
-                }catch (Exception e) {
+                } catch (Exception e) {
                     log.error(e.getMessage(), e);
                     return false;
                 }
@@ -76,7 +79,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
             SyncTaskService.me.send(synctask);
         }
 
-        return ret ? Result.success() : Result.failed(false, "新增失败");
+        return ret ? Result.object(model) : Result.failed(false, "新增失败");
     }
 
     public Result update(TruckWeightLimit model, Sysuser sysuser) {
@@ -88,6 +91,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
 
         model.setChangeTime(new Date());
 
+        String attachment = oldobj.getAttachment();
         TruckWeightLimit saveold = oldobj.clone();
         // 将修改后的对象返回
         String[] keys = model._getAttrNames();
@@ -115,6 +119,21 @@ 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);
@@ -153,6 +172,23 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
                      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;
+                      }
+                  }
                   boolean ret = model.delete();
                   if (!ret) return false;
 
@@ -172,7 +208,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
             SyncTaskService.me.send(synctask);
         }
 
-        return ret ? Result.success() : Result.failed(false, "删除失败");
+        return ret ? Result.object(true) : Result.failed(false, "删除失败");
     }
 
     public Page<Record> find(PageParam pp, String truck_license, String stm, String etm) {

ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java

@@ -63,14 +63,12 @@ import com.cowr.ssjygl.CacheData;
 import com.cowr.ssjygl.actioncmdlog.ActionCmdLogController;
 import com.cowr.ssjygl.cctv.CctvController;
 import com.cowr.ssjygl.customer.type.CustomerTypeController;
-import com.cowr.ssjygl.file.OssFileControler;
 import com.cowr.ssjygl.modifylog.ModifyLogController;
 import com.cowr.ssjygl.stat.invoice.InvoiceUseController;
 import com.cowr.ssjygl.stat.purchase.OrderPurchaseStatController;
 import com.cowr.ssjygl.stat.transfer.OrderTransferStatController;
 import com.cowr.ssjygl.transportcompany.TransportCompanyService;
 import com.cowr.ssjygl.transprice.TransPriceService;
-import com.cowr.ssjygl.truck.weightlimitmodifylog.TruckWeightLimitModifyLogController;
 import com.jfinal.config.*;
 import com.jfinal.json.FastJsonFactory;
 import com.jfinal.kit.PathKit;
@@ -159,7 +157,6 @@ public class Config extends JFinalConfig {
         me.add("/cache", CacheController.class);
         me.add("/supcctv", CctvController.class);
         me.add("/overall", OverallController.class);
-        me.add("/ossFile", OssFileControler.class);
 
         // -- 权限系统
         me.add("/sysuser", SysuserController.class);

ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/truckweightlimit/TruckWeightLimitController.java

@@ -2,11 +2,8 @@ package com.cowr.service.ssjygl.truck.truckweightlimit;
 
 import com.cowr.common.view.PageParam;
 import com.cowr.common.view.Result;
-import com.cowr.model.Sysuser;
 import com.cowr.model.TruckWeightLimit;
-import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService;
 import com.cowr.ssjygl.truck.weightlimit.TruckWeightLimitPKValidator;
-import com.cowr.ssjygl.truck.weightlimit.TruckWeightLimitValidator;
 import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
 
@@ -27,56 +24,10 @@ public class TruckWeightLimitController extends Controller {
     @Before(TruckWeightLimitPKValidator.class)
     public void checkExistsByPk(){
         TruckWeightLimit model = getModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段
-        renderJson(TruckWeightLimitSyncService.me.checkExistsByPk(model));
+        renderJson(TruckWeightLimitService.me.checkExistsByPk(model));
     }
 
-    /**
-     * 新增 truck_weight_limit  
-     */
-    @Before(TruckWeightLimitValidator.class)
-    public void save(){
-        Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token"));
 
-        if (tokenuser == null) {
-            renderJson(Result.noauth());
-            return;
-        }
-
-        TruckWeightLimit model = getModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段
-        renderJson(TruckWeightLimitSyncService.me.save(model, tokenuser));
-    }
-
-    /**
-     * 修改 truck_weight_limit
-     */
-    @Before(TruckWeightLimitValidator.class)
-    public void edit(){
-        Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token"));
-
-        if (tokenuser == null) {
-            renderJson(Result.noauth());
-            return;
-        }
-
-        TruckWeightLimit model = getModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段
-        renderJson(TruckWeightLimitSyncService.me.update(model, tokenuser));
-    }
-
-    /**
-     * 删除 truck_weight_limit  
-     */
-    @Before(TruckWeightLimitPKValidator.class)
-    public void del(){
-        Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token"));
-
-        if (tokenuser == null) {
-            renderJson(Result.noauth());
-            return;
-        }
-
-        TruckWeightLimit model = getModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段
-        renderJson(TruckWeightLimitSyncService.me.delete(model, tokenuser));
-    }
 
     /**
      * 分页查找 truck_weight_limit  
@@ -87,22 +38,22 @@ public class TruckWeightLimitController extends Controller {
         String    stm            = get("stm");
         String    etm            = get("etm");
 
-        renderJson(Result.object(TruckWeightLimitSyncService.me.find(pp, truck_license, stm, etm)));
+        renderJson(Result.object(TruckWeightLimitService.me.find(pp, truck_license, stm, etm)));
     }
 
     /**
-     * 按主键查找单个对象 truck_weight_limit  
+     * 按主键查找单个对象 truck_weight_limit
      */
     @Before(TruckWeightLimitPKValidator.class)
     public void get(){
         TruckWeightLimit model = getModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段
-        renderJson(TruckWeightLimitSyncService.me.findByPk(model));
+        renderJson(TruckWeightLimitService.me.findByPk(model));
     }
 
     /**
      * 返回所有 truck_weight_limit  
      */
     public void list(){
-        renderJson(Result.object(TruckWeightLimitSyncService.me.list()));
+        renderJson(Result.object(TruckWeightLimitService.me.list()));
     }
 }

ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/truckweightlimit/TruckWeightLimitService.java

@@ -1,8 +1,8 @@
-package com.cowr.local.ssjygl.truck.truckweightlimit;
+package com.cowr.service.ssjygl.truck.truckweightlimit;
 
 import com.cowr.common.Const;
+import com.cowr.common.base.BaseService;
 import com.cowr.common.view.PageParam;
-import com.cowr.local.ssjygl.base.BaseSyncService;
 import com.cowr.model.TruckWeightLimit;
 import com.jfinal.kit.StrKit;
 import com.jfinal.log.Log;
@@ -14,7 +14,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-public class TruckWeightLimitService extends BaseSyncService {
+public class TruckWeightLimitService extends BaseService {
     private static final Log log = Log.getLog(TruckWeightLimitService.class);
     public static final TruckWeightLimitService me = new TruckWeightLimitService();