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-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FireAndDutyAndIOTDto.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author litw
+ * @date 2021-10-29.
+ */
+@Data
+public class FireAndDutyAndIOTDto {
+
+
+    /**
+     * 未处置的消防报警
+     * */
+    @ApiModelProperty(value = "未处置的消防报警")
+    Integer fireNum;
+
+    /**
+    *  未处置的故障告警
+    * */
+    @ApiModelProperty(value = "未处置的故障告警")
+    Integer faultAlarmNum;
+
+    /**
+     *  未处置的物联报警数量
+     * */
+    @ApiModelProperty(value = "未处置的物联报警数量")
+    Integer iotNum;
+
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.AlarmGiveStatisticsDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.ESAlertCalledDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.ESAlertCalledRequestDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.FireAndDutyAndIOTDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStatusEnum;
@@ -469,6 +470,38 @@ public class AlertCalledController extends BaseController {
     }
 
     /**
+     * 消防报警，在岗检测，物联告警
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/getFireAndDutyAndIOT", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "消防报警，在岗检测，物联告警", notes = "消防报警，在岗检测，物联告警")
+    public ResponseModel<FireAndDutyAndIOTDto> getFireAndDutyAndIOT() {
+        FireAndDutyAndIOTDto dto = new FireAndDutyAndIOTDto();
+
+
+        ResponseModel<Map<String, Object>> fireAlarm = equipFeignClient.getFireAlarm();
+        Map<String, Object> map = fireAlarm.getResult();
+        int fireAlarmNum = !ValidationUtil.isEmpty(map.get("FireAlarmNum")) ? Integer.valueOf(map.get("FireAlarmNum").toString()) : 0;
+
+        ResponseModel<Map<String, Object>> faultAlarm = equipFeignClient.getFaultAlarm();
+        map = faultAlarm.getResult();
+        int faultAlarmNum = !ValidationUtil.isEmpty(map.get("FaultAlarmNum")) ? Integer.valueOf(map.get("FaultAlarmNum").toString()) : 0;
+
+        ResponseModel<Map<String, Object>> monitorEvent = equipFeignClient.getMonitorEvent();
+        map = monitorEvent.getResult();
+        int monitorEventNum = !ValidationUtil.isEmpty(map.get("monitorEventNum")) ? Integer.valueOf(map.get("monitorEventNum").toString()) : 0;
+
+        dto.setFireNum(fireAlarmNum);
+        dto.setFaultAlarmNum(faultAlarmNum);
+        dto.setIotNum(monitorEventNum);
+
+        return ResponseHelper.buildResponse(dto);
+    }
+
+    /**
      * 获取坐席情况
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)