改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificAlarmLog.java

@@ -196,6 +196,9 @@ public class EquipmentSpecificAlarmLog extends BaseEntity {
     @TableField(exist = false)
     private String jcsConfirmUserName;
 
+    @ApiModelProperty(value = "画布中建筑ID", notes = "告警详情 配置点位里用")
+    @TableField(exist = false)
+    private String sourceId;
     /**
      * 颜色
      */

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

 package com.yeejoin.equipmanage.controller;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
@@ -228,14 +225,17 @@ public class EquipmentSpecificController extends AbstractBaseController {
     /**
      * 获取instanceId和orgCode
      *
-     * @param equipmentSpecific
+     * @param sourceId
      * @return
      */
-    @RequestMapping(value = "/getEquipSpecificDetail1", method = RequestMethod.POST)
+    @RequestMapping(value = "/getInstanceIdAndOrgCode", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "POST", value = "获取instanceId和orgCode", notes = "获取instanceId和orgCode")
-    public ResponseModel getEquipSpecificDetail1(@RequestBody EquipmentSpecific equipmentSpecific) {
-        return CommonResponseUtil.success(equipmentSpecificSerivce.getEquipSpecificDetail1(equipmentSpecific));
+    @ApiOperation(httpMethod = "GET", value = "获取instanceId和orgCode", notes = "获取instanceId和orgCode")
+    public ResponseModel getInstanceIdAndOrgCode(@RequestParam Long sourceId) {
+        if (Objects.isNull(sourceId)) {
+            return CommonResponseUtil.success(null);
+        }
+        return CommonResponseUtil.success(equipmentSpecificSerivce.getInstanceIdAndOrgCode(sourceId));
     }
 
     /**

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

@@ -119,10 +119,10 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
     /**
      * 获取instanceId和orgCode
      *
-     * @param equipmentSpecific
+     * @param sourceId
      * @return
      */
-    FireEquipmentVO getEquipSpecificDetail1(EquipmentSpecific equipmentSpecific);
+    FireEquipmentVO getInstanceIdAndOrgCode(Long sourceId);
 
     void equipSpecificDataSync(Long equipmentId);
 

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

@@ -1488,13 +1488,14 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     }
 
     @Override
-    public FireEquipmentVO getEquipSpecificDetail1(EquipmentSpecific equipmentSpecific) {
-        FireEquipmentVO finalVo = equipmentSpecificMapper.getEquipSpecificDetail2(equipmentSpecific.getId());
-        if ("0".equals(finalVo.getParentId())) {
-            finalVo.setInstanceId(finalVo.getBuildId());
+    public FireEquipmentVO getInstanceIdAndOrgCode(Long sourceId) {
+        FireEquipmentVO finalVo = new FireEquipmentVO();
+        WarehouseStructure warehouseStructure = warehouseStructureMapper.selectById(sourceId);
+        if (0 == warehouseStructure.getParentId()) {
+            finalVo.setInstanceId(String.valueOf(warehouseStructure.getSourceId()));
+            finalVo.setBizOrgCode(warehouseStructure.getBizOrgCode());
         } else {
-            WarehouseStructure warehouseStructure = warehouseStructureMapper.selectById(finalVo.getParentId());
-            warehouseStructure = getWarehouseStructure(warehouseStructure);
+            warehouseStructure = getWarehouseStructure(warehouseStructureMapper.selectById(warehouseStructure.getParentId()));
             finalVo.setInstanceId(String.valueOf(warehouseStructure.getSourceId()));
             finalVo.setBizOrgCode(warehouseStructure.getBizOrgCode());
         }

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

@@ -14,6 +14,16 @@
 		    and EXISTS (SELECT distinct fi.instance_id from wl_form_instance fi where fi.instance_id = sou.source_id)
 			limit 1
 			) AS sceneId,
+			(
+			SELECT
+			sou.source_id
+			FROM
+			wl_source_scene sou
+			WHERE
+			find_in_set(ala.equipment_specific_id,sou.point_in_scene)>0
+			and EXISTS (SELECT distinct fi.instance_id from wl_form_instance fi where fi.instance_id = sou.source_id)
+			limit 1
+			) AS sourceId,
 			ala.equipment_specific_id,
 			spe.code AS equipmentSpecificCode,
 			ala.equipment_specific_index_name,