From 00dabe413d23e8bc03e2f5cf884a4f25f1c9bc49 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 20 Jul 2018 16:19:08 +0800
Subject: [PATCH] 增加 按日期 查询
---
src/main/java/com/moral/controller/ScreenController.java | 280 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 216 insertions(+), 64 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 8cc897a..ba2a89e 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -3,17 +3,20 @@
import static com.moral.common.util.ResourceUtil.getValue;
import static com.moral.common.util.WebUtils.getParametersStartingWith;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
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.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;
@@ -25,50 +28,30 @@
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.JSON;
-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;
import com.moral.common.bean.ResultBean;
import com.moral.common.util.ValidateUtil;
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.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;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
/**
* The Class ScreenController.������������
*/
@RestController
@RequestMapping("/screen")
-//@CrossOrigin(origins = "*", maxAge = 3600)
+@CrossOrigin(origins = "*", maxAge = 3600)
@SuppressWarnings({ "rawtypes", "unchecked", "unused" })
+@Api(tags = "Screen", description = "������������")
public class ScreenController {
public static Logger log = Logger.getLogger(ScreenController.class);
@Resource
@@ -80,6 +63,8 @@
SensorService sensorService;
@Resource
MonitorPointService monitorPointService;
+ @Resource
+ DeviceVersionService deviceVersionService;
/** The screen service. */
@Resource
@@ -100,8 +85,8 @@
private MachineActivateService machineActivateService;
/** The resource. */
- @Value(value = "classpath:system/alarmLevels.json")
- private org.springframework.core.io.Resource resource;
+// @Value(value = "classpath:system/alarmLevels.json")
+// private org.springframework.core.io.Resource resource;
/** The redis template. */
@Resource
@@ -112,6 +97,14 @@
@Resource
private AlarmDailyService alarmDailyService;
+ @Resource
+ private OrganizationLayoutService orgLayoutService;
+ @Resource
+ private DeviceVersionService dviceVersionService;
+ @Resource
+ private OrganizationService organizationService;
+ @Resource
+ private DictionaryDataService dictionaryDataService;
/**
* Screen login. ������������
*
@@ -128,6 +121,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 != 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,38 +172,43 @@
* @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;
- Map<String,AlarmSensorLevel> alarmLevelMap = null;
- try {
+ try {
+ AlarmConfig alarmConfig = null;
if(orgId.isPresent()){
- AlarmConfigValue alarmConfigValue = alarmConfigService.queryValueByOrganizationId(orgId.get()).get();
- alarmLevelMap = alarmConfigValue.getAlarmLevels();
+ alarmConfig = alarmConfigService.queryValueByOrganizationId(orgId.get()).get();
}else if(mpId.isPresent()){
- AlarmConfig alarmConfig = alarmConfigService.queryByMonitorPointId(mpId.get()).get();
- alarmLevelMap = alarmConfig.getValue().getAlarmLevels();
+ alarmConfig = alarmConfigService.queryByMonitorPointId(mpId.get()).get();
+ } else if(mac.isPresent() ){
+ alarmConfig = alarmConfigService.queryByDeviceMac(mac.get()).get();
+ }
+ //���������������
+ if(alarmConfig.getValue()!=null&&alarmConfig.getValue().getAlarmLevels()!=null){
+ Map<String, AlarmSensorLevel> alarmLevelMap = alarmConfig.getValue().getAlarmLevels();
// ������������������������������������������������������
+ Map<String,AlarmSensorLevel> defaultSensorLevelMap = null;
if(alarmConfig.getId()!=null){
AlarmConfigValue defaultAlarmValue = alarmConfigService.getDefaultAlarmConfigValue();
- Map<String,AlarmSensorLevel> defaultSensorLevelMap = defaultAlarmValue.getAlarmLevels();
- Map<String,AlarmSensorLevel> alarmSensorLevelMapNotZO = alarmLevelMap.entrySet().stream().collect(
- HashMap::new,
- (map,entry) -> {
- AlarmSensorLevel alarmSensorLevel = entry.getValue();
- if(alarmSensorLevel.isEnable()||alarmSensorLevel.isDegressEnable()){
- map.put(entry.getKey(),entry.getValue());
- }
- },
- (oMap,nMap) -> {
- oMap.putAll(nMap);
- }
- );
- // ������������������������������������
- defaultSensorLevelMap.putAll(alarmSensorLevelMapNotZO);
- alarmLevelMap = defaultSensorLevelMap;
+ defaultSensorLevelMap = defaultAlarmValue.getAlarmLevels();
}
- }
- if(alarmLevelMap!=null){
+ Map<String, AlarmSensorLevel> finalDefaultSensorLevelMap = defaultSensorLevelMap;
+ alarmLevelMap.entrySet().stream().forEach(entry -> {
+ //��� increment������0������������������������
+ AlarmSensorLevel alarmSensorLevel = entry.getValue();
+ if(alarmSensorLevel.getIncrement()!=null){
+ boolean isAllZero = alarmSensorLevel.getIncrement().stream().allMatch(item -> item == 0);
+ if(isAllZero){
+ AlarmSensorLevel defaultAlarmSensorLevel = finalDefaultSensorLevelMap==null?null:finalDefaultSensorLevelMap.get(entry.getKey());
+ if(defaultAlarmSensorLevel!=null){
+ alarmSensorLevel.setIncrement(defaultAlarmSensorLevel.getIncrement());
+ }else{
+ List<Float> tempList = Arrays.asList(0.0f,200.0f,500.0f);
+ alarmSensorLevel.setIncrement(tempList);
+ }
+ }
+ }
+ });
//map to list
Map<String, AlarmSensorLevel> finalAlarmLevelMap = alarmLevelMap;
sensorAlarmList = alarmLevelMap.keySet().stream().map(key -> {
@@ -222,6 +244,29 @@
return result;
}
+ /**
+ *
+ * @param dataSortCondition ������������������������
+ * @return
+ */
+ public ResultBean<Map<String,Object>> getOrderData(DataSortCondition dataSortCondition) {
+ ResultBean resultBean = new ResultBean();
+ if(dataSortCondition.getCode()==null){
+ resultBean.setCode(ResultBean.FAIL);
+ resultBean.setMessage("code can't be null");
+ } else if(dataSortCondition.getStyle()==null){
+ resultBean.setCode(ResultBean.FAIL);
+ resultBean.setMessage("style can't be null");
+ }
+ String code = dataSortCondition.getCode().toString();
+ Region region = Region.create(code);
+ if(region == null) {
+ resultBean.setCode(ResultBean.FAIL);
+ resultBean.setMessage("code is not in the correct format");
+ }
+ // todo
+ return null;
+ }
/**
* Gets the day AQI by sensor.���������������AQI������
*
@@ -371,10 +416,8 @@
@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);
+ String regionName = areaService.queryFullNameByCode(code);
if(account!=null&®ionName!=null){
- //������������
- regionName = regionName.replace(" ","");
Object sensors = sensorService.queryAll();
JSONObject params = new JSONObject();
params.put("regionCode",code);
@@ -485,7 +528,12 @@
@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");
+ int length = ((String)parameters.get("time")).split("-").length;
+ if (length == 2) {
+ parameters.put("type", "month");
+ } else if (length == 3){
+ parameters.put("type", "day");
+ }
parameters.put("monitorPointId", parameters.remove("monitorPoint"));
String sensorKey = parameters.remove("sensorKey").toString();
List<String> sensorKeys = new ArrayList<String>();
@@ -524,4 +572,108 @@
List<Map<String, Object>> list = (List<Map<String, Object>>) pieData.get(sensorKey);
return new ResultBean<List<Map<String, Object>>>(list);
}
+
+ /**
+ * ���������������id������������������version���������
+ * @param mptid
+ * @return
+ */
+ @GetMapping("getvers")
+ public ResultBean<List<Integer>> getVersions(Integer mptid){
+ return new ResultBean<>(monitorPointService.queryVersionsById(mptid));
+ }
+
+ @GetMapping("region_ranking_data")
+ @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "regionCode", value = "���������", required = true, paramType = "query", dataType = "String"),
+ @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);
+ List<Map<String, Object>> list = historyService.getRegionRankingData(parameters);
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
+ // todo
+ @Value(value = "classpath:system/realTimeMonitorLayout.json")
+ private org.springframework.core.io.Resource resource;
+ @ApiOperation(value = "������������������������������", notes = "")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "primaryKey",defaultValue = "898607b0101730391967", value = "���������������mac������������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "type", defaultValue = "device",value = "���������'monitorPoint'���'device'", required = true, paramType = "query", dataType = "String"),
+ })
+ @GetMapping("rtm-layout")
+ public ResultBean realTimeMonitorLayout(String primaryKey,String type){
+ 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();
+ }
+ }
+ }
+ 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);
+ int length = ((String)parameters.get("time")).split("-").length;
+ if (length == 2) {
+ parameters.put("type", "month");
+ } else if (length == 3){
+ parameters.put("type", "day");
+ }
+ 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);
+ }
+
}
--
Gitblit v1.8.0