panbaolin/SourceTermAnalysisSystem_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:1.修改播放数据返回格式

Browse Source
This commit is contained in:
panbaolin 2026-08-07 14:59:31 +08:00
parent 56afd228bb
commit e3fe064509
3 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
jeecg-module-weather/src/main/java/org/jeecg/job/CacheWeatherDataJob.java
View File

@ -72,6 +72,15 @@ public class CacheWeatherDataJob extends Thread {
startTime = startTime.plusHours(6); startTime = startTime.plusHours(6);
} }
} }
WeatherDataSourceEnum dataSourceEnum = WeatherDataSourceEnum.getInfoByKey(dataType);
Path directory = Paths.get(cacheVariablePath).resolve(dataSourceEnum.getValue()).resolve(weatherTypeEnum.getValue());
if(StrUtil.isNotBlank(timeBatch)){
directory = directory.resolve(timeBatch);
}
Files.createDirectories(directory);
String time = startTime.format(DateTimeFormatter.ofPattern("yyyyMMddHH"));
Path target = directory.resolve(time + ".json.gz");
if(!Files.exists(target)){
LambdaQueryWrapper<WeatherData> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<WeatherData> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(WeatherData::getDataSource,this.dataType); queryWrapper.eq(WeatherData::getDataSource,this.dataType);
queryWrapper.eq(StrUtil.isNotBlank(timeBatch),WeatherData::getTimeBatch,timeBatch); queryWrapper.eq(StrUtil.isNotBlank(timeBatch),WeatherData::getTimeBatch,timeBatch);
@ -80,9 +89,8 @@ public class CacheWeatherDataJob extends Thread {
if(Objects.nonNull(weatherData)){ if(Objects.nonNull(weatherData)){
weatherResultVO = weatherDataService.processWeatherData(weatherTypeEnum.getKey(),weatherData); weatherResultVO = weatherDataService.processWeatherData(weatherTypeEnum.getKey(),weatherData);
if(Objects.nonNull(weatherResultVO)){ if(Objects.nonNull(weatherResultVO)){
String time = startTime.format(DateTimeFormatter.ofPattern("yyyyMMddHH")); this.writeWeatherJson(target,directory,time,JSONObject.toJSONString(weatherResultVO));
WeatherDataSourceEnum dataSourceEnum = WeatherDataSourceEnum.getInfoByKey(dataType); }
this.writeWeatherJson(cacheVariablePath,time,timeBatch,dataSourceEnum.getValue(),weatherTypeEnum.getValue(),JSONObject.toJSONString(weatherResultVO));
} }
} }
} }
@ -95,34 +103,18 @@ public class CacheWeatherDataJob extends Thread {
/** /**
* 把气象数据生成json文件 * 把气象数据生成json文件
* @param cacheVariablePath * @param target
* @param time * @param directory
* @param timeBatch
* @param dataType
* @param variable
* @param json * @param json
* @throws IOException * @throws IOException
*/ */
public void writeWeatherJson( public void writeWeatherJson(
String cacheVariablePath, Path target,
Path directory,
String time, String time,
String timeBatch,
String dataType,
String variable,
String json) throws IOException { String json) throws IOException {
if (!time.matches("\\d{10}")) {
throw new IllegalArgumentException("时间必须为yyyyMMddHH格式");
}
Path directory = Paths.get(cacheVariablePath).resolve(dataType).resolve(variable);
if(StrUtil.isNotBlank(timeBatch)){
directory = directory.resolve(timeBatch);
}
Files.createDirectories(directory);
Path target = directory.resolve(time + ".json.gz");
Path temporary = directory.resolve(time + ".json.gz.tmp"); Path temporary = directory.resolve(time + ".json.gz.tmp");
try (OutputStream output = Files.newOutputStream(temporary); try (OutputStream output = Files.newOutputStream(temporary);
GZIPOutputStream gzip = new GZIPOutputStream(output)) { GZIPOutputStream gzip = new GZIPOutputStream(output)) {
gzip.write(json.getBytes(StandardCharsets.UTF_8)); gzip.write(json.getBytes(StandardCharsets.UTF_8));

5
jeecg-module-weather/src/main/java/org/jeecg/service/impl/WeatherDataServiceImpl.java
View File

@ -74,10 +74,7 @@ public class WeatherDataServiceImpl extends ServiceImpl<WeatherDataMapper, Weath
String time = startTime.format(DateTimeFormatter.ofPattern("yyyyMMddHH")); String time = startTime.format(DateTimeFormatter.ofPattern("yyyyMMddHH"));
Path targetFile = directory.resolve(time + ".json.gz"); Path targetFile = directory.resolve(time + ".json.gz");
if (!Files.exists(targetFile)) { if (!Files.exists(targetFile)) {
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); throw new RuntimeException(time+"气象数据不存在");
res.setContentType("text/plain;charset=UTF-8");
res.getWriter().write(time+"气象数据不存在");
res.flushBuffer();
}else { }else {
long fileSize = Files.size(targetFile); long fileSize = Files.size(targetFile);
res.setStatus(HttpServletResponse.SC_OK); res.setStatus(HttpServletResponse.SC_OK);

3
jeecg-module-weather/src/main/java/org/jeecg/vo/WeatherResultVO.java
View File

@ -1,5 +1,6 @@
package org.jeecg.vo; package org.jeecg.vo;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@ -18,7 +19,9 @@ public class WeatherResultVO {
private double minLong; private double minLong;
private int sn; private int sn;
private int we; private int we;
@JSONField(name = "xspeed")
private double xSpeed ; private double xSpeed ;
@JSONField(name = "yspeed")
private double ySpeed; private double ySpeed;
private List<List<Double>> dataList; private List<List<Double>> dataList;
} }