From dd9438d16375800e5b5d53c2d654b7fb4b2f2dd4 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 02 四月 2025 10:51:50 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/entity/ApiConfig.java             |   13 +
 src/main/java/com/zy/asrs/entity/TaskWrk.java               |   43 ++--
 src/main/java/com/zy/asrs/entity/BasCrnOpt.java             |   30 ++-
 src/main/java/com/zy/asrs/entity/BasDevp.java               |   19 +
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    8 
 src/main/java/com/zy/asrs/entity/BasCrnError.java           |   13 
 src/main/resources/mapper/BasCrnErrorMapper.xml             |   12 
 src/main/resources/mapper/BasCrnStatusMapper.xml            |   12 
 src/main/java/com/zy/asrs/entity/BasCrnp.java               |   43 ++--
 src/main/resources/mapper/BasCrnpMapper.xml                 |   42 ++--
 src/main/java/com/zy/asrs/entity/BasErrLog.java             |   39 ++--
 src/main/java/com/zy/asrs/entity/ApiLog.java                |   19 +
 src/main/resources/mapper/ApiConfigMapper.xml               |   20 +-
 src/main/java/com/zy/asrs/entity/DeviceError.java           |    7 
 src/main/resources/mapper/ApiLogMapper.xml                  |   30 +-
 src/main/resources/mapper/BasDevpMapper.xml                 |   76 ++++----
 src/main/resources/application.yml                          |    2 
 src/main/java/com/zy/asrs/entity/BasCrnStatus.java          |   13 
 18 files changed, 235 insertions(+), 206 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/ApiConfig.java b/src/main/java/com/zy/asrs/entity/ApiConfig.java
index 8d02f37..13f7902 100644
--- a/src/main/java/com/zy/asrs/entity/ApiConfig.java
+++ b/src/main/java/com/zy/asrs/entity/ApiConfig.java
@@ -27,32 +27,35 @@
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value= "")
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "\"id\"", type = IdType.AUTO)
     private Long id;
 
     /**
      * api鍦板潃
      */
     @ApiModelProperty(value= "api鍦板潃")
+    @TableField("\"url\"")
     private String url;
 
     /**
      * 鐘舵�� 0: 姝ｅ父  1: 绂佺敤  
      */
     @ApiModelProperty(value= "鐘舵�� 0: 姝ｅ父  1: 绂佺敤  ")
+    @TableField("\"status\"")
     private Integer status;
 
     /**
      * 澶囨敞
      */
     @ApiModelProperty(value= "澶囨敞")
+    @TableField("\"memo\"")
     private String memo;
 
     /**
      * 鍒涘缓鏃堕棿
      */
     @ApiModelProperty(value= "鍒涘缓鏃堕棿")
-    @TableField("create_time")
+    @TableField("\"create_time\"")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
@@ -60,7 +63,7 @@
      * 鏇存柊鏃堕棿
      */
     @ApiModelProperty(value= "鏇存柊鏃堕棿")
-    @TableField("update_time")
+    @TableField("\"update_time\"")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
@@ -68,14 +71,14 @@
      * 娣诲姞浜哄憳
      */
     @ApiModelProperty(value= "娣诲姞浜哄憳")
-    @TableField("create_by")
+    @TableField("\"create_by\"")
     private Long createBy;
 
     /**
      * 淇敼浜哄憳
      */
     @ApiModelProperty(value= "淇敼浜哄憳")
-    @TableField("update_by")
+    @TableField("\"update_by\"")
     private Long updateBy;
 
     public ApiConfig() {}
diff --git a/src/main/java/com/zy/asrs/entity/ApiLog.java b/src/main/java/com/zy/asrs/entity/ApiLog.java
index 73b86a2..12f8ca1 100644
--- a/src/main/java/com/zy/asrs/entity/ApiLog.java
+++ b/src/main/java/com/zy/asrs/entity/ApiLog.java
@@ -24,81 +24,91 @@
      * ID
      */
     @ApiModelProperty(value= "ID")
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "\"id\"", type = IdType.AUTO)
     private Long id;
 
     /**
      * 鏃ュ織缂栧彿
      */
     @ApiModelProperty(value= "鏃ュ織缂栧彿")
+    @TableField("\"uuid\"")
     private String uuid;
 
     /**
      * 鍚嶇О绌洪棿
      */
     @ApiModelProperty(value= "鍚嶇О绌洪棿")
+    @TableField("\"namespace\"")
     private String namespace;
 
     /**
      * 鎺ュ彛鍦板潃
      */
     @ApiModelProperty(value= "鎺ュ彛鍦板潃")
+    @TableField("\"url\"")
     private String url;
 
     /**
      * 骞冲彴瀵嗛挜
      */
     @ApiModelProperty(value= "骞冲彴瀵嗛挜")
+    @TableField("\"appkey\"")
     private String appkey;
 
     /**
      * 鏃堕棿鎴�
      */
     @ApiModelProperty(value= "鏃堕棿鎴�")
+    @TableField("\"timestamp\"")
     private String timestamp;
 
     /**
      * 瀹㈡埛绔疘P
      */
     @ApiModelProperty(value= "瀹㈡埛绔疘P")
-    @TableField("client_ip")
+    @TableField("\"clientIp\"")
     private String clientIp;
 
     /**
      * 璇锋眰鍐呭
      */
     @ApiModelProperty(value= "璇锋眰鍐呭")
