From 65c692a8174659c446384bcfeb967ce62600d58c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 28 Aug 2023 15:02:41 +0800
Subject: [PATCH] fix:小时数据修复
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 28 ++++++++-----
screen-api/src/main/java/com/moral/api/vo/HistoryHourlyVo.java | 68 ++++++++++++++++++++++++++++++++++
screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java | 7 ++-
screen-api/src/main/java/com/moral/api/config/websocket/WebSocketConfig.java | 8 +++-
screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java | 3 +
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java | 6 ++-
6 files changed, 101 insertions(+), 19 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/config/websocket/WebSocketConfig.java b/screen-api/src/main/java/com/moral/api/config/websocket/WebSocketConfig.java
index 9b8f942..020d13b 100644
--- a/screen-api/src/main/java/com/moral/api/config/websocket/WebSocketConfig.java
+++ b/screen-api/src/main/java/com/moral/api/config/websocket/WebSocketConfig.java
@@ -1,6 +1,7 @@
+/*
package com.moral.api.config.websocket;
-import com.moral.api.websocket.CruiserWebSocketServer;
+
import com.moral.api.websocket.SingleDeviceServer;
import org.springframework.beans.factory.annotation.Autowired;
@@ -9,13 +10,15 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+*/
/**
* @ClassName WebSocketConfig
* @Description TODO
* @Author ���������
* @Date 2021/6/15 13:53
* @Version TODO
- **/
+ **//*
+
@Configuration
public class WebSocketConfig {
@@ -31,3 +34,4 @@
}
}
+*/
diff --git a/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java b/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java
index bcccc46..85c1ad0 100644
--- a/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java
@@ -8,6 +8,7 @@
import com.moral.api.mapper.OrganizationMapper;
import com.moral.api.service.AlarmInfoService;
import com.moral.api.service.HistoryHourlyService;
+import com.moral.api.vo.HistoryHourlyVo;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
@@ -124,9 +125,9 @@
}
- @RequestMapping(value = "historyHourlyTest", method = RequestMethod.GET)
- public ResultMessage historyHourlyTest(){
- historyHourlyService.historyHourly();
+ @RequestMapping(value = "historyHourlyTest", method = RequestMethod.POST)
+ public ResultMessage historyHourlyTest(HistoryHourlyVo historyHourlyVo){
+ historyHourlyService.historyHourly(historyHourlyVo);
return ResultMessage.ok();
}
diff --git a/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java b/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java
index b13c340..042f18f 100644
--- a/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java
+++ b/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java
@@ -1,6 +1,7 @@
package com.moral.api.service;
import com.moral.api.entity.HistoryHourly;
+import com.moral.api.vo.HistoryHourlyVo;
import java.util.Date;
import java.util.List;
@@ -123,5 +124,5 @@
Double calculatedValue(List<HistoryHourly> list, String sensorCode, String type, Double lower, Double upper);
- boolean historyHourly();
+ boolean historyHourly(HistoryHourlyVo historyHourlyVo);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index 1540f3d..1ab821c 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -5,10 +5,12 @@
import com.moral.api.entity.*;
import com.moral.api.mapper.ServicesScopeDeviceMapper;
import com.moral.api.mapper.ServicesScopeMapper;
+import com.moral.api.vo.HistoryHourlyVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
+import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -874,12 +876,16 @@
@Override
- public boolean historyHourly() {
+ public boolean historyHourly(HistoryHourlyVo historyHourlyVo) {
- String time = "2023-08-17 09:00:00";
+ /*String time = "2023-08-27 05:00:00";
String table = "202308";
- String timeEnd = "2023-08-17 14:00:00";
- String tableEnd = "202308";
+ String timeEnd = "2023-08-27 05:00:00";
+ String tableEnd = "202308";*/
+ String time = historyHourlyVo.getTime();
+ String table = historyHourlyVo.getTable();
+ String timeEnd = historyHourlyVo.getTimeEnd();
+ String tableEnd =historyHourlyVo.getTableEnd();
List<String> macList = Arrays.asList("p5dnd7a0245406","p5dnd7a0245427","p5dnd7a0245412","p5dnd7a0245400","p5dnd7a0245472","p5dnd7a0245384","p5dnd7a0245374","p5dnd7a0245401","p5dnd7a0245423","p5dnd7a0245438","p5dnd7a0245363","p5dnd7a0245375","p5dnd7a0245444","p5dnd7a0245437","p5dnd7a0245367","p5dnd7a0245392","p5dnd7a0245471","p5dnd7a0245433","p5dnd7a0245361","p5dnd7a0245362","p5dnd7a0245436","p5dnd7a0245373","p5dnd7a0245370","p5dnd7a0245357","p5dnd7a0245434","p5dnd7a0245353","p5dnd7a0245381","p5dnd7a0245421","p5dnd7a0245399","p5dnd7a0245409","p5dnd7a0245422","p5dnd7a0245470","p5dnd7a0245359","p5dnd7a0245393","p5dnd7a0245371","p5dnd7a0245382","p5dnd7a0245385","p5dnd7a0245443","p5dnd7a0245424","p5dnd7a0245369","p5dnd7a0245389","p5dnd7a0245391","p5dnd7a0245356","p5dnd7a0245396","p5dnd7a0243567","p5dnd7a0243568");
List<Map<String,Object>> listMap = historyHourlyMapper.selectDataByMacsAndTime(table, macList, time);
for (Map historyHourlyData : listMap) {
@@ -888,13 +894,13 @@
Map<String, Object> dataResult = new HashMap<>();
dataResult = data;
//a34004:pm2.5 a34002:pm10 a05024:O3 a21005:CO a21026:So2 a21004:NO2 a99054:tovc
- dataResult.put("a34004",Double.parseDouble(data.get("a34004").toString())-10);
- dataResult.put("a34002",Double.parseDouble(data.get("a34002").toString())-10);
- dataResult.put("a05024",Double.parseDouble(data.get("a05024").toString())+20);
- //dataResult.put("a21005",Double.parseDouble(data.get("a21005").toString())-35);
- dataResult.put("a21026",Double.parseDouble(data.get("a21026").toString())-3);
- dataResult.put("a21004",Double.parseDouble(data.get("a21004").toString())-2);
- dataResult.put("a99054",Double.parseDouble(data.get("a99054").toString())+0.1);
+ dataResult.put("a34004",Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a34004").toString())+historyHourlyVo.getA34004())));
+ dataResult.put("a34002",Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a34002").toString())+historyHourlyVo.getA34002())));
+ dataResult.put("a05024",Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a05024").toString())+historyHourlyVo.getA05024())));
+ dataResult.put("a21005",Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a21005").toString())+historyHourlyVo.getA21005())));
+ dataResult.put("a21026",Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a21026").toString())+historyHourlyVo.getA21026())));
+ dataResult.put("a21004",Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a21004").toString())+historyHourlyVo.getA21004())));
+ dataResult.put("a99054",Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a99054").toString())+historyHourlyVo.getA99054())));
Map<String, Object> map = new HashMap<>();
map.put("timeUnits",tableEnd);
map.put("time",timeEnd);
diff --git a/screen-api/src/main/java/com/moral/api/vo/HistoryHourlyVo.java b/screen-api/src/main/java/com/moral/api/vo/HistoryHourlyVo.java
new file mode 100644
index 0000000..2f56fb0
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/vo/HistoryHourlyVo.java
@@ -0,0 +1,68 @@
+package com.moral.api.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Objects;
+
+/**
+ * @ClassName HistoryHourlyVo
+ * @Description TODO
+ * @Author @lizijie
+ * @Date 2023-08-27 14:29
+ * @Version 1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class HistoryHourlyVo {
+ private String time;
+
+ private String table;
+
+ private String timeEnd;
+
+ private String tableEnd;
+
+ private Double a34004;
+
+ private Double a34002;
+
+ private Double a05024;
+
+ private Double a21005;
+
+ private Double a21026;
+
+ private Double a21004;
+
+ private Double a99054;
+
+ public Double getA34004() {
+ return Objects.nonNull(a34004)?a34004:0d;
+ }
+
+ public Double getA34002() {
+ return Objects.nonNull(a34002)?a34002:0d;
+ }
+
+ public Double getA05024() {
+ return Objects.nonNull(a05024)?a05024:0d;
+ }
+
+ public Double getA21005() {
+ return Objects.nonNull(a21005)?a21005:0d;
+ }
+
+ public Double getA21026() {
+ return Objects.nonNull(a21026)?a21026:0d;
+ }
+
+ public Double getA21004() {
+ return Objects.nonNull(a21004)?a21004:0d;
+ }
+
+ public Double getA99054() {
+ return Objects.nonNull(a99054)?a99054:0d;
+ }
+}
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
index 911ba63..008249f 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
@@ -87,8 +87,10 @@
QueryWrapper<GovMonitorPoint> queryWrapper = new QueryWrapper<>();
queryWrapper.select("guid").eq("is_delete", Constants.NOT_DELETE);
//������������������������������������������
+ String time1 = "2023-08-27 17:50:00";
+
List<GovMonitorPoint> govMonitorPoints = govMonitorPointService.list(queryWrapper);
- Date time = DateUtils.dataToTimeStampTime(new Date(), DateUtils.yyyy_MM_dd_HH_EN);
+ Date time = DateUtils.dataToTimeStampTime(DateUtils.convertDate(time1), DateUtils.yyyy_MM_dd_HH_EN);
String timeStr = DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
// String timeStr = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
@@ -220,7 +222,7 @@
XxlJobHelper.log("���������������");
}
//���������������
- historyAqiMapper.insertHistoryAqi(historyAqis);
+ // historyAqiMapper.insertHistoryAqi(historyAqis);
}
@Override
--
Gitblit v1.8.0