diff --git a/pom.xml b/pom.xml
index 33f63e6..53e832d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
maven-public-1
maven-public
- http://xxs1110.local:8082/repository/maven-public/
+ http://localhost:38082/repository/maven-public/
diff --git a/src/main/java/mjkf/xinke/main/controller/PriceResultController.java b/src/main/java/mjkf/xinke/main/controller/PriceResultController.java
index a3df347..2ec1d0f 100644
--- a/src/main/java/mjkf/xinke/main/controller/PriceResultController.java
+++ b/src/main/java/mjkf/xinke/main/controller/PriceResultController.java
@@ -123,7 +123,7 @@ public class PriceResultController {
if (data == null) {
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);
var result = priceResultService.list(query);
diff --git a/src/main/java/mjkf/xinke/main/service/PriceResultService.java b/src/main/java/mjkf/xinke/main/service/PriceResultService.java
index f5d4b48..d0edec5 100644
--- a/src/main/java/mjkf/xinke/main/service/PriceResultService.java
+++ b/src/main/java/mjkf/xinke/main/service/PriceResultService.java
@@ -32,6 +32,10 @@ public class PriceResultService extends ServiceImpl, Pri
return this.getQuery(null, null, null, name);
}
+ public LambdaQueryWrapper getQueryByMaterialId(String materialId) {
+ return this.getQuery(null, null, materialId, null);
+ }
+
public LambdaQueryWrapper queryLastYear (LambdaQueryWrapper query, PriceResult data) {
var endDate = LocalDate.of(data.getYear(), data.getMonth(), 1);
var startDate = endDate.minusYears(1);
diff --git a/src/main/resources/_sql/init/mysql/tools.sql b/src/main/resources/_sql/init/mysql/tools.sql
index 7e9c89a..e1cc522 100644
--- a/src/main/resources/_sql/init/mysql/tools.sql
+++ b/src/main/resources/_sql/init/mysql/tools.sql
@@ -1,13 +1,24 @@
-- 删除6月份至今数据
select * from PRICE_PUBLISH 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_NETWORK 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_TRANSPORTATION_BUREAU 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
# Meizhou
# Chaozhou
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 3d7f146..542c857 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -16,3 +16,10 @@ spring:
main:
supervise:
dispatcher-role-id: 1677946127227682818,0
+
+api:
+ host:
+ data-tool: http://192.168.1.3:50000
+
+path:
+ predict-file-dir: /predict
\ No newline at end of file