From bab8da36a28dbceddc4b88b3e729acc38b34bb89 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 12 Oct 2021 10:48:22 +0800
Subject: [PATCH] =?UTF-8?q?dnc=E8=AE=BE=E5=A4=87=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=AA=E8=AE=B0=E5=BD=95=E6=9C=80=E6=96=B0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equip/service/EdcDataResourceService.java |  1 +
 .../impl/EdcDataResourceServiceImpl.java      | 25 +++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/EdcDataResourceService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/EdcDataResourceService.java
index d036510b..3a834743 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/EdcDataResourceService.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/EdcDataResourceService.java
@@ -26,6 +26,7 @@ public interface EdcDataResourceService extends IService<EdcDataResource> {
 
     List<EdcDataResource> selectList(EdcDataResource edcDataResource);
 
+    void removeAll(EdcDataResource edcDataResource);
     /**
      * 保存设备参数数据-DNC接口
      * @param text
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 217c04ee..8ffde942 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
@@ -42,6 +42,8 @@ public class EdcDataResourceServiceImpl extends ServiceImpl<EdcDataResourceMappe
     @Autowired
     private EdcDataResourceMapper edcDataResourceMapper;
     @Autowired
+    private EdcDataResourceService edcDataResourceService;
+    @Autowired
     private DcParameterMapper dcParameterMapper;
     @Autowired
     private ResrceService resrceService;
@@ -60,6 +62,13 @@ public class EdcDataResourceServiceImpl extends ServiceImpl<EdcDataResourceMappe
         return super.list(queryWrapper);
     }
 
+    @Override
+    public void removeAll(EdcDataResource edcDataResource) {
+        QueryWrapper<EdcDataResource> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(edcDataResource);
+        super.remove(queryWrapper);
+    }
+
     @Override
     public void saveResourceParamByMq(String text) {
         // json解析，获取json中数据
@@ -68,9 +77,6 @@ public class EdcDataResourceServiceImpl extends ServiceImpl<EdcDataResourceMappe
         String site = jsonObject.getString("SITE");
         String resource = jsonObject.getString("RESOURCE");
         String sendTime = jsonObject.getString("SEND_TIME");
-        if (StringUtil.isBlank(handle)) {
-            throw BusinessException.build("唯一标识不能为空！");
-        }
         if (StringUtil.isBlank(site)) {
             throw BusinessException.build("站点不能为空！");
         }
@@ -94,12 +100,12 @@ public class EdcDataResourceServiceImpl extends ServiceImpl<EdcDataResourceMappe
             map.put(param,paramVal);
         }
         // 获取数据收集组HANDLE
-        String resourceBo = HandleEnum.RESOURCE.getHandle(site, 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("设备编号未找到数据收集组！");
+                throw BusinessException.build("设备编号["+ resource +"]未找到数据收集组！");
             }
         }
         // 获取数据收集组的字段配置信息
@@ -129,9 +135,12 @@ public class EdcDataResourceServiceImpl extends ServiceImpl<EdcDataResourceMappe
         }
         StringBuilder sqlStr = new StringBuilder();
         String nowString = LocalDateTime.now().toString().substring(0, 19).replace('T', ' ');
-        sqlStr.append("INSERT INTO Z_EDC_DATA_")
-                .append(resource.replace("-","_"))
-                .append("@ODS")
+        EdcDataResource edcDataResource = new EdcDataResource();
+        edcDataResource.setResrce(resource);
+        edcDataResourceService.removeAll(edcDataResource);
+        sqlStr.append("INSERT INTO Z_EDC_DATA_RESOURCE")
+                //.append(resource.replace("-","_"))
+                //.append("@ODS")
                 .append(" (HANDLE,SITE,RESRCE,DC_GROUP_BO,DATE_TIME,CREATED_DATE_TIME,CREATE_USER,")
                 .append(columnSql.substring(0,columnSql.length()-1))
                 .append(") ")