From b98924dab9f433d152944f189e0a28edb09ed7e7 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 26 Apr 2018 16:40:43 +0800
Subject: [PATCH] 修改ftp服务器
---
src/main/java/com/moral/controller/ScreenController.java | 110 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 85 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index a2ca92a..df485cd 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -7,6 +7,10 @@
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
@@ -25,6 +29,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -39,6 +44,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.moral.common.bean.Constants;
import com.moral.common.bean.JsonData;
import com.moral.common.bean.PageResult;
import com.moral.common.bean.ResultBean;
@@ -52,6 +58,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.AreaService;
import com.moral.service.DeviceService;
import com.moral.service.HistoryMinutelyService;
@@ -66,6 +73,7 @@
@RestController
@RequestMapping("/screen")
//@CrossOrigin(origins = "*", maxAge = 3600)
+@SuppressWarnings({ "rawtypes", "unchecked", "unused" })
public class ScreenController {
public static Logger log = Logger.getLogger(ScreenController.class);
@Resource
@@ -107,6 +115,8 @@
/** The level key. */
private String levelKey = "alarm_";
+ @Resource
+ private AlarmService alarmService;
/**
* Screen login. ������������
*
@@ -149,7 +159,6 @@
* the request
* @return the alarm levels
*/
- @SuppressWarnings("resource")
@GetMapping("alarm-levels")
public Object getAlarmLevels(HttpServletRequest request, Integer orgId) {
List<Map<String,Object>> sensorAlarmList = null;
@@ -256,39 +265,56 @@
* ������������������������������������
*********************************************/
private String fileName = "Version.xml";
- private String ip = "121.40.92.176";
+ private String ip = "47.96.19.115";
private String userName = "ftp_user";
private String userPwd = "qwer1234";
private int port = 21;
private String path = "/";
+ private String urlStr = "http://www.7drlb.com/apps/Version.xml";
+
@RequestMapping(value = "/upgrade", method = RequestMethod.GET)
public Version index() {
Version version = new Version();
- FTPClient ftpClient = new FTPClient();
+// FTPClient ftpClient = new FTPClient();
try {
- ftpClient.connect(ip, port);
- ftpClient.login(userName, userPwd);
- ftpClient.changeWorkingDirectory(path);
- //ftpClient.enterRemotePassiveMode();
- ftpClient.enterLocalPassiveMode();
- InputStream ins = ftpClient.retrieveFileStream(fileName);
- BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8"));
+// ftpClient.connect(ip, port);
+// ftpClient.login(userName, userPwd);
+// ftpClient.changeWorkingDirectory(path);
+// //ftpClient.enterRemotePassiveMode();
+// //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;
+// StringBuilder builder = new StringBuilder();
+// while ((line = reader.readLine()) != null) {
+// builder.append(line);
+// }
+// reader.close();
+// if (ins != null) {
+// ins.close();
+// }
+// ftpClient.getReply();
+// String content = builder.toString();
+// if(ftpClient.isConnected()) {
+// ftpClient.logout();
+// ftpClient.disconnect();
+// }
+
+ URL realUrl = new URL(urlStr);
+ URLConnection connection = realUrl.openConnection();
+ connection.connect();
+ StringBuffer result = new StringBuffer();
+ BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
String line;
- StringBuilder builder = new StringBuilder();
- while ((line = reader.readLine()) != null) {
- builder.append(line);
+ while ((line = in.readLine()) != null) {
+ result.append(line);
}
- reader.close();
- if (ins != null) {
- ins.close();
- }
- ftpClient.getReply();
- String content = builder.toString();
- if(ftpClient.isConnected()) {
- ftpClient.logout();
- ftpClient.disconnect();
- }
+ String content = result.toString();
+
SAXReader saxReader = new SAXReader();
Document document = saxReader.read(new InputSource(new ByteArrayInputStream(content.getBytes("utf-8"))));
Element root = document.getRootElement();
@@ -300,6 +326,13 @@
}
return version;
}
+
+ public static void main(String[] args) {
+ ScreenController sc = new ScreenController();
+ Version a = sc.index();
+ System.out.println(a.getVer());
+ }
+
/**
* ������������
* ������
@@ -336,7 +369,7 @@
msg.append(" param[0] accountId:");
msg.append(accountId);
log.warn(msg);
- model.setViewName("401");
+ model.setViewName("403");
return model;
}
}
@@ -430,8 +463,12 @@
Map<String, Object> parameters = getParametersStartingWith(request, null);
parameters.put("type", "month");
parameters.put("monitorPointId", parameters.remove("monitorPoint"));
+ String sensorKey = parameters.remove("sensorKey").toString();
+ List<String> sensorKeys = new ArrayList<String>();
+ sensorKeys.add(sensorKey);
+ parameters.put("sensors", sensorKeys);
List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
- String sensorKey = parameters.get("sensorKey").toString();
+
for (Map<String, Object> map : list) {
String time = map.get("time").toString();
time = time.substring(time.length() - 2);
@@ -440,4 +477,27 @@
}
return new ResultBean<List<Map<String, Object>>>(list);
}
+
+ @GetMapping("report_alarm_datas")
+ public ResultBean<List<Map<String, Object>>> getAlarmData(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ parameters.put("type", "month");
+ String sensorKey = "list";
+ if (ObjectUtils.isEmpty(parameters.get("sensorKey"))) {
+ parameters.put("description", "description");
+ } else {
+ sensorKey = parameters.remove("sensorKey").toString();
+ List<String> sensorKeys = new ArrayList<String>();
+ sensorKeys.add(sensorKey);
+ parameters.put("sensors", sensorKeys);
+ }
+ if (!ObjectUtils.isEmpty(parameters.get("organizationId"))) {
+ if (!Constants.isNotSpecialOrgId(Integer.valueOf(parameters.get("organizationId").toString()))) {
+ parameters.remove("organizationId");
+ }
+ }
+ Map pieData = alarmService.getPieData(parameters);
+ List<Map<String, Object>> list = (List<Map<String, Object>>) pieData.get(sensorKey);
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
}
--
Gitblit v1.8.0