+    @TableField("\"request\"")
     private String request;
 
     /**
      * 鍝嶅簲鍐呭
      */
     @ApiModelProperty(value= "鍝嶅簲鍐呭")
+    @TableField("\"response\"")
     private String response;
 
     /**
      * 寮傚父鍐呭
      */
     @ApiModelProperty(value= "寮傚父鍐呭")
+    @TableField("\"err\"")
     private String err;
 
     /**
      * 缁撴灉 1: 鎴愬姛  0: 澶辫触  
      */
     @ApiModelProperty(value= "缁撴灉 1: 鎴愬姛  0: 澶辫触  ")
+    @TableField("\"result\"")
     private Integer result;
 
     /**
      * 鐘舵�� 1: 姝ｅ父  0: 绂佺敤  
      */
     @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父  0: 绂佺敤  ")
+    @TableField("\"status\"")
     private Integer status;
 
     /**
      * 娣诲姞鏃堕棿
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
-    @TableField("create_time")
+    @TableField("\"createTime\"")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
@@ -106,7 +116,7 @@
      * 淇敼鏃堕棿
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
-    @TableField("update_time")
+    @TableField("\"updateTime\"")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
@@ -114,6 +124,7 @@
      * 澶囨敞
      */
     @ApiModelProperty(value= "澶囨敞")
+    @TableField("\"memo\"")
     private String memo;
 
     public ApiLog() {}
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnError.java b/src/main/java/com/zy/asrs/entity/BasCrnError.java
index d6ff938..830e9c6 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnError.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnError.java
@@ -23,43 +23,42 @@
      * 寮傚父浠ｅ彿
      */
     @ApiModelProperty(value= "寮傚父浠ｅ彿")
-    @TableId(value = "error_code", type = IdType.AUTO)
-    @TableField("error_code")
+    @TableId(value = "\"errorCode\"", type = IdType.AUTO)
     private Long errorCode;
 
     /**
      * 寮傚父鎻忚堪
      */
     @ApiModelProperty(value= "寮傚父鎻忚堪")
-    @TableField("err_name")
+    @TableField("\"err_name\"")
     private String errName;
 
     /**
      * 淇敼浜哄憳
      */
     @ApiModelProperty(value= "淇敼浜哄憳")
-    @TableField("modi_user")
+    @TableField("\"modi_user\"")
     private Long modiUser;
 
     /**
      * 淇敼鏃堕棿
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
-    @TableField("modi_time")
+    @TableField("\"modi_time\"")
     private Date modiTime;
 
     /**
      * 鍒涘缓鑰�
      */
     @ApiModelProperty(value= "鍒涘缓鑰�")
-    @TableField("appe_user")
+    @TableField("\"appe_user\"")
     private Long appeUser;
 
     /**
      * 娣诲姞鏃堕棿
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
-    @TableField("appe_time")
+    @TableField("\"appe_time\"")
     private Date appeTime;
 
     public BasCrnError() {}
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnOpt.java b/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
index 0b57310..dce2496 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
@@ -23,110 +23,112 @@
      * ID
      */
     @ApiModelProperty(value= "ID")
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "\"id\"", type = IdType.AUTO)
     private Long id;
 
     /**
      * 浠诲姟鍙�
      */
     @ApiModelProperty(value= "浠诲姟鍙�")
-    @TableField("wrk_no")
+    @TableField("\"wrk_no\"")
     private Integer wrkNo;
 
     /**
      * 鍫嗗灈鏈�
      */
     @ApiModelProperty(value= "鍫嗗灈鏈�")
-    @TableField("crn_no")
+    @TableField("\"crn_no\"")
     private Integer crnNo;
 
     /**
      * 涓嬪彂鏃堕棿
      */
     @ApiModelProperty(value= "涓嬪彂鏃堕棿")
-    @TableField("send_time")
+    @TableField("\"send_time\"")
     private Date sendTime;
 
     /**
      * 妯″紡
      */
     @ApiModelProperty(value= "妯″紡")
+    @TableField("\"mode\"")
     private String mode;
 
     /**
      * 婧愭帓
      */
     @ApiModelProperty(value= "婧愭帓")
-    @TableField("source_row")
+    @TableField("\"source_row\"")
     private Integer sourceRow;
 
     /**
      * 婧愬垪
      */
     @ApiModelProperty(value= "婧愬垪")
-    @TableField("source_bay")
+    @TableField("\"source_bay\"")
     private Integer sourceBay;
 
     /**
      * 婧愬眰
      */
     @ApiModelProperty(value= "婧愬眰")
-    @TableField("source_lev")
+    @TableField("\"source_lev\"")
     private Integer sourceLev;
 
     /**
      * 婧愮珯
      */
     @ApiModelProperty(value= "婧愮珯")
-    @TableField("source_sta")
+    @TableField("\"source_sta\"")
     private Integer sourceSta;
 
     /**
      * 鐩爣鎺�
      */
     @ApiModelProperty(value= "鐩爣鎺�")
-    @TableField("pos_row")
+    @TableField("\"pos_row\"")
     private Integer posRow;
 
     /**
      * 鐩爣鍒�
      */
     @ApiModelProperty(value= "鐩爣鍒�")
-    @TableField("pos_bay")
+    @TableField("\"pos_bay\"")
     private Integer posBay;
 
     /**
      * 鐩爣灞�
      */
     @ApiModelProperty(value= "鐩爣灞�")
