From d61a829414ed87d1d5279cccbf0ada80d235fc28 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 12 十二月 2024 17:26:43 +0800
Subject: [PATCH] 改类名Intake*为Intaker*,因为有重名现象发生
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakerCtrl.java | 10 +++++-----
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakerQo.java | 2 +-
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakerSv.java | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakerCtrl.java
similarity index 91%
rename from pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakeCtrl.java
rename to pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakerCtrl.java
index 2fb3f45..291b0f5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakerCtrl.java
@@ -25,12 +25,12 @@
@RestController
@RequestMapping(path="intake")
@RequiredArgsConstructor
-public class IntakeCtrl {
+public class IntakerCtrl {
- private IntakeSv sv;
+ private IntakerSv sv;
@Autowired
- public void setSv(IntakeSv sv){
+ public void setSv(IntakerSv sv){
this.sv = sv ;
}
@@ -41,7 +41,7 @@
*/
@GetMapping(path = "/amountOfDay")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoDayIntakeAmount>>> amountOfDay(IntakeQo qo) throws Exception {
+ public BaseResponse<QueryResultVo<List<VoDayIntakeAmount>>> amountOfDay(IntakerQo qo) throws Exception {
String yearMonth = qo.getYearMonth();
if(yearMonth == null || yearMonth.trim().equals("")) {
return BaseResponseUtils.buildErrorMsg("鏌ヨ鏉′欢骞存湀涓嶈兘涓虹┖");
@@ -63,7 +63,7 @@
*/
@GetMapping(path = "/amountOfMonth")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoMonthAmount>>> amountOfMonth(IntakeQo qo) throws Exception {
+ public BaseResponse<QueryResultVo<List<VoMonthAmount>>> amountOfMonth(IntakerQo qo) throws Exception {
if(qo.getYear() == null) {
return BaseResponseUtils.buildErrorMsg("鏌ヨ鏉′欢骞村害涓嶈兘涓虹┖");
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakeQo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakerQo.java
similarity index 93%
rename from pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakeQo.java
rename to pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakerQo.java
index f899064..352bc63 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakeQo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakerQo.java
@@ -13,7 +13,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-public class IntakeQo extends QueryConditionVo {
+public class IntakerQo extends QueryConditionVo {
/**
* 缁熻骞存湀
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakerSv.java
similarity index 98%
rename from pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakeSv.java
rename to pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakerSv.java
index 3d419ad..73465aa 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakerSv.java
@@ -22,7 +22,7 @@
*/
@Slf4j
@Service
-public class IntakeSv {
+public class IntakerSv {
@Autowired
private RmIntakeAmountDayMapper dayDao ;
@@ -36,7 +36,7 @@
* @param qo
* @return
*/
- public QueryResultVo<List<VoDayIntakeAmount>> amountOfDay(IntakeQo qo) throws ParseException {
+ public QueryResultVo<List<VoDayIntakeAmount>> amountOfDay(IntakerQo qo) throws ParseException {
QueryResultVo<List<VoDayIntakeAmount>> rsVo = new QueryResultVo<>() ;
// 鐢熸垚鏌ヨ鍙傛暟
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
@@ -138,7 +138,7 @@
* @param qo
* @return
*/
- public QueryResultVo<List<VoMonthAmount>> amountOfMonth(IntakeQo qo) throws ParseException {
+ public QueryResultVo<List<VoMonthAmount>> amountOfMonth(IntakerQo qo) throws ParseException {
QueryResultVo<List<VoMonthAmount>> rsVo = new QueryResultVo<>() ;
// 鐢熸垚鏌ヨ鍙傛暟
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
--
Gitblit v1.8.0