From acc6d0cdd8c4a587c4ae4f608e25c8903171fa6b Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期三, 02 四月 2025 11:09:16 +0800 Subject: [PATCH] * --- src/main/resources/mapper/CommandInfoLogMapper.xml | 28 +++--- src/main/resources/mapper/DataResourceMapper.xml | 12 +- src/main/resources/mapper/DeviceErrorMapper.xml | 10 +- src/main/resources/mapper/BasWrkIotypeMapper.xml | 14 +- src/main/resources/mapper/BasPlcerrorLogMapper.xml | 38 ++++---- src/main/resources/mapper/HostMapper.xml | 12 +- src/main/resources/mapper/BasPlcerrorMapper.xml | 12 +- src/main/java/com/zy/asrs/entity/BasCrnp.java | 40 +++++----- src/main/resources/mapper/ConfigMapper.xml | 12 +- src/main/resources/mapper/BasLocStsMapper.xml | 12 +- src/main/resources/mapper/BasWrkStatusMapper.xml | 12 +- src/main/resources/mapper/CommandInfoMapper.xml | 22 ++-- 12 files changed, 112 insertions(+), 112 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/BasCrnp.java b/src/main/java/com/zy/asrs/entity/BasCrnp.java index d2a6d69..c015b0e 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/resources/mapper/BasLocStsMapper.xml b/src/main/resources/mapper/BasLocStsMapper.xml index 1933fd0..004d491 100644 --- a/src/main/resources/mapper/BasLocStsMapper.xml +++ b/src/main/resources/mapper/BasLocStsMapper.xml @@ -4,12 +4,12 @@ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasLocSts"> - <id column="loc_sts" property="locSts" /> - <result column="loc_desc" property="locDesc" /> - <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="LOC_STS" property="locSts" /> + <result column="LOC_DESC" property="locDesc" /> + <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/BasPlcerrorLogMapper.xml b/src/main/resources/mapper/BasPlcerrorLogMapper.xml index 716789d..2eccbd9 100644 --- a/src/main/resources/mapper/BasPlcerrorLogMapper.xml +++ b/src/main/resources/mapper/BasPlcerrorLogMapper.xml @@ -4,26 +4,26 @@ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasPlcerrorLog"> - <id column="id" property="id" /> - <result column="wrk_no" property="wrkNo" /> - <result column="start_time" property="startTime" /> - <result column="end_time" property="endTime" /> - <result column="wrk_sts" property="wrkSts" /> - <result column="io_type" property="ioType" /> - <result column="plc_no" property="plcNo" /> - <result column="loc_no" property="locNo" /> - <result column="sta_no" property="staNo" /> - <result column="source_sta_no" property="sourceStaNo" /> - <result column="source_loc_no" property="sourceLocNo" /> - <result column="barcode" property="barcode" /> - <result column="err_code" property="errCode" /> - <result column="err" property="err" /> + <id column="ID" property="id" /> + <result column="WRK_NO" property="wrkNo" /> + <result column="START_TIME" property="startTime" /> + <result column="END_TIME" property="endTime" /> + <result column="WRK_STS" property="wrkSts" /> + <result column="IO_TYPE" property="ioType" /> + <result column="PLC_NO" property="plcNo" /> + <result column="LOC_NO" property="locNo" /> + <result column="STA_NO" property="staNo" /> + <result column="SOURCE_STA_NO" property="sourceStaNo" /> + <result column="SOURCE_LOC_NO" property="sourceLocNo" /> + <result column="BARCODE" property="barcode" /> + <result column="ERR_CODE" property="errCode" /> + <result column="ERR" property="err" /> <result column="status" property="status" /> - <result column="create_time" property="createTime" /> - <result column="create_by" property="createBy" /> - <result column="update_time" property="updateTime" /> - <result column="update_by" property="updateBy" /> - <result column="memo" property="memo" /> + <result column="CREATE_TIME" property="createTime" /> + <result column="CREATE_BY" property="createBy" /> + <result column="UPDATE_TIME" property="updateTime" /> + <result column="UPDATE_BY" property="updateBy" /> + <result column="MEMO" property="memo" /> </resultMap> diff --git a/src/main/resources/mapper/BasPlcerrorMapper.xml b/src/main/resources/mapper/BasPlcerrorMapper.xml index 58c22d4..dade800 100644 --- a/src/main/resources/mapper/BasPlcerrorMapper.xml +++ b/src/main/resources/mapper/BasPlcerrorMapper.xml @@ -4,12 +4,12 @@ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasPlcerror"> - <result column="error_code" property="errorCode" /> - <result column="error_desc" property="errorDesc" /> - <result column="modi_time" property="modiTime" /> - <result column="modi_user" property="modiUser" /> - <result column="appe_time" property="appeTime" /> - <result column="appe_user" property="appeUser" /> + <result column="ERROR_CODE" property="errorCode" /> + <result column="ERROR_DESC" property="errorDesc" /> + <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/BasWrkIotypeMapper.xml b/src/main/resources/mapper/BasWrkIotypeMapper.xml index 814748c..e87158d 100644 --- a/src/main/resources/mapper/BasWrkIotypeMapper.xml +++ b/src/main/resources/mapper/BasWrkIotypeMapper.xml @@ -4,13 +4,13 @@ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasWrkIotype"> - <id column="io_type" property="ioType" /> - <result column="io_pri" property="ioPri" /> - <result column="io_desc" property="ioDesc" /> - <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="IO_TYPE" property="ioType" /> + <result column="IO_PRI" property="ioPri" /> + <result column="IO_DESC" property="ioDesc" /> + <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/BasWrkStatusMapper.xml b/src/main/resources/mapper/BasWrkStatusMapper.xml index e363bf4..d1bdbe5 100644 --- a/src/main/resources/mapper/BasWrkStatusMapper.xml +++ b/src/main/resources/mapper/BasWrkStatusMapper.xml @@ -4,12 +4,12 @@ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasWrkStatus"> - <id column="wrk_sts" property="wrkSts" /> - <result column="wrk_desc" property="wrkDesc" /> - <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="WRK_STS" property="wrkSts" /> + <result column="WRK_DESC" property="wrkDesc" /> + <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/CommandInfoLogMapper.xml b/src/main/resources/mapper/CommandInfoLogMapper.xml index 932cb5f..2f47e62 100644 --- a/src/main/resources/mapper/CommandInfoLogMapper.xml +++ b/src/main/resources/mapper/CommandInfoLogMapper.xml @@ -4,20 +4,20 @@ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.CommandInfoLog"> - <id column="id" property="id" /> - <result column="wrk_no" property="wrkNo" /> - <result column="start_pos" property="startPos" /> - <result column="end_pos" property="endPos" /> - <result column="command_status" property="commandStatus" /> - <result column="start_time" property="startTime" /> - <result column="command_type" property="commandType" /> - <result column="device" property="device" /> - <result column="device_log" property="deviceLog" /> - <result column="command_desc" property="commandDesc" /> - <result column="command" property="command" /> - <result column="task_no" property="taskNo" /> - <result column="execute_time" property="executeTime" /> - <result column="complete_time" property="completeTime" /> + <id column="ID" property="id" /> + <result column="WRK_NO" property="wrkNo" /> + <result column="START_POS" property="startPos" /> + <result column="END_POS" property="endPos" /> + <result column="COMMAND_STATUS" property="commandStatus" /> + <result column="START_TIME" property="startTime" /> + <result column="COMMAND_TYPE" property="commandType" /> + <result column="DEVICE" property="device" /> + <result column="DEVICE_LOG" property="deviceLog" /> + <result column="COMMAND_DESC" property="commandDesc" /> + <result column="COMMAND" property="command" /> + <result column="TASK_NO" property="taskNo" /> + <result column="EXECUTE_TIME" property="executeTime" /> + <result column="COMPLETE_TIME" property="completeTime" /> </resultMap> diff --git a/src/main/resources/mapper/CommandInfoMapper.xml b/src/main/resources/mapper/CommandInfoMapper.xml index 7e03ed8..d9bbc7b 100644 --- a/src/main/resources/mapper/CommandInfoMapper.xml +++ b/src/main/resources/mapper/CommandInfoMapper.xml @@ -4,17 +4,17 @@ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.CommandInfo"> - <id column="id" property="id" /> - <result column="wrk_no" property="wrkNo" /> - <result column="task_no" property="taskNo" /> - <result column="command_status" property="commandStatus" /> - <result column="start_time" property="startTime" /> - <result column="command_type" property="commandType" /> - <result column="device" property="device" /> - <result column="device_log" property="deviceLog" /> - <result column="command_desc" property="commandDesc" /> - <result column="execute_time" property="executeTime" /> - <result column="complete_time" property="completeTime" /> + <id column="ID" property="id" /> + <result column="WRK_NO" property="wrkNo" /> + <result column="TASK_NO" property="taskNo" /> + <result column="COMMAND_STATUS" property="commandStatus" /> + <result column="START_TIME" property="startTime" /> + <result column="COMMAND_TYPE" property="commandType" /> + <result column="DEVICE" property="device" /> + <result column="DEVICE_LOG" property="deviceLog" /> + <result column="COMMAND_DESC" property="commandDesc" /> + <result column="EXECUTE_TIME" property="executeTime" /> + <result column="COMPLETE_TIME" property="completeTime" /> </resultMap> diff --git a/src/main/resources/mapper/ConfigMapper.xml b/src/main/resources/mapper/ConfigMapper.xml index 57d2b13..4da171e 100644 --- a/src/main/resources/mapper/ConfigMapper.xml +++ b/src/main/resources/mapper/ConfigMapper.xml @@ -4,12 +4,12 @@ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> <resultMap id="BaseResultMap" type="com.zy.system.entity.Config"> - <id column="id" property="id" /> - <result column="name" property="name" /> - <result column="code" property="code" /> - <result column="value" property="value" /> - <result column="type" property="type" /> - <result column="status" property="status" /> + <id column="ID" property="id" /> + <result column="NAME" property="name" /> + <result column="CODE" property="code" /> + <result column="VALUE" property="value" /> + <result column="TYPE" property="type" /> + <result column="STATUS" property="status" /> </resultMap> diff --git a/src/main/resources/mapper/DataResourceMapper.xml b/src/main/resources/mapper/DataResourceMapper.xml index 13330fb..c348641 100644 --- a/src/main/resources/mapper/DataResourceMapper.xml +++ b/src/main/resources/mapper/DataResourceMapper.xml @@ -4,12 +4,12 @@ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.DataResource"> - <id column="id" property="id" /> - <result column="data" property="data" /> - <result column="name" property="name" /> - <result column="resource_id" property="resourceId" /> - <result column="create_time" property="createTime" /> - <result column="memo" property="memo" /> + <id column="ID" property="id" /> + <result column="DATA" property="data" /> + <result column="NAME" property="name" /> + <result column="RESOURCE_ID" property="resourceId" /> + <result column="CREATE_TIME" property="createTime" /> + <result column="MEMO" property="memo" /> </resultMap> diff --git a/src/main/resources/mapper/DeviceErrorMapper.xml b/src/main/resources/mapper/DeviceErrorMapper.xml index 69fc924..2644995 100644 --- a/src/main/resources/mapper/DeviceErrorMapper.xml +++ b/src/main/resources/mapper/DeviceErrorMapper.xml @@ -4,11 +4,11 @@ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> <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="DEVICE_ID" property="deviceId" /> + <result column="CREATE_TIME" property="createTime" /> + <result column="MSG" property="msg" /> </resultMap> diff --git a/src/main/resources/mapper/HostMapper.xml b/src/main/resources/mapper/HostMapper.xml index e19faf5..bf6ac75 100644 --- a/src/main/resources/mapper/HostMapper.xml +++ b/src/main/resources/mapper/HostMapper.xml @@ -4,12 +4,12 @@ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> <resultMap id="BaseResultMap" type="com.zy.system.entity.Host"> - <id column="id" property="id" /> - <result column="name" property="name" /> - <result column="flag" property="flag" /> - <result column="create_time" property="createTime" /> - <result column="update_time" property="updateTime" /> - <result column="status" property="status" /> + <id column="ID" property="id" /> + <result column="NAME" property="name" /> + <result column="FLAG" property="flag" /> + <result column="CREATE_TIME" property="createTime" /> + <result column="UPDATE_TIME" property="updateTime" /> + <result column="STATUS" property="status" /> </resultMap> -- Gitblit v1.9.1