From 48bfa4e57cd2195b86bd8c0debe2e241db0ba80d Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 05 Feb 2018 14:49:44 +0800
Subject: [PATCH] 报表

---
 src/main/java/com/moral/controller/ScreenController.java |   84 +++++++++++++++++++++++++++++++++++++-----
 1 files changed, 74 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index f101ce2..3db332a 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -5,7 +5,10 @@
 import static com.moral.common.util.ResourceUtil.getValue;
 import static com.moral.common.util.WebUtils.getParametersStartingWith;
 
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -14,21 +17,29 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.net.ftp.FTPClient;
+import org.dom4j.Document;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.xml.sax.InputSource;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONReader;
 import com.alibaba.fastjson.TypeReference;
+import com.moral.common.bean.ResultBean;
 import com.moral.common.util.ValidateUtil;
+import com.moral.common.xml.Version;
 import com.moral.service.AccountService;
 import com.moral.service.DeviceService;
+import com.moral.service.HistoryMinutelyService;
 import com.moral.service.HistoryService;
 import com.moral.service.MachineActivateService;
 
@@ -36,8 +47,8 @@
  * The Class ScreenController.������������
  */
 @RestController
-@RequestMapping("screen")
-@CrossOrigin(origins = "*", maxAge = 3600)
+@RequestMapping("/screen")
+//@CrossOrigin(origins = "*", maxAge = 3600)
 public class ScreenController {
 
 	/** The screen service. */
@@ -51,7 +62,10 @@
 	/** The device service. */
 	@Resource
 	private DeviceService deviceService;
-	
+
+	@Resource
+	private HistoryMinutelyService historyMinutelyService;
+
 	@Resource
 	private MachineActivateService machineActivateService;
 
@@ -94,7 +108,7 @@
 	 *            the request
 	 * @return the equipment states
 	 */
-	@GetMapping("equipment-state")
+	@GetMapping("/equipment-state")
 	public Map<String, Object> getDeviceStatesByAccount(HttpServletRequest request) {
 		Map<String, Object> parameters = getParametersStartingWith(request, null);
 		return deviceService.getDeviceStatesByAccount(parameters);
@@ -153,7 +167,7 @@
 	@GetMapping("day-aqi")
 	public Map<String, Object> getDayAQIByDevice(HttpServletRequest request) {
 		Map<String, Object> parameters = getParametersStartingWith(request, null);
-		return historyService.getDayAQIByDevice(parameters);
+		return historyMinutelyService.getDayAQIByDevice(parameters);
 	}
 
 	/**
@@ -196,14 +210,64 @@
 	}
 
 	@GetMapping("check-activate")
-	public Map<String, Object> checkActivate(String macCpuCode) {
-		return machineActivateService.checkActivate(macCpuCode);
+	public ResultBean<Integer> checkActivate(String macCpuCode) {
+		Integer result = machineActivateService.checkActivate(macCpuCode);
+		return new ResultBean<Integer>(result);
 	}
 
 	@PostMapping("activate-machine")
-	public Map<String, Object> activateMachine(HttpServletRequest request) {
+	public ResultBean<Integer> activateMachine(HttpServletRequest request) {
 		Map<String, Object> parameters = getParametersStartingWith(request, null);
-		return machineActivateService.activateMachine(parameters);
+		Integer result = machineActivateService.activateMachine(parameters);
+		return new ResultBean<Integer>(result);
 	}
 
+	/*********************************************
+	 * ������������������������������������
+	 *********************************************/
+	private String fileName = "Version.xml";
+	private String ip = "121.40.92.176";
+	private String userName = "ftp_user";
+	private String userPwd = "qwer1234";
+	private int port = 21;
+	private String path = "/";
+
+	@RequestMapping(value = "/upgrade", method = RequestMethod.GET)
+	public Version index() {
+		Version version = new Version();
+		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"));
+			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();
+			}
+			SAXReader saxReader = new SAXReader();
+			Document document = saxReader.read(new InputSource(new ByteArrayInputStream(content.getBytes("utf-8"))));
+			Element root = document.getRootElement();
+			version.setVer(root.element("Ver").getText());
+			version.setFileName(root.element("FileName").getText());
+			version.setFileMD5Hash(root.element("FileMD5Hash").getText());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return version;
+	}
 }

--
Gitblit v1.8.0