From 7c46bd2e4c3921fe6f77682f1c80ff5c7e927539 Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Thu, 27 Sep 2018 08:54:07 +0800 Subject: [PATCH] 组织指定父组织 --- src/main/java/com/moral/controller/ScreenController.java | 143 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 109 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index ba2a89e..4541cd3 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -10,6 +10,8 @@ import javax.servlet.http.HttpServletRequest; 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; @@ -105,6 +107,13 @@ private OrganizationService organizationService; @Resource private DictionaryDataService dictionaryDataService; + + @Resource + private WeatherService weatherService; + + @Resource + private QualityDailyService qualityDailyService; + /** * Screen login. ������������ * @@ -125,23 +134,31 @@ Object orgId = resultMap.get("orgId"); if(resultMap.get("orgId")!=null && resultMap.get("orgId") instanceof Integer) { StringBuilder areaNamesBuilder = new StringBuilder("������"); - if((Integer) orgId != dictionaryDataService.querySupperOrgId()) { + if(!((Integer) orgId).equals(dictionaryDataService.querySupperOrgId())) { Organization organization = organizationService.getOrganizationById((Integer) orgId); - if(organization.getAreaNames()!=null){ - AreaNames areaNames = organization.getAreaNames(); - if(!StringUtils.isNullOrEmpty(areaNames.getProvinceName())){ - areaNamesBuilder.append("/"); - areaNamesBuilder.append(areaNames.getProvinceName()); - if(!StringUtils.isNullOrEmpty(areaNames.getCityName())){ - areaNamesBuilder.append("/"); - areaNamesBuilder.append(areaNames.getCityName()); - if(!StringUtils.isNullOrEmpty(areaNames.getAreaName())){ - areaNamesBuilder.append("/"); - areaNamesBuilder.append(areaNames.getAreaName()); - } - } - } - } + 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()| + organization.getCityCode()| + organization.getProvinceCode()); } resultMap.put("mapPath",areaNamesBuilder.toString()); } @@ -414,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&®ionName!=null){ @@ -528,17 +545,10 @@ @GetMapping("report_avg_datas") public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request) throws Exception { Map<String, Object> parameters = getParametersStartingWith(request, null); - int length = ((String)parameters.get("time")).split("-").length; - if (length == 2) { - parameters.put("type", "month"); - } else if (length == 3){ - parameters.put("type", "day"); - } + 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) { @@ -553,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"); @@ -652,12 +663,7 @@ }) public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgDataBySensorKey(HttpServletRequest request) throws Exception { Map<String, Object> parameters = getParametersStartingWith(request, null); - int length = ((String)parameters.get("time")).split("-").length; - if (length == 2) { - parameters.put("type", "month"); - } else if (length == 3){ - parameters.put("type", "day"); - } + ParameterUtils.getTimeType4Time(parameters); parameters.put("monitorPointId", parameters.remove("monitorPoint")); String[] sensorKeys = parameters.remove("sensorKey").toString().split(","); parameters.put("sensors", Arrays.asList(sensorKeys)); @@ -675,5 +681,74 @@ } 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); + } } -- Gitblit v1.8.0