From 59fd1401d0d2ca82f1391d1147858e0c5e5e4660 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 09 四月 2025 11:04:23 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/entity/ApiLog.java       |   30 +++---
 src/main/resources/mapper/DeviceErrorMapper.xml    |   19 ++--
 src/main/java/com/zy/asrs/entity/ApiConfig.java    |   16 ++--
 src/main/java/com/zy/asrs/entity/BasCrnOpt.java    |   32 ++++----
 src/main/java/com/zy/asrs/entity/BasDevp.java      |   30 +++---
 src/main/java/com/zy/asrs/entity/BasCrnError.java  |   12 +-
 src/main/java/com/zy/asrs/entity/DeviceError.java  |   30 ++++---
 src/main/java/com/zy/asrs/entity/BasCrnp.java      |   40 +++++-----
 src/main/java/com/zy/asrs/entity/BasCrnStatus.java |   12 +-
 9 files changed, 111 insertions(+), 110 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/ApiConfig.java b/src/main/java/com/zy/asrs/entity/ApiConfig.java
index 13f7902..41a77c1 100644
--- a/src/main/java/com/zy/asrs/entity/ApiConfig.java
+++ b/src/main/java/com/zy/asrs/entity/ApiConfig.java
@@ -27,35 +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\"")
+    @TableField("URL")
     private String url;
 
     /**
      * 鐘舵�� 0: 姝e父  1: 绂佺敤  
      */
     @ApiModelProperty(value= "鐘舵�� 0: 姝e父  1: 绂佺敤  ")
-    @TableField("\"status\"")
+    @TableField("STATUS")
     private Integer status;
 
     /**
      * 澶囨敞
      */
     @ApiModelProperty(value= "澶囨敞")
-    @TableField("\"memo\"")
+    @TableField("MEMO")
     private String memo;
 
     /**
      * 鍒涘缓鏃堕棿
      */
     @ApiModelProperty(value= "鍒涘缓鏃堕棿")
-    @TableField("\"create_time\"")
+    @TableField("CREATE_TIME")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
@@ -63,7 +63,7 @@
      * 鏇存柊鏃堕棿
      */
     @ApiModelProperty(value= "鏇存柊鏃堕棿")
-    @TableField("\"update_time\"")
+    @TableField("UPDATE_TIME")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
@@ -71,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 7d99d2e..753102a 100644
--- a/src/main/java/com/zy/asrs/entity/ApiLog.java
+++ b/src/main/java/com/zy/asrs/entity/ApiLog.java
@@ -24,91 +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\"")
+    @TableField("UUID")
     private String uuid;
 
     /**
      * 鍚嶇О绌洪棿
      */
     @ApiModelProperty(value= "鍚嶇О绌洪棿")
-    @TableField("\"NAMESPACE\"")
+    @TableField("NAMESPACE")
     private String namespace;
 
     /**
      * 鎺ュ彛鍦板潃
      */
     @ApiModelProperty(value= "鎺ュ彛鍦板潃")
-    @TableField("\"URL\"")
+    @TableField("URL")
     private String url;
 
     /**
      * 骞冲彴瀵嗛挜
      */
     @ApiModelProperty(value= "骞冲彴瀵嗛挜")
-    @TableField("\"APPKEY\"")
+    @TableField("APPKEY")
     private String appkey;
 
     /**
      * 鏃堕棿鎴�
      */
     @ApiModelProperty(value= "鏃堕棿鎴�")
-    @TableField("\"TIMESTAMP\"")
+    @TableField("TIMESTAMP")
     private String timestamp;
 
     /**
      * 瀹㈡埛绔疘P
      */
     @ApiModelProperty(value= "瀹㈡埛绔疘P")
-    @TableField("\"CLIENT_IP\"")
+    @TableField("CLIENT_IP")
     private String clientIp;
 
     /**
      * 璇锋眰鍐呭
      */
     @ApiModelProperty(value= "璇锋眰鍐呭")
-    @TableField("\"REQUEST\"")
+    @TableField("REQUEST")
     private String request;
 
     /**
      * 鍝嶅簲鍐呭
      */
     @ApiModelProperty(value= "鍝嶅簲鍐呭")
-    @TableField("\"RESPONSE\"")
+    @TableField("RESPONSE")
     private String response;
 
     /**
      * 寮傚父鍐呭
      */
     @ApiModelProperty(value= "寮傚父鍐呭")
-    @TableField("\"ERR\"")
+    @TableField("ERR")
     private String err;
 
     /**
      * 缁撴灉 1: 鎴愬姛  0: 澶辫触  
      */
     @ApiModelProperty(value= "缁撴灉 1: 鎴愬姛  0: 澶辫触  ")
-    @TableField("\"RESULT\"")
+    @TableField("RESULT")
     private Integer result;
 
     /**
      * 鐘舵�� 1: 姝e父  0: 绂佺敤  
      */
     @ApiModelProperty(value= "鐘舵�� 1: 姝e父  0: 绂佺敤  ")
