From 001f24d4efd7b818bc2224b976c82faf4f9e564c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十一月 2024 11:25:00 +0800
Subject: [PATCH] 1、通信协议要增加版本号（目的为远程升级准备），原来没有版本号的协议默认为版本号为1，所以调整了程序命名； 2、流浪控制器与控制器数据库表都增加了协议版本号字段； 3、VO中Double和Float类型的属性增加注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowmeterMapper.xml | 76 ++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 35 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowmeterMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowmeterMapper.xml
index c74808b..408b346 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowmeterMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowmeterMapper.xml
@@ -5,19 +5,20 @@
<!--@mbg.generated-->
<!--@Table pr_flowmeter-->
<id column="id" jdbcType="BIGINT" property="id" />
+ <result column="monitoringId" jdbcType="BIGINT" property="monitoringId" />
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="protocol" jdbcType="VARCHAR" property="protocol" />
- <result column="onlineState" jdbcType="TINYINT" property="onlinestate" />
- <result column="reportTime" jdbcType="TIMESTAMP" property="reporttime" />
- <result column="addWays" jdbcType="TINYINT" property="addways" />
+ <result column="onlineState" jdbcType="TINYINT" property="onlineState" />
+ <result column="reportTime" jdbcType="TIMESTAMP" property="reportTime" />
+ <result column="addWays" jdbcType="TINYINT" property="addWays" />
<result column="operator" jdbcType="BIGINT" property="operator" />
- <result column="operateDt" jdbcType="TIMESTAMP" property="operatedt" />
+ <result column="operateDt" jdbcType="TIMESTAMP" property="operateDt" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
<result column="deleted" jdbcType="TINYINT" property="deleted" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, code, protocol, onlineState, reportTime, addWays, `operator`, operateDt, remarks,
+ id, monitoringId, code, protocol, onlineState, reportTime, addWays, `operator`, operateDt, remarks,
deleted
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -40,8 +41,8 @@
`operator`, operateDt, remarks,
deleted)
values (#{id,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{protocol,jdbcType=VARCHAR},
- #{onlinestate,jdbcType=TINYINT}, #{reporttime,jdbcType=TIMESTAMP}, #{addways,jdbcType=TINYINT},
- #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR},
+ #{onlineState,jdbcType=TINYINT}, #{reportTime,jdbcType=TIMESTAMP}, #{addWays,jdbcType=TINYINT},
+ #{operator,jdbcType=BIGINT}, #{operateDt,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR},
#{deleted,jdbcType=TINYINT})
</insert>
@@ -58,19 +59,19 @@
<if test="protocol != null">
protocol,
</if>
- <if test="onlinestate != null">
+ <if test="onlineState != null">
onlineState,
</if>
- <if test="reporttime != null">
+ <if test="reportTime != null">
reportTime,
</if>
- <if test="addways != null">
+ <if test="addWays != null">
addWays,
</if>
<if test="operator != null">
`operator`,
</if>
- <if test="operatedt != null">
+ <if test="operateDt != null">
operateDt,
</if>
<if test="remarks != null">
@@ -90,20 +91,20 @@
<if test="protocol != null">
#{protocol,jdbcType=VARCHAR},
</if>
- <if test="onlinestate != null">
- #{onlinestate,jdbcType=TINYINT},
+ <if test="onlineState != null">
+ #{onlineState,jdbcType=TINYINT},
</if>
- <if test="reporttime != null">
- #{reporttime,jdbcType=TIMESTAMP},
+ <if test="reportTime != null">
+ #{reportTime,jdbcType=TIMESTAMP},
</if>
- <if test="addways != null">
- #{addways,jdbcType=TINYINT},
+ <if test="addWays != null">
+ #{addWays,jdbcType=TINYINT},
</if>
<if test="operator != null">
#{operator,jdbcType=BIGINT},
</if>
- <if test="operatedt != null">
- #{operatedt,jdbcType=TIMESTAMP},
+ <if test="operateDt != null">
+ #{operateDt,jdbcType=TIMESTAMP},
</if>
<if test="remarks != null">
#{remarks,jdbcType=VARCHAR},
@@ -123,20 +124,20 @@
<if test="protocol != null">
protocol = #{protocol,jdbcType=VARCHAR},
</if>
- <if test="onlinestate != null">
- onlineState = #{onlinestate,jdbcType=TINYINT},
+ <if test="onlineState != null">
+ onlineState = #{onlineState,jdbcType=TINYINT},
</if>
- <if test="reporttime != null">
- reportTime = #{reporttime,jdbcType=TIMESTAMP},
+ <if test="reportTime != null">
+ reportTime = #{reportTime,jdbcType=TIMESTAMP},
</if>
- <if test="addways != null">
- addWays = #{addways,jdbcType=TINYINT},
+ <if test="addWays != null">
+ addWays = #{addWays,jdbcType=TINYINT},
</if>
<if test="operator != null">
`operator` = #{operator,jdbcType=BIGINT},
</if>
- <if test="operatedt != null">
- operateDt = #{operatedt,jdbcType=TIMESTAMP},
+ <if test="operateDt != null">
+ operateDt = #{operateDt,jdbcType=TIMESTAMP},
</if>
<if test="remarks != null">
remarks = #{remarks,jdbcType=VARCHAR},
@@ -152,11 +153,11 @@
update pr_flowmeter
set code = #{code,jdbcType=VARCHAR},
protocol = #{protocol,jdbcType=VARCHAR},
- onlineState = #{onlinestate,jdbcType=TINYINT},
- reportTime = #{reporttime,jdbcType=TIMESTAMP},
- addWays = #{addways,jdbcType=TINYINT},
+ onlineState = #{onlineState,jdbcType=TINYINT},
+ reportTime = #{reportTime,jdbcType=TIMESTAMP},
+ addWays = #{addWays,jdbcType=TINYINT},
`operator` = #{operator,jdbcType=BIGINT},
- operateDt = #{operatedt,jdbcType=TIMESTAMP},
+ operateDt = #{operateDt,jdbcType=TIMESTAMP},
remarks = #{remarks,jdbcType=VARCHAR},
deleted = #{deleted,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
@@ -176,8 +177,7 @@
<select id="getRecordCountOfFlowMeterByOthers" resultType="_integer">
SELECT COUNT(*) AS recordCountOfFlowmeter
from pr_flowmeter pfm
- Left join pr_monitoring_flowmeter pmofl on pmofl.flowmeterId = pfm.id
- Left join pr_flow_monitoring pfmt on pfmt.id = pmofl.monitoringId
+ Left join pr_flow_monitoring pfmt on pfmt.id = pfm.monitoringId
<where>
pfm.deleted = 0 AND pfmt.deleted = 0
<if test = "code != null and code !=''">
@@ -197,8 +197,7 @@
pfmt.`name` AS `name`,
pfm.operateDt AS operateDt
from pr_flowmeter pfm
- Left join pr_monitoring_flowmeter pmofl on pmofl.flowmeterId = pfm.id
- Left join pr_flow_monitoring pfmt on pfmt.id = pmofl.monitoringId
+ Left join pr_flow_monitoring pfmt on pfmt.id = pfm.monitoringId
<where>
pfm.deleted = 0 AND pfmt.deleted = 0
<if test = "code != null and code !=''">
@@ -223,4 +222,11 @@
from pr_flowmeter pfm
where deleted != 1
</select>
+ <update id="flowmeterAddMonId">
+ update pr_flowmeter
+ set monitoringId = #{monitoringId,jdbcType=BIGINT},
+ `operator` = #{operator,jdbcType=BIGINT},
+ operateDt = #{operateDt,jdbcType=TIMESTAMP}
+ where id = #{id,jdbcType=BIGINT}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0