fix: 修复趋势表数据异常的问题

This commit is contained in:
han0
2024-12-10 15:01:52 +08:00
parent 5e525486dc
commit bd020ec6ac
5 changed files with 25 additions and 3 deletions

View File

@@ -21,7 +21,7 @@
<repository> <repository>
<id>maven-public-1</id> <id>maven-public-1</id>
<name>maven-public</name> <name>maven-public</name>
<url>http://xxs1110.local:8082/repository/maven-public/</url> <url>http://localhost:38082/repository/maven-public/</url>
</repository> </repository>
</repositories> </repositories>
<distributionManagement> <distributionManagement>

View File

@@ -123,7 +123,7 @@ public class PriceResultController {
if (data == null) { if (data == null) {
throw new NcHttpException(HttpErrorResponseEnum.PRICE_RESULT_NOT_FOUND); throw new NcHttpException(HttpErrorResponseEnum.PRICE_RESULT_NOT_FOUND);
} }
var query = priceResultService.getQueryByName(data.getName()); var query = priceResultService.getQueryByMaterialId(data.getMaterialId());
query = priceResultService.queryLastYear(query, data); query = priceResultService.queryLastYear(query, data);
var result = priceResultService.list(query); var result = priceResultService.list(query);

View File

@@ -32,6 +32,10 @@ public class PriceResultService extends ServiceImpl<BaseMapper<PriceResult>, Pri
return this.getQuery(null, null, null, name); return this.getQuery(null, null, null, name);
} }
public LambdaQueryWrapper<PriceResult> getQueryByMaterialId(String materialId) {
return this.getQuery(null, null, materialId, null);
}
public LambdaQueryWrapper<PriceResult> queryLastYear (LambdaQueryWrapper<PriceResult> query, PriceResult data) { public LambdaQueryWrapper<PriceResult> queryLastYear (LambdaQueryWrapper<PriceResult> query, PriceResult data) {
var endDate = LocalDate.of(data.getYear(), data.getMonth(), 1); var endDate = LocalDate.of(data.getYear(), data.getMonth(), 1);
var startDate = endDate.minusYears(1); var startDate = endDate.minusYears(1);

View File

@@ -1,13 +1,24 @@
-- 删除6月份至今数据 -- 删除6月份至今数据
select * from PRICE_PUBLISH where year = 2024 and month >= 6; select * from PRICE_PUBLISH where year = 2024 and month >= 6;
select * from PRICE_RESULT where year = 2024 and month >= 6; select * from PRICE_RESULT where year = 2024 and month >= 6;
select * from DATA_FUJIAN where year = 2024 and month >= 6;
select * from DATA_ADJACENT where year = 2024 and month >= 6; select * from DATA_ADJACENT where year = 2024 and month >= 6;
select * from DATA_NETWORK where date >= '2024-6-1'; select * from DATA_NETWORK where date >= '2024-6-1';
select * from SANMING_STEEL where date >= '2024-6-1'; select * from SANMING_STEEL where date >= '2024-6-1';
select * from FUZHOU_HIGHWAY_BUREAU where date >= '2024-6-1'; select * from FUZHOU_HIGHWAY_BUREAU where date >= '2024-6-1';
select * from FUZHOU_TRANSPORTATION_BUREAU where date >= '2024-6-1'; select * from FUZHOU_TRANSPORTATION_BUREAU where date >= '2024-6-1';
select * from FUJIAN_SURVEY where date >= '2024-6-1'; select * from FUJIAN_SURVEY where date >= '2024-6-1';
TRUNCATE TABLE PRICE_PUBLISH;
TRUNCATE TABLE PRICE_RESULT;
TRUNCATE TABLE DATA_ADJACENT;
TRUNCATE TABLE DATA_NETWORK;
TRUNCATE TABLE SANMING_STEEL;
TRUNCATE TABLE FUZHOU_HIGHWAY_BUREAU;
TRUNCATE TABLE FUZHOU_TRANSPORTATION_BUREAU;
TRUNCATE TABLE FUJIAN_SURVEY;
# Guangzhou # Guangzhou
# Meizhou # Meizhou
# Chaozhou # Chaozhou

View File

@@ -16,3 +16,10 @@ spring:
main: main:
supervise: supervise:
dispatcher-role-id: 1677946127227682818,0 dispatcher-role-id: 1677946127227682818,0
api:
host:
data-tool: http://192.168.1.3:50000
path:
predict-file-dir: /predict