设备和监控点 两模块修改，同步reids里的信息。数据字典功能添加

fengxiang

2018-02-28 a0341d4100c15c57fb645fd1f23225563e306712

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

@@ -5,41 +5,61 @@
import static com.moral.common.util.ResourceUtil.getValue;

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



import java.io.IOException;

import java.io.InputStreamReader;

import java.util.HashMap;

import java.util.LinkedHashMap;

import java.util.Map;

import java.io.*;

import java.lang.reflect.InvocationTargetException;

import java.util.*;

import java.util.stream.Collectors;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import com.alibaba.fastjson.*;

import com.moral.common.bean.JsonData;

import com.moral.common.bean.PageResult;

import com.moral.common.xml.Version;

import com.moral.entity.Account;

import com.moral.entity.Device;

import com.moral.entity.MapBounds;

import com.moral.entity.MonitorPoint;

import com.moral.entity.alarm.AlarmConfigValue;

import com.moral.entity.alarm.AlarmSensorLevel;

import com.moral.service.*;

import org.apache.commons.beanutils.BeanUtils;

import org.apache.commons.collections.CollectionUtils;

import org.apache.commons.lang.ArrayUtils;

import org.apache.commons.net.ftp.FTPClient;

import org.apache.log4j.Logger;

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

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

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.ui.Model;

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

import com.moral.service.AccountService;

import com.moral.service.DeviceService;

import com.moral.service.HistoryService;

import com.moral.service.MachineActivateService;

import org.springframework.web.servlet.ModelAndView;

import org.xml.sax.InputSource;



/**

 * The Class ScreenController.大屏接口

 */

@RestController

@RequestMapping("screen")

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

@RequestMapping("/screen")

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

public class ScreenController {

   public  static Logger log = Logger.getLogger(ScreenController.class);

    @Resource

   AlarmConfigService alarmConfigService;

   @Resource

   AreaService areaService;



   @Resource

   SensorService sensorService;

   @Resource

   MonitorPointService monitorPointService;



   /** The screen service. */

   @Resource

@@ -52,7 +72,10 @@
   /** The device service. */

   @Resource

   private DeviceService deviceService;

	


   @Resource

   private HistoryMinutelyService historyMinutelyService;



   @Resource

   private MachineActivateService machineActivateService;



@@ -95,7 +118,8 @@
    *            the request

    * @return the equipment states

    */

   @GetMapping("equipment-state")

   @GetMapping("/equipment-state")

   @PreAuthorize("hasAnyRole('USER', 'ADMIN')")

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

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

      return deviceService.getDeviceStatesByAccount(parameters);

@@ -110,29 +134,30 @@
    */

   @SuppressWarnings("resource")

   @GetMapping("alarm-levels")

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

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

      String key = levelKey + orgId;

   public Object getAlarmLevels(HttpServletRequest request, Integer orgId) {

        List<Map<String,Object>> sensorAlarmList = null;

      try {

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

         AlarmConfigValue alarmConfigValue = alarmConfigService.queryValueByOrganizationId(orgId).get();

         Map<String,AlarmSensorLevel> alarmLevelMap = alarmConfigValue.getAlarmLevels();

         sensorAlarmList = alarmLevelMap.keySet().stream().map(key -> {

             AlarmSensorLevel alarmSensorLevel = alarmLevelMap.get(key);

            JSONObject alarmSensorLevelMap = (JSONObject) JSON.toJSON(alarmSensorLevel);

            alarmSensorLevelMap.put("key",key);

            return alarmSensorLevelMap;

         }).collect(Collectors.toList());

      } catch (Exception e) {

         e.printStackTrace();

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

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

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

         return  err;

      }

      return result;

      return sensorAlarmList;

   }



   /**

    * Gets the standard by sensor.获取某传感器标准值

    *

    * @param request

    * @param macKey

    *            the request

    * @return the standard by sensor

    */

@@ -154,7 +179,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);

   }



   /**

@@ -163,9 +188,10 @@
    * @param request

    *            the request

    * @return the average by all

    * @throws Exception 
    */

   @GetMapping("all-average")

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

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

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

      return historyService.getAllSensorAverageByDevice(parameters);

   }

@@ -193,7 +219,7 @@
   @GetMapping("month-sensor-average")

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

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

      return historyService.getMonthAverageBySensor(parameters);

      return historyMinutelyService.getMonthAverageBySensor(parameters);

   }



   @GetMapping("check-activate")

