Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/BuildingVideoVO.java

@@ -43,5 +43,6 @@ public class BuildingVideoVO {
     @ApiModelProperty("详细地址")
     private String presetPosition;
 
-
+    @ApiModelProperty("视频转码")
+    private String vedioFormat;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentAlarmController.java

@@ -211,6 +211,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
                                         @RequestParam(value = "buildId", required = false) String buildId,
 //                                        @RequestParam(value = "equipmentCode", required = false) String equipmentCode,
                                         @RequestParam(value = "id", required = false) String id,
+                                        @RequestParam(value = "cleanStatus", required = false) String cleanStatus,
                                         CommonPageable commonPageable) {
         List<CommonRequest> queryRequests = new ArrayList<>();
         CommonRequest request = new CommonRequest();
@@ -250,6 +251,10 @@ public class EquipmentAlarmController extends AbstractBaseController {
         request10.setName("id");
         request10.setValue(StringUtil.isNotEmpty(id) ? StringUtils.trimToNull(id) : null);
         queryRequests.add(request10);
+        CommonRequest request11 = new CommonRequest();
+        request11.setName("cleanStatus");
+        request11.setValue(StringUtil.isNotEmpty(cleanStatus) ? StringUtils.trimToNull(cleanStatus) : null);
+        queryRequests.add(request11);
         CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
         org.springframework.data.domain.Page<AlarmListDataVO> list = iEquipmentSpecificAlarmService.listAlarmsPage(param);
         return CommonResponseUtil.success(list);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -115,6 +115,9 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     @Value("${systemctl.sync.switch}")
     private Boolean syncSwitch;
 
+    @Value("${window.vedioFormat}")
+    private String vedioFormat;
+
     @Autowired
     private SourceSceneMapper sourceSceneMapper;
 
@@ -763,6 +766,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
                         x.setLocation(x.getAddress());
                     }
                 }
+                x.setVedioFormat(vedioFormat);
                 x.setUrl(videoService.getVideoUrl(x.getName(), x.getPresetPosition(), x.getUrl(), x.getCode()));
             });
         }

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -375,6 +375,12 @@
         </if>
         <if test="param.id!=null and param.id!=''">AND d.fireEquipmentId = #{param.id}</if>
         <if test="param.status!=null and param.status!=3">AND d.status = #{param.status}</if>
+        <if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 1">AND
+            d.cleanStatus = '已消除'
+        </if>
+        <if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 2">AND
+            d.cleanStatus = '未消除'
+        </if>
         ORDER BY d.createDate DESC
     </select>
     <select id="getAlarmList" resultType="java.util.HashMap">