From 7d885c1d4c86f40927af50e6e7bfa13aac0c2180 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 21 十二月 2023 21:47:15 +0800 Subject: [PATCH] 1、common模块优化代码,Command命令中增加RTU命令结果返回webRul; 2、通信中间件增加了接收http下发RTU命令和内部命令的Controler; 3、RTU模拟器和控制器增加了上报完数据是否关闭TCP连接的控制。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml index 2ab986b..9a5e14d 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml @@ -1,17 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.dy.pipIrrGlobal.daoDemo.DemoRoleMapper"> + <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoRole"> <!--@mbg.generated--> <!--@Table demo_role--> <id column="id" jdbcType="BIGINT" property="id" /> <result column="name" jdbcType="VARCHAR" property="name" /> - <result column="deleted" jdbcType="TINYINT" property="deleted" /> + <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/> </resultMap> + <sql id="Base_Column_List"> <!--@mbg.generated--> id, `name`, deleted </sql> + <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <!--@mbg.generated--> select @@ -19,18 +22,21 @@ from demo_role where id = #{id,jdbcType=BIGINT} </select> + <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <!--@mbg.generated--> delete from demo_role where id = #{id,jdbcType=BIGINT} </delete> - <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoRole"> + + <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoRole"> <!--@mbg.generated--> insert into demo_role (id, `name`, deleted ) values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{deleted,jdbcType=TINYINT} ) </insert> + <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoRole"> <!--@mbg.generated--> insert into demo_role -- Gitblit v1.8.0