-    @TableField("pos_lev")
+    @TableField("\"pos_lev\"")
     private Integer posLev;
 
     /**
      * 鐩爣绔�
      */
     @ApiModelProperty(value= "鐩爣绔�")
-    @TableField("pos_sta")
+    @TableField("\"pos_sta\"")
     private Integer posSta;
 
     /**
      * 鍝嶅簲缁撴灉 1: 姝ｅ父  0: 澶辫触  
      */
     @ApiModelProperty(value= "鍝嶅簲缁撴灉 1: 姝ｅ父  0: 澶辫触  ")
+    @TableField("\"response\"")
     private Integer response;
 
     /**
      * 淇敼鏃堕棿
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
-    @TableField("update_time")
+    @TableField("\"updateTime\"")
     private Date updateTime;
 
     /**
      * 淇敼浜哄憳
      */
     @ApiModelProperty(value= "淇敼浜哄憳")
-    @TableField("update_by")
+    @TableField("\"updateBy\"")
     private Long updateBy;
 
     public BasCrnOpt() {}
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnStatus.java b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
index 30c7aec..b976bbc 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
@@ -23,43 +23,42 @@
      * 宸ヤ綔浠ｅ彿
      */
     @ApiModelProperty(value= "鐘舵�佷唬鍙�")
-    @TableId(value = "sts_no", type = IdType.INPUT)
-    @TableField("sts_no")
+    @TableId(value = "\"sts_no\"", type = IdType.INPUT)
     private String stsNo;
 
     /**
      * 鐘舵�佹弿杩�
      */
     @ApiModelProperty(value= "鐘舵�佹弿杩�")
-    @TableField("sts_desc")
+    @TableField("\"sts_desc\"")
     private String stsDesc;
 
     /**
      * 淇敼浜哄憳
      */
     @ApiModelProperty(value= "淇敼浜哄憳")
-    @TableField("modi_user")
+    @TableField("\"modi_user\"")
     private Long modiUser;
 
     /**
      * 淇敼鏃堕棿
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
-    @TableField("modi_time")
+    @TableField("\"modi_time\"")
     private Date modiTime;
 
     /**
      * 鍒涘缓鑰�
      */
     @ApiModelProperty(value= "鍒涘缓鑰�")
-    @TableField("appe_user")
+    @TableField("\"appe_user\"")
     private Long appeUser;
 
     /**
      * 娣诲姞鏃堕棿
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
-    @TableField("appe_time")
+    @TableField("\"appe_time\"")
     private Date appeTime;
 
     public BasCrnStatus() {}
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnp.java b/src/main/java/com/zy/asrs/entity/BasCrnp.java
index 56ab945..d2a6d69 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnp.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnp.java
@@ -25,127 +25,126 @@
      * 缂栧彿
      */
     @ApiModelProperty(value= "缂栧彿")
-    @TableId(value = "crn_no", type = IdType.INPUT)
-    @TableField("crn_no")
+    @TableId(value = "CRN_NO", type = IdType.INPUT)
     private Integer crnNo;
 
     /**
      * 鍙叆
      */
     @ApiModelProperty(value= "鍙叆")
-    @TableField("in_enable")
+    @TableField("\"in_enable\"")
     private String inEnable;
 
     /**
      * 鍙嚭
      */
     @ApiModelProperty(value= "鍙嚭")
-    @TableField("out_enable")
+    @TableField("\"out_enable\"")
     private String outEnable;
 
     /**
      * 鐘舵��
      */
     @ApiModelProperty(value= "鐘舵��")
-    @TableField("crn_sts")
+    @TableField("\"crn_sts\"")
     private Integer crnSts;
 
     /**
      * 宸ヤ綔鍙�
      */
     @ApiModelProperty(value= "宸ヤ綔鍙�")
-    @TableField("wrk_no")
+    @TableField("\"wrk_no\"")
     private Integer wrkNo;
 
     /**
      * 寮傚父鐮�
      */
     @ApiModelProperty(value= "寮傚父鐮�")
-    @TableField("crn_err")
+    @TableField("\"crn_err\"")
     private Long crnErr;
 
     /**
      * 婧愬簱浣�
      */
     @ApiModelProperty(value= "婧愬簱浣�")
-    @TableField("frm_locno")
+    @TableField("\"frm_locno\"")
     private String frmLocno;
 
     /**
      * 婧愮珯
      */
     @ApiModelProperty(value= "婧愮珯")
-    @TableField("frm_sta")
+    @TableField("\"frm_sta\"")
     private Integer frmSta;
 
     /**
      * 鐩爣绔�
      */
     @ApiModelProperty(value= "鐩爣绔�")
-    @TableField("to_sta")
+    @TableField("\"to_sta\"")
     private Integer toSta;
 
     /**
      * 鐩爣搴撲綅
      */
     @ApiModelProperty(value= "鐩爣搴撲綅")
-    @TableField("to_locno")
+    @TableField("\"to_locno\"")
     private String toLocno;
 
     /**
      * 鍒涘缓鑰�
      */
     @ApiModelProperty(value= "鍒涘缓鑰�")
-    @TableField("appe_user")
+    @TableField("\"appe_user\"")
     private Long appeUser;
 
     /**
      * 鍒涘缓鏃堕棿
      */
     @ApiModelProperty(value= "鍒涘缓鏃堕棿")
-    @TableField("appe_time")
+    @TableField("\"appe_time\"")
     private Date appeTime;
 
     /**
      * 淇敼浜哄憳
      */
     @ApiModelProperty(value= "淇敼浜哄憳")
