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

fengxiang

2018-02-28 a0341d4100c15c57fb645fd1f23225563e306712

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

@@ -6,21 +6,27 @@
import static com.moral.common.util.WebUtils.getParametersStartingWith;



import java.io.*;

import java.util.HashMap;

import java.util.LinkedHashMap;

import java.util.List;

import java.util.Map;

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

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;

@@ -32,9 +38,6 @@
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 org.springframework.web.servlet.ModelAndView;

@@ -48,7 +51,8 @@
//@CrossOrigin(origins = "*", maxAge = 3600)

public class ScreenController {

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



    @Resource

   AlarmConfigService alarmConfigService;

   @Resource

   AreaService areaService;



@@ -130,23 +134,24 @@
    */

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

   }



   /**

@@ -183,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);

   }

@@ -213,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")

@@ -277,12 +283,24 @@
      }

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

@@ -317,6 +335,18 @@
      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(

@@ -327,4 +357,47 @@
   ){

      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;

   }

}