大屏 path 更新

fengxiang

2018-09-27 243e009a18d738543baab77b107dea475cf2e8bd

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

@@ -9,8 +9,10 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import com.alibaba.fastjson.JSONReader;

import com.alibaba.fastjson.TypeReference;

import com.alibaba.fastjson.*;

import com.moral.common.util.BeanUtils;

import com.moral.common.util.ParameterUtils;

import com.moral.common.util.StringUtils;

import com.moral.entity.*;

import com.moral.entity.alarm.AlarmConfig;

import com.moral.entity.alarm.AlarmConfigValue;

@@ -28,18 +30,9 @@
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;

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

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

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

import org.springframework.web.servlet.ModelAndView;

import org.xml.sax.InputSource;

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;

@@ -58,9 +51,9 @@
 */

@RestController

@RequestMapping("/screen")

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

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

@SuppressWarnings({ "rawtypes", "unchecked", "unused" })

@Api(tags = "Screen", description = "大屏相关") 
@Api(tags = "Screen", description = "大屏接口") 
public class ScreenController {

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

    @Resource

@@ -110,6 +103,17 @@
   private OrganizationLayoutService orgLayoutService;

   @Resource

   private  DeviceVersionService dviceVersionService;

   @Resource

    private  OrganizationService organizationService;

   @Resource

    private  DictionaryDataService dictionaryDataService;

	
   @Resource

   private WeatherService weatherService;

	
   @Resource 
   private QualityDailyService qualityDailyService;



   /**

    * Screen login. 大屏登录

    * 

@@ -126,6 +130,38 @@
         resultMap.put("accountId", -1);

      } else {

         resultMap = accountService.screenLogin(parameters);

         // 添加返回行政区信息字符串操作

         Object orgId = resultMap.get("orgId");

         if(resultMap.get("orgId")!=null && resultMap.get("orgId") instanceof Integer) {

                StringBuilder areaNamesBuilder = new StringBuilder("中国");

                if(!((Integer) orgId).equals(dictionaryDataService.querySupperOrgId())) {

                    Organization organization = organizationService.getOrganizationById((Integer) orgId);

                  if(organization.getAreaNames()!=null){

                     Map<String,String> areaNameMap = BeanUtils.beanToMap(organization.getAreaNames());

                     List<String> names = areaNameMap.entrySet().stream().filter(item -> {

                        return item.getValue()!=null;

                     }).map(item -> {

                        return  item.getValue();

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

                     AreaNames areaNames =  organization.getAreaNames();

                     areaNamesBuilder.append("/");

                     areaNamesBuilder.append(String.join("/",names));

                  }

               // 企业用户

               if( 0 == organization.getRank()) {

                  resultMap.put("type","enterprise");

                    }else{

                  resultMap.put("type","government");

               }

               resultMap.put("areaCode",

                     organization.getVillageCode()|

                     organization.getTownCode()|

                     organization.getAreaCode()*1000000|

                     organization.getCityCode()*1000000|

                     organization.getProvinceCode()*1000000);

                }

                resultMap.put("mapPath",areaNamesBuilder.toString());

            }

      }

      return resultMap;

   }

@@ -395,7 +431,7 @@
    * @return

    */

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

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

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

      Account account = accountService.getAccountById(accountId);

      String regionName = areaService.queryFullNameByCode(code);

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

@@ -509,12 +545,10 @@
   @GetMapping("report_avg_datas")

