Merge remote-tracking branch 'origin/20210223' into 20210223

sms_water/src/main/java/com/huaxu/controller/MonitorInfoController.java

@@ -132,13 +132,17 @@ public class MonitorInfoController {
     public AjaxMessage<List<MonitorInfoEntity>> findBySceneId(
             @ApiParam(value = "场景ID", required = true) @RequestParam Long id,
             @ApiParam(value = "图片类型(0鸟瞰图 1工艺图)", required = false) @RequestParam(required = false) Integer imageType,
-            @ApiParam(value = "设备ID", required = false) @RequestParam(required = false) Long deviceId
+            @ApiParam(value = "设备ID", required = false) @RequestParam(required = false) Long deviceId,
+            @ApiParam(value = "类型(0综合调度 1综合展示)", required = false) @RequestParam(required = false) Integer... type
             ) {
         MonitorInfoEntity monitorInfoEntity = new MonitorInfoEntity();
         monitorInfoEntity.setSceneId(id);
         if (imageType != null) {
             monitorInfoEntity.setImageType(imageType);
         }
+        if(type!=null&&type.length>0) {
+            monitorInfoEntity.setType(type[0]);
+        }
         if (deviceId != null) {
             monitorInfoEntity.setDeviceId(deviceId);
         }

sms_water/src/main/java/com/huaxu/entity/MonitorInfoEntity.java

@@ -95,6 +95,10 @@ public class MonitorInfoEntity{
     @TableField(exist = false)
     private Integer isAlarm;
 
+    /** 类型 */
+    @ApiModelProperty(value = "类型(0综合调度 1综合展示)")
+    private Integer type;
+
     @ApiModelProperty(value = "数据删除标识")
     @TableLogic
     @JsonIgnore

sms_water/src/main/resources/mapper/MonitorInfoMapper.xml

@@ -73,6 +73,8 @@
             <if test="deviceId != null ">and a.device_id = #{deviceId}</if>
             <if test="attributeId != null ">and a.attribute_id = #{attributeId}</if>
             <if test="imageType != null ">and a.image_type = #{imageType}</if>
+            <if test="type != null ">and a.type = #{type}</if>
+            <if test="type == null ">and a.type is null</if>
             <if test="monitorType != null ">and a.monitor_type = #{monitorType}</if>
         </where>
     </select>