Skip to content

F
fill-system
Commit e6e389e5 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加设备相关信息

parent 656671e4
Pipeline #2635 failed with stages
      Show whitespace changes
      Inline Side-by-side
      Showing with 1103 additions and 807 deletions
      fill-manager/src/main/resources/sqlmap/module/device/DeviceMapper.xml
      View file @ e6e389e5
      <?xml version="1.0" encoding="UTF-8"?>
      <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
      "mybatis-3-mapper.dtd">
      "mybatis-3-mapper.dtd">
      <mapper namespace="com.mortals.xhx.module.device.dao.ibatis.DeviceDaoImpl">
      <!-- 字段和属性映射 -->
      ......@@ -27,6 +27,13 @@
      <result property="createTime" column="createTime" />
      <result property="updateUserId" column="updateUserId" />
      <result property="updateTime" column="updateTime" />
      <result property="deviceFirmId" column="deviceFirmId" />
      <result property="deviceFirmname" column="deviceFirmname" />
      <result property="ip" column="ip" />
      <result property="port" column="port" />
      <result property="enabled" column="enabled" />
      <result property="onlineTime" column="onlineTime" />
      <result property="offlineTime" column="offlineTime" />
      </resultMap>
      ......@@ -100,23 +107,44 @@
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
      a.updateTime,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceFirmId') or colPickMode == 1 and data.containsKey('deviceFirmId')))">
      a.deviceFirmId,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceFirmname') or colPickMode == 1 and data.containsKey('deviceFirmname')))">
      a.deviceFirmname,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ip') or colPickMode == 1 and data.containsKey('ip')))">
      a.ip,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('port') or colPickMode == 1 and data.containsKey('port')))">
      a.port,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enabled') or colPickMode == 1 and data.containsKey('enabled')))">
      a.enabled,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('onlineTime') or colPickMode == 1 and data.containsKey('onlineTime')))">
      a.onlineTime,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('offlineTime') or colPickMode == 1 and data.containsKey('offlineTime')))">
      a.offlineTime,
      </if>
      </trim>
      </sql>
      <!-- 新增 区分主键自增加还是业务插入 -->
      <insert id="insert" parameterType="DeviceEntity" useGeneratedKeys="true" keyProperty="id">
      insert into mortals_xhx_device
      (deviceId,deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,productCode,productName,deviceSrc,lon,lati,leadingOfficial,leadingOfficialTelephone,deviceStatus,deviceRemark,source,createUserId,createTime,updateUserId,updateTime)
      (deviceId,deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,productCode,productName,deviceSrc,lon,lati,leadingOfficial,leadingOfficialTelephone,deviceStatus,deviceRemark,source,createUserId,createTime,updateUserId,updateTime,deviceFirmId,deviceFirmname,ip,port,enabled,onlineTime,offlineTime)
      VALUES
      (#{deviceId},#{deviceName},#{deviceCode},#{deviceMac},#{siteId},#{siteCode},#{siteName},#{productCode},#{productName},#{deviceSrc},#{lon},#{lati},#{leadingOfficial},#{leadingOfficialTelephone},#{deviceStatus},#{deviceRemark},#{source},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
      (#{deviceId},#{deviceName},#{deviceCode},#{deviceMac},#{siteId},#{siteCode},#{siteName},#{productCode},#{productName},#{deviceSrc},#{lon},#{lati},#{leadingOfficial},#{leadingOfficialTelephone},#{deviceStatus},#{deviceRemark},#{source},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{deviceFirmId},#{deviceFirmname},#{ip},#{port},#{enabled},#{onlineTime},#{offlineTime})
      </insert>
      <!-- 批量新增 -->
      <insert id="insertBatch" parameterType="paramDto">
      insert into mortals_xhx_device
      (deviceId,deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,productCode,productName,deviceSrc,lon,lati,leadingOfficial,leadingOfficialTelephone,deviceStatus,deviceRemark,source,createUserId,createTime,updateUserId,updateTime)
      (deviceId,deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,productCode,productName,deviceSrc,lon,lati,leadingOfficial,leadingOfficialTelephone,deviceStatus,deviceRemark,source,createUserId,createTime,updateUserId,updateTime,deviceFirmId,deviceFirmname,ip,port,enabled,onlineTime,offlineTime)
      VALUES
      <foreach collection="data.dataList" item="item" index="index" separator="," >
      (#{item.deviceId},#{item.deviceName},#{item.deviceCode},#{item.deviceMac},#{item.siteId},#{item.siteCode},#{item.siteName},#{item.productCode},#{item.productName},#{item.deviceSrc},#{item.lon},#{item.lati},#{item.leadingOfficial},#{item.leadingOfficialTelephone},#{item.deviceStatus},#{item.deviceRemark},#{item.source},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
      (#{item.deviceId},#{item.deviceName},#{item.deviceCode},#{item.deviceMac},#{item.siteId},#{item.siteCode},#{item.siteName},#{item.productCode},#{item.productName},#{item.deviceSrc},#{item.lon},#{item.lati},#{item.leadingOfficial},#{item.leadingOfficialTelephone},#{item.deviceStatus},#{item.deviceRemark},#{item.source},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.deviceFirmId},#{item.deviceFirmname},#{item.ip},#{item.port},#{item.enabled},#{item.onlineTime},#{item.offlineTime})
      </foreach>
      </insert>
      ......@@ -210,6 +238,33 @@
      <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
      a.updateTime=#{data.updateTime},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deviceFirmId')) or (colPickMode==1 and !data.containsKey('deviceFirmId'))">
      a.deviceFirmId=#{data.deviceFirmId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deviceFirmIdIncrement')) or (colPickMode==1 and !data.containsKey('deviceFirmIdIncrement'))">
      a.deviceFirmId=ifnull(a.deviceFirmId,0) + #{data.deviceFirmIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deviceFirmname')) or (colPickMode==1 and !data.containsKey('deviceFirmname'))">
      a.deviceFirmname=#{data.deviceFirmname},
      </if>
      <if test="(colPickMode==0 and data.containsKey('ip')) or (colPickMode==1 and !data.containsKey('ip'))">
      a.ip=#{data.ip},
      </if>
      <if test="(colPickMode==0 and data.containsKey('port')) or (colPickMode==1 and !data.containsKey('port'))">
      a.port=#{data.port},
      </if>
      <if test="(colPickMode==0 and data.containsKey('enabled')) or (colPickMode==1 and !data.containsKey('enabled'))">
      a.enabled=#{data.enabled},
      </if>
      <if test="(colPickMode==0 and data.containsKey('enabledIncrement')) or (colPickMode==1 and !data.containsKey('enabledIncrement'))">
      a.enabled=ifnull(a.enabled,0) + #{data.enabledIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('onlineTime')) or (colPickMode==1 and !data.containsKey('onlineTime'))">
      a.onlineTime=#{data.onlineTime},
      </if>
      <if test="(colPickMode==0 and data.containsKey('offlineTime')) or (colPickMode==1 and !data.containsKey('offlineTime'))">
      a.offlineTime=#{data.offlineTime},
      </if>
      </trim>
      <trim suffixOverrides="where" suffix="">
      where
      ......@@ -404,6 +459,65 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="deviceFirmId=(case" suffix="ELSE deviceFirmId end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('deviceFirmId')) or (colPickMode==1 and !item.containsKey('deviceFirmId'))">
      when a.id=#{item.id} then #{item.deviceFirmId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('deviceFirmIdIncrement')) or (colPickMode==1 and !item.containsKey('deviceFirmIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.deviceFirmId,0) + #{item.deviceFirmIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="deviceFirmname=(case" suffix="ELSE deviceFirmname end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('deviceFirmname')) or (colPickMode==1 and !item.containsKey('deviceFirmname'))">
      when a.id=#{item.id} then #{item.deviceFirmname}
      </if>
      </foreach>
      </trim>
      <trim prefix="ip=(case" suffix="ELSE ip end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('ip')) or (colPickMode==1 and !item.containsKey('ip'))">
      when a.id=#{item.id} then #{item.ip}
      </if>
      </foreach>
      </trim>
      <trim prefix="port=(case" suffix="ELSE port end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('port')) or (colPickMode==1 and !item.containsKey('port'))">
      when a.id=#{item.id} then #{item.port}
      </if>
      </foreach>
      </trim>
      <trim prefix="enabled=(case" suffix="ELSE enabled end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('enabled')) or (colPickMode==1 and !item.containsKey('enabled'))">
      when a.id=#{item.id} then #{item.enabled}
      </when>
      <when test="(colPickMode==0 and item.containsKey('enabledIncrement')) or (colPickMode==1 and !item.containsKey('enabledIncrement'))">
      when a.id=#{item.id} then ifnull(a.enabled,0) + #{item.enabledIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="onlineTime=(case" suffix="ELSE onlineTime end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('onlineTime')) or (colPickMode==1 and !item.containsKey('onlineTime'))">
      when a.id=#{item.id} then #{item.onlineTime}
      </if>
      </foreach>
      </trim>
      <trim prefix="offlineTime=(case" suffix="ELSE offlineTime end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('offlineTime')) or (colPickMode==1 and !item.containsKey('offlineTime'))">
      when a.id=#{item.id} then #{item.offlineTime}
      </if>
      </foreach>
      </trim>
      </trim>
      where id in
      <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
      ......@@ -1018,6 +1132,153 @@
      <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
      ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmId')">
      <if test="conditionParamRef.deviceFirmId != null ">
      ${_conditionType_} a.deviceFirmId = #{${_conditionParam_}.deviceFirmId}
      </if>
      <if test="conditionParamRef.deviceFirmId == null">
      ${_conditionType_} a.deviceFirmId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmIdList') and conditionParamRef.deviceFirmIdList.size() > 0">
      ${_conditionType_} a.deviceFirmId in
      <foreach collection="conditionParamRef.deviceFirmIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmIdNotList') and conditionParamRef.deviceFirmIdNotList.size() > 0">
      ${_conditionType_} a.deviceFirmId not in
      <foreach collection="conditionParamRef.deviceFirmIdNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmIdStart') and conditionParamRef.deviceFirmIdStart != null">
      ${_conditionType_} a.deviceFirmId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceFirmIdStart}
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmIdEnd') and conditionParamRef.deviceFirmIdEnd != null">
      ${_conditionType_} a.deviceFirmId <![CDATA[ <= ]]> #{${_conditionParam_}.deviceFirmIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmname')">
      <if test="conditionParamRef.deviceFirmname != null and conditionParamRef.deviceFirmname != ''">
      ${_conditionType_} a.deviceFirmname like #{${_conditionParam_}.deviceFirmname}
      </if>
      <if test="conditionParamRef.deviceFirmname == null">
      ${_conditionType_} a.deviceFirmname is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmnameList') and conditionParamRef.deviceFirmnameList.size() > 0">
      ${_conditionType_} a.deviceFirmname in
      <foreach collection="conditionParamRef.deviceFirmnameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmnameNotList') and conditionParamRef.deviceFirmnameNotList.size() > 0">
      ${_conditionType_} a.deviceFirmname not in
      <foreach collection="conditionParamRef.deviceFirmnameNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('ip')">
      <if test="conditionParamRef.ip != null and conditionParamRef.ip != ''">
      ${_conditionType_} a.ip like #{${_conditionParam_}.ip}
      </if>
      <if test="conditionParamRef.ip == null">
      ${_conditionType_} a.ip is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('ipList') and conditionParamRef.ipList.size() > 0">
      ${_conditionType_} a.ip in
      <foreach collection="conditionParamRef.ipList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('ipNotList') and conditionParamRef.ipNotList.size() > 0">
      ${_conditionType_} a.ip not in
      <foreach collection="conditionParamRef.ipNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('port')">
      <if test="conditionParamRef.port != null and conditionParamRef.port != ''">
      ${_conditionType_} a.port like #{${_conditionParam_}.port}
      </if>
      <if test="conditionParamRef.port == null">
      ${_conditionType_} a.port is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('portList') and conditionParamRef.portList.size() > 0">
      ${_conditionType_} a.port in
      <foreach collection="conditionParamRef.portList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('portNotList') and conditionParamRef.portNotList.size() > 0">
      ${_conditionType_} a.port not in
      <foreach collection="conditionParamRef.portNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('enabled')">
      <if test="conditionParamRef.enabled != null ">
      ${_conditionType_} a.enabled = #{${_conditionParam_}.enabled}
      </if>
      <if test="conditionParamRef.enabled == null">
      ${_conditionType_} a.enabled is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('enabledList') and conditionParamRef.enabledList.size() > 0">
      ${_conditionType_} a.enabled in
      <foreach collection="conditionParamRef.enabledList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('enabledNotList') and conditionParamRef.enabledNotList.size() > 0">
      ${_conditionType_} a.enabled not in
      <foreach collection="conditionParamRef.enabledNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('enabledStart') and conditionParamRef.enabledStart != null">
      ${_conditionType_} a.enabled <![CDATA[ >= ]]> #{${_conditionParam_}.enabledStart}
      </if>
      <if test="conditionParamRef.containsKey('enabledEnd') and conditionParamRef.enabledEnd != null">
      ${_conditionType_} a.enabled <![CDATA[ <= ]]> #{${_conditionParam_}.enabledEnd}
      </if>
      <if test="conditionParamRef.containsKey('onlineTime')">
      <if test="conditionParamRef.onlineTime != null ">
      ${_conditionType_} a.onlineTime = #{${_conditionParam_}.onlineTime}
      </if>
      <if test="conditionParamRef.onlineTime == null">
      ${_conditionType_} a.onlineTime is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('onlineTimeStart') and conditionParamRef.onlineTimeStart != null and conditionParamRef.onlineTimeStart!=''">
      ${_conditionType_} a.onlineTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.onlineTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('onlineTimeEnd') and conditionParamRef.onlineTimeEnd != null and conditionParamRef.onlineTimeEnd!=''">
      ${_conditionType_} a.onlineTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.onlineTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('offlineTime')">
      <if test="conditionParamRef.offlineTime != null ">
      ${_conditionType_} a.offlineTime = #{${_conditionParam_}.offlineTime}
      </if>
      <if test="conditionParamRef.offlineTime == null">
      ${_conditionType_} a.offlineTime is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('offlineTimeStart') and conditionParamRef.offlineTimeStart != null and conditionParamRef.offlineTimeStart!=''">
      ${_conditionType_} a.offlineTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.offlineTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('offlineTimeEnd') and conditionParamRef.offlineTimeEnd != null and conditionParamRef.offlineTimeEnd!=''">
      ${_conditionType_} a.offlineTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.offlineTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      </sql>
      <sql id="_orderCols_">
      <if test="orderColList != null and !orderColList.isEmpty()">
      ......@@ -1141,6 +1402,41 @@
      <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('deviceFirmId')">
      a.deviceFirmId
      <if test='orderCol.deviceFirmId != null and "DESC".equalsIgnoreCase(orderCol.deviceFirmId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('deviceFirmname')">
      a.deviceFirmname
      <if test='orderCol.deviceFirmname != null and "DESC".equalsIgnoreCase(orderCol.deviceFirmname)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('ip')">
      a.ip
      <if test='orderCol.ip != null and "DESC".equalsIgnoreCase(orderCol.ip)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('port')">
      a.port
      <if test='orderCol.port != null and "DESC".equalsIgnoreCase(orderCol.port)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('enabled')">
      a.enabled
      <if test='orderCol.enabled != null and "DESC".equalsIgnoreCase(orderCol.enabled)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('onlineTime')">
      a.onlineTime
      <if test='orderCol.onlineTime != null and "DESC".equalsIgnoreCase(orderCol.onlineTime)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('offlineTime')">
      a.offlineTime
      <if test='orderCol.offlineTime != null and "DESC".equalsIgnoreCase(orderCol.offlineTime)'>DESC</if>
      ,
      </if>
      </trim>
      </if>
      </sql>
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment