From efde84df1da433b52c1faf36b79bf52c9fddd7e8 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 12 Oct 2021 15:53:42 +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     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 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 8ffde942..cb20062d 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
@@ -75,7 +75,8 @@ public class EdcDataResourceServiceImpl extends ServiceImpl<EdcDataResourceMappe
         JSONObject jsonObject = JSONObject.parseObject(text);
         String handle = jsonObject.getString("TRANID");
         String site = jsonObject.getString("SITE");
-        String resource = jsonObject.getString("RESOURCE");
+//        String resource = jsonObject.getString("RESOURCE");
+        String resource = jsonObject.getString("equipmentId");
         String sendTime = jsonObject.getString("SEND_TIME");
         if (StringUtil.isBlank(site)) {
             throw BusinessException.build("站点不能为空！");
@@ -90,7 +91,7 @@ public class EdcDataResourceServiceImpl extends ServiceImpl<EdcDataResourceMappe
         }
 
         // 参数列，将参数存入MAP，方便提取
-        String paramList = jsonObject.getString("PARAM_LIST");
+        /*String paramList = jsonObject.getString("PARAM_LIST");
         JSONArray jsonArray = JSON.parseArray(paramList);
         Map<String,String> map = new HashMap<>();
         for (int i = 0; i < jsonArray.size(); i++) {
@@ -98,7 +99,7 @@ public class EdcDataResourceServiceImpl extends ServiceImpl<EdcDataResourceMappe
             String paramVal = jsonObj.getString("PARAM_VAL");
             String param = jsonObj.getString("PARAM");
             map.put(param,paramVal);
-        }
+        }*/
         // 获取数据收集组HANDLE
         String resourceBo = HandleEnum.RESOURCE.getHandle(site, "Z_EDC_DATA_RESOURCE");
         String dcGroupBo = edcDataResourceMapper.getDcGroupBoByResourceBo(resourceBo);
@@ -116,11 +117,12 @@ public class EdcDataResourceServiceImpl extends ServiceImpl<EdcDataResourceMappe
             throw BusinessException.build("数据收集组" + dcGroupBo + "未维护字段信息");
         }
         for (DcParameter dcParam:getParamList) {
-            String parameterName = dcParam.getParameterName();
+            String parameterName = dcParam.getDescription();
             // 数据收集组---值-列
             String dcValueMask = dcParam.getDcValueMask();
             // json值
-            String value = map.get(parameterName);
+//            String value = map.get(parameterName);
+            String value = jsonObject.getString(parameterName);
             if (value == null){
                 continue;
             }