From 9437c74510c25be9d2413821c65fcf6ca4e6d21a Mon Sep 17 00:00:00 2001 From: xufenglei <xufenglei> Date: Fri, 31 Aug 2018 08:35:26 +0800 Subject: [PATCH] 获取优良天数 --- src/main/java/com/moral/controller/ScreenController.java | 226 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 187 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index 79beb59..91f21b1 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -9,12 +9,15 @@ 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.ParameterUtils; +import com.moral.common.util.StringUtils; import com.moral.entity.*; import com.moral.entity.alarm.AlarmConfig; import com.moral.entity.alarm.AlarmConfigValue; import com.moral.entity.charts.DataSortCondition; +import com.moral.entity.layout.RealTimeDeviceLayout; +import com.moral.service.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.net.ftp.FTPClient; import org.apache.log4j.Logger; @@ -26,18 +29,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; @@ -45,16 +39,6 @@ import com.moral.common.util.ValidateUtil; import com.moral.common.xml.Version; 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; -import com.moral.service.HistoryService; -import com.moral.service.MachineActivateService; -import com.moral.service.MonitorPointService; -import com.moral.service.SensorService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -66,9 +50,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 @@ -80,6 +64,8 @@ SensorService sensorService; @Resource MonitorPointService monitorPointService; + @Resource + DeviceVersionService deviceVersionService; /** The screen service. */ @Resource @@ -112,6 +98,18 @@ @Resource private AlarmDailyService alarmDailyService; + @Resource + private OrganizationLayoutService orgLayoutService; + @Resource + private DeviceVersionService dviceVersionService; + @Resource + private OrganizationService organizationService; + @Resource + private DictionaryDataService dictionaryDataService; + + @Resource + private WeatherService weatherService; + /** * Screen login. ������������ * @@ -128,6 +126,30 @@ 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){ + 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()); + } + } + } + } + } + resultMap.put("mapPath",areaNamesBuilder.toString()); + } } return resultMap; } @@ -155,7 +177,7 @@ * @return the alarm levels */ @GetMapping("alarm-levels") - public Object getAlarmLevels(HttpServletRequest request, Optional<Integer> orgId, Optional<Integer> mpId) { + public Object getAlarmLevels(HttpServletRequest request, Optional<Integer> orgId, Optional<Integer> mpId,Optional<String> mac) { List<Map<String,Object>> sensorAlarmList = null; try { AlarmConfig alarmConfig = null; @@ -163,6 +185,8 @@ alarmConfig = alarmConfigService.queryValueByOrganizationId(orgId.get()).get(); }else if(mpId.isPresent()){ alarmConfig = alarmConfigService.queryByMonitorPointId(mpId.get()).get(); + } else if(mac.isPresent() ){ + alarmConfig = alarmConfigService.queryByDeviceMac(mac.get()).get(); } //��������������� if(alarmConfig.getValue()!=null&&alarmConfig.getValue().getAlarmLevels()!=null){ @@ -509,12 +533,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 +551,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"); @@ -566,6 +589,7 @@ @ApiImplicitParam(name = "dimension", value = "������(profession���region���monitorPoint������)", required = true, paramType = "query", dataType = "String"), @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"), @ApiImplicitParam(name = "accountId", value = "������id", required = true, paramType = "query", dataType = "int"), + @ApiImplicitParam(name = "timeType", value = "������������(month���day���hour������)", required = true, paramType = "query", dataType = "int"), }) public ResultBean<List<Map<String, Object>>> getRegionRankingData(HttpServletRequest request){ Map<String, Object> parameters = getParametersStartingWith(request, null); @@ -582,15 +606,139 @@ }) @GetMapping("rtm-layout") public ResultBean realTimeMonitorLayout(String primaryKey,String type){ - InputStreamReader reader = null; - Map<String,Object> map = null; - try { - reader = new InputStreamReader(resource.getInputStream(),"UTF-8"); - map = new JSONReader(reader).readObject(new TypeReference<Map<String,Object>>() {}); - } catch (IOException e) { - e.printStackTrace(); + RealTimeDeviceLayout rtdLayout = null; + if(type != null && type.equals("device")) { + Device device = deviceService.getDeviceByMac(primaryKey,false); + if(device!= null + && device.getOrganizationIds()!=null + && device.getOrganizationIds().size() >0 + && device.getDeviceVersionId()!=null) { + Integer orgId = device.getOrganizationIds().get(0); + DeviceVersion deviceVersion = deviceVersionService.queryVersionById(device.getDeviceVersionId()); + rtdLayout = orgLayoutService.queryRtdLayoutWithUnit(orgId,deviceVersion.getVersion()); + }else { + 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.queryByMpointId(monitorPoint.getId()); + if(versionList.size() > 0) { + List<Integer> versionNolist = versionList.stream().map(item -> { + return item.getVersion(); + }).collect(Collectors.toList()); + rtdLayout = orgLayoutService.queryRtdLayoutWithUnit(monitorPoint.getOrganizationId(),versionNolist); + if(rtdLayout == null) { + return ResultBean.fail(); + } + } } - return new ResultBean(map); + if(rtdLayout!=null && rtdLayout.getDefaultMonitorItems().size() == 0 ) { + rtdLayout.getDefaultMonitorItems().addAll(rtdLayout.getCoreMonitorItems()); + } + return new ResultBean(rtdLayout == null? new RealTimeDeviceLayout():rtdLayout); } + @GetMapping("report_avg_data") + @ApiOperation(value = "������������������������������", notes = "������������������������������") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "monitorPoint", value = "���������id", required = true, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "mac", value = "������mac", required = false, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "sensorKey", value = "���������key,���������������������������", required = true, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "time", value = "������,������(���������2018-03)", required = true, paramType = "query", dataType = "String"), + }) + public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgDataBySensorKey(HttpServletRequest request) throws Exception { + Map<String, Object> parameters = getParametersStartingWith(request, null); + ParameterUtils.getTimeType4Time(parameters); + parameters.put("monitorPointId", parameters.remove("monitorPoint")); + String[] sensorKeys = parameters.remove("sensorKey").toString().split(","); + parameters.put("sensors", Arrays.asList(sensorKeys)); + List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters); + + for (Map<String, Object> map : list) { + 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 = hangzhouAqiService.getQualityCountDayByRegion(parameters); + Map<String, Object> map = new HashMap<String, Object>(); + map.put("count", 136); + return new ResultBean<Map<String, Object>>(map); + } } -- Gitblit v1.8.0