解决冲突

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

@@ -47,8 +47,7 @@ public class AlarmStatisticController extends AbstractBaseController {
         return CommonResponseUtil.success(list);
     }
 
-    @PersonIdentify
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/alarmList")
     @ApiOperation(httpMethod = "GET", value = "消防告警信息", notes = "消防告警信息")
     public ResponseModel alarmList(@RequestParam Integer pageNumber,
@@ -78,7 +77,7 @@ public class AlarmStatisticController extends AbstractBaseController {
         return CommonResponseUtil.success(iEmergencyService.alarmList(page, bizOrgCode, systemCode, types, emergencyLevels, name, cleanStatus, handleStatus, createDate, startDate, endDate));
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(value = "报警趋势统计")
     @GetMapping("/statistic/trend")
     public ResponseModel getSystemAlarmTrend(@RequestParam(value = "systemCode", required = false)String systemCode,
@@ -86,7 +85,7 @@ public class AlarmStatisticController extends AbstractBaseController {
         return CommonResponseUtil.success(iFireFightingSystemService.getCenterSystemAlarmTrend(systemCode, updateTime));
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(value = "系统告警事件数量占比")
     @GetMapping("/num")
     public ResponseModel getSystemAlarmNum(@RequestParam(value = "bizOrgCode", required = false)String bizOrgCode) {

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

@@ -282,9 +282,8 @@ public class PoolStatisticController {
         return CommonResponseUtil.success(page1);
     }
 
-    @PersonIdentify
     @RequestMapping(value = "/selectWaterLevelDetail", method = RequestMethod.GET)
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "水池液位详情", produces = "application/json;charset=UTF-8", notes = "水池液位详情")
     public ResponseModel selectWaterLevelDetail(@RequestParam(value = "equipmentSpecificId") String equipmentSpecificId,
                                                   @RequestParam(value = "startTime", required = false) String startTime,

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

@@ -7008,7 +7008,7 @@
             wes.name,
             CASE WHEN wesi.equipment_index_key = 'CAFS_GunValve_Open' AND wesi.`value` = 'true' THEN '开启'
             WHEN wesi.equipment_index_key = 'CAFS_GunValve_Close' AND wesi.`value` = 'true' THEN '关闭' ELSE '关闭' END AS stateValue,
-            CASE WHEN wesi.equipment_index_key = 'CAFS_CAFSFireGun_FireGunPressure' THEN wesi.`value` END AS `pressureValue`
+            IFNULL(CASE WHEN wesi.equipment_index_key = 'CAFS_CAFSFireGun_FireGunPressure' THEN IFNULL(wesi.`value`, 0) END, 0) AS `pressureValue`
         FROM
             wl_equipment_specific wes
         LEFT JOIN wl_equipment_specific_index wesi ON wesi.equipment_specific_id = wes.id