增加是否绑定验证

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

@@ -251,7 +251,21 @@ public class RiskSourceSceneController extends AbstractBaseController {
         return iRiskSourceSceneService.getstatus(sceneId);
     }
 
-     /**
+
+
+    @GetMapping(value = "/getStatus/All")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
+    public   List<Map<String, Object>> getStatusAll(@RequestParam(value = "sceneId", required = false) String sceneId){
+        return iRiskSourceSceneService.getStatusAll(sceneId);
+    }
+
+
+
+
+
+
+    /**
      * 根据风险位置获取装备
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -84,6 +84,8 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
      * @return
      */
     List<EquipmentSpecificIndex> getEquipLatestStatusBySceneId(String sceneId);
+    List<Map<String, Object>> getStatusAll(@Param("sceneId")String sceneId);
+
 
     List<String> getEquipmentIotCodeLists();
 

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

@@ -131,7 +131,9 @@ public interface IRiskSourceSceneService extends IService <RiskSourceScene> {
 
 
     List<Map> getstatus(String sceneId);
-	    /**
+    List<Map<String, Object>> getStatusAll(String sceneId);
+
+    /**
      * 分页查询部件
      * @param page 分页对象
      * @param riskSourceId 风险区域ID

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

@@ -349,12 +349,22 @@ public class RiskSourceSceneServiceImpl extends ServiceImpl<RiskSourceSceneMappe
         	 Map<String, String> map = new HashMap<>();
         	 map.put("equipCode", action.getQrCode());
              map.put("color", EquipmentStateUtil.judgeEquipState(action));
-             map.put("num", action.getNum()+"");
+//             map.put("num", action.getNum()+"");
 
             data.add(map);
         });
         return data;
     }
+    @Override
+    public  List<Map<String, Object>> getStatusAll(String sceneId) {
+        List<Map<String, Object>> data = new ArrayList<>();
+        data = equipmentSpecificMapper.getStatusAll(sceneId);
+
+        return data;
+    }
+
+
+
 
     private String getStatusByQrCode(String qrCode) {
         List<EquipmentSpecificIndex> equipMentStatus = equipmentSpecificMapper.getEquipMentStatus(qrCode);

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

@@ -277,8 +277,7 @@
 			ei.type_code AS 'typeCode',
 			es.qr_code AS 'qrCode',
 			equipindex.color AS emergencyLevelColor,
-			equipindex.isAlarm AS isAlarm,
-			(select  COUNT(id) from   wl_video_equipment_specific   where wl_video_equipment_specific.equipment_specific_id=es.id) num
+			equipindex.isAlarm AS isAlarm
 
 		FROM
 			(
@@ -313,6 +312,23 @@
 		AND equipindex.equipment_index_id = ei.id
     </select>
     
+    <select id="getStatusAll" resultType="java.util.HashMap">
+
+      select  COUNT(id)  num,  wl_video_equipment_specific.equipment_specific_id as id  from   wl_video_equipment_specific   where  find_in_set(
+            wl_video_equipment_specific.equipment_specific_id,
+            (
+                SELECT
+                    wss.point_in_scene
+                FROM
+                    wl_source_scene wss
+                WHERE
+                    wss.scene_id =  #{sceneId}
+            )
+        )  GROUP BY wl_video_equipment_specific.equipment_specific_id
+
+
+    </select>
+
     <select id = "getEquipLatestStatusBySceneId"  resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex">
     	SELECT
 			ei.type_code AS 'typeCode',
@@ -323,8 +339,7 @@
 			es.iot_code AS 'iotCode',
 			es.realtime_iot_index_value AS 'value',
 			ei.is_alarm AS isAlarm,
-            ei.emergency_level_color AS 'emergencyLevelColor',
-            (select  COUNT(id) from   wl_video_equipment_specific   where wl_video_equipment_specific.equipment_specific_id=es.id) num
+            ei.emergency_level_color AS 'emergencyLevelColor'
 
 		FROM
 			wl_equipment_specific es,