From c4a6cf65e1851d85cf104ea21e2921a98089b6a9 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 16 一月 2024 15:36:45 +0800 Subject: [PATCH] 1、通信中间件实现控制器自报数据处理逻辑,及实现数据库映射Mapper。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml | 68 +++++++++++++++++++++++----------- 1 files changed, 46 insertions(+), 22 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml index df83fbb..1668e2d 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml @@ -5,7 +5,7 @@ <!--@mbg.generated--> <!--@Table pr_controller--> <id column="id" jdbcType="BIGINT" property="id" /> - <result column="code" jdbcType="VARCHAR" property="code" /> + <result column="rtuAddr" jdbcType="VARCHAR" property="rtuaddr" /> <result column="protocol" jdbcType="VARCHAR" property="protocol" /> <result column="onlineState" jdbcType="TINYINT" property="onlinestate" /> <result column="reportTime" jdbcType="TIMESTAMP" property="reporttime" /> @@ -16,7 +16,11 @@ </resultMap> <sql id="Base_Column_List"> <!--@mbg.generated--> - id, code, protocol, onlineState, reportTime, addWays, `operator`, operateDt, deleted + id, rtuAddr, protocol, onlineState, reportTime, addWays, `operator`, operateDt, deleted + </sql> + <sql id="Part_Column_List"> + <!--@mbg.generated--> + id, rtuAddr </sql> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <!--@mbg.generated--> @@ -30,19 +34,17 @@ delete from pr_controller where id = #{id,jdbcType=BIGINT} </delete> - <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoPr.PrController"> <!--@mbg.generated--> - insert into pr_controller (id, code, protocol, + insert into pr_controller (id, rtuAddr, protocol, onlineState, reportTime, addWays, `operator`, operateDt, deleted ) - values (#{id,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{protocol,jdbcType=VARCHAR}, + values (#{id,jdbcType=BIGINT}, #{rtuaddr,jdbcType=VARCHAR}, #{protocol,jdbcType=VARCHAR}, #{onlinestate,jdbcType=TINYINT}, #{reporttime,jdbcType=TIMESTAMP}, #{addways,jdbcType=TINYINT}, #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}, #{deleted,jdbcType=TINYINT} ) </insert> - <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoPr.PrController"> <!--@mbg.generated--> insert into pr_controller @@ -50,8 +52,8 @@ <if test="id != null"> id, </if> - <if test="code != null"> - code, + <if test="rtuaddr != null"> + rtuAddr, </if> <if test="protocol != null"> protocol, @@ -79,8 +81,8 @@ <if test="id != null"> #{id,jdbcType=BIGINT}, </if> - <if test="code != null"> - #{code,jdbcType=VARCHAR}, + <if test="rtuaddr != null"> + #{rtuaddr,jdbcType=VARCHAR}, </if> <if test="protocol != null"> #{protocol,jdbcType=VARCHAR}, @@ -109,8 +111,8 @@ <!--@mbg.generated--> update pr_controller <set> - <if test="code != null"> - code = #{code,jdbcType=VARCHAR}, + <if test="rtuaddr != null"> + rtuAddr = #{rtuaddr,jdbcType=VARCHAR}, </if> <if test="protocol != null"> protocol = #{protocol,jdbcType=VARCHAR}, @@ -139,7 +141,7 @@ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoPr.PrController"> <!--@mbg.generated--> update pr_controller - set code = #{code,jdbcType=VARCHAR}, + set rtuAddr = #{rtuaddr,jdbcType=VARCHAR}, protocol = #{protocol,jdbcType=VARCHAR}, onlineState = #{onlinestate,jdbcType=TINYINT}, reportTime = #{reporttime,jdbcType=TIMESTAMP}, @@ -153,15 +155,19 @@ <!--鏍规嵁鎸囧畾鑾峰彇鎺у埗鍣ㄨ褰曟暟--> <select id="getRecordCount" resultType="java.lang.Long"> SELECT - COUNT(*) AS recordCount + COUNT(*) AS recordCount FROM pr_controller con INNER JOIN pr_intake_controller ic ON ic.controllerId = con.id INNER JOIN pr_intake inta ON ic.intakeId = inta.id - , (SELECT @i:=0) AS itable <where> AND ic.operateType = 1 - <if test = "controllerCode != null and controllerCode !=''"> - AND con.code like CONCAT('%',#{controllerCode},'%') + + <if test = "id != null and id > 0"> + AND con.id = ${id} + </if> + + <if test = "rtuAddr != null and rtuAddr !=''"> + AND con.rtuAddr like CONCAT('%',#{rtuAddr},'%') </if> <if test = "onlineState != null and onlineState > 0"> @@ -177,8 +183,7 @@ <!--鏍规嵁鎸囧畾鑾峰彇鎺у埗鍣ㄨ褰�--> <select id="getControllers" resultType="com.dy.pipIrrGlobal.voPr.VoController"> SELECT - (@i:=@i+1) AS id, - con.code AS controllerCode, + con.rtuAddr AS rtuAddr, (CASE WHEN con.onlineState = 1 THEN "鍦ㄧ嚎" WHEN con.onlineState = 2 THEN "绂荤嚎" @@ -189,11 +194,15 @@ FROM pr_controller con INNER JOIN pr_intake_controller ic ON ic.controllerId = con.id INNER JOIN pr_intake inta ON ic.intakeId = inta.id - , (SELECT @i:=0) AS itable <where> AND ic.operateType = 1 - <if test = "controllerCode != null and controllerCode !=''"> - AND con.code like CONCAT('%',#{controllerCode},'%') + + <if test = "id != null and id > 0"> + AND con.id = ${id} + </if> + + <if test = "rtuAddr != null and rtuAddr !=''"> + AND con.rtuAddr like CONCAT('%',#{rtuAddr},'%') </if> <if test = "onlineState != null and onlineState > 0"> @@ -210,4 +219,19 @@ </if> </select> + + <!--鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨帶鍒跺櫒鍒楄〃--> + <select id="getControllersByCode" resultType="java.util.Map"> + SELECT id, rtuAddr FROM pr_controller WHERE rtuAddr LIKE CONCAT('%',#{rtuAddr},'%') + </select> + + <!--鏍规嵁鎺у埗鍣ㄧ紪鍙烽�昏緫鍒犻櫎鎺у埗--> + <update id="deleteControllerById"> + UPDATE pr_controller SET deleted = 1 WHERE id = ${controllerId} + </update> + + <!--鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨湭鍒犻櫎鐨勬帶鍒跺櫒鏁伴噺--> + <select id="getRecordCountOfController" resultType="java.lang.Integer"> + SELECT COUNT(*) AS recordCount FROM pr_controller WHERE deleted = 0 AND id = ${controllerId} + </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0