处理authOrg

AmosBankService/src/main/java/com/yeejoin/amos/bank/config/EquipmentListener.java

@@ -16,6 +16,7 @@ import com.yeejoin.amos.bank.remote.client.RiskModelRemoteClient;
 import com.yeejoin.amos.bank.service.IAlarmPointService;
 import com.yeejoin.amos.bank.service.IAlarmService;
 import com.yeejoin.amos.bank.utils.HttpUtil;
+import com.yeejoin.amos.bank.utils.JsonUtil;
 import com.yeejoin.amos.bank.webSocket.AmosWsClient;
 import com.yeejoin.amos.bank.webSocket.WebsocketParam;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
@@ -35,11 +36,7 @@ import org.typroject.tyboot.component.emq.EmqxListener;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
 
 @Component
 public class EquipmentListener extends EmqxListener implements InitializingBean {
@@ -162,6 +159,7 @@ public class EquipmentListener extends EmqxListener implements InitializingBean
             String eqpName = parseObject.getString("eqpName");
             // orgcode
             String orgcode = parseObject.getString("orgCode");
+            String authOrg = parseObject.getString("authOrg");
 
             if (ObjectUtils.isEmpty(jsonArray)) {
                 return;
@@ -199,7 +197,7 @@ public class EquipmentListener extends EmqxListener implements InitializingBean
             }
 
             // 增加报警(跑马灯，首页)
-            addAlarmMethod(eqpId, statusByName, eqpName, ipAddress, metricKey, orgcode, sanwei, lou);
+            addAlarmMethod(eqpId, statusByName, eqpName, ipAddress, metricKey, orgcode, sanwei, lou, authOrg);
 
             // 增建告警记录表
             addAlarmRecord(eqpId, metricKey, statusByName, orgcode, ipAddress, eqpName);
@@ -334,7 +332,8 @@ public class EquipmentListener extends EmqxListener implements InitializingBean
         }
     }
 
