修改装备归属

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

@@ -242,5 +242,7 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
     Page<FireFightingSystemDto> fireSysIotEquipCount(Page<Map<String, Object>> page, @Param("bizOrgCode") String bizOrgCode);
 
     List<FireFightingSystemDto> fireSysIotEquipAlarmCount(Date date, String bizOrgCode);
+    Map<String, Object> getStationCode(@Param("id")Long id);
+
 
 }

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

@@ -264,4 +264,7 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
      * @return
      */
     List<FireFightingSystemDto> fireSysIotEquipAlarmCount(Date date, String bizOrgCode);
+
+    Map<String,Object> getStationCode(Long id);
+
 }

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

@@ -1970,4 +1970,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     public List<FireFightingSystemDto> fireSysIotEquipAlarmCount(Date date, String bizOrgCode) {
         return equipmentSpecificMapper.fireSysIotEquipAlarmCount(date, bizOrgCode);
     }
+    @Override
+    public Map<String, Object> getStationCode(Long id) {
+        return equipmentSpecificMapper.getStationCode(id);
+    }
+
 }

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

@@ -854,8 +854,20 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         equipmentSpecificAlarmLog.setId(null);
         equipmentSpecificAlarmLog.setCreateDate(new Date());
         equipmentSpecificAlarmLog.setEquipmentSpecificAlarmId(equipmentSpecificAlarm.getId());
-        equipmentSpecificAlarmLog.setStationCode(stationCode);
-        equipmentSpecificAlarmLog.setStationName(stationName);
+
+        //调整为按照设备归属（可归属公司或者部门
+        Map<String,Object> mapd= iEquipmentSpecificSerivce.getStationCode(equipmentSpecificAlarm.getEquipmentSpecificId());
+        if(mapd!=null){
+            equipmentSpecificAlarmLog.setStationCode(mapd.get("station_code").toString());
+            equipmentSpecificAlarmLog.setStationName(mapd.get("station_name").toString());
+        }
+
+
+//        equipmentSpecificAlarmLog.setStationCode(stationCode);
+//        equipmentSpecificAlarmLog.setStationName(stationName);
+
+
+
         boolean bool = equipmentSpecificAlarmLogService.save(equipmentSpecificAlarmLog);
         // 同步告警消息给平台
         if (amosSwitch && bool) {
@@ -899,8 +911,20 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         equipmentSpecificAlarm.setEmergencyLevelDescribe(equipmentSpecificIndex.getEmergencyLevelDescribe());
         equipmentSpecificAlarm.setBizOrgCode(equipmentSpecificIndex.getBizOrgCode());
         equipmentSpecificAlarm.setBizOrgName(equipmentSpecificIndex.getBizOrgName());
-        equipmentSpecificAlarm.setStationCode(stationCode);
-        equipmentSpecificAlarm.setStationName(stationName);
+
+        //调整为按照设备归属（可归属公司或者部门
+        Map<String,Object> mapd= iEquipmentSpecificSerivce.getStationCode(equipmentSpecificIndex.getEquipmentSpecificId());
+        if(mapd!=null){
+            equipmentSpecificAlarm.setStationCode(mapd.get("station_code").toString());
+            equipmentSpecificAlarm.setStationName(mapd.get("station_name").toString());
+        }
+
+
+//        equipmentSpecificAlarm.setStationCode(stationCode);
+//        equipmentSpecificAlarm.setStationName(stationName);
+
+
+
         equipmentSpecificAlarms.add(equipmentSpecificAlarm);
         return equipmentSpecificAlarms;
     }

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

@@ -2069,4 +2069,22 @@
             GROUP BY
             fs.id) s
     </select>
+
+    <select id="getStationCode" resultType="java.util.Map">
+             SELECT
+            u.`station_code`,
+              u.`station_name`
+            from
+            (SELECT
+            s.`code` as station_code ,
+            b.biz_org_code,
+            b.biz_org_name as station_name
+            FROM
+            `idx_biz_station_info` s,
+             cb_org_usr b
+            where s.`code` = b.`code`) u
+
+             where LOCATE(u.biz_org_code, (SELECT  wl_equipment_specific.biz_org_code   FROM  wl_equipment_specific   WHERE  wl_equipment_specific.id=#{id})) > 0
+    </select>
+
 </mapper>
\ No newline at end of file