-    @TableField("modi_user")
+    @TableField("\"modi_user\"")
     private Long modiUser;
 
     /**
      * 淇敼鏃堕棿
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
-    @TableField("modi_time")
+    @TableField("\"modi_time\"")
     private Date modiTime;
 
     @ApiModelProperty(value= "")
-    @TableField("hp_mk")
+    @TableField("\"hp_mk\"")
     private String hpMk;
 
     @ApiModelProperty(value= "")
-    @TableField("retrieve_mk")
+    @TableField("\"retrieve_mk\"")
     private String retrieveMk;
 
     @ApiModelProperty(value= "")
-    @TableField("ctl_hp")
+    @TableField("\"ctl_hp\"")
     private String ctlHp;
 
     @ApiModelProperty(value= "")
-    @TableField("ctl_rest")
+    @TableField("\"ctl_rest\"")
     private String ctlRest;
 
     @ApiModelProperty(value= "")
-    @TableField("emp_in")
+    @TableField("\"emp_in\"")
     private String empIn;
 
     @ApiModelProperty(value= "")
-    @TableField("tank_qty")
+    @TableField("\"tank_qty\"")
     private Integer tankQty;
 
     @ApiModelProperty(value= "")
-    @TableField("tank_qty1")
+    @TableField("\"tank_qty1\"")
     private Integer tankQty1;
 
     public BasCrnp() {}
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 6e7bf88..99fca6f 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -25,72 +25,79 @@
      * 缂栧彿
      */
     @ApiModelProperty(value= "缂栧彿")
-    @TableId(value = "dev_no", type = IdType.INPUT)
-    @TableField("dev_no")
+    @TableId(value = "\"dev_no\"", type = IdType.INPUT)
     private Integer devNo;
 
     /**
      * 璁惧鎻忚堪
      */
     @ApiModelProperty(value= "璁惧鎻忚堪")
-    @TableField("dec_desc")
+    @TableField("\"dec_desc\"")
     private String decDesc;
 
     /**
      * 澶囨敞
      */
     @ApiModelProperty(value= "澶囨敞")
-    @TableField("dev_mk")
+    @TableField("\"dev_mk\"")
     private String devMk;
 
     /**
      * 鍙叆
      */
     @ApiModelProperty(value= "鍙叆")
-    @TableField("in_enable")
+    @TableField("\"in_enable\"")
     private String inEnable;
 
     /**
      * 鍙嚭
      */
     @ApiModelProperty(value= "鍙嚭")
-    @TableField("out_enable")
+    @TableField("\"out_enable\"")
     private String outEnable;
 
     /**
      * 鑷姩
      */
     @ApiModelProperty(value= "鑷姩")
+    @TableField("\"autoing\"")
     private String autoing;
 
     /**
      * 鏈夌墿
      */
     @ApiModelProperty(value= "鏈夌墿")
+    @TableField("\"loading\"")
     private String loading;
 
     /**
      * 鑳藉叆
      */
     @ApiModelProperty(value= "鑳藉叆")
+    @TableField("\"canining\"")
     private String canining;
 
     /**
      * 鑳藉嚭
      */
     @ApiModelProperty(value= "鑳藉嚭")
+    @TableField("\"canouting\"")
     private String canouting;
 
     @ApiModelProperty(value= "")
+    @TableField("\"fronting\"")
     private String fronting;
 
     @ApiModelProperty(value= "")
+    @TableField("\"rearing\"")
     private String rearing;
 
     @ApiModelProperty(value= "")
+    @TableField("\"uping\"")
     private String uping;
 
     @ApiModelProperty(value= "")
+    @TableField("\"downing\"")
     private String downing;
 
     /**
diff --git a/src/main/java/com/zy/asrs/entity/BasErrLog.java b/src/main/java/com/zy/asrs/entity/BasErrLog.java
index 77e6214..393439c 100644
--- a/src/main/java/com/zy/asrs/entity/BasErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasErrLog.java
@@ -23,149 +23,154 @@
      * ID
      */
     @ApiModelProperty(value= "ID")
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "\"id\"", type = IdType.AUTO)
     private Long id;
 
     /**
      * 缂栧彿
      */
     @ApiModelProperty(value= "缂栧彿")
+    @TableField("\"uuid\"")
     private String uuid;
 
     /**
      * 宸ヤ綔鍙�
      */
     @ApiModelProperty(value= "宸ヤ綔鍙�")
-    @TableField("wrk_no")
+    @TableField("\"wrk_no\"")
     private Integer wrkNo;
 
     /**
      * 鍙戠敓鏃堕棿
      */
     @ApiModelProperty(value= "鍙戠敓鏃堕棿")
-    @TableField("start_time")
+    @TableField("\"start_time\"")
     private Date startTime;
 
     /**
      * 缁撴潫鏃堕棿
      */
     @ApiModelProperty(value= "缁撴潫鏃堕棿")
-    @TableField("end_time")
+    @TableField("\"end_time\"")
     private Date endTime;
 
     /**
      * 宸ヤ綔鐘舵��
      */
     @ApiModelProperty(value= "宸ヤ綔鐘舵��")
-    @TableField("wrk_sts")
+    @TableField("\"wrk_sts\"")
     private Long wrkSts;
 
     /**
      * 鍏ュ嚭搴撶被鍨�
      */
     @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
-    @TableField("io_type")
+    @TableField("\"io_type\"")
     private Integer ioType;
 
     /**
      * 鍫嗗灈鏈�
      */
     @ApiModelProperty(value= "鍫嗗灈鏈�")
