大屏API提供修改数据结构

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

@@ -2,15 +2,21 @@ package com.yeejoin.equipmanage.common.vo;
 
 import lombok.Data;
 
+import java.util.List;
 import java.util.Map;
 
 @Data
 public class BigScreenVo {
-    private Map<String, Object> systemAlarmInfoNum;
 
-    private Map<String, Object> pool;
+    private List<Map<String, Object>> infoList;
 
-    private Map<String, Object> industryPool;
+    private List<Map<String, Object>> carNumInfo;
 
-    private Integer carNum;
+//    private Map<String, Object> systemAlarmInfoNum;
+//
+//    private Map<String, Object> pool;
+//
+//    private Map<String, Object> industryPool;
+//
+//    private Integer carNum;
 }

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

@@ -8,6 +8,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -52,6 +53,10 @@ public class EquipmentAlarmController extends AbstractBaseController {
 
     @Autowired
     IEquipmentSpecificAlarmService iEquipmentSpecificAlarmService;
+
+    @Autowired
+    private EquipmentSpecificMapper equipmentSpecificMapper;
+
     @Value("${equip.enabled}")
    private  Boolean equioEnabled;
     /**
@@ -379,4 +384,10 @@ public class EquipmentAlarmController extends AbstractBaseController {
         return CommonResponseUtil.success(map);
     }
 
+    @RequestMapping(value = "/getAllEquipNum", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查装备数量", produces = "application/json;charset=UTF-8", notes = "查装备数量")
+    public ResponseModel getAllEquipNum(@RequestParam(required = false) String bizOrgCode) {
+        return CommonResponseUtil.success(equipmentSpecificMapper.getAllEquipNum(bizOrgCode));
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java

@@ -232,4 +232,5 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
 
     List<Map<String, Object>> getFirePumpInfo(@Param("list") String[] strings);
 
+    Integer getAllEquipNum(@Param("bizOrgCode") String bizOrgCode);
 }

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

@@ -1325,14 +1325,24 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     @Override
     public BigScreenVo getSystemAlarmInfoNum(String companyCode) {
         BigScreenVo bigScreenVo = new BigScreenVo();
+        List<Map<String, Object>> infoList = new ArrayList<>();
         Map<String, Object> systemAlarmInfoNum = fireFightingSystemMapper.getSystemAlarmInfoNum(companyCode);
-        bigScreenVo.setSystemAlarmInfoNum(systemAlarmInfoNum);
+//        bigScreenVo.setSystemAlarmInfoNum(systemAlarmInfoNum);
+        infoList.add(systemAlarmInfoNum);
         Map<String, Object> pool = fireFightingSystemMapper.getWaterPoolInfoNum(companyCode, "pool");
-        bigScreenVo.setPool(pool);
+//        bigScreenVo.setPool(pool);
+        infoList.add(pool);
         Map<String, Object> industryPool = fireFightingSystemMapper.getWaterPoolInfoNum(companyCode, "industryPool");
-        bigScreenVo.setIndustryPool(industryPool);
+//        bigScreenVo.setIndustryPool(industryPool);
+        infoList.add(industryPool);
+        List<Map<String, Object>> carInfoList = new ArrayList<>();
         Integer carNum = fireFightingSystemMapper.getCarNum(companyCode);
-        bigScreenVo.setCarNum(carNum);
+        Map<String, Object> carInfo = new HashMap<>();
+        carInfo.put("carNum", carNum);
+        carInfoList.add(carInfo);
+//        bigScreenVo.setCarNum(carNum);
+        bigScreenVo.setCarNumInfo(carInfoList);
+        bigScreenVo.setInfoList(infoList);
         return bigScreenVo;
     }
 }

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

@@ -1624,4 +1624,13 @@
         </where>
         ORDER BY realtiemIotIndexUpdateDate DESC
     </select>
+
+    <select id="getAllEquipNum" resultType="java.lang.Integer">
+        select count(*) from wl_equipment_specific
+        <where>
+            <if test="bizOrgCode != null and bizOrgCode != ''">
+                biz_org_code = #{bizOrgCode}
+            </if>
+        </where>
+    </select>
 </mapper>
\ No newline at end of file