修改报警器端口

zengh

2021-03-10 fa9ffa9012d7b1df7692bb99e71be6592f48cd4b

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml

@@ -24,6 +24,9 @@
        <result column="pay" property="pay"/>
        <result column="expireTime" property="expireTime"/>
        <result column="heartbeat" property="heartbeat"/>
        <result column="province" property="province"/>
        <result column="city" property="city"/>
        <result column="district" property="district"/>
    </resultMap>

    <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
@@ -44,7 +47,6 @@
        <result column="ownerId" property="ownerId"/>
        <result column="devicestate" property="devicestate"/>
        <result column="stime" property="stime"/>
        <result column="coordinate" property="coordinate"/>
        <result column="parent_id" property="parentId"/>
        <result column="jd" property="jd"/>
        <result column="wd" property="wd"/>
@@ -58,9 +60,8 @@


    <select id="selectEquipmentPage" resultMap="equipmentResultMap">
        select id,deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,ST_ASTEXT (coordinate ) AS
        coordinate,dtype,heartbeat,expireTime,pay,
        parent_id,
        select id,deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,dtype,heartbeat,expireTime,pay,
        parent_id,district,province,city,serialNumber,channelNumber,
        jd ,
        wd ,
        street,
@@ -69,9 +70,24 @@
            and (deviceName like concat('%',#{equipment.deviceName},'%') or deviceNumber like
            concat('%',#{equipment.deviceName},'%'))
        </if>
        <if test="equipment.addvcd!=null">
            and addvcd=#{equipment.addvcd}

        <if test="equipment.beginTime!=null and equipment.beginTime!=''">
            and expireTime&gt;=#{equipment.beginTime}
        </if>
        <if test="equipment.endTime!=null and equipment.endTime!=''">
            and expireTime&lt;=#{equipment.endTime}
        </if>

        <if test="equipment.district!=null">
            and district like concat('%',#{equipment.district},'%')
        </if>
        <if test="equipment.province!=null">
            and province like concat('%',#{equipment.province},'%')
        </if>
        <if test="equipment.city!=null">
            and city like concat('%',#{equipment.city},'%')
        </if>

        <if test="equipment.devicestate!=null">
            and devicestate =#{equipment.devicestate}
        </if>
@@ -79,6 +95,14 @@
        <if test="equipment.dtype!=null">
            and dtype=#{equipment.dtype}
        </if>

        <if test="childList!=null and childList.size>0">
            and deviceNumber in
            <foreach collection="childList" index="index" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>

    </select>

    <!--新增-->
@@ -88,6 +112,15 @@

    <select id="tree" resultMap="treeNodeResultMap">
          select id, parent_id, deviceName as title, id as "value", id as "key" from sys_equipment
    </select>

    <select id="listAll" resultMap="equipmentResultMap">
          select id,deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,dtype,heartbeat,expireTime,pay,
        parent_id,
        jd ,
        wd ,
        street,
        addvcd,pay,expireTime from sys_equipment
    </select>


@@ -154,9 +187,9 @@
            parameterType="org.springblade.jfpt.equipment.entity.Equipment">
        SELECT
        dept.id,dept.deviceName,dept.deviceNumber,dept.deviceType,dept.ownership,
        dept.ownerId,dept.devicestate,dept.stime,
        dept.ownerId,dept.devicestate,dept.stime,dept.district,dept.province,dept.city,
        ST_ASTEXT(dept.coordinate) as coordinate,dept.dtype,dept.expireTime,dept.heartbeat,
        dept.parent_id,dept.jd,dept.wd,dept.street,u.yname,d.addvnm,dept.addvcd,
        dept.parent_id,dept.jd,dept.wd,dept.street,u.yname,d.addvnm,dept.addvcd,dept.serialNumber,dept.channelNumber,
        (
        SELECT
        CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
@@ -202,12 +235,13 @@
   dept.wd,
   dept.street AS streeName,
   u.yname,
   d.addvnm,
   dept.addvcd
   dept.addvcd,
   dept.province,
   dept.city,
   dept.district
FROM
   sys_equipment dept
   LEFT JOIN sys_suser u ON u.ynumber = dept.ownerId
   LEFT JOIN sys_district d ON d.addvcds = dept.addvcd
   LEFT JOIN sys_street s ON s.id = dept.street  WHERE  dept.deviceNumber=#{deviceNumber}
    </select>