From 8beab91730f3e3cd6b53e4d498f763ff9dc65ef5 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:16:55 +0800
Subject: [PATCH] 修改污染溯源接口，从history表中获取改为从history天表获取
---
src/main/java/com/moral/controller/ScreenController.java | 129 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 124 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 60502d8..3fa1e6e 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -701,6 +701,9 @@
//������������������������������������������������
ParameterUtils.getTimeType4Time(parameters);
String time1 = (String) parameters.get("time");
+ time1 = time1.replaceAll(" ", "");
+ parameters.put("time",time1);
+
String mac1 = (String) parameters.get("mac");
List<Map<String, Object>> list = null;
if (mac1 != null && mac1.equals("p5dnd7a0392018") && time1.substring(0, 4).equals("2019")) {
@@ -711,13 +714,42 @@
parameters.put("sensors", Arrays.asList(sensorKey));
// monitorPointService.isCompensateCalculation(parameters);
list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+
+
+ /* 0���������������������11������������0���������������������1-24������������������������0������������������������������������24������������
+ ������������������24���������������23-24���������24������������������������0���������������
+ */
+ /*������������start-------------------------------------------------------------------------*/
+ list.remove(0);
+ if (list.size() == 23) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+ //���������������������yyyy-MM-dd HH:mm:ss
+ time1 = time1 + " 00:00:00";
+ Date date = sdf.parse(time1);
+ date = DateUtil.rollDay(date, 1);
+ //������������������������
+ String time2 = sdf2.format(date);
+ parameters.put("time", time2);
+ /*���������������0������������������24���������������������������*/
+ List<Map<String, Object>> nextDayList = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+ if(!ObjectUtils.isEmpty(nextDayList)){
+ time1=time1.replaceAll(" 00:00:00"," 24");
+ Map<String, Object> datas = nextDayList.get(0);
+ datas.put("time",time1);
+ list.add(datas);
+ }
+ }
+ /*������������end-------------------------------------------------------------------------*/
+
+
for (Map<String, Object> map : list) {
String time = map.get("time").toString();
time = time.substring(time.length() - 2);
map.put("time", Integer.valueOf(time));
- if (parameters.get("type").equals("day")) {
+ /* if (parameters.get("type").equals("day")) {
map.put("time", Integer.valueOf(time) + 1);
- }
+ }*/
map.put("value", map.remove(sensorKey));
}
}
@@ -1455,12 +1487,13 @@
public ModelAndView pollutionSource(ModelAndView model, HttpServletRequest request) throws Exception {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
String timeStr = parameters.get("time").toString();
- String YearAndDay = timeStr.substring(0, timeStr.lastIndexOf("-"));
+ String yearAndDay = timeStr.substring(0, timeStr.lastIndexOf("-"));
String Hour = timeStr.substring(timeStr.lastIndexOf("-") + 1);
- String time = YearAndDay + " " + Hour + ":00:00";
+ String time = yearAndDay + " " + Hour + ":00:00";
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime timeLocalDateTime = LocalDateTime.parse(time, dateTimeFormatter);
int month = timeLocalDateTime.getMonth().getValue();
+ parameters.put("yearAndDay",yearAndDay);
Point dirPoint = historyHourlyService.getDirPoint(parameters);
Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceDataByHour(parameters);
if (MapUtils.isEmpty(getPollutionSourceData)) {
@@ -2601,4 +2634,90 @@
}
return 0;
}
-}
\ No newline at end of file
+
+ @RequestMapping("/biaozhun")
+ @ResponseBody
+ public List<Device> queryDevice(String macOrName){
+ List<Device> deviceList = new ArrayList<>();
+ if (!macOrName.equals("")){
+ deviceList= deviceService.getDevice(macOrName);
+ }
+ return deviceList;
+ }
+
+ @RequestMapping("/getBiaoZhun")
+ @ResponseBody
+ public List<DeviceAdjustValueTiming> getBiaoZhun(String id){
+ List<DeviceAdjustValueTiming> dataByDeviceid = deviceAdjustValueTimingService.getDataByDeviceid(Integer.parseInt(id));
+ for (DeviceAdjustValueTiming deviceAdjustValueTiming : dataByDeviceid) {
+ int seconds = Integer.parseInt(deviceAdjustValueTiming.getSeconds());
+ String hour = String.valueOf(seconds/3600);
+ int millAndSeconds = seconds%3600;
+ String mill = String.valueOf(millAndSeconds/60);
+ String second = String.valueOf(millAndSeconds%60);
+ if (hour.length()<2){
+ hour="0"+hour;
+ }
+ if (mill.length()<2){
+ mill="0"+mill;
+ }
+ if (second.length()<2){
+ second="0"+second;
+ }
+ String time = hour+":"+mill+":"+second;
+ Map<String, String> value = deviceAdjustValueTiming.getValue();
+ Collection<String> values = value.values();
+ deviceAdjustValueTiming.setSeconds(time);
+ }
+ return dataByDeviceid;
+ }
+
+
+ @RequestMapping("/getSensor")
+ @ResponseBody
+ public List<Map<String, Object>> getSensor(String id){
+ List<Map<String, Object>> allSensors = sensorService.getSensorByDeviceId(id);
+ return allSensors;
+ }
+
+ @RequestMapping("/deleteBiaoZhun")
+ @ResponseBody
+ public int deleteBiaoZhun(String id){
+ int i= deviceAdjustValueTimingService.delete(id);
+ return i;
+ }
+
+
+ @GetMapping("/monitorAVGData")
+ @ApiOperation(value = "monitor������������������", notes = "monitor������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitorPointIds", value = "������monitorid", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
+ public List<List<Map>> monitorAVGData(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ String monitorPointIds = (String) parameters.get("monitorPointIds");
+ String time = (String) parameters.get("time");
+ time = time+" 00:00:00";
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd mm:HH:ss");//���������������MM
+ Date date = simpleDateFormat.parse(time);
+ Calendar calendar = new GregorianCalendar();
+ calendar.setTime(date);
+ calendar.add(calendar.DATE,+1);
+ String date1= simpleDateFormat.format(date);
+ String date2= simpleDateFormat.format(calendar.getTime());
+ String[] mIds = monitorPointIds.split(",");
+ List<List<Map>> lists = new ArrayList<>();
+ if (mIds.length==1 && mIds.length!=0){
+ String mId = mIds[0];
+ List<Map> dataAvbByMIdAndTime = historyHourlyService.getDataAvbByMIdAndTime(mId, date1, date2);
+ lists.add(dataAvbByMIdAndTime);
+ //List<Device> devicesByMonitorPointId = deviceService.getDevicesByMonitorPointId(Integer.valueOf(mId));
+ }else {
+ for (int i = 0; i <mIds.length ; i++) {
+ List<Map> dataAvbByMIdAndTime = historyHourlyService.getDataAvbByMIdAndTime(mIds[i], date1, date2);
+ lists.add(dataAvbByMIdAndTime);
+ }
+ }
+ return lists;
+ }
+}
--
Gitblit v1.8.0