Merge remote-tracking branch 'origin/master'

cl

2024-02-17 7ff5e9edadf446d0d033574a7b0ae802f5ac2233

 jcdm-main/src/main/resources/mapper/da/opcuaconfig/DaOpcuaConfigMapper.xml

@@ -3,7 +3,6 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jcdm.main.da.opcuaconfig.mapper.DaOpcuaConfigMapper">
    
    <resultMap type="DaOpcuaConfig" id="DaOpcuaConfigResult">
        <result property="id"    column="id"    />
        <result property="node"    column="node"    />
@@ -11,23 +10,22 @@
        <result property="subscribe"    column="subscribe"    />
        <result property="rFunction"    column="r_function"    />
        <result property="remarks"    column="remarks"    />
        <result property="process"    column="process"    />
        <result property="processName"    column="process_name"    />
        <result property="process"    column="process"    />
        <result property="state"    column="state"    />
    </resultMap>

    <sql id="selectDaOpcuaConfigVo">
        select id, node,sys_types, subscribe, r_function, remarks, process, process_name, state from da_opcua_config
        select id, node, sys_types, subscribe, r_function, remarks, process_name, process, state from da_opcua_config
    </sql>

    <select id="selectDaOpcuaConfigList" parameterType="DaOpcuaConfig" resultMap="DaOpcuaConfigResult">
        <include refid="selectDaOpcuaConfigVo"/>
        <where>  
            <if test="node != null  and node != ''"> and node = #{node}</if>
            <if test="sysTypes != null  and sysTypes != ''"> and sys_types = #{sysTypes}</if>
            <if test="rFunction != null  and rFunction != ''"> and r_function = #{rFunction}</if>
            <if test="process != null  and process != ''"> and process = #{process}</if>
            <if test="processName != null  and processName != ''"> and process_name like concat('%', #{processName}, '%')</if>
            <if test="subscribe != null  and subscribe != ''"> and subscribe = #{subscribe}</if>
            <if test="state != null "> and state = #{state}</if>
        </where>
    </select>
@@ -40,23 +38,23 @@
    <insert id="insertDaOpcuaConfig" parameterType="DaOpcuaConfig" useGeneratedKeys="true" keyProperty="id">
        insert into da_opcua_config
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="node != null and node != ''">node,</if>
            <if test="sysTypes != null and sysTypes != ''">sys_types,</if>
            <if test="node != null">node,</if>
            <if test="sysTypes != null">sys_types,</if>
            <if test="subscribe != null">subscribe,</if>
            <if test="rFunction != null and rFunction != ''">r_function,</if>
            <if test="rFunction != null">r_function,</if>
            <if test="remarks != null">remarks,</if>
            <if test="process != null">process,</if>
            <if test="processName != null">process_name,</if>
            <if test="process != null">process,</if>
            <if test="state != null">state,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="node != null and node != ''">#{node},</if>
            <if test="sysTypes != null and sysTypes != ''">#{sysTypes},</if>
            <if test="node != null">#{node},</if>
            <if test="sysTypes != null">#{sysTypes},</if>
            <if test="subscribe != null">#{subscribe},</if>
            <if test="rFunction != null and rFunction != ''">#{rFunction},</if>
            <if test="rFunction != null">#{rFunction},</if>
            <if test="remarks != null">#{remarks},</if>
            <if test="process != null">#{process},</if>
            <if test="processName != null">#{processName},</if>
            <if test="process != null">#{process},</if>
            <if test="state != null">#{state},</if>
         </trim>
    </insert>
@@ -64,13 +62,13 @@
    <update id="updateDaOpcuaConfig" parameterType="DaOpcuaConfig">
        update da_opcua_config
        <trim prefix="SET" suffixOverrides=",">
            <if test="node != null and node != ''">node = #{node},</if>
            <if test="sysTypes != null and sysTypes != ''">sys_types = #{sysTypes},</if>
            <if test="node != null">node = #{node},</if>
            <if test="sysTypes != null">sys_types = #{sysTypes},</if>
            <if test="subscribe != null">subscribe = #{subscribe},</if>
            <if test="rFunction != null and rFunction != ''">r_function = #{rFunction},</if>
            <if test="rFunction != null">r_function = #{rFunction},</if>
            <if test="remarks != null">remarks = #{remarks},</if>
            <if test="process != null">process = #{process},</if>
            <if test="processName != null">process_name = #{processName},</if>
            <if test="process != null">process = #{process},</if>
            <if test="state != null">state = #{state},</if>
        </trim>
        where id = #{id}