From e7eca591f90bc489f3034ef3cf9f77435c8178b1 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 26 Apr 2018 15:41:37 +0800
Subject: [PATCH] 修改ftp服务器
---
src/main/java/com/moral/controller/ScreenController.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index b21674a..8ea576f 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -7,6 +7,7 @@
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;
@@ -26,6 +27,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;
@@ -40,6 +42,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;
@@ -53,6 +56,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;
@@ -67,6 +71,7 @@
@RestController
@RequestMapping("/screen")
//@CrossOrigin(origins = "*", maxAge = 3600)
+@SuppressWarnings({ "rawtypes", "unchecked", "unused" })
public class ScreenController {
public static Logger log = Logger.getLogger(ScreenController.class);
@Resource
@@ -108,6 +113,8 @@
/** The level key. */
private String levelKey = "alarm_";
+ @Resource
+ private AlarmService alarmService;
/**
* Screen login. ������������
*
@@ -150,7 +157,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;
@@ -257,7 +263,7 @@
* ������������������������������������
*********************************************/
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;
@@ -272,7 +278,9 @@
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;
@@ -301,6 +309,12 @@
}
return version;
}
+
+ public static void main(String[] args) {
+ ScreenController sc = new ScreenController();
+ sc.index();
+ }
+
/**
* ������������
* ������
@@ -337,7 +351,7 @@
msg.append(" param[0] accountId:");
msg.append(accountId);
log.warn(msg);
- model.setViewName("401");
+ model.setViewName("403");
return model;
}
}
@@ -434,7 +448,7 @@
String sensorKey = parameters.remove("sensorKey").toString();
List<String> sensorKeys = new ArrayList<String>();
sensorKeys.add(sensorKey);
- parameters.put("sensorKeys", sensorKeys);
+ parameters.put("sensors", sensorKeys);
List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
for (Map<String, Object> map : list) {
@@ -445,4 +459,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