优化组态图设备状态查询接口

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

@@ -247,8 +247,8 @@ public class RiskSourceSceneController extends AbstractBaseController {
     @GetMapping(value = "/getStatus")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
-    public  List<Map> getstatus(){
-        return iRiskSourceSceneService.getstatus();
+    public  List<Map> getstatus(@RequestParam(value = "sceneId", required = false) String sceneId){
+        return iRiskSourceSceneService.getstatus(sceneId);
     }
 
      /**

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

@@ -69,6 +69,13 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
     List<EquipmentSpecificIndex> getEquipMentStatus(@Param("id") String id);
     
     List<EquipmentSpecificIndex> getEquipIndexLatestStatus();
+    
+    /**
+     * 根据画布id获取画布绑定设备最新指标状态
+     * @param sceneId
+     * @return
+     */
+    List<EquipmentSpecificIndex> getEquipLatestStatusBySceneId(String sceneId);
 
     List<String> getEquipmentIotCodeLists();
 

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

@@ -99,14 +99,19 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
      */
     List<AlarmDataVO> getSystemById(Long id);
 
-    IPage<EquipmentAlarmBySystemIdOrSourceIdVO> getEquipmentAlarmBySystemIdOrSourceIdVO(IPage<EquipmentAlarmBySystemIdOrSourceIdVO> page, Long sourceId, Long systemId, Integer confirmType, String createDate, String type);
+    IPage<EquipmentAlarmBySystemIdOrSourceIdVO> getEquipmentAlarmBySystemIdOrSourceIdVO(@Param("page")IPage<EquipmentAlarmBySystemIdOrSourceIdVO> page
+    		, @Param("sourceId")Long sourceId
+    		, @Param("systemId")Long systemId
+    		, @Param("confirmType")Integer confirmType
+    		, @Param("createDate")String createDate
+    		, @Param("type")String type);
 
     IPage<EquipTypeImgAmountVO> getColaCategoryAmountList(@Param("page")IPage page, 
     		@Param("hierarchy")int hierarchy,
     		@Param("codeHead")String codeHead, 
     		@Param("equipTypeAmountPage")EquipTypeAmountPageDTO equipTypeAmountPage);
 
-    List<FireFightingSystem> getFireFightingSystemDetail(FireFightingSystemVo fireFightingSystemVo);
+    List<FireFightingSystem> getFireFightingSystemDetail(@Param("fireFightingSystemVo")FireFightingSystemVo fireFightingSystemVo);
 
     List<FireFightingSystemEntity> getFightingSysByCodes(@Param("ids") String[] idsArr);
 

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

@@ -130,7 +130,7 @@ public interface IRiskSourceSceneService extends IService <RiskSourceScene> {
     List<PointTreeVo>  getSystemmeanLsit();
 
 
-    List<Map> getstatus();
+    List<Map> getstatus(String sceneId);
 	    /**
      * 分页查询部件
      * @param page 分页对象

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

 package com.yeejoin.equipmanage.service.impl;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.utils.TreeBuilder;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -13,18 +36,23 @@ import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.morphic.Morphic;
 import com.yeejoin.amos.feign.morphic.model.ResourceDTO;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
-import com.yeejoin.equipmanage.common.entity.*;
+import com.yeejoin.equipmanage.common.entity.Equipment;
+import com.yeejoin.equipmanage.common.entity.EquipmentCategory;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
+import com.yeejoin.equipmanage.common.entity.RiskSourceScene;
 import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
 import com.yeejoin.equipmanage.common.entity.publics.CommonResponse;
-import com.yeejoin.equipmanage.common.entity.vo.*;
+import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
+import com.yeejoin.equipmanage.common.entity.vo.PageSecurityVideoVO;
+import com.yeejoin.equipmanage.common.entity.vo.PersonVo;
+import com.yeejoin.equipmanage.common.entity.vo.PointTreeVo;
+import com.yeejoin.equipmanage.common.entity.vo.RiskSourceTreeVO;
 import com.yeejoin.equipmanage.common.enums.EquipmentRiskTypeEnum;
-import com.yeejoin.equipmanage.common.enums.EquipmentStateEnum;
 import com.yeejoin.equipmanage.common.enums.TrueOrFalseEnum;
 import com.yeejoin.equipmanage.common.exception.CommonException;
 import com.yeejoin.equipmanage.common.exception.errorEnum.CommonErrorEnum;
 import com.yeejoin.equipmanage.common.response.RiskSourceTreeResponse;
 import com.yeejoin.equipmanage.common.utils.EquipmentStateUtil;
-import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.utils.TreeUtil;
 import com.yeejoin.equipmanage.mapper.BuildingMapper;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
@@ -36,20 +64,6 @@ import com.yeejoin.equipmanage.service.IEquipmentCategoryService;
 import com.yeejoin.equipmanage.service.IEquipmentDetailService;
 import com.yeejoin.equipmanage.service.IEquipmentService;
 import com.yeejoin.equipmanage.service.IRiskSourceSceneService;
-import org.apache.commons.beanutils.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.utils.TreeBuilder;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author DELL
@@ -320,28 +334,17 @@ public class RiskSourceSceneServiceImpl extends ServiceImpl<RiskSourceSceneMappe
     public List<PointTreeVo> getSystemmeanLsit() {
         return equipmentSpecificMapper.getSystemmeanLsit();
     }
-
+    
     @Override
-    public List<Map> getstatus() {
-       /* List<Map> data = new ArrayList<>();
-        QueryWrapper<EquipmentSpecific> q = new QueryWrapper<>();
-        q.ne("iot_code", "");
-        List<EquipmentSpecific> equipmentSpecifics = equipmentSpecificMapper.selectList(q);
-        if (equipmentSpecifics.size() == 0) {
-            return data;
-        }
-        Map<String, String> map = null;
-        for (EquipmentSpecific e : equipmentSpecifics) {
-            map = new HashMap<>();
-            String qrCode = e.getQrCode();
-            String status = getStatusByQrCode(qrCode);
-            map.put("equipCode", qrCode);
-            map.put("status", status);
-            data.add(map);
-        }
-        return data;*/
+    public List<Map> getstatus(String sceneId) {
         List<Map> data = new ArrayList<>();
-        List<EquipmentSpecificIndex> equipIndexLatestStatus = equipmentSpecificMapper.getEquipIndexLatestStatus();
+        List<EquipmentSpecificIndex> equipIndexLatestStatus = new ArrayList<>();
+        if(ObjectUtils.isEmpty(sceneId)){
+        	equipIndexLatestStatus = equipmentSpecificMapper.getEquipIndexLatestStatus();
+        }else{
+        	equipIndexLatestStatus = equipmentSpecificMapper.getEquipLatestStatusBySceneId(sceneId);
+        }
+         
         equipIndexLatestStatus.forEach(action->{
         	 Map<String, String> map = new HashMap<>();
         	 map.put("equipCode", action.getQrCode());

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

@@ -307,6 +307,33 @@
 		AND equipindex.equipment_index_id = ei.id
     </select>
     
+    <select id = "getEquipLatestStatusBySceneId"  resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex">
+    	SELECT
+			ei.type_code AS 'typeCode',
+			es.`name` as 'equipmentSpecificName',
+			es.realtime_iot_index_key AS 'indexKey',
+			es.realtime_iot_index_name AS 'indexName',
+			es.qr_code AS 'qrCode',
+			es.iot_code AS 'iotCode',
+			es.realtime_iot_index_value AS 'value'
+		FROM
+			wl_equipment_specific es,
+			wl_equipment_index ei
+		WHERE
+			es.realtime_iot_index_id = ei.id
+		AND find_in_set(
+			es.id,
+			(
+				SELECT
+					wss.point_in_scene
+				FROM
+					wl_source_scene wss
+				WHERE
+					wss.scene_id = #{sceneId}
+			)
+		)
+    </select>
+    
     <select id="getEquipmentIotCodeLists" resultType="String">
         SELECT
             iot_code