Home Explore Help
Register Sign In
suqinyi
/
wlyy2.0
forked from Amoy2/wlyy2.0
Watch 1
Star 0
Fork 0
Files
Browse Source

Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java
wangzhinan 5 years ago
parent
c5387751b3
commit
545053dfb5
1 changed files with 1 additions and 0 deletions
Unified View Show Diff Stats
  1. 1 0
      svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

+ 1 - 0
svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java
View File 

@ -481,6 +481,7 @@ public class MonitorPlatformService  {
 
            for (int i=0;i<str.length;i++){
 
            for (int i=0;i<str.length;i++){
 
                list.add(str[i]);
 
                list.add(str[i]);
 
            }
 
            }
 
            if (iotSystemDictDO!=null){
 
            if (iotSystemDictDO!=null){
 
                if (!list.contains(iotSystemDictDO.getCode())){
 
                if (!list.contains(iotSystemDictDO.getCode())){
 
                    for (int i=0;i<jsonArray.size();i++){
 
                    for (int i=0;i<jsonArray.size();i++){