From 1f69ad0de4a0abf9b50599146d8f9b6a22e803a3 Mon Sep 17 00:00:00 2001
From: huangzhen <867217663@qq.com>
Date: Thu, 19 Oct 2023 08:57:03 +0800
Subject: [PATCH] 第一版-20231019
---
src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasConcentrationWebsocketServer.java | 2
src/main/resources/template/dailyReportTemplate.docx | 0
src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/DailyReportSchedule.java | 3
src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/GasFluxServiceImpl.java | 22 ++
src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/MonitorDataServiceImpl.java | 8
src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/HeartbeatExcWebsocketServer.java | 2
src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/GasConcentrationAutoCreateKeySchedule.java | 6
src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/TestSchedule.java | 398 ++++++++++++++++++++++++------------------------
src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasFluxWebsocketServer.java | 4
src/main/resources/config/application-online-uat.yaml | 2
src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasConcentrationExcWebsocketServer.java | 2
src/main/resources/config/application.yaml | 4
src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/MonitorDailyReportServiceImpl.java | 11
src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasDeviceExcWebsocketServer.java | 2
src/main/java/com/gkhy/fourierSpecialGasMonitor/service/GasFluxService.java | 2
15 files changed, 250 insertions(+), 218 deletions(-)
diff --git a/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/DailyReportSchedule.java b/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/DailyReportSchedule.java
index 28b8834..2086fb0 100644
--- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/DailyReportSchedule.java
+++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/DailyReportSchedule.java
@@ -174,7 +174,8 @@
}
}
- List<GasFlux> gasFluxes = gasFluxService.listYesterday();
+ //List<GasFlux> gasFluxes = gasFluxService.listYesterday();
+ List<GasFlux> gasFluxes = gasFluxService.listYesterdayTenAmToSixPm();
List<Integer> areaNum = gasFluxes.stream().map(GasFlux::getAreaId).distinct().collect(Collectors.toList());
List<Region> allRegion = regionService.findAll();
diff --git a/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/GasConcentrationAutoCreateKeySchedule.java b/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/GasConcentrationAutoCreateKeySchedule.java
index 1908f22..7476297 100644
--- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/GasConcentrationAutoCreateKeySchedule.java
+++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/GasConcentrationAutoCreateKeySchedule.java
@@ -41,6 +41,7 @@
private final Logger logger = LoggerFactory.getLogger(this.getClass());
private static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
private static String gasConcentrationCachePrefix = "gas_concentration_cache_";
@Scheduled(cron = "0 0 0 * * ?") // 每天凌晨执行
@@ -53,6 +54,11 @@
RBucket<String> bucket = redissonClient.getBucket(gasConcentrationCachePrefix+cacheName);
bucket.set(jsonString);
+ try {
+ TimeUnit.SECONDS.sleep(3);
+ } catch (InterruptedException e) {
+ logger.info("自动清除历史气体对照表缓存key失败");
+ }
//清除前一天的缓存
LocalDateTime yesterday = LocalDateTime.now().minusDays(1);
String yesterdayCache = yesterday.format(formatter);
diff --git a/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/TestSchedule.java b/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/TestSchedule.java
index 2806d4e..3f1dc4d 100644
--- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/TestSchedule.java
+++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/TestSchedule.java
@@ -1,199 +1,199 @@
-package com.gkhy.fourierSpecialGasMonitor.schedule;
-
-import com.gkhy.fourierSpecialGasMonitor.entity.req.DeviceMonitorReqDTO;
-import com.gkhy.fourierSpecialGasMonitor.entity.req.UploadGasConcentrationReqDTO;
-import com.gkhy.fourierSpecialGasMonitor.entity.req.UploadGasFluxReqDTO;
-import com.gkhy.fourierSpecialGasMonitor.service.DataReceiveService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.text.DecimalFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author Mr.huang
- * @decription
- * @date 2023/8/22 13:49
- */
-@Component
-public class TestSchedule {
-
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
- @Autowired
- private DataReceiveService dataReceiveService;
-
- private static final DateTimeFormatter execformatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-
-
- @Scheduled(cron = "1 * * * * ?")
- @Async(value = "SocketTaskExecutor")
- public void testDeviceMonitor() {
- logger.info("【硬件设备一分钟一次推送测试】：" + LocalDateTime.now().format(execformatter));
- DeviceMonitorReqDTO deviceMonitorReqDTO = new DeviceMonitorReqDTO();
- deviceMonitorReqDTO.setTime(LocalDateTime.now());
- deviceMonitorReqDTO.setConState(0);
- deviceMonitorReqDTO.setFluxState(0);
- List<Integer> list = new ArrayList<>();
- list.add(0);
- deviceMonitorReqDTO.setHardwareState(list);
- dataReceiveService.deviceMonitor(deviceMonitorReqDTO);
- }
-
-
- @Scheduled(cron = "0/30 * * * * ?")
- @Async(value = "SocketTaskExecutor")
- public void testGasConcentration() {
- logger.info("【气体实时浓度推送测试】："+LocalDateTime.now().format(execformatter));
- Random random = new Random();
- double randomDouble = random.nextDouble() * 99.9 + 1; // 生成1到100之间的随机双精度数
- DecimalFormat decimalFormat = new DecimalFormat("0.0");
- String formattedDouble = decimalFormat.format(randomDouble);
- double result = Double.parseDouble(formattedDouble);
- UploadGasConcentrationReqDTO dto = new UploadGasConcentrationReqDTO();
- dto.setEquipmentId("No-123456");
- dto.setTime(LocalDateTime.now());
- dto.setType(1);
- dto.setLng("东经43");
- dto.setLat("北纬53");
- dto.setAngle("60");
- dto.setTemp(26.9);
- dto.setHumidity(63.3);
- dto.setWindSpeed(12.3);
- dto.setWindDirection(56);
- dto.setPressure(200.0);
- dto.setGasName01(1);
- dto.setGasValue01(result);
- dto.setGasName02(2);
- dto.setGasValue02(result);
- dto.setGasName03(3);
- dto.setGasValue03(result);
- dto.setGasName04(4);
- dto.setGasValue04(result);
- dto.setGasName05(5);
- dto.setGasValue05(result);
- dto.setGasName06(6);
- dto.setGasValue06(result);
- dto.setGasName07(7);
- dto.setGasValue07(result);
- dto.setGasName08(8);
- dto.setGasValue08(result);
- dto.setGasName09(9);
- dto.setGasValue09(result);
- dto.setGasName10(10);
- dto.setGasValue10(result);
- dto.setGasName11(11);
- dto.setGasValue11(result);
- dto.setGasName12(12);
- dto.setGasValue12(result);
- dto.setGasName13(13);
- dto.setGasValue13(result);
- dto.setGasName14(14);
- dto.setGasValue14(result);
- dto.setGasName15(15);
- dto.setGasValue15(result);
- dto.setGasName16(16);
- dto.setGasValue16(result);
- dto.setGasName17(17);
- dto.setGasValue17(result);
- dto.setGasName18(18);
- dto.setGasValue18(result);
- dto.setGasName19(19);
- dto.setGasValue19(result);
- dto.setGasName20(20);
- dto.setGasValue20(result);
- dto.setGasName21(21);
- dto.setGasValue21(result);
- dto.setGasName22(22);
- dto.setGasValue22(result);
- dto.setGasName23(23);
- dto.setGasValue23(result);
- dto.setGasName24(24);
- dto.setGasValue24(result);
- dto.setGasName25(25);
- dto.setGasValue25(result);
- dto.setGasName26(26);
- dto.setGasValue26(result);
- dto.setGasName27(27);
- dto.setGasValue27(result);
- dto.setGasName28(28);
- dto.setGasValue28(result);
- dto.setGasName29(29);
- dto.setGasValue29(result);
- dto.setGasName30(30);
- dto.setGasValue30(result);
- dataReceiveService.uploadGasConcentration(dto);
- }
-
- //@Scheduled(cron = "0 0/15 * * * ?")
- @Scheduled(cron = "0/30 * * * * ?")
- @Async(value = "SocketTaskExecutor")
- public void testGasFlux() {
- logger.info("【气体通量推送测试】："+LocalDateTime.now().format(execformatter));
- for (int i = 1; i <= 8 ; i++) {
- Random random = new Random();
- double randomDouble = random.nextDouble() * 99.9 + 1; // 生成1到100之间的随机双精度数
- DecimalFormat decimalFormat = new DecimalFormat("0.0");
- String formattedDouble = decimalFormat.format(randomDouble);
- double result = Double.parseDouble(formattedDouble);
- UploadGasFluxReqDTO dto = new UploadGasFluxReqDTO();
- dto.setEquipmentId("No-123456");
- dto.setTime(LocalDateTime.now());
- dto.setAreaId(i);
- dto.setType(1);
- dto.setWindSpeed(12.3);
- dto.setWindDirection(56);
- dto.setGasName01(1);
- dto.setGasValue01(result);
- dto.setGasName02(2);
- dto.setGasValue02(result);
- dto.setGasName03(3);
- dto.setGasValue03(result);
- dto.setGasName04(4);
- dto.setGasValue04(result);
- dto.setGasName05(5);
- dto.setGasValue05(result);
- dto.setGasName06(6);
- dto.setGasValue06(result);
- dto.setGasName07(7);
- dto.setGasValue07(result);
- dto.setGasName08(8);
- dto.setGasValue08(result);
- dto.setGasName09(9);
- dto.setGasValue09(result);
- dto.setGasName10(10);
- dto.setGasValue10(result);
- dto.setGasName11(11);
- dto.setGasValue11(result);
- dto.setGasName12(12);
- dto.setGasValue12(result);
- dto.setGasName13(13);
- dto.setGasValue13(result);
- dto.setGasName14(14);
- dto.setGasValue14(result);
- dto.setGasName15(15);
- dto.setGasValue15(result);
- dto.setGasName16(16);
- dto.setGasValue16(result);
- dto.setGasName17(17);
- dto.setGasValue17(result);
- dto.setGasName18(18);
- dto.setGasValue18(result);
- dto.setGasName19(19);
- dto.setGasValue19(result);
- dto.setGasName20(20);
- dto.setGasValue20(result);
- dataReceiveService.uploadGasFlux(dto);
- }
-
- }
-}
\ No newline at end of file
+//package com.gkhy.fourierSpecialGasMonitor.schedule;
+//
+//import com.gkhy.fourierSpecialGasMonitor.entity.req.DeviceMonitorReqDTO;
+//import com.gkhy.fourierSpecialGasMonitor.entity.req.UploadGasConcentrationReqDTO;
+//import com.gkhy.fourierSpecialGasMonitor.entity.req.UploadGasFluxReqDTO;
+//import com.gkhy.fourierSpecialGasMonitor.service.DataReceiveService;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.scheduling.annotation.Async;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.stereotype.Component;
+//
+//import javax.annotation.PostConstruct;
+//import java.text.DecimalFormat;
+//import java.time.LocalDateTime;
+//import java.time.format.DateTimeFormatter;
+//import java.util.ArrayList;
+//import java.util.List;
+//import java.util.Random;
+//import java.util.concurrent.TimeUnit;
+//
+///**
+// * @author Mr.huang
+// * @decription
+// * @date 2023/8/22 13:49
+// */
+//@Component
+//public class TestSchedule {
+//
+// private final Logger logger = LoggerFactory.getLogger(this.getClass());
+//
+// @Autowired
+// private DataReceiveService dataReceiveService;
+//
+// private static final DateTimeFormatter execformatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+//
+//
+// @Scheduled(cron = "1 * * * * ?")
+// @Async(value = "SocketTaskExecutor")
+// public void testDeviceMonitor() {
+// logger.info("【硬件设备一分钟一次推送测试】：" + LocalDateTime.now().format(execformatter));
+// DeviceMonitorReqDTO deviceMonitorReqDTO = new DeviceMonitorReqDTO();
+// deviceMonitorReqDTO.setTime(LocalDateTime.now());
+// deviceMonitorReqDTO.setConState(0);
+// deviceMonitorReqDTO.setFluxState(0);
+// List<Integer> list = new ArrayList<>();
+// list.add(0);
+// deviceMonitorReqDTO.setHardwareState(list);
+// dataReceiveService.deviceMonitor(deviceMonitorReqDTO);
+// }
+//
+//
+// @Scheduled(cron = "0/30 * * * * ?")
+// @Async(value = "SocketTaskExecutor")
+// public void testGasConcentration() {
+// logger.info("【气体实时浓度推送测试】："+LocalDateTime.now().format(execformatter));
+// Random random = new Random();
+// double randomDouble = random.nextDouble() * 99.9 + 1; // 生成1到100之间的随机双精度数
+// DecimalFormat decimalFormat = new DecimalFormat("0.0");
+// String formattedDouble = decimalFormat.format(randomDouble);
+// double result = Double.parseDouble(formattedDouble);
+// UploadGasConcentrationReqDTO dto = new UploadGasConcentrationReqDTO();
+// dto.setEquipmentId("No-123456");
+// dto.setTime(LocalDateTime.now());
+// dto.setType(1);
+// dto.setLng("东经43");
+// dto.setLat("北纬53");
+// dto.setAngle("60");
+// dto.setTemp(26.9);
+// dto.setHumidity(63.3);
+// dto.setWindSpeed(12.3);
+// dto.setWindDirection(56);
+// dto.setPressure(200.0);
+// dto.setGasName01(1);
+// dto.setGasValue01(result);
+// dto.setGasName02(2);
+// dto.setGasValue02(result);
+// dto.setGasName03(3);
+// dto.setGasValue03(result);
+// dto.setGasName04(4);
+// dto.setGasValue04(result);
+// dto.setGasName05(5);
+// dto.setGasValue05(result);
+// dto.setGasName06(6);
+// dto.setGasValue06(result);
+// dto.setGasName07(7);
+// dto.setGasValue07(result);
+// dto.setGasName08(8);
+// dto.setGasValue08(result);
+// dto.setGasName09(9);
+// dto.setGasValue09(result);
+// dto.setGasName10(10);
+// dto.setGasValue10(result);
+// dto.setGasName11(11);
+// dto.setGasValue11(result);
+// dto.setGasName12(12);
+// dto.setGasValue12(result);
+// dto.setGasName13(13);
+// dto.setGasValue13(result);
+// dto.setGasName14(14);
+// dto.setGasValue14(result);
+// dto.setGasName15(15);
+// dto.setGasValue15(result);
+// dto.setGasName16(16);
+// dto.setGasValue16(result);
+// dto.setGasName17(17);
+// dto.setGasValue17(result);
+// dto.setGasName18(18);
+// dto.setGasValue18(result);
+// dto.setGasName19(19);
+// dto.setGasValue19(result);
+// dto.setGasName20(20);
+// dto.setGasValue20(result);
+// dto.setGasName21(21);
+// dto.setGasValue21(result);
+// dto.setGasName22(22);
+// dto.setGasValue22(result);
+// dto.setGasName23(23);
+// dto.setGasValue23(result);
+// dto.setGasName24(24);
+// dto.setGasValue24(result);
+// dto.setGasName25(25);
+// dto.setGasValue25(result);
+// dto.setGasName26(26);
+// dto.setGasValue26(result);
+// dto.setGasName27(27);
+// dto.setGasValue27(result);
+// dto.setGasName28(28);
+// dto.setGasValue28(result);
+// dto.setGasName29(29);
+// dto.setGasValue29(result);
+// dto.setGasName30(30);
+// dto.setGasValue30(result);
+// dataReceiveService.uploadGasConcentration(dto);
+// }
+//
+// @Scheduled(cron = "0 0/15 * * * ?")
+// @Async(value = "SocketTaskExecutor")
+// public void testGasFlux() {
+// logger.info("【气体通量推送测试】："+LocalDateTime.now().format(execformatter));
+// for (int i = 1; i <= 8 ; i++) {
+// Random random = new Random();
+// double randomDouble = random.nextDouble() * 99.9 + 1; // 生成1到100之间的随机双精度数
+// DecimalFormat decimalFormat = new DecimalFormat("0.0");
+// String formattedDouble = decimalFormat.format(randomDouble);
+// double result = Double.parseDouble(formattedDouble);
+// UploadGasFluxReqDTO dto = new UploadGasFluxReqDTO();
+// dto.setEquipmentId("No-123456");
+// dto.setTime(LocalDateTime.now());
+// dto.setAreaId(i);
+// dto.setType(1);
+// dto.setWindSpeed(12.3);
+// dto.setWindDirection(56);
+// dto.setGasName01(1);
+// dto.setGasValue01(result);
+// dto.setGasName02(2);
+// dto.setGasValue02(result);
+// dto.setGasName03(3);
+// dto.setGasValue03(result);
+// dto.setGasName04(4);
+// dto.setGasValue04(result);
+// dto.setGasName05(5);
+// dto.setGasValue05(result);
+// dto.setGasName06(6);
+// dto.setGasValue06(result);
+// dto.setGasName07(7);
+// dto.setGasValue07(result);
+// dto.setGasName08(8);
+// dto.setGasValue08(result);
+// dto.setGasName09(9);
+// dto.setGasValue09(result);
+// dto.setGasName10(10);
+// dto.setGasValue10(result);
+// dto.setGasName11(11);
+// dto.setGasValue11(result);
+// dto.setGasName12(12);
+// dto.setGasValue12(result);
+// dto.setGasName13(13);
+// dto.setGasValue13(result);
+// dto.setGasName14(14);
+// dto.setGasValue14(result);
+// dto.setGasName15(15);
+// dto.setGasValue15(result);
+// dto.setGasName16(16);
+// dto.setGasValue16(result);
+// dto.setGasName17(17);
+// dto.setGasValue17(result);
+// dto.setGasName18(18);
+// dto.setGasValue18(result);
+// dto.setGasName19(19);
+// dto.setGasValue19(result);
+// dto.setGasName20(20);
+// dto.setGasValue20(result);
+// dataReceiveService.uploadGasFlux(dto);
+// }
+//
+// }
+//}
\ No newline at end of file
diff --git a/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/GasFluxService.java b/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/GasFluxService.java
index 4863339..65436e8 100644
--- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/GasFluxService.java
+++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/GasFluxService.java
@@ -27,4 +27,6 @@
List<GasFlux> listYesterday();
+ List<GasFlux> listYesterdayTenAmToSixPm();
+
}
diff --git a/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/GasFluxServiceImpl.java b/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/GasFluxServiceImpl.java
index 0b80e0d..a7b2426 100644
--- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/GasFluxServiceImpl.java
+++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/GasFluxServiceImpl.java
@@ -120,4 +120,26 @@
List<GasFlux> gasFluxes = gasFluxRepository.findAll(specification);
return gasFluxes;
}
+
+ @Override
+ public List<GasFlux> listYesterdayTenAmToSixPm() {
+ // 获取昨天的上午十点
+ LocalDateTime yesterdayStart = LocalDateTime.now()
+ .minusDays(1) // 减去一天，获取昨天的日期
+ .with(LocalTime.of(10, 0)); // 设置时间为上午十点
+ // 获取昨天的下午6点
+ LocalDateTime yesterdayEnd = LocalDateTime.now()
+ .minusDays(1) // 减去一天，获取昨天的日期
+ .with(LocalTime.of(18, 0)); // 设置时间为下午6点
+ Specification<GasFlux> specification = new Specification<GasFlux>() {
+ @Override
+ public Predicate toPredicate(Root root, CriteriaQuery query, CriteriaBuilder criteriaBuilder) {
+ Set<Predicate> predicateList = new HashSet<>();
+ predicateList.add(criteriaBuilder.between(root.get("time").as(LocalDateTime.class),yesterdayStart,yesterdayEnd));
+ return criteriaBuilder.and(predicateList.toArray(new Predicate[predicateList.size()]));
+ }
+ };
+ List<GasFlux> gasFluxes = gasFluxRepository.findAll(specification);
+ return gasFluxes;
+ }
}
diff --git a/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/MonitorDailyReportServiceImpl.java b/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/MonitorDailyReportServiceImpl.java
index e369f7c..d7c9991 100644
--- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/MonitorDailyReportServiceImpl.java
+++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/MonitorDailyReportServiceImpl.java
@@ -58,7 +58,7 @@
LocalDate firstDayOfMonth = LocalDate.of(searchParams.getYear(), searchParams.getMonth(), 1);
// 获取指定月份的最后一天
LocalDate lastDayOfMonth = LocalDate.of(searchParams.getYear(), searchParams.getMonth(), 1).with(TemporalAdjusters.lastDayOfMonth());
- predicateList.add(criteriaBuilder.between(root.get("gmtCreate").as(LocalDateTime.class),firstDayOfMonth,lastDayOfMonth));
+ predicateList.add(criteriaBuilder.between(root.get("gmtCreate").as(LocalDate.class),firstDayOfMonth,lastDayOfMonth));
}
return criteriaBuilder.and(predicateList.toArray(new Predicate[predicateList.size()]));
}
@@ -71,9 +71,12 @@
searchResult.setTotal(pageResult.getTotalElements());
searchResult.setPages(pageResult.getTotalPages());
if (!CollectionUtils.isEmpty(pageResult.getContent())){
- List<FindDailyReportPageRespDTO> respDTOS = new ArrayList<>();
- BeanUtils.copyProperties(pageResult.getContent(),respDTOS);
- searchResult.setData(respDTOS);
+ List<FindDailyReportPageRespDTO> dtos = pageResult.getContent().stream().map(monitorDailyReport -> {
+ FindDailyReportPageRespDTO dto = new FindDailyReportPageRespDTO();
+ BeanUtils.copyProperties(monitorDailyReport, dto);
+ return dto;
+ }).collect(Collectors.toList());
+ searchResult.setData(dtos);
}
return searchResult;
}
diff --git a/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/MonitorDataServiceImpl.java b/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/MonitorDataServiceImpl.java
index 59a4821..889ead1 100644
--- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/MonitorDataServiceImpl.java
+++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/MonitorDataServiceImpl.java
@@ -309,11 +309,10 @@
gasAtmosphereLineChartRespDTO.setTime(gasConcentration.getTime());
Field[] fields = gasConcentration.getClass().getDeclaredFields();
for (Field field : fields) {
- field.setAccessible(true); // 设置字段可访问，即使是私有字段
+ field.setAccessible(true);
if (field.getName().equals(reqDto.getAtmosphere())) {
- Double value = null;
try {
- value = (Double) field.get(gasConcentration);
+ Object value = field.get(gasConcentration);
gasAtmosphereLineChartRespDTO.setValue(value);
} catch (IllegalAccessException e) {
logger.info("【警告】气象折线图反射获取气体浓度失败");
@@ -360,9 +359,8 @@
for (Field field : fields) {
field.setAccessible(true); // 设置字段可访问，即使是私有字段
if (field.getName().equals(atmosphere)) {
- Double value = null;
try {
- value = (Double) field.get(gasConcentration);
+ Object value = field.get(gasConcentration);
gasAtmospherePageRespDTO.setValue(value);
} catch (IllegalAccessException e) {
logger.info("【警告】气象折线图反射获取气体浓度失败");
diff --git a/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasConcentrationExcWebsocketServer.java b/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasConcentrationExcWebsocketServer.java
index 1ab64e0..1ce6205 100644
--- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasConcentrationExcWebsocketServer.java
+++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasConcentrationExcWebsocketServer.java
@@ -119,7 +119,7 @@
@OnError
public void onError(Session session, Throwable error) {
log.error("用户错误：" + this.userId + "，原因：" + error.getMessage());
- error.printStackTrace();
+ //error.printStackTrace();
}
/**
diff --git a/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasConcentrationWebsocketServer.java b/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasConcentrationWebsocketServer.java
index b6a6452..b72042f 100644
--- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasConcentrationWebsocketServer.java
+++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasConcentrationWebsocketServer.java
@@ -117,7 +117,7 @@
@OnError
public void onError(Session session, Throwable error) {
log.error("用户错误：" + this.userId + "，原因：" + error.getMessage());
- error.printStackTrace();
+ //error.printStackTrace();
}
/**
diff --git a/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasDeviceExcWebsocketServer.java b/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasDeviceExcWebsocketServer.java
index cfa9820..1aa3e84 100644
--- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasDeviceExcWebsocketServer.java
+++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasDeviceExcWebsocketServer.java
@@ -117,7 +117,7 @@
@OnError
public void onError(Session session, Throwable error) {
log.error("用户错误：" + this.userId + "，原因：" + error.getMessage());
- error.printStackTrace();
+ //error.printStackTrace();
}
/**
diff --git a/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasFluxWebsocketServer.java b/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasFluxWebsocketServer.java
index c267667..18db060 100644
--- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasFluxWebsocketServer.java
+++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/GasFluxWebsocketServer.java
@@ -53,7 +53,7 @@
this.userId = userId;
webSocketMap.put(userId, this);
- log.info("webSocketMap -> " + JSON.toJSONString(webSocketMap));
+ //log.info("webSocketMap -> " + JSON.toJSONString(webSocketMap));
addOnlineCount(); // 在线数 +1
//log.info("【气体通量实时推送】有新窗口开始监听:" + userId + ",当前在线人数为" + getOnlineCount());
@@ -117,7 +117,7 @@
@OnError
public void onError(Session session, Throwable error) {
log.error("用户错误：" + this.userId + "，原因：" + error.getMessage());
- error.printStackTrace();
+ //error.printStackTrace();
}
/**
diff --git a/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/HeartbeatExcWebsocketServer.java b/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/HeartbeatExcWebsocketServer.java
index 5598fda..9210a20 100644
--- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/HeartbeatExcWebsocketServer.java
+++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/websocket/HeartbeatExcWebsocketServer.java
@@ -117,7 +117,7 @@
@OnError
public void onError(Session session, Throwable error) {
log.error("用户错误：" + this.userId + "，原因：" + error.getMessage());
- error.printStackTrace();
+ //error.printStackTrace();
}
/**
diff --git a/src/main/resources/config/application-online-uat.yaml b/src/main/resources/config/application-online-uat.yaml
index c465132..5d4a69f 100644
--- a/src/main/resources/config/application-online-uat.yaml
+++ b/src/main/resources/config/application-online-uat.yaml
@@ -91,6 +91,6 @@
#测试环境 短信功能关闭，只在控制台上打印日志
sms:
send:
- enabled: false
+ enabled: true
diff --git a/src/main/resources/config/application.yaml b/src/main/resources/config/application.yaml
index 6065d42..fe2dbb1 100644
--- a/src/main/resources/config/application.yaml
+++ b/src/main/resources/config/application.yaml
@@ -2,5 +2,5 @@
application:
name: fourierSpecialGasMonitor
profiles:
- active: dev
-# active: online-uat
+# active: dev
+ active: online-uat
diff --git a/src/main/resources/template/dailyReportTemplate.docx b/src/main/resources/template/dailyReportTemplate.docx
index 5645ae0..d110195 100644
--- a/src/main/resources/template/dailyReportTemplate.docx
+++ b/src/main/resources/template/dailyReportTemplate.docx
Binary files differ
--
Gitblit v1.9.2