@@ -209,4 +235,169 @@
      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;

   }

   /**

    * 地图接口

    * 开始

    */

   /**

    * 地图主页

    * @param model

    * @param code

    * @param accountId

    * @return

    */

   @RequestMapping(value = "/map-page", method = RequestMethod.GET)

   public ModelAndView map(ModelAndView model, @RequestParam("areaCode")int code, @RequestParam("accountId")int accountId){

      Account account = accountService.getAccountById(accountId);

      String regionName = areaService.selectFullNameByCode(code);

      if(account!=null&&regionName!=null){

          //去除空格

            regionName = regionName.replace(" ","");

         Object sensors = sensorService.queryAll();

         JSONObject params = new JSONObject();

         params.put("regionCode",code);

         params.put("regionName",regionName);

         params.put("accountId", accountId);

         params.put("orgId", account.getOrganizationId());

         params.put("sensors", sensors);

         String paramsJson = params.toJSONString();

         model.addObject("mapParams",paramsJson);

         model.setViewName("map");

         return model;

      } else {

         StringBuilder msg = new StringBuilder();

         msg.append(" param[0] areaCode:");

         msg.append(code);

         msg.append(" param[0] accountId:");

         msg.append(accountId);

         log.warn(msg);

         model.setViewName("401");

         return model;

      }

   }

   @RequestMapping(value="/get-monitorpoints",method = RequestMethod.GET)

   @ResponseBody

   public ResultBean getMonitorpointList(@RequestParam("orgId")String orgId,MapBounds mapBounds){

      ResultBean<List<MonitorPoint>> resultBean = new ResultBean();

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

      paramMap.put("orgId", orgId);

      paramMap.put("mapBounds",mapBounds);

      List<MonitorPoint> list = monitorPointService.queryWithStateByMap(paramMap);

      resultBean.setData(list);

      resultBean.setCode(ResultBean.SUCCESS);

      return resultBean;

   }

   @RequestMapping(value="/get-devices",method = RequestMethod.GET)

   @ResponseBody

   public ResultBean getDevices(@RequestParam("orgId")Integer orgId,MapBounds mapBounds){

      ResultBean<List<Device>> resultBean = new ResultBean();

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

      paramMap.put("orgId", orgId);

      paramMap.put("mapBounds",mapBounds);

      List<Device> list = deviceService.query(paramMap);

      resultBean.setData(list);

      resultBean.setCode(ResultBean.SUCCESS);

      return resultBean;

   }

   @RequestMapping(value = "get-devices-for-popup",method = RequestMethod.GET)

   @ResponseBody

   public PageResult getDevicesForPopup(

         @RequestParam("orgId")Integer orgId,

         String name,

         Integer pageSize,

         Integer pageNo

   ){

      return  deviceService.query(orgId,name,pageSize,pageNo);

   }

   @RequestMapping(value = "get-devices-by-mid-oid",method = RequestMethod.GET)

   @ResponseBody

   public PageResult getDevicesByMidOid(

         @RequestParam("orgId")Integer orgId,

         @RequestParam("mpId")Integer mpId,

         Integer pageSize,

         Integer pageNo

   ){

      return deviceService.query(orgId,mpId,pageSize,pageNo);

   }

   @RequestMapping(value="/get-real-state-data",method = RequestMethod.POST)

   @ResponseBody

   public JsonData getRealStateAndData(@RequestBody JSONObject paramMap){

      JsonData jsonData = new JsonData();

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

      returnMap.put("layer", paramMap.getString("layer"));

      //覆盖控件的数据刷新

      if(!CollectionUtils.isEmpty(paramMap.getJSONArray("markerKeys"))) {

         JSONArray markerKeys = paramMap.getJSONArray("markerKeys");

         List<Map<String, String>> markers = null;

         if("equipments".equals(paramMap.getString("layer"))) {

            markers = deviceService.queryDevicesState(markerKeys.toJavaList(String.class),true);

         }else {//返回监控点id和state

            String orgId= paramMap.getString("orgId");

            String areaCode= paramMap.getString("areaCode");

            for(Object mPointId:markerKeys) {

               markers = monitorPointService.queryMonitroPointsState(markerKeys.toJavaList(Integer.class));

            }

         }

         returnMap.put("markers", markers);

      }

      if(paramMap.getJSONArray("popupEquMacs")!=null&&paramMap.getJSONArray("popupEquMacs").size()>0) {

         JSONArray popupEquMacs = paramMap.getJSONArray("popupEquMacs");

         List<Map<String, String>> popupEquWithStates = null;

         for(Object mac:popupEquMacs) {

            popupEquWithStates = deviceService.queryDevicesState(popupEquMacs.toJavaList(String.class),false);

         }

         //返回搜索结果的状态

         returnMap.put("popupEquStates", popupEquWithStates);

      }

      jsonData.setExtData(returnMap);

      return jsonData;

   }

}