Merge branch 'master' of http://gitlab.scsmile.cn/zxf/sample-form-platform

sample-form-manager/db/add.sql

@@ -58,3 +58,10 @@ PRIMARY KEY  (`id`)
 
 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
+    ADD COLUMN `deviceInBuilding` tinyint(4)      COMMENT '所属楼栋';
+
+ALTER TABLE mortals_xhx_device
+    ADD COLUMN `deviceInFloor` tinyint(4)      COMMENT '所属楼层';
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java

@@ -14,7 +14,7 @@ import lombok.Data;
  * 设备实体对象
  *
  * @author zxfei
- * @date 2023-12-08
+ * @date 2024-01-16
  */
 @Data
 public class DeviceEntity extends DeviceVo {
@@ -108,6 +108,18 @@ public class DeviceEntity extends DeviceVo {
      * 所属机构
      */
     private String belong;
+    /**
+     * 所属楼栋
+     */
+    private Integer deviceInBuilding;
+    /**
+     * 所属楼层
+     */
+    private Integer deviceInFloor;
+    /**
+     * 分辨率
+     */
+    private String resolution;
     /**
      * 最近上线时间
      */
@@ -159,6 +171,9 @@ public class DeviceEntity extends DeviceVo {
         this.deviceStatus = 0;
         this.deviceRemark = "";
         this.belong = "";
+        this.deviceInBuilding = 0;
+        this.deviceInFloor = 0;
+        this.resolution = "";
         this.onlineTime = new Date();
         this.offlineTime = new Date();
         this.source = 1;

sample-form-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceQuery.java

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.device.model.DeviceEntity;
  * 设备查询对象
  *
  * @author zxfei
- * @date 2023-12-08
+ * @date 2024-01-16
  */
 public class DeviceQuery extends DeviceEntity {
     /** 开始 主键ID，主键，自增长 */
@@ -195,6 +195,41 @@ public class DeviceQuery extends DeviceEntity {
 
     /** 所属机构排除列表 */
     private List <String> belongNotList;
+    /** 开始 所属楼栋 */
+    private Integer deviceInBuildingStart;
+
+    /** 结束 所属楼栋 */
+    private Integer deviceInBuildingEnd;
+
+    /** 增加 所属楼栋 */
+    private Integer deviceInBuildingIncrement;
+
+    /** 所属楼栋列表 */
+    private List <Integer> deviceInBuildingList;
+
+    /** 所属楼栋排除列表 */
+    private List <Integer> deviceInBuildingNotList;
+
+    /** 开始 所属楼层 */
+    private Integer deviceInFloorStart;
+
+    /** 结束 所属楼层 */
+    private Integer deviceInFloorEnd;
+
+    /** 增加 所属楼层 */
+    private Integer deviceInFloorIncrement;
+
+    /** 所属楼层列表 */
+    private List <Integer> deviceInFloorList;
+
+    /** 所属楼层排除列表 */
+    private List <Integer> deviceInFloorNotList;
+
+    /** 分辨率 */
+    private List<String> resolutionList;
+
+    /** 分辨率排除列表 */
+    private List <String> resolutionNotList;
     /** 开始 最近上线时间 */
     private String onlineTimeStart;
 
@@ -1351,6 +1386,200 @@ public class DeviceQuery extends DeviceEntity {
         this.belongNotList = belongNotList;
     }
 
+    /**
+     * 获取 开始 所属楼栋
+     * @return deviceInBuildingStart
+     */
+    public Integer getDeviceInBuildingStart(){
+        return this.deviceInBuildingStart;
+    }
+
+    /**
+     * 设置 开始 所属楼栋
+     * @param deviceInBuildingStart
+     */
+    public void setDeviceInBuildingStart(Integer deviceInBuildingStart){
+        this.deviceInBuildingStart = deviceInBuildingStart;
+    }
+
+    /**
+     * 获取 结束 所属楼栋
+     * @return $deviceInBuildingEnd
+     */
+    public Integer getDeviceInBuildingEnd(){
+        return this.deviceInBuildingEnd;
+    }
+
+    /**
+     * 设置 结束 所属楼栋
+     * @param deviceInBuildingEnd
+     */
+    public void setDeviceInBuildingEnd(Integer deviceInBuildingEnd){
+        this.deviceInBuildingEnd = deviceInBuildingEnd;
+    }
+
+    /**
+     * 获取 增加 所属楼栋
+     * @return deviceInBuildingIncrement
+     */
+    public Integer getDeviceInBuildingIncrement(){
+        return this.deviceInBuildingIncrement;
+    }
+
+    /**
+     * 设置 增加 所属楼栋
+     * @param deviceInBuildingIncrement
+     */
+    public void setDeviceInBuildingIncrement(Integer deviceInBuildingIncrement){
+        this.deviceInBuildingIncrement = deviceInBuildingIncrement;
+    }
+
+    /**
+     * 获取 所属楼栋
+     * @return deviceInBuildingList
+     */
+    public List<Integer> getDeviceInBuildingList(){
+        return this.deviceInBuildingList;
+    }
+
+    /**
+     * 设置 所属楼栋
+     * @param deviceInBuildingList
+     */
+    public void setDeviceInBuildingList(List<Integer> deviceInBuildingList){
+        this.deviceInBuildingList = deviceInBuildingList;
+    }
+
+    /**
+     * 获取 所属楼栋
+     * @return deviceInBuildingNotList
+     */
+    public List<Integer> getDeviceInBuildingNotList(){
+        return this.deviceInBuildingNotList;
+    }
+
+    /**
+     * 设置 所属楼栋
+     * @param deviceInBuildingNotList
+     */
+    public void setDeviceInBuildingNotList(List<Integer> deviceInBuildingNotList){
+        this.deviceInBuildingNotList = deviceInBuildingNotList;
+    }
+
+
+    /**
+     * 获取 开始 所属楼层
+     * @return deviceInFloorStart
+     */
+    public Integer getDeviceInFloorStart(){
+        return this.deviceInFloorStart;
+    }
+
+    /**
+     * 设置 开始 所属楼层
+     * @param deviceInFloorStart
+     */
+    public void setDeviceInFloorStart(Integer deviceInFloorStart){
+        this.deviceInFloorStart = deviceInFloorStart;
+    }
+
+    /**
+     * 获取 结束 所属楼层
+     * @return $deviceInFloorEnd
+     */
+    public Integer getDeviceInFloorEnd(){
+        return this.deviceInFloorEnd;
+    }
+
+    /**
+     * 设置 结束 所属楼层
+     * @param deviceInFloorEnd
+     */
+    public void setDeviceInFloorEnd(Integer deviceInFloorEnd){
+        this.deviceInFloorEnd = deviceInFloorEnd;
+    }
+
+    /**
+     * 获取 增加 所属楼层
+     * @return deviceInFloorIncrement
+     */
+    public Integer getDeviceInFloorIncrement(){
+        return this.deviceInFloorIncrement;
+    }
+
+    /**
+     * 设置 增加 所属楼层
+     * @param deviceInFloorIncrement
+     */
+    public void setDeviceInFloorIncrement(Integer deviceInFloorIncrement){
+        this.deviceInFloorIncrement = deviceInFloorIncrement;
+    }
+
+    /**
+     * 获取 所属楼层
+     * @return deviceInFloorList
+     */
+    public List<Integer> getDeviceInFloorList(){
+        return this.deviceInFloorList;
+    }
+
+    /**
+     * 设置 所属楼层
+     * @param deviceInFloorList
+     */
+    public void setDeviceInFloorList(List<Integer> deviceInFloorList){
+        this.deviceInFloorList = deviceInFloorList;
+    }
+
+    /**
+     * 获取 所属楼层
+     * @return deviceInFloorNotList
+     */
+    public List<Integer> getDeviceInFloorNotList(){
+        return this.deviceInFloorNotList;
+    }
+
+    /**
+     * 设置 所属楼层
+     * @param deviceInFloorNotList
+     */
+    public void setDeviceInFloorNotList(List<Integer> deviceInFloorNotList){
+        this.deviceInFloorNotList = deviceInFloorNotList;
+    }
+
+
+    /**
+     * 获取 分辨率
+     * @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
@@ -2404,6 +2633,133 @@ public class DeviceQuery extends DeviceEntity {
         return this;
     }
 
+    /**
+     * 设置  所属楼栋
+     * @param deviceInBuilding
+     */
+    public DeviceQuery deviceInBuilding(Integer deviceInBuilding){
+        setDeviceInBuilding(deviceInBuilding);
+        return this;
+    }
+
+    /**
+     * 设置 开始 所属楼栋
+     * @param deviceInBuildingStart
+     */
+    public DeviceQuery deviceInBuildingStart(Integer deviceInBuildingStart){
+        this.deviceInBuildingStart = deviceInBuildingStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 所属楼栋
+     * @param deviceInBuildingEnd
+     */
+    public DeviceQuery deviceInBuildingEnd(Integer deviceInBuildingEnd){
+        this.deviceInBuildingEnd = deviceInBuildingEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 所属楼栋
+     * @param deviceInBuildingIncrement
+     */
+    public DeviceQuery deviceInBuildingIncrement(Integer deviceInBuildingIncrement){
+        this.deviceInBuildingIncrement = deviceInBuildingIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 所属楼栋
+     * @param deviceInBuildingList
+     */
+    public DeviceQuery deviceInBuildingList(List<Integer> deviceInBuildingList){
+        this.deviceInBuildingList = deviceInBuildingList;
+        return this;
+    }
+
+    /**
+     * 设置 所属楼栋
+     * @param deviceInBuildingNotList
+     */
+    public DeviceQuery deviceInBuildingNotList(List<Integer> deviceInBuildingNotList){
+        this.deviceInBuildingNotList = deviceInBuildingNotList;
+        return this;
+    }
+
+    /**
+     * 设置  所属楼层
+     * @param deviceInFloor
+     */
+    public DeviceQuery deviceInFloor(Integer deviceInFloor){
+        setDeviceInFloor(deviceInFloor);
+        return this;
+    }
+
+    /**
+     * 设置 开始 所属楼层
+     * @param deviceInFloorStart
+     */
+    public DeviceQuery deviceInFloorStart(Integer deviceInFloorStart){
+        this.deviceInFloorStart = deviceInFloorStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 所属楼层
+     * @param deviceInFloorEnd
+     */
+    public DeviceQuery deviceInFloorEnd(Integer deviceInFloorEnd){
+        this.deviceInFloorEnd = deviceInFloorEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 所属楼层
+     * @param deviceInFloorIncrement
+     */
+    public DeviceQuery deviceInFloorIncrement(Integer deviceInFloorIncrement){
+        this.deviceInFloorIncrement = deviceInFloorIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 所属楼层
+     * @param deviceInFloorList
+     */
+    public DeviceQuery deviceInFloorList(List<Integer> deviceInFloorList){
+        this.deviceInFloorList = deviceInFloorList;
+        return this;
+    }
+
+    /**
+     * 设置 所属楼层
+     * @param deviceInFloorNotList
+     */
+    public DeviceQuery deviceInFloorNotList(List<Integer> deviceInFloorNotList){
+        this.deviceInFloorNotList = deviceInFloorNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 分辨率
+     * @param resolution
+     */
+    public DeviceQuery resolution(String resolution){
+        setResolution(resolution);
+        return this;
+    }
+
+    /**
+     * 设置 分辨率
+     * @param resolutionList
+     */
+    public DeviceQuery resolutionList(List<String> resolutionList){
+        this.resolutionList = resolutionList;
+        return this;
+    }
+
 
 
     /**

sample-form-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java

@@ -175,7 +175,7 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
             Rest<String> rest = deviceFeign.deviceCall(deviceReq, token);
             log.info("添加结果：{}", JSON.toJSONString(rest));*/
         } else {
-            String token = getToken();
+          //  String token = getToken();
             DeviceReq deviceReq = new DeviceReq();
             deviceReq.setReceiveMethod(DeviceMethodEnum.UPDATE.getValue());
 /*            deviceReq.setDeviceName(entity.getDeviceName());
@@ -190,7 +190,7 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
             deviceReq.setLeadingOfficialTelephone(entity.getLeadingOfficialTelephone());
             deviceReq.setSource(1);
             deviceReq.setDeviceStatus(entity.getDeviceStatus());
-            Rest<String> rest = deviceFeign.deviceCall(deviceReq, token);
+            Rest<String> rest = deviceFeign.deviceCall(deviceReq);
             log.info("更新结果：{}", JSON.toJSONString(rest));
         }
 
@@ -200,7 +200,7 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
     @Override
     protected void deleteBefore(Long[] ids, Context context) throws AppException {
         super.deleteBefore(ids, context);
-        String token = getToken();
+      //  String token = getToken();
         DeviceQuery deviceQuery = new DeviceQuery();
         deviceQuery.setIdList(Arrays.asList(ids));
         List<DeviceEntity> deviceEntities = this.service.find(deviceQuery, context);
@@ -208,18 +208,18 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
             DeviceReq deviceReq = new DeviceReq();
             deviceReq.setReceiveMethod(DeviceMethodEnum.DEL.getValue());
             deviceReq.setDeviceCode(entity.getDeviceCode());
-            Rest<String> rest = deviceFeign.deviceCall(deviceReq, token);
+            Rest<String> rest = deviceFeign.deviceCall(deviceReq);
             log.info("删除结果：{}", JSON.toJSONString(rest));
         }
     }
 
-    private String getToken() {
+/*    private String getToken() {
         LoginForm loginForm = new LoginForm();
         loginForm.setLoginName(loginName);
         loginForm.setPassword(password);
         Rest<String> rest = deviceFeign.getToken(loginForm);
         String token = rest.getData();
         return token;
-    }
+    }*/
 
 }
\ No newline at end of file

sample-form-manager/src/main/resources/sqlmap/module/device/DeviceMapper.xml

@@ -28,6 +28,9 @@
         <result property="deviceStatus" column="deviceStatus" />
         <result property="deviceRemark" column="deviceRemark" />
         <result property="belong" column="belong" />
+        <result property="deviceInBuilding" column="deviceInBuilding" />
+        <result property="deviceInFloor" column="deviceInFloor" />
+        <result property="resolution" column="resolution" />
         <result property="onlineTime" column="onlineTime" />
         <result property="offlineTime" column="offlineTime" />
         <result property="source" column="source" />
@@ -111,6 +114,15 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('belong') or colPickMode == 1 and data.containsKey('belong')))">
                 a.belong,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceInBuilding') or colPickMode == 1 and data.containsKey('deviceInBuilding')))">
+                a.deviceInBuilding,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceInFloor') or colPickMode == 1 and data.containsKey('deviceInFloor')))">
+                a.deviceInFloor,
+            </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')))">
                 a.onlineTime,
             </if>
@@ -137,18 +149,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="DeviceEntity"  useGeneratedKeys="true" keyProperty="id">
         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,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
-        (#{deviceId},#{deviceName},#{deviceCode},#{deviceMac},#{siteId},#{siteCode},#{siteName},#{deviceFirmId},#{deviceFirmname},#{ip},#{port},#{enabled},#{productCode},#{productName},#{deviceSrc},#{lon},#{lati},#{leadingOfficial},#{leadingOfficialTelephone},#{deviceStatus},#{deviceRemark},#{belong},#{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 id="insertBatch" parameterType="paramDto">
         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,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
         <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.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>
     </insert>
 
@@ -242,6 +254,21 @@
             <if test="(colPickMode==0 and data.containsKey('belong')) or (colPickMode==1 and !data.containsKey('belong'))">
                 a.belong=#{data.belong},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('deviceInBuilding')) or (colPickMode==1 and !data.containsKey('deviceInBuilding'))">
+                a.deviceInBuilding=#{data.deviceInBuilding},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deviceInBuildingIncrement')) or (colPickMode==1 and !data.containsKey('deviceInBuildingIncrement'))">
+                a.deviceInBuilding=ifnull(a.deviceInBuilding,0) + #{data.deviceInBuildingIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deviceInFloor')) or (colPickMode==1 and !data.containsKey('deviceInFloor'))">
+                a.deviceInFloor=#{data.deviceInFloor},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deviceInFloorIncrement')) or (colPickMode==1 and !data.containsKey('deviceInFloorIncrement'))">
+                a.deviceInFloor=ifnull(a.deviceInFloor,0) + #{data.deviceInFloorIncrement},
+            </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'))">
                 a.onlineTime=#{data.onlineTime},
             </if>
@@ -468,6 +495,37 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="deviceInBuilding=(case" suffix="ELSE deviceInBuilding end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('deviceInBuilding')) or (colPickMode==1 and !item.containsKey('deviceInBuilding'))">
+                            when a.id=#{item.id} then #{item.deviceInBuilding}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('deviceInBuildingIncrement')) or (colPickMode==1 and !item.containsKey('deviceInBuildingIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.deviceInBuilding,0) + #{item.deviceInBuildingIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="deviceInFloor=(case" suffix="ELSE deviceInFloor end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('deviceInFloor')) or (colPickMode==1 and !item.containsKey('deviceInFloor'))">
+                            when a.id=#{item.id} then #{item.deviceInFloor}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('deviceInFloorIncrement')) or (colPickMode==1 and !item.containsKey('deviceInFloorIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.deviceInFloor,0) + #{item.deviceInFloorIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </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),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <if test="(colPickMode==0 and item.containsKey('onlineTime')) or (colPickMode==1 and !item.containsKey('onlineTime'))">
@@ -1173,6 +1231,81 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('deviceInBuilding')">
+            <if test="conditionParamRef.deviceInBuilding != null ">
+                ${_conditionType_} a.deviceInBuilding = #{${_conditionParam_}.deviceInBuilding}
+            </if>
+            <if test="conditionParamRef.deviceInBuilding == null">
+                ${_conditionType_} a.deviceInBuilding is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('deviceInBuildingList') and conditionParamRef.deviceInBuildingList.size() > 0">
+            ${_conditionType_} a.deviceInBuilding in
+            <foreach collection="conditionParamRef.deviceInBuildingList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('deviceInBuildingNotList') and conditionParamRef.deviceInBuildingNotList.size() > 0">
+            ${_conditionType_} a.deviceInBuilding not in
+            <foreach collection="conditionParamRef.deviceInBuildingNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('deviceInBuildingStart') and conditionParamRef.deviceInBuildingStart != null">
+            ${_conditionType_} a.deviceInBuilding <![CDATA[ >= ]]> #{${_conditionParam_}.deviceInBuildingStart}
+        </if>
+        <if test="conditionParamRef.containsKey('deviceInBuildingEnd') and conditionParamRef.deviceInBuildingEnd != null">
+            ${_conditionType_} a.deviceInBuilding <![CDATA[ <= ]]> #{${_conditionParam_}.deviceInBuildingEnd}
+        </if>
+
+        <if test="conditionParamRef.containsKey('deviceInFloor')">
+            <if test="conditionParamRef.deviceInFloor != null ">
+                ${_conditionType_} a.deviceInFloor = #{${_conditionParam_}.deviceInFloor}
+            </if>
+            <if test="conditionParamRef.deviceInFloor == null">
+                ${_conditionType_} a.deviceInFloor is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('deviceInFloorList') and conditionParamRef.deviceInFloorList.size() > 0">
+            ${_conditionType_} a.deviceInFloor in
+            <foreach collection="conditionParamRef.deviceInFloorList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('deviceInFloorNotList') and conditionParamRef.deviceInFloorNotList.size() > 0">
+            ${_conditionType_} a.deviceInFloor not in
+            <foreach collection="conditionParamRef.deviceInFloorNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('deviceInFloorStart') and conditionParamRef.deviceInFloorStart != null">
+            ${_conditionType_} a.deviceInFloor <![CDATA[ >= ]]> #{${_conditionParam_}.deviceInFloorStart}
+        </if>
+        <if test="conditionParamRef.containsKey('deviceInFloorEnd') and conditionParamRef.deviceInFloorEnd != null">
+            ${_conditionType_} a.deviceInFloor <![CDATA[ <= ]]> #{${_conditionParam_}.deviceInFloorEnd}
+        </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.onlineTime != null ">
@@ -1367,6 +1500,20 @@
                 </foreach>
                 ,
             </if>
+            <if test="conditionParamRef.containsKey('deviceInBuildingList') and conditionParamRef.deviceInBuildingList.size() > 0">
+                field(a.deviceInBuilding,
+                <foreach collection="conditionParamRef.deviceInBuildingList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('deviceInFloorList') and conditionParamRef.deviceInFloorList.size() > 0">
+                field(a.deviceInFloor,
+                <foreach collection="conditionParamRef.deviceInFloorList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
                 field(a.source,
                 <foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
@@ -1445,6 +1592,20 @@
                 </foreach>
                 ,
             </if>
+            <if test="conditionParamRef.containsKey('deviceInBuildingList') and conditionParamRef.deviceInBuildingList.size() > 0">
+                field(a.deviceInBuilding,
+                <foreach collection="conditionParamRef.deviceInBuildingList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('deviceInFloorList') and conditionParamRef.deviceInFloorList.size() > 0">
+                field(a.deviceInFloor,
+                <foreach collection="conditionParamRef.deviceInFloorList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
                 field(a.source,
                 <foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
@@ -1582,6 +1743,21 @@
                     <if test='orderCol.belong != null and "DESC".equalsIgnoreCase(orderCol.belong)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('deviceInBuilding')">
+                    a.deviceInBuilding
+                    <if test='orderCol.deviceInBuilding != null and "DESC".equalsIgnoreCase(orderCol.deviceInBuilding)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('deviceInFloor')">
+                    a.deviceInFloor
+                    <if test='orderCol.deviceInFloor != null and "DESC".equalsIgnoreCase(orderCol.deviceInFloor)'>DESC</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')">
                     a.onlineTime
                     <if test='orderCol.onlineTime != null and "DESC".equalsIgnoreCase(orderCol.onlineTime)'>DESC</if>