Skip to content

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

添加设备分辨率

parent 090cf87b
Pipeline #2754 failed with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 117 additions and 7 deletions
      fill-manager/db/add.sql
      View file @ 552fdce4
      ...@@ -41,8 +41,17 @@ ALTER TABLE mortals_xhx_device ...@@ -41,8 +41,17 @@ ALTER TABLE mortals_xhx_device
      -- ---------------------------- -- ----------------------------
      2024-01-15 2024-01-15
      -- ---------------------------- -- ----------------------------
      ALTER TABLE mortals_xhx_device
      ADD COLUMN `belong` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '所属机构' AFTER deviceRemark;
      ALTER TABLE mortals_xhx_device ALTER TABLE mortals_xhx_device
      ADD COLUMN `deviceInBuilding` tinyint(4) COMMENT '所属楼栋'; ADD COLUMN `deviceInBuilding` tinyint(4) COMMENT '所属楼栋';
      ALTER TABLE mortals_xhx_device ALTER TABLE mortals_xhx_device
      ADD COLUMN `deviceInFloor` tinyint(4) COMMENT '所属楼层'; ADD COLUMN `deviceInFloor` tinyint(4) COMMENT '所属楼层';
      \ No newline at end of file
      ALTER TABLE mortals_xhx_device
      ADD COLUMN `resolution` varchar(255) COMMENT '分辨率';
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java
      View file @ 552fdce4
      ...@@ -14,7 +14,7 @@ import lombok.Data; ...@@ -14,7 +14,7 @@ import lombok.Data;
      * 设备实体对象 * 设备实体对象
      * *
      * @author zxfei * @author zxfei
      * @date 2024-01-15 * @date 2024-01-16
      */ */
      @Data @Data
      public class DeviceEntity extends DeviceVo { public class DeviceEntity extends DeviceVo {
      ...@@ -116,6 +116,10 @@ public class DeviceEntity extends DeviceVo { ...@@ -116,6 +116,10 @@ public class DeviceEntity extends DeviceVo {
      * 所属楼层 * 所属楼层
      */ */
      private Integer deviceInFloor; private Integer deviceInFloor;
      /**
      * 分辨率
      */
      private String resolution;
      /** /**
      * 最近上线时间 * 最近上线时间
      */ */
      ...@@ -169,6 +173,7 @@ public class DeviceEntity extends DeviceVo { ...@@ -169,6 +173,7 @@ public class DeviceEntity extends DeviceVo {
      this.belong = ""; this.belong = "";
      this.deviceInBuilding = 0; this.deviceInBuilding = 0;
      this.deviceInFloor = 0; this.deviceInFloor = 0;
      this.resolution = "";
      this.onlineTime = new Date(); this.onlineTime = new Date();
      this.offlineTime = new Date(); this.offlineTime = new Date();
      this.source = 1; this.source = 1;
      ......
      fill-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceQuery.java
      View file @ 552fdce4
      ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.device.model.DeviceEntity; ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.device.model.DeviceEntity;
      * 设备查询对象 * 设备查询对象
      * *
      * @author zxfei * @author zxfei
      * @date 2024-01-15 * @date 2024-01-16
      */ */
      public class DeviceQuery extends DeviceEntity { public class DeviceQuery extends DeviceEntity {
      /** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
      ...@@ -225,6 +225,11 @@ public class DeviceQuery extends DeviceEntity { ...@@ -225,6 +225,11 @@ public class DeviceQuery extends DeviceEntity {
      /** 所属楼层排除列表 */ /** 所属楼层排除列表 */
      private List <Integer> deviceInFloorNotList; private List <Integer> deviceInFloorNotList;
      /** 分辨率 */
      private List<String> resolutionList;
      /** 分辨率排除列表 */
      private List <String> resolutionNotList;
      /** 开始 最近上线时间 */ /** 开始 最近上线时间 */
      private String onlineTimeStart; private String onlineTimeStart;
      ...@@ -1543,6 +1548,38 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1543,6 +1548,38 @@ public class DeviceQuery extends DeviceEntity {
      } }
      /**
      * 获取 分辨率
      * @return resolutionList
      */
      public List<String> getResolutionList(){
      return this.resolutionList;
      }
      /**
      * 设置 分辨率
      * @param resolutionList
      */
      public void setResolutionList(List<String> resolutionList){
      this.resolutionList = resolutionList;
      }
      /**
      * 获取 分辨率
      * @return resolutionNotList
      */
      public List<String> getResolutionNotList(){
      return this.resolutionNotList;
      }
      /**
      * 设置 分辨率
      * @param resolutionNotList
      */
      public void setResolutionNotList(List<String> resolutionNotList){
      this.resolutionNotList = resolutionNotList;
      }
      /** /**
      * 获取 开始 最近上线时间 * 获取 开始 最近上线时间
      * @return onlineTimeStart * @return onlineTimeStart
      ...@@ -2705,6 +2742,25 @@ public class DeviceQuery extends DeviceEntity { ...@@ -2705,6 +2742,25 @@ public class DeviceQuery extends DeviceEntity {
      } }
      /**
      * 设置 分辨率
      * @param resolution
      */
      public DeviceQuery resolution(String resolution){
      setResolution(resolution);
      return this;
      }
      /**
      * 设置 分辨率
      * @param resolutionList
      */
      public DeviceQuery resolutionList(List<String> resolutionList){
      this.resolutionList = resolutionList;
      return this;
      }
      /** /**
      * 设置 设备来源(0.旧设备，1.新设备) * 设置 设备来源(0.旧设备，1.新设备)
      ......
      fill-manager/src/main/resources/sqlmap/module/device/DeviceMapper.xml
      View file @ 552fdce4
      ...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
      <result property="belong" column="belong" /> <result property="belong" column="belong" />
      <result property="deviceInBuilding" column="deviceInBuilding" /> <result property="deviceInBuilding" column="deviceInBuilding" />
      <result property="deviceInFloor" column="deviceInFloor" /> <result property="deviceInFloor" column="deviceInFloor" />
      <result property="resolution" column="resolution" />
      <result property="onlineTime" column="onlineTime" /> <result property="onlineTime" column="onlineTime" />
      <result property="offlineTime" column="offlineTime" /> <result property="offlineTime" column="offlineTime" />
      <result property="source" column="source" /> <result property="source" column="source" />
      ...@@ -119,6 +120,9 @@ ...@@ -119,6 +120,9 @@
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceInFloor') or colPickMode == 1 and data.containsKey('deviceInFloor')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceInFloor') or colPickMode == 1 and data.containsKey('deviceInFloor')))">
      a.deviceInFloor, a.deviceInFloor,
      </if> </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('resolution') or colPickMode == 1 and data.containsKey('resolution')))">
      a.resolution,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('onlineTime') or colPickMode == 1 and data.containsKey('onlineTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('onlineTime') or colPickMode == 1 and data.containsKey('onlineTime')))">
      a.onlineTime, a.onlineTime,
      </if> </if>
      ...@@ -145,18 +149,18 @@ ...@@ -145,18 +149,18 @@
      <!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
      <insert id="insert" parameterType="DeviceEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="DeviceEntity" useGeneratedKeys="true" keyProperty="id">
      insert into mortals_xhx_device insert into mortals_xhx_device
      (deviceId,deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,deviceFirmId,deviceFirmname,ip,port,enabled,productCode,productName,deviceSrc,lon,lati,leadingOfficial,leadingOfficialTelephone,deviceStatus,deviceRemark,belong,deviceInBuilding,deviceInFloor,onlineTime,offlineTime,source,createUserId,createTime,updateUserId,updateTime) (deviceId,deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,deviceFirmId,deviceFirmname,ip,port,enabled,productCode,productName,deviceSrc,lon,lati,leadingOfficial,leadingOfficialTelephone,deviceStatus,deviceRemark,belong,deviceInBuilding,deviceInFloor,resolution,onlineTime,offlineTime,source,createUserId,createTime,updateUserId,updateTime)
      VALUES VALUES
      (#{deviceId},#{deviceName},#{deviceCode},#{deviceMac},#{siteId},#{siteCode},#{siteName},#{deviceFirmId},#{deviceFirmname},#{ip},#{port},#{enabled},#{productCode},#{productName},#{deviceSrc},#{lon},#{lati},#{leadingOfficial},#{leadingOfficialTelephone},#{deviceStatus},#{deviceRemark},#{belong},#{deviceInBuilding},#{deviceInFloor},#{onlineTime},#{offlineTime},#{source},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{deviceId},#{deviceName},#{deviceCode},#{deviceMac},#{siteId},#{siteCode},#{siteName},#{deviceFirmId},#{deviceFirmname},#{ip},#{port},#{enabled},#{productCode},#{productName},#{deviceSrc},#{lon},#{lati},#{leadingOfficial},#{leadingOfficialTelephone},#{deviceStatus},#{deviceRemark},#{belong},#{deviceInBuilding},#{deviceInFloor},#{resolution},#{onlineTime},#{offlineTime},#{source},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
      </insert> </insert>
      <!-- 批量新增 --> <!-- 批量新增 -->
      <insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
      insert into mortals_xhx_device insert into mortals_xhx_device
      (deviceId,deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,deviceFirmId,deviceFirmname,ip,port,enabled,productCode,productName,deviceSrc,lon,lati,leadingOfficial,leadingOfficialTelephone,deviceStatus,deviceRemark,belong,deviceInBuilding,deviceInFloor,onlineTime,offlineTime,source,createUserId,createTime,updateUserId,updateTime) (deviceId,deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,deviceFirmId,deviceFirmname,ip,port,enabled,productCode,productName,deviceSrc,lon,lati,leadingOfficial,leadingOfficialTelephone,deviceStatus,deviceRemark,belong,deviceInBuilding,deviceInFloor,resolution,onlineTime,offlineTime,source,createUserId,createTime,updateUserId,updateTime)
      VALUES VALUES
      <foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
      (#{item.deviceId},#{item.deviceName},#{item.deviceCode},#{item.deviceMac},#{item.siteId},#{item.siteCode},#{item.siteName},#{item.deviceFirmId},#{item.deviceFirmname},#{item.ip},#{item.port},#{item.enabled},#{item.productCode},#{item.productName},#{item.deviceSrc},#{item.lon},#{item.lati},#{item.leadingOfficial},#{item.leadingOfficialTelephone},#{item.deviceStatus},#{item.deviceRemark},#{item.belong},#{item.deviceInBuilding},#{item.deviceInFloor},#{item.onlineTime},#{item.offlineTime},#{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.deviceFirmId},#{item.deviceFirmname},#{item.ip},#{item.port},#{item.enabled},#{item.productCode},#{item.productName},#{item.deviceSrc},#{item.lon},#{item.lati},#{item.leadingOfficial},#{item.leadingOfficialTelephone},#{item.deviceStatus},#{item.deviceRemark},#{item.belong},#{item.deviceInBuilding},#{item.deviceInFloor},#{item.resolution},#{item.onlineTime},#{item.offlineTime},#{item.source},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
      </foreach> </foreach>
      </insert> </insert>
      ...@@ -262,6 +266,9 @@ ...@@ -262,6 +266,9 @@
      <if test="(colPickMode==0 and data.containsKey('deviceInFloorIncrement')) or (colPickMode==1 and !data.containsKey('deviceInFloorIncrement'))"> <if test="(colPickMode==0 and data.containsKey('deviceInFloorIncrement')) or (colPickMode==1 and !data.containsKey('deviceInFloorIncrement'))">
      a.deviceInFloor=ifnull(a.deviceInFloor,0) + #{data.deviceInFloorIncrement}, a.deviceInFloor=ifnull(a.deviceInFloor,0) + #{data.deviceInFloorIncrement},
      </if> </if>
      <if test="(colPickMode==0 and data.containsKey('resolution')) or (colPickMode==1 and !data.containsKey('resolution'))">
      a.resolution=#{data.resolution},
      </if>
      <if test="(colPickMode==0 and data.containsKey('onlineTime')) or (colPickMode==1 and !data.containsKey('onlineTime'))"> <if test="(colPickMode==0 and data.containsKey('onlineTime')) or (colPickMode==1 and !data.containsKey('onlineTime'))">
      a.onlineTime=#{data.onlineTime}, a.onlineTime=#{data.onlineTime},
      </if> </if>
      ...@@ -512,6 +519,13 @@ ...@@ -512,6 +519,13 @@
      </choose> </choose>
      </foreach> </foreach>
      </trim> </trim>
      <trim prefix="resolution=(case" suffix="ELSE resolution end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('resolution')) or (colPickMode==1 and !item.containsKey('resolution'))">
      when a.id=#{item.id} then #{item.resolution}
      </if>
      </foreach>
      </trim>
      <trim prefix="onlineTime=(case" suffix="ELSE onlineTime end),"> <trim prefix="onlineTime=(case" suffix="ELSE onlineTime end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('onlineTime')) or (colPickMode==1 and !item.containsKey('onlineTime'))"> <if test="(colPickMode==0 and item.containsKey('onlineTime')) or (colPickMode==1 and !item.containsKey('onlineTime'))">
      ...@@ -1272,6 +1286,27 @@ ...@@ -1272,6 +1286,27 @@
      </if> </if>
      <if test="conditionParamRef.containsKey('resolution')">
      <if test="conditionParamRef.resolution != null and conditionParamRef.resolution != ''">
      ${_conditionType_} a.resolution like #{${_conditionParam_}.resolution}
      </if>
      <if test="conditionParamRef.resolution == null">
      ${_conditionType_} a.resolution is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('resolutionList') and conditionParamRef.resolutionList.size() > 0">
      ${_conditionType_} a.resolution in
      <foreach collection="conditionParamRef.resolutionList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('resolutionNotList') and conditionParamRef.resolutionNotList.size() > 0">
      ${_conditionType_} a.resolution not in
      <foreach collection="conditionParamRef.resolutionNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('onlineTime')"> <if test="conditionParamRef.containsKey('onlineTime')">
      <if test="conditionParamRef.onlineTime != null "> <if test="conditionParamRef.onlineTime != null ">
      ${_conditionType_} a.onlineTime = #{${_conditionParam_}.onlineTime} ${_conditionType_} a.onlineTime = #{${_conditionParam_}.onlineTime}
      ...@@ -1718,6 +1753,11 @@ ...@@ -1718,6 +1753,11 @@
      <if test='orderCol.deviceInFloor != null and "DESC".equalsIgnoreCase(orderCol.deviceInFloor)'>DESC</if> <if test='orderCol.deviceInFloor != null and "DESC".equalsIgnoreCase(orderCol.deviceInFloor)'>DESC</if>
      , ,
      </if> </if>
      <if test="orderCol.containsKey('resolution')">
      a.resolution
      <if test='orderCol.resolution != null and "DESC".equalsIgnoreCase(orderCol.resolution)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('onlineTime')"> <if test="orderCol.containsKey('onlineTime')">
      a.onlineTime a.onlineTime
      <if test='orderCol.onlineTime != null and "DESC".equalsIgnoreCase(orderCol.onlineTime)'>DESC</if> <if test='orderCol.onlineTime != null and "DESC".equalsIgnoreCase(orderCol.onlineTime)'>DESC</if>
      ......
      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