-    @TableField("crn_no")
+    @TableField("\"crn_no\"")
     private Integer crnNo;
 
     /**
      * plc
      */
     @ApiModelProperty(value= "plc")
-    @TableField("plc_no")
+    @TableField("\"plc_no\"")
     private Integer plcNo;
 
     /**
      * 鐩爣搴撲綅
      */
     @ApiModelProperty(value= "鐩爣搴撲綅")
-    @TableField("loc_no")
+    @TableField("\"loc_no\"")
     private String locNo;
 
     /**
      * 鐩爣绔�
      */
     @ApiModelProperty(value= "鐩爣绔�")
-    @TableField("sta_no")
+    @TableField("\"sta_no\"")
     private Integer staNo;
 
     /**
      * 婧愮珯
      */
     @ApiModelProperty(value= "婧愮珯")
-    @TableField("source_sta_no")
+    @TableField("\"source_sta_no\"")
     private Integer sourceStaNo;
 
     /**
      * 婧愬簱浣�
      */
     @ApiModelProperty(value= "婧愬簱浣�")
-    @TableField("source_loc_no")
+    @TableField("\"source_loc_no\"")
     private String sourceLocNo;
 
     /**
      * 鏉＄爜
      */
     @ApiModelProperty(value= "鏉＄爜")
+    @TableField("\"barcode\"")
     private String barcode;
 
     /**
      * 寮傚父鐮�
      */
     @ApiModelProperty(value= "寮傚父鐮�")
-    @TableField("err_code")
+    @TableField("\"err_code\"")
     private Integer errCode;
 
     /**
      * 寮傚父
      */
     @ApiModelProperty(value= "寮傚父")
+    @TableField("\"error\"")
     private String error;
 
     /**
      * 寮傚父鎯呭喌 1: 鏈鐞�  2: 宸蹭慨澶�  
      */
     @ApiModelProperty(value= "寮傚父鎯呭喌 1: 鏈鐞�  2: 宸蹭慨澶�  ")
+    @TableField("\"status\"")
     private Integer status;
 
     /**
      * 娣诲姞鏃堕棿
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
-    @TableField("create_time")
+    @TableField("\"create_time\"")
     private Date createTime;
 
     /**
      * 娣诲姞浜哄憳
      */
     @ApiModelProperty(value= "娣诲姞浜哄憳")
-    @TableField("create_by")
+    @TableField("\"create_by\"")
     private Long createBy;
 
     /**
      * 淇敼鏃堕棿
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
-    @TableField("update_time")
+    @TableField("\"update_time\"")
     private Date updateTime;
 
     /**
      * 淇敼浜哄憳
      */
     @ApiModelProperty(value= "淇敼浜哄憳")
-    @TableField("update_by")
+    @TableField("\"update_by\"")
     private Long updateBy;
 
     /**
      * 澶囨敞
      */
     @ApiModelProperty(value= "澶囨敞")
+    @TableField("\"memo\"")
     private String memo;
 
     public BasErrLog() {}
diff --git a/src/main/java/com/zy/asrs/entity/DeviceError.java b/src/main/java/com/zy/asrs/entity/DeviceError.java
index ebbd105..0a4de49 100644
--- a/src/main/java/com/zy/asrs/entity/DeviceError.java
+++ b/src/main/java/com/zy/asrs/entity/DeviceError.java
@@ -19,27 +19,28 @@
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value= "")
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "\"id\"", type = IdType.AUTO)
     private Long id;
 
     /**
      * 璁惧
      */
     @ApiModelProperty(value= "璁惧")
+    @TableField("\"device\"")
     private String device;
 
     /**
      * 璁惧ID
      */
     @ApiModelProperty(value= "璁惧ID")
-    @TableField("device_id")
+    @TableField("\"device_id\"")
     private Integer deviceId;
 
     /**
      * 鍒涘缓鏃堕棿
      */
     @ApiModelProperty(value= "鍒涘缓鏃堕棿")
-    @TableField("create_time")
+    @TableField("\"create_time\"")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java
index 15cb346..df76b24 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrk.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java
@@ -43,35 +43,36 @@
      * wms浠诲姟鍙�
      */
     @ApiModelProperty(value= "wms浠诲姟鍙�")
-    @TableId(value = "task_no", type = IdType.INPUT)
-    @TableField("task_no")
+    @TableId(value = "\"task_no\"", type = IdType.INPUT)
+    @TableField("\"task_no\"")
     private String taskNo;
 
     /**
      * 浠诲姟鐘舵�� 1: 鎺ユ敹  2: 娲惧彂  3: 瀹岀粨  4: 鍙栨秷
      */
     @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹  2: 娲惧彂  5: 瀹岀粨  4: 鍙栨秷  ")
+    @TableField("\"status\"")
     private Integer status;
 
     /**
      * 浠诲姟鍙�
      */
     @ApiModelProperty(value= "浠诲姟鍙�")
-    @TableField("wrk_no")
+    @TableField("\"wrk_no\"")
     private Integer wrkNo;
 
     /**
      * 浠诲姟鍙�
      */
     @ApiModelProperty(value= "閲嶉噺")
-    @TableField("sc_weight")
+    @TableField("\"sc_weight\"")
     private Integer scWeight;
 
     /**
      * 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
      */
     @ApiModelProperty(value= "浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)")
-    @TableField("create_time")
+    @TableField("\"create_time\"")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
@@ -79,42 +80,42 @@
      * 浠诲姟绫诲瀷
      */
     @ApiModelProperty(value= "浠诲姟绫诲瀷")
-    @TableField("io_type")
+    @TableField("\"io_type\"")
     private Integer ioType;
 
     /**
      * 浼樺厛绾�
      */
     @ApiModelProperty(value= "浼樺厛绾�")
-    @TableField("io_pri")
+    @TableField("\"io_pri\"")
     private Integer ioPri;
 
     /**
      * 璧风偣
      */
     @ApiModelProperty(value= "璧风偣")
-    @TableField("start_point")
+    @TableField("\"start_point\"")
     private String startPoint;
 
     /**
      * 缁堢偣
      */
     @ApiModelProperty(value= "缁堢偣")
-    @TableField("target_point")
+    @TableField("\"target_point\"")
     private String targetPoint;
 
     /**
      * 淇敼浜哄憳
      */
     @ApiModelProperty(value= "淇敼浜哄憳")
-    @TableField("modi_user")
+    @TableField("\"modi_user\"")
     private Long modiUser;
 
     /**
      * 淇敼鏃堕棿
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
-    @TableField("modi_time")
+    @TableField("\"modi_time\"")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date modiTime;
 
@@ -122,19 +123,21 @@
      * 澶囨敞
      */
     @ApiModelProperty(value= "澶囨敞")
+    @TableField("\"memo\"")
     private String memo;
 
     /**
      * 鏉＄爜
      */
     @ApiModelProperty(value= "鏉＄爜")
+    @TableField("\"barcode\"")
     private String barcode;
 
     /**
      * 娲惧彂鏃堕棿
      */
     @ApiModelProperty(value= "娲惧彂鏃堕棿")
-    @TableField("assign_time")
+    @TableField("\"assign_time\"")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date assignTime;
 
@@ -142,7 +145,7 @@
      * 鎵ц鏃堕棿
      */
     @ApiModelProperty(value= "鎵ц鏃堕棿")
-    @TableField("execute_time")
+    @TableField("\"execute_time\"")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date executeTime;
 
@@ -150,7 +153,7 @@
      * 瀹岀粨鏃堕棿
      */
     @ApiModelProperty(value= "瀹岀粨鏃堕棿")
-    @TableField("complete_time")
+    @TableField("\"complete_time\"")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date completeTime;
 
@@ -158,7 +161,7 @@
      * 鍙栨秷鏃堕棿
      */
     @ApiModelProperty(value= "鍙栨秷鏃堕棿")
-    @TableField("cancel_time")
+    @TableField("\"cancel_time\"")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date cancelTime;
 
@@ -166,26 +169,26 @@
      * 宸ヤ綔鐘舵��
      */
     @ApiModelProperty(value= "宸ヤ綔鐘舵��")
-    @TableField("wrk_sts")
+    @TableField("\"wrk_sts\"")
     private Integer wrkSts;
 
     /**
      * 鍫嗗灈鏈哄彿
      */
     @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
-    @TableField("crn_no")
+    @TableField("\"crn_no\"")
     private Integer crnNo;
 
     @ApiModelProperty(value = "绉诲簱鏍囪")
-    @TableField("transfer_mark")
+    @TableField("\"transfer_mark\"")
     private Integer transferMark;
 
     @ApiModelProperty(value = "鍘熷璧风偣")
-    @TableField("origin_start_point")
+    @TableField("\"origin_start_point\"")
     private String originStartPoint;
 
     @ApiModelProperty(value = "鍘熷璧风偣")
-    @TableField("origin_target_point")
+    @TableField("\"origin_target_point\"")
     private String originTargetPoint;
 
     public TaskWrk() {}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 4c1e5cd..a07a02b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -749,10 +749,10 @@
         for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
             // 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑绉诲簱宸ヤ綔妗�
             List<TaskWrk> taskWrks = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>()
