Browse Source

modify load params

master
xiaowuler 2 years ago
parent
commit
c7b1e2d804
  1. 4
      04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/TLogPController.java
  2. 21
      04.系统编码/Backend/src/main/java/com/userinformation/backend/service/TLogPService.java
  3. 2
      04.系统编码/Backend/src/main/resources/application.yml
  4. 31
      04.系统编码/Frontend/src/components/MicrowaveRadiation.vue

4
04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/TLogPController.java

@ -22,7 +22,7 @@ public class TLogPController {
} }
@RequestMapping("findLater") @RequestMapping("findLater")
public String findLater(@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime startTime, @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime){ public String findLater(@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime startTime, @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime, String station){
return tLogPService.findLater(startTime, endTime.plusSeconds(1)); return tLogPService.findLater(startTime, endTime.plusSeconds(1), station);
} }
} }

21
04.系统编码/Backend/src/main/java/com/userinformation/backend/service/TLogPService.java

@ -33,8 +33,8 @@ public class TLogPService {
private static final DateTimeFormatter COMMON_TIME_FORMAT = DateTimeFormatter.ofPattern("yyyy/yyyyMM/yyyyMMdd"); private static final DateTimeFormatter COMMON_TIME_FORMAT = DateTimeFormatter.ofPattern("yyyy/yyyyMM/yyyyMMdd");
private static final DateTimeFormatter FILE_FORMAT = DateTimeFormatter.ofPattern("yyyyMMddHHmm"); private static final DateTimeFormatter FILE_FORMAT = DateTimeFormatter.ofPattern("yyyyMMddHHmm");
public String findLater(LocalDateTime startTime, LocalDateTime endTime){ public String findLater(LocalDateTime startTime, LocalDateTime endTime, String station){
String path = "%s/picture/weibo/jiangning/T-logP/%s".formatted(parentPath, endTime.format(COMMON_TIME_FORMAT)); String path = "%s/picture/weibo/%s/T-logP/%s".formatted(parentPath, station, endTime.format(COMMON_TIME_FORMAT));
File file = new File(path); File file = new File(path);
if (file.exists()){ if (file.exists()){
File[] files = file.listFiles((File dir, String name) -> name.startsWith("T_logP_") && name.toLowerCase(Locale.ROOT).endsWith(".png")); File[] files = file.listFiles((File dir, String name) -> name.startsWith("T_logP_") && name.toLowerCase(Locale.ROOT).endsWith(".png"));
@ -50,7 +50,22 @@ public class TLogPService {
if (endTime.getDayOfMonth() == startTime.getDayOfMonth()){ if (endTime.getDayOfMonth() == startTime.getDayOfMonth()){
return null; return null;
} }
return findLater(startTime.minusMinutes(Duration.between(startTime, endTime).toMinutes()), startTime); return findLater(startTime.minusMinutes(Duration.between(startTime, endTime).toMinutes()), startTime, station);
}
private String getStationNameByStationId(String stationId){
switch (stationId){
case "58238":
return "jiangning";
case "58339":
return "gaochun";
case "58340":
return "lishui";
case "58237":
return "pukou";
default:
return "luhe";
}
} }
private boolean isAfter(LocalDateTime startTime, LocalDateTime endTime, String name){ private boolean isAfter(LocalDateTime startTime, LocalDateTime endTime, String name){

2
04.系统编码/Backend/src/main/resources/application.yml

@ -28,7 +28,7 @@ custom:
# host: 192.168.0.112 # host: 192.168.0.112
# username: xiaowuler@163.com # username: xiaowuler@163.com
# password: a7758a58 # password: a7758a58
path: /home/project/NJEnvironmentPlatform/html/product path: /home/product
parent-url: http://10.124.102.10 parent-url: http://10.124.102.10
quality-path: /share/win quality-path: /share/win
ftp: ftp:

31
04.系统编码/Frontend/src/components/MicrowaveRadiation.vue

@ -26,16 +26,16 @@
<div class="menu-item"> <div class="menu-item">
<h2 class="tip">区域选择</h2> <h2 class="tip">区域选择</h2>
<el-row :gutter="12"> <el-row :gutter="12">
<el-col :span="8"><span :class="{'active': currentRegion === 'jiang-ning'}" <el-col :span="8"><span :class="{'active': currentRegion === '58238'}"
@click="onRegionClick('jiang-ning')">江宁</span></el-col> @click="onRegionClick('58238')">江宁</span></el-col>
<el-col :span="8"><span :class="{'active': currentRegion === 'liu-he'}" <el-col :span="8"><span :class="{'active': currentRegion === '58235'}"
@click="onRegionClick('liu-he')">六合</span></el-col> @click="onRegionClick('58235')">六合</span></el-col>
<el-col :span="8"><span :class="{'active': currentRegion === 'pu-kou'}" <el-col :span="8"><span :class="{'active': currentRegion === '58237'}"
@click="onRegionClick('pu-kou')">浦口</span></el-col> @click="onRegionClick('58237')">浦口</span></el-col>
<el-col :span="8"><span :class="{'active': currentRegion === 'gao-chun'}" <el-col :span="8"><span :class="{'active': currentRegion === '58339'}"
@click="onRegionClick('gao-chun')">高淳</span></el-col> @click="onRegionClick('58339')">高淳</span></el-col>
<el-col :span="8"><span :class="{'active': currentRegion === 'li-shui'}" <el-col :span="8"><span :class="{'active': currentRegion === '58340'}"
@click="onRegionClick('li-shui')">溧水</span></el-col> @click="onRegionClick('58340')">溧水</span></el-col>
</el-row> </el-row>
</div> </div>
<div class="menu-item"> <div class="menu-item">
@ -251,11 +251,11 @@ export default {
let options = reactive({ let options = reactive({
currentTab: 'MWR', currentTab: 'MWR',
currentRegion: 'jiang-ning', currentRegion: '58238',
currentType: 'TEMP', currentType: 'TEMP',
currentElement: 'six-minute', currentElement: 'six-minute',
currentCategory: 'CAPE', currentCategory: 'CAPE',
date: moment('2021-12-05').format('YYYY-MM-DD'), date: moment().format('YYYY-MM-DD'),
currentHour: '00', currentHour: '00',
hours: [], hours: [],
times: [], times: [],
@ -469,6 +469,7 @@ export default {
const onRegionClick = (region) => { const onRegionClick = (region) => {
options.currentRegion = region; options.currentRegion = region;
reloadChangeData();
} }
const onElementClick = (element, apiTimeLength, apiTimeInterval) => { const onElementClick = (element, apiTimeLength, apiTimeInterval) => {
@ -605,7 +606,8 @@ export default {
const reloadTLogPData = () => { const reloadTLogPData = () => {
let params = { let params = {
startTime: moment(options.titleEndTime).add(-options.apiTimeInterval, 'm').format('YYYY-MM-DD HH:mm:00'), startTime: moment(options.titleEndTime).add(-options.apiTimeInterval, 'm').format('YYYY-MM-DD HH:mm:00'),
endTime: options.titleEndTime endTime: options.titleEndTime,
station: options.currentRegion
} }
post("/tLogP/findLater", params).then((response: any) => { post("/tLogP/findLater", params).then((response: any) => {
@ -932,7 +934,8 @@ export default {
return { return {
radar_data_code: radarDataCode, radar_data_code: radarDataCode,
data_time_start: startTime, data_time_start: startTime,
data_time_end: endTime data_time_end: endTime,
station: options.currentRegion
} }
} }

Loading…
Cancel
Save