From 8055e2dec629a0a1a8f468d8713bca80c2df9116 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 22 Sep 2020 13:30:10 +0800
Subject: [PATCH] 接口请求方式更改
---
src/main/java/com/moral/controller/WebController.java | 25 +++++++++---
src/main/java/com/moral/common/util/ParameterUtils.java | 2 +
pom.xml | 2
src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java | 36 +++++++++--------
4 files changed, 41 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index b9a283b..b727ece 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
diff --git a/src/main/java/com/moral/common/util/ParameterUtils.java b/src/main/java/com/moral/common/util/ParameterUtils.java
index 4052898..489eeab 100644
--- a/src/main/java/com/moral/common/util/ParameterUtils.java
+++ b/src/main/java/com/moral/common/util/ParameterUtils.java
@@ -45,6 +45,8 @@
}
}
}
+
+
parameters.put("regionType", regionType);
parameters.put("nextLevel", nextLevel);
}
diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java
index 1450043..5fef648 100644
--- a/src/main/java/com/moral/controller/WebController.java
+++ b/src/main/java/com/moral/controller/WebController.java
@@ -3,15 +3,16 @@
import com.auth0.jwt.exceptions.JWTDecodeException;
import com.moral.common.bean.ResultBean;
import com.moral.common.exception.WebAuthException;
-import com.moral.common.util.BeanUtils;
-import com.moral.common.util.ParameterUtils;
-import com.moral.common.util.RedisHashUtil;
-import com.moral.common.util.WebTokenUtils;
+import com.moral.common.util.*;
import com.moral.common.webAnno.UserLoginToken;
import com.moral.entity.AreaNames;
+import com.moral.entity.MonitorPoint;
import com.moral.entity.Organization;
import com.moral.service.*;
import com.moral.util.LatLngTransformation;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import jdk.nashorn.internal.runtime.logging.Logger;
import org.springframework.web.bind.annotation.*;
@@ -42,6 +43,8 @@
RedisHashUtil redisHashUtil;
@Resource
HistoryMinutelyService historyMinutelyService;
+ @Resource
+ MonitorPointService monitorPointService;
@UserLoginToken
@GetMapping("test")
@@ -193,9 +196,10 @@
@UserLoginToken
- @PostMapping("report_avg_datas")
- public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request,@RequestBody Map<String, Object> parameters)
+ @GetMapping("report_avg_datas")
+ public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request)
throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
//������������������������������������������������
ParameterUtils.getTimeType4Time(parameters);
Object sensorKey = parameters.remove("sensorKey");
@@ -212,4 +216,13 @@
}
return new ResultBean<List<Map<String, Object>>>(list);
}
+
+ @UserLoginToken
+ @GetMapping("monitorpoints-devices")
+ public ResultBean<List<MonitorPoint>> getMonitorPointsAndDevicesByRegion(HttpServletRequest request)
+ throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
+ return new ResultBean<List<MonitorPoint>>(monitorPoints);
+ }
}
diff --git a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
index 94f379e..2df2138 100644
--- a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
@@ -298,45 +298,42 @@
public List<MonitorPoint> getMonitorPointsAndDevicesByRegion(Map<String, Object> parameters) {
//������������
Object organizationId = parameters.remove("organizationId");
+ //���������������������null������������null���������������������������msgKey���������������
ValidateUtil.notNull(organizationId, "param.is.null");
ValidateUtil.notNull(parameters.get("regionCode"), "param.is.null");
//������������������
ParameterUtils.getRegionType4RegionCode(parameters);
+ //������������code���������������
Example example = new Example(MonitorPoint.class);
Criteria criteria = example.createCriteria();
criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);
+
+ //������������������������������������������������������������orgid������������������������
if (Constants.isNotSpecialOrgId(Integer.valueOf(organizationId.toString()))) {
- //criteria.andEqualTo("organizationId", organizationId);
Set<Integer> organizationIds = organizationService.getChildOrganizationIds(Integer.valueOf(organizationId.toString()));
criteria.andIn("organizationId", organizationIds);
}
criteria.andEqualTo(parameters.get("regionType") + "Code", parameters.remove("regionCode"));
-
- //���������������������
List<MonitorPoint> monitorPoints = monitorPointMapper.selectByExample(example);
- //���������������������������������
- Iterator<MonitorPoint> iterator = monitorPoints.iterator();
- /*while (iterator.hasNext()) {
- MonitorPoint monitorPoint = iterator.next();
- List<Device> devices = deviceService.getDevicesByMonitorPointId(monitorPoint.getId());
- if (ObjectUtils.isEmpty(devices)) {
- iterator.remove();
- } else {
- monitorPoint.setDevices(devices);
- }
-
- }*/
- Example deviceExample = new Example(Device.class);//���������
+
+ //������������������������
+ Example deviceExample = new Example(Device.class);
Criteria deviceCriteria = deviceExample.createCriteria();
deviceCriteria.orEqualTo("isDelete", Constants.IS_DELETE_FALSE);
List<Device> devicesInfo = deviceMapper.selectByExample(deviceExample);
- Example monitorExample = new Example(MonitorPoint.class);//���������
+
+ //������������������������
+ Example monitorExample = new Example(MonitorPoint.class);
Criteria monitorCriteria = monitorExample.createCriteria();
monitorCriteria.orEqualTo("isDelete", Constants.IS_DELETE_FALSE);
List<MonitorPoint> monitorPointInfo = monitorPointMapper.selectByExample(monitorExample);
+
+ //������������������������������
List<DeviceProperty> devicePropertyList = devicePropertyMapper.selectAll();
+
+ //������������������������������������������
for (Device d : devicesInfo) {
for (DeviceProperty dp : devicePropertyList) {
if (dp.getId().equals(d.getId())) {
@@ -344,6 +341,8 @@
}
}
}
+
+ //������������������������������������������
Map<Integer, List<Device>> monitorDeviceMap = new HashMap();
for (MonitorPoint m : monitorPointInfo) {
List<Device> monitorDevices = new ArrayList<>();
@@ -354,6 +353,9 @@
}
monitorDeviceMap.put(m.getId(), monitorDevices);
}
+
+ //������������Code���������������������������������������������
+ Iterator<MonitorPoint> iterator = monitorPoints.iterator();
while (iterator.hasNext()) {
MonitorPoint monitorPoint = iterator.next();
for (Map.Entry<Integer, List<Device>> entry : monitorDeviceMap.entrySet()) {
--
Gitblit v1.8.0