From c40cd444023f567b2f2fb09f809fc06e39735785 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Thu, 7 Nov 2024 12:58:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/zlevent/service/impl/EventServiceImpl.java   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java
index 0ed80bf..2c4f7d1 100644
--- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java
+++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java
@@ -88,6 +88,8 @@ public class EventServiceImpl implements IEventService {
         }
         //获取装置id
         CsEquipmentDeliveryPO po = equipmentFeignClient.findDevByNDid(appEventMessage.getId()).getData();
+        //获取设备类型 true:治理设备 false:其他类型的设备
+        boolean devModel = equipmentFeignClient.judgeDevModel(appEventMessage.getId()).getData();
         try {
             //处理事件数据
             List<AppEventMessage.DataArray> dataArray = appEventMessage.getMsg().getDataArray();
@@ -124,17 +126,18 @@ public class EventServiceImpl implements IEventService {
                         tags.put(InfluxDBTableConstant.UUID,id);
                         Map<String,Object> fields = new HashMap<>();
                         //只有治理型号的设备有监测位置
-                        if (Objects.equals(ZlConstant.EVENT_POSITION,param.getName())){
-                            if (Objects.equals(param.getData(),ZlConstant.GRID)){
+                        if (devModel) {
+                            if (appEventMessage.getMsg().getClDid() == 1) {
                                 fields.put(param.getName(),"电网侧");
                                 lineId = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appEventMessage.getId())), Map.class).get("1").toString();
                                 csEvent.setClDid(1);
-                            } else if (Objects.equals(param.getData(),ZlConstant.LOAD)){
+                                csEvent.setLocation("grid");
+                            } else if (appEventMessage.getMsg().getClDid() == 2) {
                                 fields.put(param.getName(),"负载侧");
                                 lineId = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appEventMessage.getId())), Map.class).get("2").toString();
                                 csEvent.setClDid(2);
+                                csEvent.setLocation("load");
                             }
-                            csEvent.setLocation(param.getData().toString());
                         } else {
                             if (Objects.equals(param.getName(),ZlConstant.EVT_PARAM_TM)){
                                 csEvent.setPersistTime(Double.parseDouble(param.getData().toString()));