.

ssjygl-xsx-common/src/main/java/com/cowr/common/enums/Enums.java

@@ -64,8 +64,42 @@ public interface Enums {
      * 出入场控制 which
      */
     enum WhichEnum{
-        R01, // 入场 01
+        R01("R01", "入口1"), // 入场 01
-        C01, //  出场 01
+        C01("C01", "出口1"); //  出场 01
+
+        String name;
+        String label;
+
+        WhichEnum(String name, String label){
+            this.name = name;
+            this.label = label;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getLabel() {
+            return label;
+        }
+
+        public void setLabel(String label) {
+            this.label = label;
+        }
+
+        public static String getLabel(String name){
+            for(WhichEnum whichEnum : WhichEnum.values()){
+                if(whichEnum.getName().equals(name)){
+                    return whichEnum.getLabel();
+                }
+            }
+
+            return null;
+        }
     }
 
     enum RowEnum{

ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseActionCmdLog.java

@@ -5,7 +5,7 @@ import com.jfinal.plugin.activerecord.IBean;
 import com.alibaba.fastjson.annotation.JSONField;
 
 /**
- * Generated by COWR Fri Apr 17 16:59:35 CST 2020
+ * Generated by COWR Mon Sep 28 15:53:55 CST 2020
  * TableName: action_cmd_log
  * Remarks: 日志相关- 硬件操作指令日志
  * PrimaryKey: id
@@ -22,24 +22,24 @@ public abstract class BaseActionCmdLog<M extends BaseActionCmdLog<M>> extends Ba
 
     /**
      * name: id
-     * type: BIGINT(19)
+     * type: CHAR(32)
      * isNullable: NO
      * isPrimaryKey: YES
      * defaultValue: 
-     * @param id 
+     * @param id uuid
      */
     @JSONField(name="id")
-    public void setId(java.lang.Long id) {
+    public void setId(String id) {
         set("id", id);
     }
     
 
     /**
-     * @return id 
+     * @return id uuid
      */
     @JSONField(name="id")
-    public java.lang.Long getId() {
+    public String getId() {
-        return getLong("id");
+        return getStr("id");
     }
 
     /**
@@ -51,7 +51,7 @@ public abstract class BaseActionCmdLog<M extends BaseActionCmdLog<M>> extends Ba
      * @param createUserId 创建用户id
      */
     @JSONField(name="create_user_id")
-    public void setCreateUserId(java.lang.Integer createUserId) {
+    public void setCreateUserId(Integer createUserId) {
         set("create_user_id", createUserId);
     }
     
@@ -60,7 +60,7 @@ public abstract class BaseActionCmdLog<M extends BaseActionCmdLog<M>> extends Ba
      * @return create_user_id 创建用户id
      */
     @JSONField(name="create_user_id")
-    public java.lang.Integer getCreateUserId() {
+    public Integer getCreateUserId() {
         return getInt("create_user_id");
     }
 
@@ -73,7 +73,7 @@ public abstract class BaseActionCmdLog<M extends BaseActionCmdLog<M>> extends Ba
      * @param createUserName 创建用户名
      */
     @JSONField(name="create_user_name")
-    public void setCreateUserName(java.lang.String createUserName) {
+    public void setCreateUserName(String createUserName) {
         set("create_user_name", createUserName);
     }
     
@@ -82,7 +82,7 @@ public abstract class BaseActionCmdLog<M extends BaseActionCmdLog<M>> extends Ba
      * @return create_user_name 创建用户名
      */
     @JSONField(name="create_user_name")
-    public java.lang.String getCreateUserName() {
+    public String getCreateUserName() {
         return getStr("create_user_name");
     }
 
@@ -117,7 +117,7 @@ public abstract class BaseActionCmdLog<M extends BaseActionCmdLog<M>> extends Ba
      * @param content 指令内容
      */
     @JSONField(name="content")
-    public void setContent(java.lang.String content) {
+    public void setContent(String content) {
         set("content", content);
     }
     
@@ -126,7 +126,7 @@ public abstract class BaseActionCmdLog<M extends BaseActionCmdLog<M>> extends Ba
      * @return content 指令内容
      */
     @JSONField(name="content")
-    public java.lang.String getContent() {
+    public String getContent() {
         return getStr("content");
     }
 

ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogController.java

@@ -1,4 +1,4 @@
-package com.cowr.local.ssjygl.actioncmdlog;
+package com.cowr.ssjygl.actioncmdlog;
 
 import com.cowr.common.view.PageParam;
 import com.cowr.common.view.Result;
@@ -19,4 +19,12 @@ public class ActionCmdLogController extends Controller {
         PageParam pp = getBean(PageParam.class, "", true);
         renderJson(Result.object(ActionCmdLogService.me.find(pp)));
     }
+
+    public void findRodLog() {
+        PageParam pp               = getBean(PageParam.class, "", true);
+        String    create_user_name = get("create_user_name");
+        String    stm              = get("stm");
+        String    etm              = get("etm");
+        renderJson(Result.object(ActionCmdLogService.me.findRodLog(pp, create_user_name, stm, etm)));
+    }
 }

ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java

@@ -0,0 +1,104 @@
+package com.cowr.ssjygl.actioncmdlog;
+
+import com.alibaba.fastjson.JSONObject;
+import com.cowr.common.Const;
+import com.cowr.common.enums.Enums;
+import com.cowr.common.view.PageParam;
+import com.cowr.model.ActionCmdLog;
+import com.cowr.model.Sysuser;
+import com.jfinal.kit.StrKit;
+import com.jfinal.log.Log;
+import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.Page;
+import com.jfinal.plugin.activerecord.Record;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Generated by COWR Fri Apr 17 16:59:39 CST 2020
+ * TableName: action_cmd_log
+ * Remarks: 日志相关- 硬件操作指令日志
+ * PrimaryKey: id
+ */
+public class ActionCmdLogService {
+    private static      Log                 log = Log.getLog(ActionCmdLogService.class);
+    public static final ActionCmdLogService me  = new ActionCmdLogService();
+
+    public Page<Record> find(PageParam pp) {
+        String       selectsql = "select * ";
+        String       fromsql   = "from action_cmd_log t where 1=1 ";
+        List<Object> paraList  = new ArrayList<>();
+
+        String totalRowSql = "select count(*) " + fromsql;
+        String findSql     = selectsql + fromsql;
+
+        // 前端传了排序字段，并且排序字段存在相关表中
+        if (StrKit.notBlank(pp.getSort_field()) && ActionCmdLog.dao.hasColunm(pp.getSort_field())) {
+            findSql += " order by t." + pp.getSort_field() + " is null, t." + pp.getSort_field();
+
+            if (Const.ORDER_BY_ASC.equals(pp.getSort_order())) {
+                findSql += " " + Const.ORDER_BY_ASC;
+            } else {
+                findSql += " " + Const.ORDER_BY_DESC;
+            }
+        }
+
+        return Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray());
+    }
+
+    public Page<Record> findRodLog(PageParam pp, String create_user_name, String stm, String etm) {
+        String       selectsql = "select * ";
+        String       fromsql   = "from action_cmd_log t where t.content -> '$.cmd' = 'rodUp' ";
+        List<Object> paraList  = new ArrayList<>();
+
+        if (StrKit.notBlank(create_user_name)) {
+            fromsql += " and t.create_user_name like ? \n";
+            paraList.add("%" + create_user_name + "%");
+        }
+
+        if (StrKit.notBlank(stm)) {
+            fromsql += " and t.create_time >= ? \n";
+            paraList.add(stm);
+        }
+
+        if (StrKit.notBlank(etm)) {
+            fromsql += " and t.create_time <= ? \n";
+            paraList.add(etm);
+        }
+
+        String totalRowSql = "select count(*) " + fromsql;
+        String findSql     = selectsql + fromsql;
+
+        // 前端传了排序字段，并且排序字段存在相关表中
+        if (StrKit.notBlank(pp.getSort_field()) && ActionCmdLog.dao.hasColunm(pp.getSort_field())) {
+            findSql += " order by t." + pp.getSort_field() + " is null, t." + pp.getSort_field();
+
+            if (Const.ORDER_BY_ASC.equals(pp.getSort_order())) {
+                findSql += " " + Const.ORDER_BY_ASC;
+            } else {
+                findSql += " " + Const.ORDER_BY_DESC;
+            }
+        } else {
+            findSql += " order by t.create_time desc";
+        }
+
+        Page<Record> page = Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray());
+        List<Record> list = page.getList();
+
+        for (Record record : list) {
+            try {
+                String     content = record.getStr("content");
+                JSONObject obj     = JSONObject.parseObject(content);
+
+                String which = obj.getString("which");
+                record.set("content", "抬" + Enums.WhichEnum.getLabel(which) + (obj.getInteger("num") == 1 ? "前" : "后") + "闸" + (obj.getBoolean("rod") ? "成功" : "失败"));
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+            }
+        }
+
+        return page;
+    }
+}

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

@@ -1,24 +0,0 @@
-package com.cowr.local.ssjygl.actioncmdlog;
-
-
-import com.cowr.common.validator.CrudParamValidator;
-import com.cowr.common.view.Result;
-import com.jfinal.core.Controller;
-
-/**
- * Generated by COWR Fri Apr 17 16:59:39 CST 2020
- * TableName: action_cmd_log
- * Remarks: 日志相关- 硬件操作指令日志
- * PrimaryKey: id
- */
-public class ActionCmdLogPKValidator extends CrudParamValidator {
-    @Override
-    protected void validate(Controller c) {
-        validateRequired("id", "id", "id 必填");
-        validateLong("id", 1, 9223372036854775807L, "id", "id 范围 1~9223372036854775807");
-    }
-
-    protected void handleError(Controller c) {
-        c.renderJson(Result.failed(getErrmsg()));
-    }
-}

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

@@ -1,61 +0,0 @@
-package com.cowr.local.ssjygl.actioncmdlog;
-
-import com.cowr.common.Const;
-import com.cowr.common.view.PageParam;
-import com.cowr.model.ActionCmdLog;
-import com.cowr.model.Sysuser;
-import com.jfinal.kit.StrKit;
-import com.jfinal.plugin.activerecord.Db;
-import com.jfinal.plugin.activerecord.Page;
-import com.jfinal.plugin.activerecord.Record;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Generated by COWR Fri Apr 17 16:59:39 CST 2020
- * TableName: action_cmd_log
- * Remarks: 日志相关- 硬件操作指令日志
- * PrimaryKey: id
- */
-public class ActionCmdLogService {
-    public static final ActionCmdLogService me = new ActionCmdLogService();
-
-    public Page<Record> find(PageParam pp) {
-        String selectsql = "select * ";
-        String fromsql = "from action_cmd_log t where 1=1 ";
-        List<Object> paraList = new ArrayList<>();
-
-        String totalRowSql = "select count(*) " + fromsql;
-        String findSql = selectsql + fromsql;
-
-        // 前端传了排序字段，并且排序字段存在相关表中
-        if (StrKit.notBlank(pp.getSort_field()) && ActionCmdLog.dao.hasColunm(pp.getSort_field())) {
-            findSql += " order by t." + pp.getSort_field() + " is null, t." + pp.getSort_field();
-
-            if (Const.ORDER_BY_ASC.equals(pp.getSort_order())) {
-                findSql += " " + Const.ORDER_BY_ASC;
-            } else {
-                findSql += " " + Const.ORDER_BY_DESC;
-            }
-        }
-
-        return Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray());
-    }
-
-    /**
-     * TODO: 后续优化存储内容，要方便后续查询、统计等
-     * @param content
-     * @param sysuser
-     * @return
-     */
-    public boolean save(String content, Sysuser sysuser){
-        ActionCmdLog cmd = new ActionCmdLog();
-        cmd.setCreateUserId(sysuser.getId());
-        cmd.setCreateUserName(sysuser.getName());
-        cmd.setCreateTime(new Date());
-        cmd.setContent(content);
-
-        return cmd.save();
-    }
-}

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

@@ -0,0 +1,52 @@
+package com.cowr.local.ssjygl.actioncmdlog;
+
+import com.cowr.local.ssjygl.base.BaseSyncService;
+import com.cowr.local.ssjygl.synctask.SyncTaskService;
+import com.cowr.model.ActionCmdLog;
+import com.cowr.model.SyncTask;
+import com.cowr.model.Sysuser;
+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;
+
+/**
+ * Generated by COWR Fri Apr 17 16:59:39 CST 2020
+ * TableName: action_cmd_log
+ * Remarks: 日志相关- 硬件操作指令日志
+ * PrimaryKey: id
+ */
+public class ActionCmdLogSyncService extends BaseSyncService {
+    private static      Log                     log = Log.getLog(ActionCmdLogSyncService.class);
+    public static final ActionCmdLogSyncService me  = new ActionCmdLogSyncService();
+
+    /**
+     * TODO: 后续优化存储内容，要方便后续查询、统计等
+     *
+     * @param content
+     * @param sysuser
+     * @return
+     */
+    public boolean save(String content, Sysuser sysuser) {
+        ActionCmdLog cmd = new ActionCmdLog();
+        cmd.setId(StrKit.getRandomUUID());
+        cmd.setCreateUserId(sysuser.getId());
+        cmd.setCreateUserName(sysuser.getName());
+        cmd.setCreateTime(new Date());
+        cmd.setContent(content);
+
+        return Db.tx(new IAtom() {
+            @Override
+            public boolean run(){
+                try{
+                    return cmd.save() && SyncTaskService.me.save(new SyncTask().addSaveData(cmd));
+                }catch (Exception e){
+                    log.error(e.getMessage(), e);
+                    return false;
+                }
+            }
+        });
+    }
+
+}

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

@@ -3,6 +3,7 @@ package com.cowr.local.ssjygl.main;
 import com.alibaba.druid.filter.stat.StatFilter;
 import com.alibaba.druid.wall.WallFilter;
 import com.cowr.common.ctrl.HomeController;
+import com.cowr.ssjygl.actioncmdlog.ActionCmdLogController;
 import com.cowr.local.ssjygl.authlicense.AuthLicenseController;
 import com.cowr.local.ssjygl.authlicense.AuthLicenseSyncService;
 import com.cowr.local.ssjygl.blacklist.BlacklistController;
@@ -221,6 +222,7 @@ public class Config extends JFinalConfig {
 
         // -- 日志
         me.add("/log/sms", SmsLogController.class);
+        me.add("/log/actioncmd", ActionCmdLogController.class);
     }
 
     @Override

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

@@ -7,7 +7,7 @@ import com.cowr.common.enums.OrderTypeEnum;
 import com.cowr.common.utils.ChineseNumberUtil;
 import com.cowr.common.utils.StrUtil;
 import com.cowr.common.view.Result;
-import com.cowr.local.ssjygl.actioncmdlog.ActionCmdLogService;
+import com.cowr.local.ssjygl.actioncmdlog.ActionCmdLogSyncService;
 import com.cowr.local.ssjygl.devicectrl.common.Const;
 import com.cowr.local.ssjygl.devicectrl.printer.ExcelHelper;
 import com.cowr.local.ssjygl.main.Config;
@@ -534,18 +534,23 @@ public class LocalOrderService {
         printdata.set("first_weight", transport.getFirstWeight());
         printdata.set("second_weight", transport.getSecondWeight());
 
-        try {
-            Config.deviceThread.print(printerId, getPrintFile(printdata));
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            return Result.failed("打印指令失败");
-        }
-
         Record cmd = new Record();
         cmd.set("cmd", "print");
         cmd.set("sn", sn);
         cmd.set("printer", printerId);
-        ActionCmdLogService.me.save(cmd.toJson(), sysuser);
+
+        try {
+            Config.deviceThread.print(printerId, getPrintFile(printdata));
+            cmd.set("print", true);
+
+            ActionCmdLogSyncService.me.save(cmd.toJson(), sysuser);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            cmd.set("print", false);
+
+            ActionCmdLogSyncService.me.save(cmd.toJson(), sysuser);
+            return Result.failed("打印指令失败");
+        }
 
         return Result.success("打印指令已发送");
     }

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

@@ -5,7 +5,7 @@ import com.cowr.common.enums.OrderStateEnum;
 import com.cowr.common.enums.OrderTypeEnum;
 import com.cowr.common.utils.DateTimeUtil;
 import com.cowr.common.view.Result;
-import com.cowr.local.ssjygl.actioncmdlog.ActionCmdLogService;
+import com.cowr.local.ssjygl.actioncmdlog.ActionCmdLogSyncService;
 import com.cowr.local.ssjygl.main.Config;
 import com.cowr.local.ssjygl.order.LocalOrderService;
 import com.cowr.local.ssjygl.order.orderseq.OrderSeqService;
@@ -991,18 +991,23 @@ public class OrderTempSyncService {
             printdata.set("first_weight", transport.getFirstWeight());
             printdata.set("second_weight", transport.getSecondWeight());
 
-            try {
-                Config.deviceThread.print(printerId, LocalOrderService.me.getPrintFile(printdata));
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-                return Result.failed("打印指令失败");
-            }
-
             Record cmd = new Record();
             cmd.set("cmd", "print");
             cmd.set("sn", sn);
             cmd.set("printer", printerId);
-            ActionCmdLogService.me.save(cmd.toJson(), sysuser);
+
+            try {
+                Config.deviceThread.print(printerId, LocalOrderService.me.getPrintFile(printdata));
+                cmd.set("print", true);
+
+                ActionCmdLogSyncService.me.save(cmd.toJson(), sysuser);
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                cmd.set("print", false);
+
+                ActionCmdLogSyncService.me.save(cmd.toJson(), sysuser);
+                return Result.failed("打印指令失败");
+            }
 
             return Result.success("开票成功，打印指令已发送");
         }

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

@@ -38,6 +38,11 @@ public class TransportController extends BaseController {
         String truck_license = getUpperCaseVal("truck_license");
         String which         = getUpperCaseVal("which", Enums.WhichEnum.R01.name());
 
+        if (!Enums.CtrlFlowEnum.isValid(which)) {
+            renderJson(Result.failed("which 参数错误"));
+            return;
+        }
+
         renderJson(TransportSyncService.me.addLicense(truck_license, which, tokenuser));
     }
 
@@ -63,6 +68,11 @@ public class TransportController extends BaseController {
         String which          = getUpperCaseVal("which", Enums.WhichEnum.R01.name());
         int    supermarket_id = getInt("supermarket_id", CliCacheData.SUP.getId());
 
+        if (!Enums.CtrlFlowEnum.isValid(which)) {
+            renderJson(Result.failed("which 参数错误"));
+            return;
+        }
+
         renderJson(Result.success(TransportSyncService.me.postLicense(supermarket_id, truck_license, file, which)));
     }
 
@@ -73,6 +83,11 @@ public class TransportController extends BaseController {
         Double weight         = getParaToDouble("weight");//称重数值
         int    supermarket_id = getInt("supermarket_id", CliCacheData.SUP.getId());
 
+        if (!Enums.CtrlFlowEnum.isValid(which)) {
+            renderJson(Result.failed("which 参数错误"));
+            return;
+        }
+
         renderJson(Result.success(TransportSyncService.me.postWeigh(supermarket_id, truck_license, weight, which)));
     }
 
@@ -80,6 +95,11 @@ public class TransportController extends BaseController {
         String trucks = getUpperCaseVal("trucks", "");
         String which  = getUpperCaseVal("which", Enums.WhichEnum.R01.name());
 
+        if (!Enums.CtrlFlowEnum.isValid(which)) {
+            renderJson(Result.failed("which 参数错误"));
+            return;
+        }
+
         // 传空字符串时，清空队列
         if (StrKit.isBlank(trucks)) {
             renderJson(Result.success(TransportDeviceService.me.postLicenseQueue(new ArrayList<>(), which)));
@@ -106,6 +126,11 @@ public class TransportController extends BaseController {
         String which          = getUpperCaseVal("which", Enums.WhichEnum.R01.name());
         int    supermarket_id = getInt("supermarket_id", CliCacheData.SUP.getId());
 
+        if (!Enums.CtrlFlowEnum.isValid(which)) {
+            renderJson(Result.failed("which 参数错误"));
+            return;
+        }
+
         renderJson(Result.success(TransportSyncService.me.manualIn(supermarket_id, truck_license, which, tokenuser)));
     }
 
@@ -175,10 +200,6 @@ public class TransportController extends BaseController {
         String transport_id = get("transport_id");
         String which        = getUpperCaseVal("which", Enums.WhichEnum.R01.name());
         String deviceid     = get("deviceid"); // TODO: 设置默认值
-
-        if (StrKit.notBlank(which)) {
-            which = which.toUpperCase();
-        }
     }
 
     @Before(CmdLicenseValidator.class)
@@ -191,14 +212,11 @@ public class TransportController extends BaseController {
         }
 
         String truck_license = getUpperCaseVal("truck_license");
-        String which         = get("which");
+        String which         = getUpperCaseVal("which");
 
-        if (StrKit.notBlank(which)) {
+        if (!Enums.CtrlFlowEnum.isValid(which)) {
-            which = which.toUpperCase();
+            renderJson(Result.failed("which 参数错误"));
-        }
+            return;
-
-        if (StrKit.notBlank(truck_license)) {
-            truck_license = truck_license.toUpperCase();
         }
 
         String phone    = get("phone");//验证账户
@@ -218,14 +236,11 @@ public class TransportController extends BaseController {
         }
 
         String truck_license = getUpperCaseVal("truck_license");
-        String which         = get("which");
+        String which         = getUpperCaseVal("which");
 
-        if (StrKit.notBlank(which)) {
+        if (!Enums.CtrlFlowEnum.isValid(which)) {
-            which = which.toUpperCase();
+            renderJson(Result.failed("which 参数错误"));
-        }
+            return;
-
-        if (StrKit.notBlank(truck_license)) {
-            truck_license = truck_license.toUpperCase();
         }
 
         boolean result = TransportDeviceService.me.cmdDelLicense(truck_license, which, tokenuser);
@@ -240,10 +255,11 @@ public class TransportController extends BaseController {
             return;
         }
 
-        String which = get("which"); // Enums.WhichEnum R01 入场流程 C01 出场流程
+        String which = getUpperCaseVal("which");// Enums.WhichEnum R01 入场流程 C01 出场流程
 
-        if (StrKit.notBlank(which)) {
+        if (!Enums.CtrlFlowEnum.isValid(which)) {
-            which = which.toUpperCase();
+            renderJson(Result.failed("which 参数错误"));
+            return;
         }
 
         boolean result = TransportDeviceService.me.cmdResetFlow(which, tokenuser);
@@ -258,14 +274,15 @@ public class TransportController extends BaseController {
             return;
         }
 
-        int    num   = getInt("num", 1); // 抬前闸 1，还是后闸 2
+        int    num   = getInt("num", 1); // 抬前闸 1，还是后闸 2 // 2020-09-28 可以确定，一个磅上只有两个闸，num 值只能为 1 或者 2
-        String which = get("which"); // Enums.WhichEnum R01 入场流程 C01 出场流程
+        String which = getUpperCaseVal("which");// Enums.WhichEnum R01 入场流程 C01 出场流程
 
-        if (StrKit.notBlank(which)) {
+        if (!Enums.CtrlFlowEnum.isValid(which)) {
-            which = which.toUpperCase();
+            renderJson(Result.failed("which 参数错误"));
+            return;
         }
 
-        boolean result = TransportDeviceService.me.cmdRodUp(num, which, tokenuser);
+        boolean result = TransportDeviceService.me.cmdRodUp(num == 1 ? 1 : 2, which, tokenuser);
         renderJson(result ? Result.success(true) : Result.failed("抬闸失败"));
     }
 
@@ -277,10 +294,11 @@ public class TransportController extends BaseController {
             return;
         }
 
-        String which = get("which"); // Enums.WhichEnum R01 入场流程 C01 出场流程
+        String which = getUpperCaseVal("which");// Enums.WhichEnum R01 入场流程 C01 出场流程
 
-        if (StrKit.notBlank(which)) {
+        if (!Enums.CtrlFlowEnum.isValid(which)) {
-            which = which.toUpperCase();
+            renderJson(Result.failed("which 参数错误"));
+            return;
         }
 
         double result = TransportDeviceService.me.cmdScale(which, tokenuser);

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

@@ -1,12 +1,11 @@
 package com.cowr.local.ssjygl.transport;
 
 import com.cowr.common.enums.Enums;
-import com.cowr.local.ssjygl.actioncmdlog.ActionCmdLogService;
+import com.cowr.local.ssjygl.actioncmdlog.ActionCmdLogSyncService;
 import com.cowr.local.ssjygl.devicectrl.controllers.Controller;
 import com.cowr.local.ssjygl.main.CliCacheData;
 import com.cowr.local.ssjygl.main.Config;
 import com.cowr.model.Sysuser;
-import com.cowr.ssjygl.CacheData;
 import com.jfinal.kit.HttpKit;
 import com.jfinal.kit.StrKit;
 import com.jfinal.log.Log;
@@ -162,11 +161,11 @@ public class TransportDeviceService {
      */
     public boolean cmdAddLicense(String license, String which, Sysuser sysuser) {
         Record cmdlog = new Record();
-        cmdlog.set("cmd", "cmdAddLicense");
+        cmdlog.set("cmd", "addLicense");
         cmdlog.set("license", license);
         cmdlog.set("which", which);
 
-        return cmdLicense(license, which, false) && ActionCmdLogService.me.save(cmdlog.toJson(), sysuser);
+        return cmdLicense(license, which, false) && ActionCmdLogSyncService.me.save(cmdlog.toJson(), sysuser);
     }
 
     /**
@@ -179,7 +178,7 @@ public class TransportDeviceService {
      */
     public boolean cmdDelLicense(String license, String which, Sysuser sysuser) {
         Record cmdlog = new Record();
-        cmdlog.set("cmd", "cmdDelLicense");
+        cmdlog.set("cmd", "delLicense");
         cmdlog.set("license", license);
         cmdlog.set("which", which);
 
@@ -209,10 +208,10 @@ public class TransportDeviceService {
                 }
             }
 
-            ActionCmdLogService.me.save(cmdlog.toJson(), sysuser);
+            ActionCmdLogSyncService.me.save(cmdlog.toJson(), sysuser);
             return true;
         } else {
-            ActionCmdLogService.me.save(cmdlog.toJson(), sysuser);
+            ActionCmdLogSyncService.me.save(cmdlog.toJson(), sysuser);
             return cmdLicense(license, which, true);
         }
     }
@@ -225,39 +224,47 @@ public class TransportDeviceService {
      */
     public boolean cmdResetFlow(String which, Sysuser sysuser) {
         Record cmdlog = new Record();
-        cmdlog.set("cmd", "cmdResetFlow");
+        cmdlog.set("cmd", "resetFlow");
         cmdlog.set("which", which);
 
         CliCacheData.nowLicenseMap.put(which, "");
         CliCacheData.nowWeightMap.put(which, 0d);
 
-        return Config.deviceThread.cmdResetFlow(which) && ActionCmdLogService.me.save(cmdlog.toJson(), sysuser);
+        return Config.deviceThread.cmdResetFlow(which) && ActionCmdLogSyncService.me.save(cmdlog.toJson(), sysuser);
     }
 
     public boolean cmdRodUp(int num, String which, Sysuser sysuser){
         Record cmdlog = new Record();
-        cmdlog.set("cmd", "cmdRodUp");
+        cmdlog.set("cmd", "rodUp");
         cmdlog.set("which", which);
         cmdlog.set("num", num);
 
+        boolean ret;
+
         try{
             Config.deviceThread.cmdRodUp(num, which);
             cmdlog.set("rod", true);
+
+            ret = true;
         }catch (Exception e){
             log.error(e.getMessage(), e);
             cmdlog.set("rod", false);
+
+            ret = false;
         }
 
-        return ActionCmdLogService.me.save(cmdlog.toJson(), sysuser);
+        ActionCmdLogSyncService.me.save(cmdlog.toJson(), sysuser);
+
+        return ret;
     }
 
     public double cmdScale(String which, Sysuser sysuser){
         Record cmdlog = new Record();
-        cmdlog.set("cmd", "cmdScale");
+        cmdlog.set("cmd", "scale");
         cmdlog.set("which", which);
 
         try{
-            ActionCmdLogService.me.save(cmdlog.toJson(), sysuser);
+            ActionCmdLogSyncService.me.save(cmdlog.toJson(), sysuser);
 
             return Config.deviceThread.scale(which);
         }catch (Exception e){
@@ -273,7 +280,7 @@ public class TransportDeviceService {
      */
     public void manualTrigger(String which, Sysuser sysuser){
         Record cmdlog = new Record();
-        cmdlog.set("cmd", "cmdManualTrigger");
+        cmdlog.set("cmd", "manualTrigger");
         cmdlog.set("which", which);
 
         Controller controller = Config.deviceThread.getController(which);
@@ -289,7 +296,7 @@ public class TransportDeviceService {
 
         try{
             HttpKit.post("http://" + controller.getCamera().getIp() + "/cgi-bin/param.cgi?random=" + Math.random(), "key=manual_trigger_info");
-            ActionCmdLogService.me.save(cmdlog.toJson(), sysuser);
+            ActionCmdLogSyncService.me.save(cmdlog.toJson(), sysuser);
         }catch (Exception e){
             log.error(e.getMessage(), e);
         }

ssjygl-xsx-local/src/main/resources/dev/db.properties

@@ -1,12 +1,12 @@
 # mysql
 # GRANT ALL PRIVILEGES ON *.* TO 'root'@'192.168.1.119' IDENTIFIED BY 'Local_1' WITH GRANT OPTION;
-#jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true
+jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true
-#user=dev_ssjy_xsx
+user=dev_ssjy_xsx
-#password=Ssjy_xs_890
+password=Ssjy_xs_890
 
-jdbcUrl=jdbc:mysql://192.168.20.2:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true
+#jdbcUrl=jdbc:mysql://192.168.20.2:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true
-user=root
+#user=root
-password=Ssjy_xsx_890
+#password=Ssjy_xsx_890
 
 # redis
 redis.basekey=ssjcgl_xsx_dev

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

@@ -40,6 +40,7 @@ import com.cowr.service.ssjygl.truck.TruckController;
 import com.cowr.ssjygl.CacheData;
 import com.cowr.common.Const;
 import com.cowr.common.plugin.QuartzPlugin;
+import com.cowr.ssjygl.actioncmdlog.ActionCmdLogController;
 import com.cowr.ssjygl.cctv.CctvController;
 import com.cowr.service.ssjygl.prepay.PrepayController;
 import com.cowr.service.ssjygl.overall.OverallController;
@@ -187,6 +188,7 @@ public class Config extends JFinalConfig {
 
         // -- 日志
         me.add("/log/sms", SmsLogController.class);
+        me.add("/log/actioncmd", ActionCmdLogController.class);
     }
 
     @Override