设备信息修改

fengxiang

2018-05-08 7be408b1ce28b70005cdf147f9c41065ddc43dea

 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.util.ArrayList;

import java.util.HashMap;

import java.util.LinkedHashMap;

import java.util.List;

@@ -25,6 +26,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 +41,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 +55,7 @@
import com.moral.entity.alarm.AlarmSensorLevel;

import com.moral.service.AccountService;

import com.moral.service.AlarmConfigService;

import com.moral.service.AlarmDailyService;

import com.moral.service.AreaService;

import com.moral.service.DeviceService;

import com.moral.service.HistoryMinutelyService;

@@ -66,6 +70,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 +112,8 @@
   /** The level key. */

   private String levelKey = "alarm_";



   @Resource

   private AlarmDailyService alarmDailyService;

   /**

    * Screen login. 大屏登录

    * 

@@ -149,7 +156,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,7 +262,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;

@@ -270,8 +276,9 @@
         ftpClient.connect(ip, port);

         ftpClient.login(userName, userPwd);

         ftpClient.changeWorkingDirectory(path);

         //ftpClient.enterRemotePassiveMode();

         ftpClient.enterLocalPassiveMode();

         //ftpClient.enterLocalActiveMode();



         InputStream ins = ftpClient.retrieveFileStream(fileName);

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

         String line;

@@ -289,6 +296,19 @@
            ftpClient.logout();

            ftpClient.disconnect();

         }



//         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"))));

         Element root = document.getRootElement();

@@ -300,6 +320,13 @@
      }

      return version;

   }



   public static void main(String[] args) {

      ScreenController sc = new ScreenController();

      Version a = sc.index();

      System.out.println(a.getVer());

   }



   /**

    * 地图接口

    * 开始

@@ -336,7 +363,7 @@
         msg.append(" param[0] accountId:");

         msg.append(accountId);

         log.warn(msg);

         model.setViewName("401");

         model.setViewName("403");

         return model;

      }

   }

@@ -429,17 +456,42 @@
   public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request) throws Exception {

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

      parameters.put("type", "month");

      parameters.put("format", "yyyy-MM");

      parameters.put("typeFormat", "%Y-%m-%d");

      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);

         map.put("time", Integer.valueOf(time));

         map.put("value", map.get(sensorKey));

         map.remove(sensorKey);

         map.put("value", map.remove(sensorKey));

      }

      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 = alarmDailyService.getPieData(parameters);

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

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

   }

}