Merge remote-tracking branch 'origin/developer' into developer

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

@@ -571,7 +571,7 @@ public class FireFightingSystemController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public List<SpeIndexVo> selectById(Long id) {
-        return fireFightingSystemService.getSpeIndex(id);
+        return fireFightingSystemService.getSpeIndex(id,1);
     }
 
 

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

@@ -190,9 +190,6 @@ public class MaintenanceResourceDataController extends AbstractBaseController {
         if (!CollectionUtils.isEmpty(buildingIds)) {
             queryWrapper.in("building_id", buildingIds);
         }
-        if (!ValidationUtil.isEmpty(fireFacilityId)) {
-            queryWrapper.eq("fire_fight_sys_id", fireFacilityId);
-        }
         IPage<MaintenanceResourceData> page;
         if (pageNum != null && pageSize != null) {
             pageBean = new Page<>(pageNum, pageSize);

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

@@ -92,7 +92,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
      *
      * @return
      */
-    List<SpeIndexVo> getSpeIndex(Long id);
+    List<SpeIndexVo> getSpeIndex(Long id,int flag);
 
     /**
      * 列表查询

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

@@ -40,6 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.net.Inet4Address;
@@ -404,8 +405,22 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     }
 
     @Override
-    public List<SpeIndexVo> getSpeIndex(Long id) {
-        return makeStatus(fireFightingSystemMapper.getSpeIndex(id));
+    public List<SpeIndexVo> getSpeIndex(Long id,int flag) {
+        //  因此处代码其他地方有调用 增加表示判断 flag == 1 为 消防点位图处需要iot编码所用
+        if (flag == 1){
+            List<SpeIndexVo> speIndexVos = makeStatus(fireFightingSystemMapper.getSpeIndex(id));
+            if (!ValidationUtil.isEmpty(speIndexVos)){
+                EquipmentSpecific equipmentSpecific = equipmentSpecificSerivce.getBaseMapper().selectById(id);
+                if (!ValidationUtil.isEmpty(equipmentSpecific)){
+                    SpeIndexVo speIndexVo = new SpeIndexVo();
+                    speIndexVo.setName("设备编码");
+                    speIndexVo.setValue(equipmentSpecific.getCode());
+                    speIndexVos.add(0,speIndexVo);
+                }
+            }
+            return speIndexVos;
+        }
+       return makeStatus(fireFightingSystemMapper.getSpeIndex(id));
     }
 
     private void insertFiles(FireFightingSystemVo vo) {

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

@@ -323,7 +323,10 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             equipmentStateVo.setStatus("");
             equipmentStateVo.setColor(index.getEmergencyLevelColor());
             // 添加性能指标项
-            equipmentStateVo.setSpeindexList(fireFightingSystemService.getSpeIndex(index.getEquipmentSpecificId()));
+            //flag 无意义 getSpeIndex 方法其他地方共用 做了额外封装 为0时走原逻辑
+            int flag = 0;
+            equipmentStateVo.setSpeindexList(fireFightingSystemService.getSpeIndex(index.getEquipmentSpecificId(),flag));
+
             Map<String, Object> topicObject = new HashMap<>();
             topicObject.put("equipCode", equipmentStateVo.getEquipCode());
             if (TrueOrFalseEnum.real.value.toUpperCase().equals(index.getValue().toUpperCase())) {

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

@@ -132,7 +132,7 @@
             fire_fight_sys_id AS id,
             fire_fight_sys_name name ,
             owner_unit_id as parentId,
-            IFNULL(classify_type,3)
+            IFNULL(classify_type,3) as type
         FROM
             `mt_maintenance_resource_data`
         GROUP BY