修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

@@ -780,12 +780,12 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         // TODO 车辆枚举后期修改为已到达状态车辆
         List<Map<String, Object>> arrivedCarList = carList.stream()
                 .filter(c -> carIdList.contains(Long.valueOf((String) c.get("id")))
-                        && FireCarStatusEnum.出动.getCode().equals(c.get("carState")))
+                        && FireCarStatusEnum.到场.getCode().equals(c.get("carState")))
                 .collect(Collectors.toList());
         // 调派-已到达车辆id列表
         List<Long> arrivedCarIdList = Lists.newArrayList();
         arrivedCarList.forEach(c -> {
-            if (FireCarStatusEnum.出动.getCode().equals(c.get("carState"))) {
+            if (FireCarStatusEnum.到场.getCode().equals(c.get("carState"))) {
                 arrivedCarIdList.add(Long.valueOf((String) c.get("id")));
             }
         });
@@ -827,11 +827,11 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         // 泡沫和水车载统计 获取调用车辆的车载资源
         ResponseModel<Map<String, Object>> carPropertyByCarIds = equipFeignService.getCarPropertyByCarIds(carIds);
         obj.put("total", carTotal);
-        obj.put("count", carPropertyByCarIds.getResult().get("waterNum"));
+        obj.put("count", carPropertyByCarIds.getResult().get("waterNum")!=null?carPropertyByCarIds.getResult().get("waterNum"):0);
 
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("total", carTotal);
-        jsonObject.put("count", carPropertyByCarIds.getResult().get("foamNum"));
+        jsonObject.put("count", carPropertyByCarIds.getResult().get("foamNum")!=null?carPropertyByCarIds.getResult().get("foamNum"):0);
         resourceStatistics.put("medicament", jsonObject);
 
         resourceStatistics.put(jsoKey, obj);

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

@@ -6,6 +6,7 @@
         <result property="equipmentName" column="equipment_name"></result>
         <result property="code" column="code"></result>
         <result property="categoryName" column="category_name"></result>
+        <result property="isBound" column="is_bound"></result>
     </resultMap>
 
     <resultMap id="EquipCountBySystemId" type="com.yeejoin.equipmanage.common.entity.vo.EquipCountBySystemVO">
@@ -41,7 +42,9 @@
             spe.id,
             det.`name` equipment_name,
             spe.`code`,
-            wle.`name` AS category_name
+            wle.`name` AS category_name,
+            find_in_set(spe.id,(select  point_in_scene from  wl_source_scene  where source_id=#{systemId}))	 is_bound
+
         FROM
             wl_equipment_specific AS spe
             LEFT JOIN wl_equipment_detail AS det ON spe.equipment_detail_id = det.id

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

@@ -371,7 +371,12 @@
             v.id,
             v.code,
             v.name,
-            v.type
+          (case   v.type
+          when 'behavioural' then '行为分析摄像头'
+          when 'sharpEyes' then '火眼识别摄像头'
+            when 'other' then '其他'
+          else v.type
+            end ) type
         from
             wl_video v,
             wl_video_source vs