设备信息修改

fengxiang

2018-05-08 7be408b1ce28b70005cdf147f9c41065ddc43dea

 src/main/java/com/moral/controller/ScreenController.java

@@ -7,7 +7,6 @@
import java.io.ByteArrayInputStream;

import java.io.InputStream;

import java.io.InputStreamReader;

import java.net.InetAddress;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.LinkedHashMap;

@@ -56,7 +55,7 @@
import com.moral.entity.alarm.AlarmSensorLevel;

import com.moral.service.AccountService;

import com.moral.service.AlarmConfigService;

import com.moral.service.AlarmService;

import com.moral.service.AlarmDailyService;

import com.moral.service.AreaService;

import com.moral.service.DeviceService;

import com.moral.service.HistoryMinutelyService;

@@ -114,7 +113,7 @@
   private String levelKey = "alarm_";



   @Resource

   private AlarmService alarmService;

   private AlarmDailyService alarmDailyService;

   /**

    * Screen login. 大屏登录

    * 

@@ -277,10 +276,9 @@
         ftpClient.connect(ip, port);

         ftpClient.login(userName, userPwd);

         ftpClient.changeWorkingDirectory(path);

         //ftpClient.enterRemotePassiveMode();

         //ftpClient.enterLocalPassiveMode();

         ftpClient.enterLocalPassiveMode();

         //ftpClient.enterLocalActiveMode();

         //ftpClient.enterRemoteActiveMode(InetAddress.getByName(ip), port);



         InputStream ins = ftpClient.retrieveFileStream(fileName);

         BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8"));

         String line;

@@ -298,8 +296,18 @@
            ftpClient.logout();

            ftpClient.disconnect();

         }

         System.out.println("==================================================");

         System.out.println(content);



//         String urlStr = "http://www.7drlb.com/apps/Version.xml";

//         URL realUrl = new URL(urlStr);

//         URLConnection connection = realUrl.openConnection();

//         connection.connect();

//         StringBuffer result = new StringBuffer();

//         BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "utf-8"));

//         String line;

//         while ((line = in.readLine()) != null) {

//            result.append(line);

//         }

//         String content = result.toString();



         SAXReader saxReader = new SAXReader();

         Document document = saxReader.read(new InputSource(new ByteArrayInputStream(content.getBytes("utf-8"))));

@@ -482,7 +490,7 @@
            parameters.remove("organizationId");

         }

      }

      Map pieData = alarmService.getPieData(parameters);

      Map pieData = alarmDailyService.getPieData(parameters);

      List<Map<String, Object>> list = (List<Map<String, Object>>) pieData.get(sensorKey);

      return new ResultBean<List<Map<String, Object>>>(list);

   }