修改动环商业银行权限

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

@@ -146,11 +146,8 @@ public class DeviceListener extends EmqxListener implements InitializingBean {
 	                        }else {
 	                        	System.out.println("----update device state  fail  : "+ riskFactorId);
 	                        }
-	                        
-	                        
 	                    }
 				}
-
             });
 
         } catch (Exception e) {

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

@@ -43,6 +43,12 @@ import java.util.*;
 
 import static com.yeejoin.amos.bank.constants.AlarmConstant.*;
 
+
+/**
+ * @Author: Xing Lei
+ * @Description: 设备监听
+ * @Date: 2020-05-25 16:23
+ */
 @Component
 public class EquipmentListener extends EmqxListener implements InitializingBean {
 

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

@@ -7,6 +7,7 @@ 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.ObjectUtils;
 import org.springframework.util.ResourceUtils;
 
 import java.io.File;
@@ -110,7 +111,11 @@ public class JsonUtil {
     public static String arraysToString(String[] str){
         String result = null;
         for(int i = 0; i < str.length; i++) {
-            result = "#" + str[i];
+            if (ObjectUtils.isEmpty(result)){
+                result = "#" + str[i];
+            } else {
+                result = result + "#" + str[i];
+            }
         }
         return result;
     }

AmosBankService/src/main/java/com/yeejoin/amos/bank/webSocket/ShiduAlarmWebSocketClient.java

@@ -42,6 +42,7 @@ import com.yeejoin.amos.spc.exception.YeeException;
 
 import fr.opensagres.xdocreport.template.velocity.internal.Foreach;
 import io.micrometer.core.instrument.util.StringUtils;
+import org.springframework.util.ObjectUtils;
 
 /**
  * 湿度动环告警
@@ -132,6 +133,7 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
                             String equipmentAttrs = msgJson.getString("equipmentAttrs");
                             String sourceId = msgJson.getString("sourceId");
                             String authOrgs = getAuthOrg(msgJson.getString("authOrg"));
+
                             //String orgCode = msgJson.getString("orgCode");
                             AlarmPoint alarmPoint = new AlarmPoint();
                             alarmPoint.setCode(authOrgs);
@@ -201,13 +203,19 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
                             alarm.setAlarmSourceIp(msgJson.getString("sourceId"));
                             alarm.setAlarmSourceType(alarmType);
                             alarm.setUpdateDate(df.format(new Date()));
-                            alarm.setOrgCode(msgJson.getString("orgCode"));
+
+                            String orgCode = msgJson.getString("orgCode");
+                            String authOrg = msgJson.getString("authOrg");
+                            String authOrgTemp = JsonUtil.arraysToString(JsonUtil.toStringArray(authOrg));
+                            if (!ObjectUtils.isEmpty(authOrgTemp)) {
+                                orgCode = authOrgTemp;
+                            }
+                            alarm.setOrgCode(orgCode);
                             alarm.setQueryColumn(queryColumn);
                             alarm.setAlarmLevel("警告告警");
                             alarm.setCurrentState(res);
                             alarmList.add(alarm);
                         }
-
                     }
                 	//alarmService.save(alarmList);
                     iAlarmDao.saveAll(alarmList);