修改系统状态接口返回格式

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireStationInfoMapper.xml

@@ -147,7 +147,7 @@
             and s.confirm_date like concat(date ,'%')
         </where>
         ) as alarmNums,
-        date
+        concat(date ,'时') as date
         from
         (SELECT
         DATE_FORMAT( DATE_ADD( #{beginDateTime}, INTERVAL @s HOUR ),'%Y-%m-%d %H') AS date,

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireStationInfoController.java

@@ -122,7 +122,7 @@ public class FireStationInfoController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "根据换流站code统计消防系统状态", notes = "根据换流站code统计消防系统状态")
     @GetMapping(value = "/getFireSystemByStationCode")
-    public ResponseModel<Map<String, Integer>> getFireSystemByStationCode(@ApiParam(value = "换流站编号", required = true) @RequestParam(required = true) String stationCode) {
+    public ResponseModel<List<Map<String, String>>> getFireSystemByStationCode(@ApiParam(value = "换流站编号", required = true) @RequestParam(required = true) String stationCode) {
         if (StrUtil.isEmpty(stationCode)) {
             throw new BadRequest("换流站编号不能为空");
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireStationInfoServiceImpl.java

@@ -164,12 +164,15 @@ public class FireStationInfoServiceImpl extends BaseService<FireStationInfoDto,
         return carInfoByStationCode;
     }
 
-    public Map<String, Integer> getFireSystemByStationCode(String stationCode) {
-        HashMap<String, Integer> resultMap = new HashMap<>();
+    public List<Map<String, String>> getFireSystemByStationCode(String stationCode) {
+        List<Map<String, String>> resultList= new ArrayList<>();
         List<FireFightingSystem> mridList = fireFightingSystemMapper.getMridByCode(stationCode);
         mridList.forEach(item -> {
-            resultMap.put(item.getName(), fireEquipmentSignalLogMapper.getAlarmCountByMrid(item.getMrid()));
+            HashMap<String, String> resultMap = new HashMap<>();
+            resultMap.put("systemName", item.getName());
+            resultMap.put("alarmNum", String.valueOf(fireEquipmentSignalLogMapper.getAlarmCountByMrid(item.getMrid())));
+            resultList.add(resultMap);
         });
-        return resultMap;
+        return resultList;
     }
 }
\ No newline at end of file