-                    .eq("crn_no",slave.getId())
-                    .eq("wrk_sts",11)
-                    .eq("io_type",3)
-                    .orderBy("io_pri",false));
+                    .eq("\"crn_no\"",slave.getId())
+                    .eq("\"wrk_sts\"",11)
+                    .eq("\"io_type\"",3)
+                    .orderBy("\"io_pri\"",false));
             for (TaskWrk taskWrk : taskWrks){
 
                 // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 871e27f..6fc1b9a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -41,7 +41,7 @@
 
 #License鐩稿叧閰嶇疆
 license:
-  subject: ryzhwcs
+  subject: shzhjxydwcs
   publicAlias: publicCert
   storePass: public_zhongyang_123456789
   licensePath: license.lic
diff --git a/src/main/resources/mapper/ApiConfigMapper.xml b/src/main/resources/mapper/ApiConfigMapper.xml
index 2d084f0..cac57ff 100644
--- a/src/main/resources/mapper/ApiConfigMapper.xml
+++ b/src/main/resources/mapper/ApiConfigMapper.xml
@@ -4,21 +4,21 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.zy.asrs.entity.ApiConfig">
-        <id column="id" property="id" />
-        <result column="url" property="url" />
-        <result column="status" property="status" />
-        <result column="memo" property="memo" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-        <result column="create_by" property="createBy" />
-        <result column="update_by" property="updateBy" />
+        <id column="ID" property="id" />
+        <result column="URL" property="url" />
+        <result column="STATUS" property="status" />
+        <result column="MEMO" property="memo" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="UPDATE_TIME" property="updateTime" />
+        <result column="CREATE_BY" property="createBy" />
+        <result column="UPDATE_BY" property="updateBy" />
 
     </resultMap>
 
     <select id="selectByUrl" resultMap="BaseResultMap">
         select top 1 * from "SOURCE"."wcs_api_config"
-        where "url" = #{url}
-        order by "create_time" desc
+        where "URL" = #{url}
+        order by "CREATE_TIME" desc
     </select>
 
 </mapper>
diff --git a/src/main/resources/mapper/ApiLogMapper.xml b/src/main/resources/mapper/ApiLogMapper.xml
index ce84aac..9b298cb 100644
--- a/src/main/resources/mapper/ApiLogMapper.xml
+++ b/src/main/resources/mapper/ApiLogMapper.xml
@@ -4,21 +4,21 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.zy.asrs.entity.ApiLog">
-        <id column="id" property="id" />
-        <result column="uuid" property="uuid" />
-        <result column="namespace" property="namespace" />
-        <result column="url" property="url" />
-        <result column="appkey" property="appkey" />
-        <result column="timestamp" property="timestamp" />
-        <result column="client_ip" property="clientIp" />
-        <result column="request" property="request" />
-        <result column="response" property="response" />
-        <result column="err" property="err" />
-        <result column="result" property="result" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-        <result column="memo" property="memo" />
+        <id column="ID" property="id" />
+        <result column="UUID" property="uuid" />
+        <result column="NAMESPACE" property="namespace" />
+        <result column="URL" property="url" />
+        <result column="APPKEY" property="appkey" />
+        <result column="TIMESTAMP" property="timestamp" />
+        <result column="CLIENT_IP" property="clientIp" />
+        <result column="REQUEST" property="request" />
+        <result column="RESPONSE" property="response" />
+        <result column="ERR" property="err" />
+        <result column="RESULT" property="result" />
+        <result column="STATUS" property="status" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="UPDATE_TIME" property="updateTime" />
+        <result column="MEMO" property="memo" />
 
     </resultMap>
 
diff --git a/src/main/resources/mapper/BasCrnErrorMapper.xml b/src/main/resources/mapper/BasCrnErrorMapper.xml
index e911e0f..ab48327 100644
--- a/src/main/resources/mapper/BasCrnErrorMapper.xml
+++ b/src/main/resources/mapper/BasCrnErrorMapper.xml
@@ -4,12 +4,12 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasCrnError">
-        <id column="error_code" property="errorCode" />
-        <result column="err_name" property="errName" />
-        <result column="modi_user" property="modiUser" />
-        <result column="modi_time" property="modiTime" />
-        <result column="appe_user" property="appeUser" />
-        <result column="appe_time" property="appeTime" />
+        <id column="ERROR_CODE" property="errorCode" />
+        <result column="ERR_NAME" property="errName" />
+        <result column="MODI_USER" property="modiUser" />
+        <result column="MODI_TIME" property="modiTime" />
+        <result column="APPE_USER" property="appeUser" />
+        <result column="APPE_TIME" property="appeTime" />
 
     </resultMap>
 
diff --git a/src/main/resources/mapper/BasCrnStatusMapper.xml b/src/main/resources/mapper/BasCrnStatusMapper.xml
index bfcfc3f..581b681 100644
--- a/src/main/resources/mapper/BasCrnStatusMapper.xml
+++ b/src/main/resources/mapper/BasCrnStatusMapper.xml
@@ -4,12 +4,12 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasCrnStatus">
-        <id column="sts_no" property="stsNo" />
-        <result column="sts_desc" property="stsDesc" />
-        <result column="modi_user" property="modiUser" />
-        <result column="modi_time" property="modiTime" />
-        <result column="appe_user" property="appeUser" />
-        <result column="appe_time" property="appeTime" />
+        <id column="STS_NO" property="stsNo" />
+        <result column="STS_DESC" property="stsDesc" />
+        <result column="MODI_USER" property="modiUser" />
+        <result column="MODI_TIME" property="modiTime" />
+        <result column="APPE_USER" property="appeUser" />
+        <result column="APPE_TIME" property="appeTime" />
 
     </resultMap>
 
diff --git a/src/main/resources/mapper/BasCrnpMapper.xml b/src/main/resources/mapper/BasCrnpMapper.xml
index b9a10bc..453cc19 100644
--- a/src/main/resources/mapper/BasCrnpMapper.xml
+++ b/src/main/resources/mapper/BasCrnpMapper.xml
@@ -4,27 +4,27 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasCrnp">
-        <id column="crn_no" property="crnNo" />
-        <result column="in_enable" property="inEnable" />
-        <result column="out_enable" property="outEnable" />
-        <result column="crn_sts" property="crnSts" />
-        <result column="wrk_no" property="wrkNo" />
-        <result column="crn_err" property="crnErr" />
-        <result column="frm_locno" property="frmLocno" />
-        <result column="frm_sta" property="frmSta" />
-        <result column="to_sta" property="toSta" />
-        <result column="to_locno" property="toLocno" />
-        <result column="appe_user" property="appeUser" />
-        <result column="appe_time" property="appeTime" />
-        <result column="modi_user" property="modiUser" />
-        <result column="modi_time" property="modiTime" />
-        <result column="hp_mk" property="hpMk" />
-        <result column="retrieve_mk" property="retrieveMk" />
-        <result column="ctl_hp" property="ctlHp" />
-        <result column="ctl_rest" property="ctlRest" />
-        <result column="emp_in" property="empIn" />
-        <result column="tank_qty" property="tankQty" />
-        <result column="tank_qty1" property="tankQty1" />
+        <id column="CRN_NO" property="crnNo" />
+        <result column="IN_ENABLE" property="inEnable" />
+        <result column="OUT_ENABLE" property="outEnable" />
+        <result column="CRN_STS" property="crnSts" />
+        <result column="WRK_NO" property="wrkNo" />
+        <result column="CRN_ERR" property="crnErr" />
+        <result column="FRM_LOCNO" property="frmLocno" />
+        <result column="FRM_STA" property="frmSta" />
+        <result column="TO_STA" property="toSta" />
+        <result column="TO_LOCNO" property="toLocno" />
+        <result column="APPE_USER" property="appeUser" />
+        <result column="APPE_TIME" property="appeTime" />
+        <result column="MODI_USER" property="modiUser" />
+        <result column="MODI_TIME" property="modiTime" />
+        <result column="HP_MK" property="hpMk" />
+        <result column="RETRIEVE_MK" property="retrieveMk" />
+        <result column="CTL_HP" property="ctlHp" />
+        <result column="CTL_REST" property="ctlRest" />
+        <result column="EMP_IN" property="empIn" />
+        <result column="TANK_QTY" property="tankQty" />
+        <result column="TANK_QTY1" property="tankQty1" />
 
     </resultMap>
 
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index d5385ee..faf62c1 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -4,44 +4,44 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasDevp">
-        <id column="dev_no" property="devNo" />
-        <result column="dec_desc" property="decDesc" />
-        <result column="dev_mk" property="devMk" />
-        <result column="in_enable" property="inEnable" />
-        <result column="out_enable" property="outEnable" />
-        <result column="autoing" property="autoing" />
-        <result column="loading" property="loading" />
-        <result column="canining" property="canining" />
-        <result column="canouting" property="canouting" />
-        <result column="fronting" property="fronting" />
-        <result column="rearing" property="rearing" />
-        <result column="uping" property="uping" />
-        <result column="downing" property="downing" />
-        <result column="inreq1" property="inreq1" />
-        <result column="inreq2" property="inreq2" />
-        <result column="wrk_no" property="wrkNo" />
-        <result column="wrk_no1" property="wrkNo1" />
-        <result column="ctn_type" property="ctnType" />
-        <result column="barcode" property="barcode" />
-        <result column="in_qty" property="inQty" />
-        <result column="row1" property="row1" />
-        <result column="io_time" property="ioTime" />
-        <result column="area" property="area" />
-        <result column="in_ok" property="inOk" />
-        <result column="out_ok" property="outOk" />
-        <result column="loc_type1" property="locType1" />
-        <result column="loc_type2" property="locType2" />
-        <result column="loc_type3" property="locType3" />
-        <result column="modi_user" property="modiUser" />
-        <result column="modi_time" property="modiTime" />
-        <result column="appe_user" property="appeUser" />
-        <result column="appe_time" property="appeTime" />
-        <result column="std_qty" property="stdQty" />
-        <result column="min_wt" property="minWt" />
-        <result column="max_wt" property="maxWt" />
-        <result column="gross_wt" property="grossWt" />
-        <result column="cart_pos" property="cartPos" />
-        <result column="sta_err" property="staErr" />
+        <id column="DEC_NO" property="devNo" />
+        <result column="DEC_DESC" property="decDesc" />
+        <result column="DEV_MK" property="devMk" />
+        <result column="IN_ENABLE" property="inEnable" />
+        <result column="OUT_ENABLE" property="outEnable" />
+        <result column="AUTOING" property="autoing" />
+        <result column="LOADING" property="loading" />
+        <result column="CANINING" property="canining" />
+        <result column="CANOUTING" property="canouting" />
+        <result column="FRONTING" property="fronting" />
+        <result column="REARING" property="rearing" />
+        <result column="UPING" property="uping" />
+        <result column="DOWNING" property="downing" />
+        <result column="INREQ1" property="inreq1" />
+        <result column="INREQ2" property="inreq2" />
+        <result column="WRK_NO" property="wrkNo" />
+        <result column="WRK_NO1" property="wrkNo1" />
+        <result column="CTN_TYPE" property="ctnType" />
+        <result column="BARCODE" property="barcode" />
+        <result column="IN_QTY" property="inQty" />
+        <result column="ROW1" property="row1" />
+        <result column="IO_TIME" property="ioTime" />
+        <result column="AREA" property="area" />
+        <result column="IN_OK" property="inOk" />
+        <result column="OUT_OK" property="outOk" />
+        <result column="LOC_TYPE1" property="locType1" />
+        <result column="LOC_TYPE2" property="locType2" />
+        <result column="LOC_TYPE3" property="locType3" />
+        <result column="MODI_USER" property="modiUser" />
+        <result column="MODI_TIME" property="modiTime" />
+        <result column="APPE_USER" property="appeUser" />
+        <result column="APPE_TIME" property="appeTime" />
+        <result column="STD_QTY" property="stdQty" />
+        <result column="MIN_WT" property="minWt" />
+        <result column="MAX-WT" property="maxWt" />
+        <result column="GROSS_WT" property="grossWt" />
+        <result column="CART_POS" property="cartPos" />
+        <result column="STA_ERR" property="staErr" />
 
     </resultMap>
 

--
Gitblit v1.9.1