-    public void addAlarmMethod(Long eqpId, Integer statusByName, String eqpName, String ipAddress, String metricKey, String orgCode, String sanwei, String lou) throws IOException {
+    public void addAlarmMethod(Long eqpId, Integer statusByName, String eqpName, String ipAddress, String metricKey, String orgCode, String sanwei, String lou, String authOrg) throws IOException {
+        String authOrgTemp = JsonUtil.arraysToString(JsonUtil.toStringArray(authOrg));
         List<AlarmPoint> alarmPoint = alarmPointService.selectPointTypeAndPointId(AlarmPointTypeEnum.设备.getCode(),
                 eqpId);
         if (alarmPoint != null && alarmPoint.size() > 0) {
@@ -357,6 +356,7 @@ public class EquipmentListener extends EmqxListener implements InitializingBean
                 alarmPoint1.setContent(eqpName + "-" + ipAddress + "-" + metricKey);
                 alarmPoint1.setCode(orgCode);
                 alarmPoint1.setPointName(eqpName);
+                alarmPoint1.setAuthOrg(authOrgTemp);
                 Map<String, Object> map = new HashMap<>();
                 map.put("position", sanwei);
                 map.put("storey", lou);

AmosBankService/src/main/java/com/yeejoin/amos/bank/utils/JsonUtil.java

@@ -2,13 +2,20 @@ package com.yeejoin.amos.bank.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
+import com.ctrip.framework.apollo.core.utils.StringUtils;
+import com.google.common.base.Joiner;
 import org.apache.commons.io.FileUtils;
 import org.springframework.util.ResourceUtils;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * @Author: xinglei
@@ -17,11 +24,11 @@ import java.io.IOException;
  */
 public class JsonUtil {
 
-    public static JSONArray getJsonArray(String jsonPath){
+    public static JSONArray getJsonArray(String jsonPath) {
         File jsonFile = null;
         String json = "";
         try {
-            jsonFile = ResourceUtils.getFile(String.format("classpath:json/%s",jsonPath));
+            jsonFile = ResourceUtils.getFile(String.format("classpath:json/%s", jsonPath));
             json = FileUtils.readFileToString(jsonFile);
         } catch (Exception e) {
             e.printStackTrace();
@@ -29,12 +36,12 @@ public class JsonUtil {
         JSONArray jsonArray = JSON.parseArray(json);
         return jsonArray;
     }
-    
-    public static JSONObject getJsonObject(String jsonPath){
+
+    public static JSONObject getJsonObject(String jsonPath) {
         File jsonFile = null;
         String json = "";
         try {
-            jsonFile = ResourceUtils.getFile(String.format("classpath:json/%s",jsonPath));
+            jsonFile = ResourceUtils.getFile(String.format("classpath:json/%s", jsonPath));
             json = FileUtils.readFileToString(jsonFile);
         } catch (Exception e) {
             e.printStackTrace();
@@ -42,46 +49,69 @@ public class JsonUtil {
         JSONObject parseObject = JSON.parseObject(json);
         return parseObject;
     }
-    
-    
+
+
     //classpath:json/donghuanAlarm.json
     public static String readJsonFile(String path) {
-    	try {
-			File jsonFile = ResourceUtils.getFile(path);
-			String json = FileUtils.readFileToString(jsonFile);
-			return json;
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return "";
+        try {
+            File jsonFile = ResourceUtils.getFile(path);
+            String json = FileUtils.readFileToString(jsonFile);
+            return json;
+        } catch (FileNotFoundException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return "";
     }
-    
+
     /**
      * 去除json中多余的转义符号
+     *
      * @param paramString
      * @return
      */
     public static String formatJsonString(String paramString) {
-		// 序列化为JSON字符串
-		String data02 = JSON.toJSONString(paramString);
-		System.out.println("data02:" + data02);
-		// 通过 replace 去掉斜杠
-		String data03 = data02.replace("\\", "");
-		System.out.println("data03:" + data03);
-		// 去掉首尾的引号
-		String data04 = data03.substring(1, data03.length() - 1);
-		System.out.println("data04:" + data04);
-		// 去掉首尾的引号
-		if (data04.startsWith("{") && data04.endsWith("}")) {
-			return data04;
-		} else {
-			String data05 = data03.substring(2, data04.length());
-			System.out.println("data05:" + data05);
-			return data05;
-		}
-	}
+        // 序列化为JSON字符串
+        String data02 = JSON.toJSONString(paramString);
+        System.out.println("data02:" + data02);
+        // 通过 replace 去掉斜杠
+        String data03 = data02.replace("\\", "");
+        System.out.println("data03:" + data03);
+        // 去掉首尾的引号
+        String data04 = data03.substring(1, data03.length() - 1);
+        System.out.println("data04:" + data04);
+        // 去掉首尾的引号
+        if (data04.startsWith("{") && data04.endsWith("}")) {
+            return data04;
+        } else {
+            String data05 = data03.substring(2, data04.length());
+            System.out.println("data05:" + data05);
+            return data05;
+        }
+    }
+
+    public static  String[] toStringArray(String fields) {
+        fields = fields.replace("\"", "");
+        String[] field = null;
+        if (fields != null && fields.length() > 0) {
+            field = fields.split(",");
+            String first = field[0];
+            field[0] = first.substring(first.indexOf("[") + 1);
+            String last = field[field.length - 1];
+            field[field.length - 1] = last.substring(0, last.indexOf("]"));
+        }
+        String[] objects = Arrays.stream(field).filter(x -> !x.isEmpty() && !x.equals("null")).toArray(String[]::new);
+        return objects;
+    }
+
+    public static String arraysToString(String[] str){
+        String result = null;
+        for(int i = 0; i < str.length; i++) {
+            result = "#" + str[i];
+        }
+        return result;
+    }
 }