设备模块代码恢复

fengxiang

2018-02-01 bf07dc7110da782eeb655371d6d6c11818c1b33f

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

@@ -4,10 +4,8 @@
import static com.moral.common.util.RedisUtil.hasKey;

import static com.moral.common.util.ResourceUtil.getValue;

import static com.moral.common.util.WebUtils.getParametersStartingWith;

import static org.springframework.util.ObjectUtils.isEmpty;



import java.io.IOException;

import java.io.InputStreamReader;

import java.io.*;

import java.util.HashMap;

import java.util.LinkedHashMap;

import java.util.Map;

@@ -15,29 +13,32 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import com.moral.common.xml.Version;

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.RequestMapping;

import org.springframework.web.bind.annotation.RequestParam;

import org.springframework.web.bind.annotation.RestController;

import org.springframework.web.bind.annotation.*;



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.exception.BusinessException;

import com.moral.entity.Account;

import com.moral.common.util.ValidateUtil;

import com.moral.service.AccountService;

import com.moral.service.DataService;

import com.moral.service.DeviceService;

import com.moral.service.HistoryService;

import com.moral.service.MachineActivateService;

import org.xml.sax.InputSource;



/**

 * The Class ScreenController.

 * The Class ScreenController.大屏接口

 */

@RestController

@RequestMapping(value = "screen")

@RequestMapping("screen")

@CrossOrigin(origins = "*", maxAge = 3600)

public class ScreenController {



@@ -53,6 +54,12 @@
   @Resource

   private DeviceService deviceService;



   @Resource

   private DataService dataService;



   @Resource

   private MachineActivateService machineActivateService;



   /** The resource. */

   @Value(value = "classpath:system/alarmLevels.json")

   private org.springframework.core.io.Resource resource;

@@ -62,7 +69,7 @@
   private RedisTemplate<String, String> redisTemplate;



   /** The level key. */

   private String levelKey = "alarm_level_config";

   private String levelKey = "alarm_";



   /**

    * Screen login. 大屏登录

@@ -84,22 +91,6 @@
      return resultMap;

   }



   @GetMapping("login1")

   public ResultBean<Account> screenLogin1(HttpServletRequest request) {

      ResultBean<Account> resultBean = new ResultBean<Account>(ResultBean.FAIL);

      try {

         Map<String, Object> parameters = getParametersStartingWith(request, null);

         if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {

            resultBean.setMsg("用户名及密码不允许为空！");

         } else {

            resultBean = accountService.screenLogin1(parameters);

         }

      } catch (Exception e) {

         e.printStackTrace();

         resultBean = new ResultBean<Account>(e);

      }

      return resultBean;

   }



   /**

    * Gets the equipment states. 获取该账号下所有设备的状态

@@ -110,14 +101,8 @@
    */

   @GetMapping("equipment-state")

   public Map<String, Object> getDeviceStatesByAccount(HttpServletRequest request) {

      Map<String, Object> result = new LinkedHashMap<String, Object>();

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      if (!parameters.containsKey("accountId")) {

         result.put("msg", "参数不能为空！");

      } else {

         result = deviceService.getDeviceStatesByAccount(parameters);

      }

      return result;

      return deviceService.getDeviceStatesByAccount(parameters);

   }



   /**

@@ -129,16 +114,18 @@
    */

   @SuppressWarnings("resource")

   @GetMapping("alarm-levels")

   public Map<String, Object> getAlarmLevels(HttpServletRequest request) {

   public Map<String, Object> getAlarmLevels(HttpServletRequest request,String orgId) {

      Map<String, Object> result = new LinkedHashMap<String, Object>();

      String key = levelKey + orgId;

      try {

         if (hasKey(redisTemplate, levelKey)) {

            String levelConfigStr = get(redisTemplate, levelKey);

         if (hasKey(redisTemplate, key)) {

            String levelConfigStr = get(redisTemplate, key);

            result = JSON.parseObject(levelConfigStr, new TypeReference<Map<String, Object>>() {});

         } else {

            InputStreamReader reader = new InputStreamReader(resource.getInputStream());

            result = new JSONReader(reader).readObject(new TypeReference<LinkedHashMap<String, Object>>() {});

         }

			
      } catch (IOException e) {

         e.printStackTrace();

         result.put("msg", "系统错误，请联系管理员！原因如下：" + e.getMessage());

@@ -155,12 +142,9 @@
    */

   @GetMapping("sensor-standard")

   public Map<String, Object> getStandardBySensor(@RequestParam("macKey") String macKey) {

      ValidateUtil.notEmpty(macKey, "param.is.null");

      Map<String, Object> result = new HashMap<String, Object>();

      if (isEmpty(macKey)) {

         throw new BusinessException("参数不能为空！");

      } else {

         result.put("standard", getValue(macKey + "-standard"));

      }

      result.put("standard", getValue(macKey + "-standard"));

      return result;

   }



@@ -173,14 +157,8 @@
    */

   @GetMapping("day-aqi")

   public Map<String, Object> getDayAQIByDevice(HttpServletRequest request) {

      Map<String, Object> result = new HashMap<String, Object>();

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      if (!parameters.containsKey("mac")) {

         result.put("msg", "参数不能为空！");

      } else {

         result = historyService.getDayAQIByDevice(parameters);

      }

      return result;

      return dataService.getDayAQIByDevice(parameters);

   }



   /**

@@ -192,14 +170,8 @@
    */

   @GetMapping("all-average")

   public Map<String, Object> getAllSensorAverageByDevice(HttpServletRequest request) {

      Map<String, Object> result = new LinkedHashMap<String, Object>();

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      if (!(parameters.containsKey("areaCode") && parameters.containsKey("accountId"))) {

         result.put("msg", "参数不能为空！");

      } else {

         result = historyService.getAllSensorAverageByDevice(parameters);

      }

      return result;

      return historyService.getAllSensorAverageByDevice(parameters);

   }



   /**

@@ -211,15 +183,8 @@
    */

   @GetMapping("sensor-average")

   public Map<String, Object> getDeviceRankingBySensorAverage(HttpServletRequest request) {

      Map<String, Object> result = new HashMap<String, Object>();

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      if (!(parameters.containsKey("areaCode") && parameters.containsKey("accountId")

            && parameters.containsKey("macKey"))) {

         result.put("msg", "参数不能为空！");

      } else {

         result = historyService.getDeviceRankingBySensorAverage(parameters);

      }

      return result;

      return historyService.getDeviceRankingBySensorAverage(parameters);

   }



   /**

@@ -231,14 +196,69 @@
    */

   @GetMapping("month-sensor-average")

   public Map<String, Object> getMonthAverageBySensor(HttpServletRequest request) {

      Map<String, Object> result = new HashMap<String, Object>();

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      if (!(parameters.containsKey("mac") && parameters.containsKey("macKey"))) {

         result.put("msg", "参数不能为空！");

      } else {

         result = historyService.getMonthAverageBySensor(parameters);

      }

      return result;

      return historyService.getMonthAverageBySensor(parameters);

   }



   @GetMapping("check-activate")

   public ResultBean<Integer> checkActivate(String macCpuCode) {

      Integer result = machineActivateService.checkActivate(macCpuCode);

      return new ResultBean<Integer>(result);

   }



   @PostMapping("activate-machine")

   public ResultBean<Integer> activateMachine(HttpServletRequest request) {

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      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;

   }

}