   public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request) throws Exception {

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

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

      ParameterUtils.getTimeType4Time(parameters);

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

      Object sensorKey = parameters.remove("sensorKey");

      parameters.put("sensors", Arrays.asList(sensorKey));

      List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);

      

      for (Map<String, Object> map : list) {

@@ -529,7 +563,8 @@
   @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");

      ParameterUtils.getTimeType4Time(parameters);

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

      String sensorKey = "list";

      if (ObjectUtils.isEmpty(parameters.get("sensorKey"))) {

         parameters.put("description", "description");

@@ -594,12 +629,14 @@
             DeviceVersion deviceVersion = deviceVersionService.queryVersionById(device.getDeviceVersionId());

              rtdLayout = orgLayoutService.queryRtdLayoutWithUnit(orgId,deviceVersion.getVersion());

         }else {

            return  ResultBean.fail();

            String errMsg = "device 数据异常："+ JSON.toJSONString(device);

            log.warn(errMsg);

            return  ResultBean.fail(errMsg);

         }



      } else {

         MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(Integer.parseInt(primaryKey));

         List<DeviceVersion> versionList = deviceVersionService.queryByOrgId(monitorPoint.getOrganizationId());

         List<DeviceVersion> versionList = deviceVersionService.queryByMpointId(monitorPoint.getId());

         if(versionList.size() > 0) {

         List<Integer> versionNolist =   versionList.stream().map(item -> {

               return  item.getVersion();

@@ -626,7 +663,7 @@
   })

   public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgDataBySensorKey(HttpServletRequest request) throws Exception {

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

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

      ParameterUtils.getTimeType4Time(parameters);

      parameters.put("monitorPointId", parameters.remove("monitorPoint"));

      String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");

      parameters.put("sensors", Arrays.asList(sensorKeys));

@@ -636,8 +673,82 @@
         String time = map.get("time").toString();

         time = time.substring(time.length() - 2);

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

         List<Number> values = new ArrayList<Number>();

         for (String string : sensorKeys) {

            values.add((Number) map.remove(string));

         }

         map.put("values", values);

      }

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

   }

   @GetMapping("getmpoint-byid")

   @ApiOperation(value = "获取监测站数据", notes = "获取监测站数据,包含名称、地址、坐标等详细信息")

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "monitorPointId",defaultValue = "1",value = "监控站id", required = true, paramType = "query", dataType = "Integer"),

   })

    public ResultBean<MonitorPoint> getMonitorPointById(Integer monitorPointId){

      MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(monitorPointId);

      return new ResultBean<>(monitorPoint);

   }

   @Resource

   HangzhouAqiService hangzhouAqiService;

   @GetMapping("aqi24hours")

   @ApiOperation(value = "最近24小时aqi数值", notes = "最近24小时国控aqi数值")

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "orgid",defaultValue = "5",value = "组织id", required = true, paramType = "query", dataType = "Integer"),

   })

   public ResultBean<List<Map>> getAqi24HoursNC(@RequestParam("orgid") Integer organizationId) {

      return new ResultBean<>(hangzhouAqiService.queryAqi24Hours(organizationId));

   }

   @GetMapping("mpt-dev-summary")

   @ApiOperation(value = "监控总数和设备状态信息", notes = "监控总数和设备状态信息")

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "orgid",defaultValue = "5",value = "组织id", required = true, paramType = "query", dataType = "Integer"),

   })

   public ResultBean<Map> getMptAndDevSummary(@RequestParam("orgid") Integer organizationId){

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

          Integer mptCount = monitorPointService.countOfSubOrgs(organizationId);

          Map monitorPointSummary = new HashMap();

          monitorPointSummary.put("all",mptCount);

          Map deviceSummary = deviceService.queryDeviceStateSummary(organizationId);

        result.put("monitorPoint",monitorPointSummary);

        result.put("device",deviceSummary);

        return new ResultBean<>(result);

   }

	
   @GetMapping("weather")

   @ApiOperation(value = "获取区域天气情况", notes = "获取区域天气情况")

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "organizationId",defaultValue = "5", value = "登录账号的组织id", required = true, paramType = "query", dataType = "String")

   })

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

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

      Map<String, Object> map = weatherService.getWeatherDataByRegion(parameters);

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

   }



   @GetMapping("actual")

   @ApiOperation(value = "获取监测因子实时最大值", notes = "获取监测因子实时最大值")

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "accountId",defaultValue = "1", value = "登录账号的id", required = true, paramType = "query", dataType = "String"),

         @ApiImplicitParam(name = "sensorKey",defaultValue = "e1,e2,e3", value = "传感器key,如有多个用逗号分隔", required = true, paramType = "query", dataType = "String"), 
         @ApiImplicitParam(name = "time",defaultValue = "", value = "时间(long类型时间)", required = false, paramType = "query", dataType = "String"), 
         @ApiImplicitParam(name = "interval",defaultValue = "30", value = "时间间隔（秒）", required = true, paramType = "query", dataType = "Integer"),

   })

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

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

      Map<String, Object> map = historyService.getActualDataByRegion(parameters);

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

   }



   @GetMapping("quality")

   @ApiOperation(value = "获取优良天数", notes = "获取优良天数")

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "organizationId",defaultValue = "5", value = "登录账号的组织id", required = true, paramType = "query", dataType = "String")

   })

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

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

      Map<String, Object> map = qualityDailyService.getQualityCountDayByRegion(parameters);

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

   }

}