-    @TableField("\"STATUS\"")
+    @TableField("STATUS")
     private Integer status;
 
     /**
      * 娣诲姞鏃堕棿
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
-    @TableField("\"CREATE_TIME\"")
+    @TableField("CREATE_TIME")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
@@ -116,7 +116,7 @@
      * 淇敼鏃堕棿
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
-    @TableField("\"UPDATE_TIME\"")
+    @TableField("UPDATE_TIME")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
@@ -124,7 +124,7 @@
      * 澶囨敞
      */
     @ApiModelProperty(value= "澶囨敞")
-    @TableField("\"MEMO\"")
+    @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 3df3962..13b9b9c 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnError.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnError.java
@@ -23,42 +23,42 @@
      * 寮傚父浠e彿
      */
     @ApiModelProperty(value= "寮傚父浠e彿")
-    @TableId(value = "\"ERROR_CODE\"", type = IdType.AUTO)
+    @TableId(value = "ERROR_CODE", 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 dce2496..7be796d 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
@@ -23,112 +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("")
     private Integer wrkNo;
 
     /**
      * 鍫嗗灈鏈�
      */
     @ApiModelProperty(value= "鍫嗗灈鏈�")
-    @TableField("\"crn_no\"")
+    @TableField("")
     private Integer crnNo;
 
     /**
      * 涓嬪彂鏃堕棿
      */
     @ApiModelProperty(value= "涓嬪彂鏃堕棿")
-    @TableField("\"send_time\"")
+    @TableField("")
     private Date sendTime;
 
     /**
      * 妯″紡
      */
     @ApiModelProperty(value= "妯″紡")
-    @TableField("\"mode\"")
+    @TableField("")
     private String mode;
 
     /**
      * 婧愭帓
      */
     @ApiModelProperty(value= "婧愭帓")
-    @TableField("\"source_row\"")
+    @TableField("")
     private Integer sourceRow;
 
     /**
      * 婧愬垪
      */
     @ApiModelProperty(value= "婧愬垪")
-    @TableField("\"source_bay\"")
+    @TableField("")
     private Integer sourceBay;
 
     /**
      * 婧愬眰
      */
     @ApiModelProperty(value= "婧愬眰")
-    @TableField("\"source_lev\"")
+    @TableField("")
     private Integer sourceLev;
 
     /**
      * 婧愮珯
      */
     @ApiModelProperty(value= "婧愮珯")
-    @TableField("\"source_sta\"")
+    @TableField("")
     private Integer sourceSta;
 
     /**
      * 鐩爣鎺�
      */
     @ApiModelProperty(value= "鐩爣鎺�")
-    @TableField("\"pos_row\"")
+    @TableField("")
     private Integer posRow;
 
     /**
      * 鐩爣鍒�
      */
     @ApiModelProperty(value= "鐩爣鍒�")
-    @TableField("\"pos_bay\"")
+    @TableField("")
     private Integer posBay;
 
     /**
      * 鐩爣灞�
      */
     @ApiModelProperty(value= "鐩爣灞�")
-    @TableField("\"pos_lev\"")
+    @TableField("")
     private Integer posLev;
 
     /**
      * 鐩爣绔�
      */
     @ApiModelProperty(value= "鐩爣绔�")
-    @TableField("\"pos_sta\"")
+    @TableField("")
     private Integer posSta;
 
     /**
      * 鍝嶅簲缁撴灉 1: 姝e父  0: 澶辫触  
      */
     @ApiModelProperty(value= "鍝嶅簲缁撴灉 1: 姝e父  0: 澶辫触  ")
-    @TableField("\"response\"")
+    @TableField("")
     private Integer response;
 
     /**
      * 淇敼鏃堕棿
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
-    @TableField("\"updateTime\"")
+    @TableField("")
     private Date updateTime;
 
     /**
      * 淇敼浜哄憳
      */
     @ApiModelProperty(value= "淇敼浜哄憳")
-    @TableField("\"updateBy\"")
+    @TableField("")
     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 08eec63..43e4df5 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
@@ -23,42 +23,42 @@
      * 宸ヤ綔浠e彿
      */
     @ApiModelProperty(value= "鐘舵�佷唬鍙�")
-    @TableId(value = "\"STS_NO\"", type = IdType.INPUT)
+    @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 c015b0e..5db8cd9 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnp.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnp.java
@@ -32,119 +32,119 @@
      * 鍙叆
      */
     @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 38036d5..10e3fce 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -25,93 +25,93 @@
      * 缂栧彿
      */
     @ApiModelProperty(value= "缂栧彿")
-    @TableId(value = "\"DEV_NO\"", type = IdType.INPUT)
+    @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\"")
+    @TableField("AUTOING")
     private String autoing;
 
     /**
      * 鏈夌墿
      */
     @ApiModelProperty(value= "鏈夌墿")
