From 47b332d677eac427334040852e5698943e54bfd2 Mon Sep 17 00:00:00 2001 From: han0 Date: Tue, 9 Jul 2024 11:46:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B6=8B=E5=8A=BF=E8=A1=A8=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E4=B8=80=E5=B9=B4=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/mjkf/xinke/main/constant/MaterialTaskType.java | 2 +- .../mjkf/xinke/main/controller/PriceResultController.java | 2 ++ .../java/mjkf/xinke/main/service/AsphaltDomesticService.java | 2 +- .../java/mjkf/xinke/main/service/AsphaltImportedService.java | 2 +- src/main/java/mjkf/xinke/main/service/CementService.java | 2 +- src/main/java/mjkf/xinke/main/service/DataFujianService.java | 2 +- .../java/mjkf/xinke/main/service/DataGuangdongService.java | 2 +- src/main/java/mjkf/xinke/main/service/DataNetworkService.java | 2 +- .../java/mjkf/xinke/main/service/DataZhejiangService.java | 2 +- .../java/mjkf/xinke/main/service/FujianSurveyService.java | 2 +- .../mjkf/xinke/main/service/FuzhouHighwayBureauService.java | 2 +- .../xinke/main/service/FuzhouTransportationBureauService.java | 2 +- src/main/java/mjkf/xinke/main/service/PriceResultService.java | 4 ++-- .../java/mjkf/xinke/main/service/SanmingSteelService.java | 2 +- src/main/java/mjkf/xinke/main/service/SteelPlateService.java | 2 +- src/main/java/mjkf/xinke/main/service/SteelRebarService.java | 2 +- .../java/mjkf/xinke/main/service/SteelSectionService.java | 2 +- src/main/java/mjkf/xinke/main/service/SteelStrandService.java | 4 ++-- 18 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/main/java/mjkf/xinke/main/constant/MaterialTaskType.java b/src/main/java/mjkf/xinke/main/constant/MaterialTaskType.java index d364dc0..100518d 100644 --- a/src/main/java/mjkf/xinke/main/constant/MaterialTaskType.java +++ b/src/main/java/mjkf/xinke/main/constant/MaterialTaskType.java @@ -290,7 +290,7 @@ public class MaterialTaskType { /** * todo-1 数据展示模块 地市暂不切换 - * todo-1 趋势图一年每月打点 + * todo-1 计算模块更新 */ } diff --git a/src/main/java/mjkf/xinke/main/controller/PriceResultController.java b/src/main/java/mjkf/xinke/main/controller/PriceResultController.java index 0e1001f..5bd342c 100644 --- a/src/main/java/mjkf/xinke/main/controller/PriceResultController.java +++ b/src/main/java/mjkf/xinke/main/controller/PriceResultController.java @@ -97,6 +97,8 @@ public class PriceResultController { throw new NcHttpException(HttpErrorResponseEnum.PRICE_RESULT_NOT_FOUND); } var query = priceResultService.getQueryByName(data.getName()); + query.orderByAsc(PriceResult::getYear, PriceResult::getMonth); + var result = priceResultService.list(query); return FuHttpResponse.Builder().dataResponse(result).build(); diff --git a/src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java b/src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java index f2432e6..3ac715c 100644 --- a/src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java +++ b/src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java @@ -25,7 +25,7 @@ public class AsphaltDomesticService extends DataService query = new LambdaQueryWrapper<>(); query.eq(AsphaltDomestic::getName, data.getName()); var date = LocalDate.of(year, month, 1); - query.between(AsphaltDomestic::getDate, date,date.plusMonths(1)); + query.between(AsphaltDomestic::getDate, date.minusYears(1), date.plusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/AsphaltImportedService.java b/src/main/java/mjkf/xinke/main/service/AsphaltImportedService.java index b89e6ee..9f54487 100644 --- a/src/main/java/mjkf/xinke/main/service/AsphaltImportedService.java +++ b/src/main/java/mjkf/xinke/main/service/AsphaltImportedService.java @@ -25,7 +25,7 @@ public class AsphaltImportedService extends DataService query = new LambdaQueryWrapper<>(); query.eq(AsphaltImported::getName, data.getName()); var date = LocalDate.of(year, month, 1); - query.between(AsphaltImported::getDate, date,date.plusMonths(1)); + query.between(AsphaltImported::getDate, date.minusYears(1), date.plusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/CementService.java b/src/main/java/mjkf/xinke/main/service/CementService.java index 2ebe3d3..673c142 100644 --- a/src/main/java/mjkf/xinke/main/service/CementService.java +++ b/src/main/java/mjkf/xinke/main/service/CementService.java @@ -31,7 +31,7 @@ public class CementService extends DataService, Cement> { query.eq(Cement::getPack, data.getPack()); query.eq(Cement::getSource, data.getSource()); var date = LocalDate.of(year, month, 1); - query.between(Cement::getDate, date,date.plusMonths(1)); + query.between(Cement::getDate, date.minusYears(1), date.plusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/DataFujianService.java b/src/main/java/mjkf/xinke/main/service/DataFujianService.java index 242390a..63ad859 100644 --- a/src/main/java/mjkf/xinke/main/service/DataFujianService.java +++ b/src/main/java/mjkf/xinke/main/service/DataFujianService.java @@ -62,7 +62,7 @@ public class DataFujianService extends DataService, DataF LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(DataFujian::getName, data.getName()); var date = LocalDate.of(year, month, 1); - query.between(DataFujian::getDate, date, date.plusMonths(1)); + query.between(DataFujian::getDate, date.minusYears(1), date.plusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/DataGuangdongService.java b/src/main/java/mjkf/xinke/main/service/DataGuangdongService.java index f170b7d..77e1191 100644 --- a/src/main/java/mjkf/xinke/main/service/DataGuangdongService.java +++ b/src/main/java/mjkf/xinke/main/service/DataGuangdongService.java @@ -56,7 +56,7 @@ public class DataGuangdongService extends DataService, LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(DataGuangdong::getName, data.getName()); var date = LocalDate.of(year, month, 1); - query.between(DataGuangdong::getDate, date, date.plusMonths(1)); + query.between(DataGuangdong::getDate, date.minusYears(1), date.plusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/DataNetworkService.java b/src/main/java/mjkf/xinke/main/service/DataNetworkService.java index d3623ca..51dda22 100644 --- a/src/main/java/mjkf/xinke/main/service/DataNetworkService.java +++ b/src/main/java/mjkf/xinke/main/service/DataNetworkService.java @@ -59,7 +59,7 @@ public class DataNetworkService extends DataService, Dat LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(DataNetwork::getName, data.getName()); var date = LocalDate.of(year, month, 1); - query.between(DataNetwork::getDate, date, date.plusMonths(1)); + query.between(DataNetwork::getDate, date.minusYears(1), date.plusMonths(1)); return query; } } diff --git a/src/main/java/mjkf/xinke/main/service/DataZhejiangService.java b/src/main/java/mjkf/xinke/main/service/DataZhejiangService.java index fbb1ec0..fbe0594 100644 --- a/src/main/java/mjkf/xinke/main/service/DataZhejiangService.java +++ b/src/main/java/mjkf/xinke/main/service/DataZhejiangService.java @@ -58,7 +58,7 @@ public class DataZhejiangService extends DataService, LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(DataZhejiang::getName, data.getName()); var date = LocalDate.of(year, month, 1); - query.between(DataZhejiang::getDate, date, date.plusMonths(1)); + query.between(DataZhejiang::getDate, date.minusYears(1), date.plusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/FujianSurveyService.java b/src/main/java/mjkf/xinke/main/service/FujianSurveyService.java index 1bddc7f..aebeaa6 100644 --- a/src/main/java/mjkf/xinke/main/service/FujianSurveyService.java +++ b/src/main/java/mjkf/xinke/main/service/FujianSurveyService.java @@ -27,7 +27,7 @@ public class FujianSurveyService extends DataService, F query.eq(FujianSurvey::getName, data.getName()); query.eq(FujianSurvey::getSpec, data.getSpec()); var date = LocalDate.of(year, month, 1); - query.between(FujianSurvey::getDate, date,date.plusMonths(1)); + query.between(FujianSurvey::getDate, date.minusYears(1), date.plusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java b/src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java index 96f239a..79bd069 100644 --- a/src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java +++ b/src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java @@ -28,7 +28,7 @@ public class FuzhouHighwayBureauService extends DataService, PriceResult> { - public LambdaQueryWrapper getQuery(Integer year, Integer month, String materialId, String name) { + public LambdaQueryWrapper getQuery(Integer year, Integer month, String materialId, String name) { var query = new LambdaQueryWrapper(); if (year != null) { query = query.eq(PriceResult::getYear, year); @@ -26,7 +26,7 @@ public class PriceResultService extends ServiceImpl, Pri return query; } - public LambdaQueryWrapper getQueryByName(String name) { + public LambdaQueryWrapper getQueryByName(String name) { return this.getQuery(null, null, null, name); } } diff --git a/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java b/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java index dfa5ef2..9e70015 100644 --- a/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java +++ b/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java @@ -26,7 +26,7 @@ public class SanmingSteelService extends DataService, S query.eq(SanmingSteel::getSpec, data.getSpec()); query.eq(SanmingSteel::getMaterial, data.getMaterial()); var date = LocalDate.of(year, month, 1); - query.between(SanmingSteel::getDate, date,date.plusMonths(1)); + query.between(SanmingSteel::getDate, date.minusYears(1), date.plusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/SteelPlateService.java b/src/main/java/mjkf/xinke/main/service/SteelPlateService.java index 65ae525..a30752c 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelPlateService.java +++ b/src/main/java/mjkf/xinke/main/service/SteelPlateService.java @@ -34,7 +34,7 @@ public class SteelPlateService extends DataService, Steel query.eq(SteelPlate::getMaterial, data.getMaterial()); query.eq(SteelPlate::getSource, data.getSource()); var date = LocalDate.of(year, month, 1); - query.between(SteelPlate::getDate, date,date.plusMonths(1)); + query.between(SteelPlate::getDate, date.minusYears(1), date.plusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/SteelRebarService.java b/src/main/java/mjkf/xinke/main/service/SteelRebarService.java index 7a32d60..6d503bc 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelRebarService.java +++ b/src/main/java/mjkf/xinke/main/service/SteelRebarService.java @@ -31,7 +31,7 @@ public class SteelRebarService extends DataService, Steel query.eq(SteelRebar::getMaterial, data.getMaterial()); query.eq(SteelRebar::getSource, data.getSource()); var date = LocalDate.of(year, month, 1); - query.between(SteelRebar::getDate, date, date.plusMonths(1)); + query.between(SteelRebar::getDate, date.minusYears(1), date.plusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/SteelSectionService.java b/src/main/java/mjkf/xinke/main/service/SteelSectionService.java index cc3f101..37795ee 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelSectionService.java +++ b/src/main/java/mjkf/xinke/main/service/SteelSectionService.java @@ -32,7 +32,7 @@ public class SteelSectionService extends DataService, S query.eq(SteelSection::getMaterial, data.getMaterial()); query.eq(SteelSection::getSource, data.getSource()); var date = LocalDate.of(year, month, 1); - query.between(SteelSection::getDate, date,date.plusMonths(1)); + query.between(SteelSection::getDate, date.minusYears(1), date.plusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/SteelStrandService.java b/src/main/java/mjkf/xinke/main/service/SteelStrandService.java index a5c359d..65242c1 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelStrandService.java +++ b/src/main/java/mjkf/xinke/main/service/SteelStrandService.java @@ -32,7 +32,7 @@ public class SteelStrandService extends DataService, Ste query.eq(SteelStrand::getMaterial, data.getMaterial()); query.eq(SteelStrand::getSource, data.getSource()); var date = LocalDate.of(year, month, 1); - query.between(SteelStrand::getDate, date,date.plusMonths(1)); + query.between(SteelStrand::getDate, date.minusYears(1),date.plusMonths(1)); return query; } @@ -54,7 +54,7 @@ public class SteelStrandService extends DataService, Ste } if (month != null) { var date = LocalDate.of(year, month, 1); - query.between(SteelStrand::getDate, date,date.plusMonths(1)); + query.between(SteelStrand::getDate, date.minusYears(1), date.plusMonths(1)); } if (name != null) { query.like(SteelStrand::getName, name);