From babcb936d13a39b9b5adeb20826f3fb91df36ea6 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Wed, 13 Oct 2021 15:25:28 +0800
Subject: [PATCH] =?UTF-8?q?dnc=E6=8E=A5=E5=8F=A3=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=8E=A5=E6=94=B6=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EdcDataResourceServiceImpl.java | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EdcDataResourceServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EdcDataResourceServiceImpl.java
index cb20062d..f4b481c2 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EdcDataResourceServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EdcDataResourceServiceImpl.java
@@ -73,7 +73,7 @@ public class EdcDataResourceServiceImpl extends ServiceImpl<EdcDataResourceMappe
     public void saveResourceParamByMq(String text) {
         // json解析，获取json中数据
         JSONObject jsonObject = JSONObject.parseObject(text);
-        String handle = jsonObject.getString("TRANID");
+//        String handle = jsonObject.getString("TRANID");
         String site = jsonObject.getString("SITE");
 //        String resource = jsonObject.getString("RESOURCE");
         String resource = jsonObject.getString("equipmentId");
@@ -101,20 +101,21 @@ public class EdcDataResourceServiceImpl extends ServiceImpl<EdcDataResourceMappe
             map.put(param,paramVal);
         }*/
         // 获取数据收集组HANDLE
-        String resourceBo = HandleEnum.RESOURCE.getHandle(site, "Z_EDC_DATA_RESOURCE");
+        /*String resourceBo = HandleEnum.RESOURCE.getHandle(site, "Z_EDC_DATA_RESOURCE");
         String dcGroupBo = edcDataResourceMapper.getDcGroupBoByResourceBo(resourceBo);
         if (dcGroupBo == null){
             dcGroupBo = edcDataResourceMapper.getDcGroupBoByResourceBo2(resourceBo);
             if (dcGroupBo == null){
                 throw BusinessException.build("设备编号["+ resource +"]未找到数据收集组！");
             }
-        }
+        }*/
         // 获取数据收集组的字段配置信息
         StringBuilder columnValSql = new StringBuilder();
         StringBuilder columnSql = new StringBuilder();
-        List<DcParameter> getParamList = dcParameterMapper.getDcParameterByDcGroupBo(dcGroupBo);
-        if (getParamList.size() < 1){
-            throw BusinessException.build("数据收集组" + dcGroupBo + "未维护字段信息");
+        List<DcParameter> getParamList = dcParameterMapper.getDcParameterByDcGroupBo("DcGroupBO:1000,RESOURCE_EDC,A");
+        if (getParamList.size() <= 0){
+//            throw BusinessException.build("数据收集组" + dcGroupBo + "未维护字段信息");
+            throw BusinessException.build("数据收集组" + "DcGroupBO:1000,RESOURCE_EDC,A" + "未维护字段信息");
         }
         for (DcParameter dcParam:getParamList) {
             String parameterName = dcParam.getDescription();
@@ -150,7 +151,8 @@ public class EdcDataResourceServiceImpl extends ServiceImpl<EdcDataResourceMappe
                 .append(UUID.randomUUID()).append("','")
                 .append(site).append("','")
                 .append(resource).append("','")
-                .append(dcGroupBo).append("',")
+//                .append(dcGroupBo).append("',")
+                .append("DcGroupBO:1000,RESOURCE_EDC,A").append("',")
                 .append("TO_DATE('").append(sendTime).append("','yyyy-MM-dd hh24:mi-ss') ,")
                 .append("TO_DATE('").append(nowString).append("','yyyy-MM-dd hh24:mi-ss') ,'")
                 .append("SITE_ADMIN").append("',")