-    @TableField("\"LOADING\"")
+    @TableField("LOADING")
     private String loading;
 
     /**
      * 鑳藉叆
      */
     @ApiModelProperty(value= "鑳藉叆")
-    @TableField("\"CANINING\"")
+    @TableField("CANINING")
     private String canining;
 
     /**
      * 鑳藉嚭
      */
     @ApiModelProperty(value= "鑳藉嚭")
-    @TableField("\"CANOUTING\"")
+    @TableField("CANOUTING")
     private String canouting;
 
     @ApiModelProperty(value= "")
-    @TableField("\"FRONTING\"")
+    @TableField("FRONTING")
     private String fronting;
 
     @ApiModelProperty(value= "")
-    @TableField("\"REARING\"")
+    @TableField("REARING")
     private String rearing;
 
     @ApiModelProperty(value= "")
-    @TableField("\"UPING\"")
+    @TableField("UPING")
     private String uping;
 
     @ApiModelProperty(value= "")
-    @TableField("\"DOWNING\"")
+    @TableField("DOWNING")
     private String downing;
 
     /**
      * 闇�姹�1
      */
     @ApiModelProperty(value= "闇�姹�1")
-    @TableField("\"INREQ1\"")
+    @TableField("INREQ1")
     private String inreq1;
 
     /**
      * 闇�姹�2
      */
     @ApiModelProperty(value= "闇�姹�2")
-    @TableField("\"INREQ2\"")
+    @TableField("INREQ2")
     private String inreq2;
 
     /**
diff --git a/src/main/java/com/zy/asrs/entity/DeviceError.java b/src/main/java/com/zy/asrs/entity/DeviceError.java
index 04cb0e3..855c79b 100644
--- a/src/main/java/com/zy/asrs/entity/DeviceError.java
+++ b/src/main/java/com/zy/asrs/entity/DeviceError.java
@@ -19,48 +19,50 @@
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value= "")
-    @TableId(value = "\"id\"", type = IdType.AUTO)
+    @TableId(value = "ID", type = IdType.AUTO)
+    @TableField("ID")
     private Long id;
 
     /**
      * 璁惧
      */
     @ApiModelProperty(value= "璁惧")
-    @TableField("\"device\"")
+    @TableField("DEVICE")
     private String device;
+
+    /**
+     * 寮傚父淇℃伅
+     */
+    @ApiModelProperty(value= "寮傚父淇℃伅")
+    @TableField("MSG")
+    private String msg;
 
     /**
      * 璁惧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;
 
-    /**
-     * 寮傚父淇℃伅
-     */
-    @ApiModelProperty(value= "寮傚父淇℃伅")
-    @TableField("\"msg\"")
-    private String msg;
-
     public DeviceError() {}
 
-    public DeviceError(String device,Integer deviceId,Date createTime,String msg) {
+    public DeviceError(Long id, String device, String msg, Integer deviceId, Date createTime) {
+        this.id = id;
         this.device = device;
+        this.msg = msg;
         this.deviceId = deviceId;
         this.createTime = createTime;
-        this.msg = msg;
     }
 
-//    DeviceError deviceError = new DeviceError(
+    //    DeviceError deviceError = new DeviceError(
 //            null,    // 璁惧
 //            null,    // 璁惧ID
 //            null,    // 鍒涘缓鏃堕棿
diff --git a/src/main/resources/mapper/DeviceErrorMapper.xml b/src/main/resources/mapper/DeviceErrorMapper.xml
index 69fc924..9188ec0 100644
--- a/src/main/resources/mapper/DeviceErrorMapper.xml
+++ b/src/main/resources/mapper/DeviceErrorMapper.xml
@@ -4,24 +4,23 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.zy.asrs.entity.DeviceError">
-        <id column="id" property="id" />
-        <result column="device" property="device" />
-        <result column="device_id" property="deviceId" />
-        <result column="create_time" property="createTime" />
-        <result column="msg" property="msg" />
-
+        <id column="ID" property="id" />
+        <result column="DEVICE" property="device" />
+        <result column="MSG" property="msg" />
+        <result column="DEVICE_ID" property="deviceId" />
+        <result column="CREATE_TIME" property="createTime" />
     </resultMap>
 
     <select id="selectByDeviceAndDeviceId" resultMap="BaseResultMap">
         select top 1 * from "SOURCE"."wcs_device_error"
-        where "device" = #{device}
-        and "device_id" = #{deviceId}
+        where "DEVICE" = #{device}
+        and "DEVICE_ID" = #{deviceId}
     </select>
 
     <delete id="deleteByDeviceAndDeviceId">
         delete from "SOURCE"."wcs_device_error"
-        where "device" = #{device}
-        and "device_id" = #{deviceId}
+        where "DEVICE" = #{device}
+        and "DEVICE_ID" = #{deviceId}
     </delete>
 
 </mapper>

--
Gitblit v1.9.1