From c7c42b3361b2058d5a76f12a62569beb3359aa70 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Mon, 6 Sep 2021 09:14:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=95=85=E9=9A=9C=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B6=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ResourceFaultReceiveServiceImpl.java        | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java
index 92e06289..6885f20b 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java
@@ -8,6 +8,7 @@ import com.foreverwin.mesnac.common.util.StringUtil;
 import com.foreverwin.mesnac.meapi.model.Resrce;
 import com.foreverwin.mesnac.meapi.service.ResrceService;
 import com.foreverwin.modular.core.exception.BusinessException;
+import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -62,6 +63,7 @@ public class ResourceFaultReceiveServiceImpl extends ServiceImpl<ResourceFaultRe
 
     @Override
     public String parseResourceFaultInfo(String text) {
+        String user = CommonMethods.getUser();
         JSONObject jsonObject = JSONObject.parseObject(text);
 
         String handle = jsonObject.getString("TRANID");
@@ -81,6 +83,10 @@ public class ResourceFaultReceiveServiceImpl extends ServiceImpl<ResourceFaultRe
             logger.error("站点不能为空！");
             throw BusinessException.build("站点不能为空！");
         }
+        if (StringUtil.isBlank(faultList)) {
+            logger.error("故障参数列表不能为空！");
+            throw BusinessException.build("故障参数列表不能为空！");
+        }
         if (StringUtil.isBlank(resource)) {
             logger.error("设备编号不能为空！");
             throw BusinessException.build("设备编号不能为空！");
@@ -95,13 +101,17 @@ public class ResourceFaultReceiveServiceImpl extends ServiceImpl<ResourceFaultRe
         List<ResourceFaultReceive> list = new ArrayList<>();
         // 故障编码及故障时间
         JSONArray jsonArray = JSON.parseArray(faultList);
+        if (jsonArray == null || jsonArray.size() < 1){
+            logger.error("设备编号：" + resource + ",故障参数列表不能为空！");
+            throw BusinessException.build("设备编号：" + resource + ",故障参数列表不能为空！");
+        }
         for (int i = 0; i < jsonArray.size(); i++) {
             ResourceFaultReceive resourceFaultReceive = new ResourceFaultReceive();
             // 设备编号、站点、创建时间-使用SEND_TIME、创建用户
             resourceFaultReceive.setResrce(resource);
             resourceFaultReceive.setSite(site);
             resourceFaultReceive.setCreatedDateTime(sendDate);
-            resourceFaultReceive.setCreateUser("SITE_ADMIN");
+            resourceFaultReceive.setCreateUser(user);
 
             JSONObject jsonObj = (JSONObject) jsonArray.get(i);
             String faultCode = jsonObj.getString("FAULT_CODE");