From b7d83328c1d4cf65f0dc9ec7c17e957afc7e3c76 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 13 一月 2025 17:07:33 +0800
Subject: [PATCH] web文件系统，文件上传返回增加一个属性filePath ;//文件在服务端存储相对路径
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java | 84 +++++++++++++++++++++++++++---------------
1 files changed, 54 insertions(+), 30 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java
index d718760..64031bb 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java
@@ -63,7 +63,7 @@
}
if(startId != null && endId != null){
if(endId < startId){
- return BaseResponseUtils.buildErrorMsg("鎴鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+ return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
}
}
try {
@@ -97,6 +97,47 @@
return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
+
+
+
+ /** ok 113
+ * 鑾峰彇浠庢湭寮�杩囬榾鐨勫彇姘村彛
+ * @param
+ * @return
+ */
+ @GetMapping(path = "/getNeverOpenValveIntakes")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoIntakeUnOpenValve>>> getNeverOpenValveIntakes(@Valid CommonQO qo, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+ String timeStart = qo.getTimeStart();
+ String timeStop = qo.getTimeStop();
+ Long startId = null ;
+ Long endId = null ;
+ if(timeStart != null && !timeStart.trim().equals("")){
+ int[] ymdStart = DateTime.yyyy_MM_dd_2_ymdGroup(timeStart) ;
+ startId = IDLongGenerator.generateOneDayStartId(ymdStart[0], ymdStart[1], ymdStart[2]) ;
+ }
+ if(timeStop != null && !timeStop.trim().equals("")){
+ int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
+ endId = IDLongGenerator.generateOneDayStartId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+ }
+ if(startId != null && endId != null){
+ if(endId < startId){
+ return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+ }
+ }
+ try {
+ QueryResultVo<List<VoIntakeUnOpenValve>> res = intakeSv.getNeverOpenValveIntakes(qo, startId, endId) ;
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇璁板綍寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+
+
/** ok 1
* 鑾峰彇绱娴侀噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
* @param qo
@@ -190,11 +231,11 @@
return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈠紑濮嬫椂闂�");
}
if(timeStop == null || timeStop.trim().equals("")){
- return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈡埅姝㈡椂闂�");
+ return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈢粨鏉熸椂闂�");
}
long dur = DateTime.daysBetweenyyyy_MM_dd(timeStop, timeStart) ;
if(dur < 0){
- return BaseResponseUtils.buildErrorMsg("鎴鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+ return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
}
if(dur > 366){
return BaseResponseUtils.buildErrorMsg("鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�骞�");
@@ -228,11 +269,11 @@
return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈠紑濮嬫椂闂�");
}
if(timeStop == null || timeStop.trim().equals("")){
- return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈡埅姝㈡椂闂�");
+ return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈢粨鏉熸椂闂�");
}
long dur = DateTime.daysBetweenyyyy_MM_dd(timeStop, timeStart) ;
if(dur < 0){
- return BaseResponseUtils.buildErrorMsg("鎴鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+ return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
}
if(dur > 366){
return BaseResponseUtils.buildErrorMsg("鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�骞�");
@@ -266,11 +307,11 @@
return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈠紑濮嬫椂闂�");
}
if(timeStop == null || timeStop.trim().equals("")){
- return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈡埅姝㈡椂闂�");
+ return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈢粨鏉熸椂闂�");
}
long dur = DateTime.daysBetweenyyyy_MM_dd(timeStop, timeStart) ;
if(dur < 0){
- return BaseResponseUtils.buildErrorMsg("鎴鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+ return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
}
if(dur > 366){
return BaseResponseUtils.buildErrorMsg("鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�骞�");
@@ -305,11 +346,11 @@
return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈠紑濮嬫椂闂�");
}
if(timeStop == null || timeStop.trim().equals("")){
- return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈡埅姝㈡椂闂�");
+ return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈢粨鏉熸椂闂�");
}
long dur = DateTime.daysBetweenyyyy_MM_dd(timeStop, timeStart) ;
if(dur < 0){
- return BaseResponseUtils.buildErrorMsg("鎴鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+ return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
}
if(dur > 366){
return BaseResponseUtils.buildErrorMsg("鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�骞�");
@@ -327,23 +368,6 @@
}
}
-
- /**
- * 鑾峰彇浠庢湭寮�杩囬榾鐨勫彇姘村彛
- * @param
- * @return
- */
- @GetMapping(path = "/getNeverOpenValveIntakes")
- @SsoAop()
- public BaseResponse<QueryResultVo<List<VoIntake>>> getNeverOpenValveIntakes(CommonQO qo) {
- try {
- QueryResultVo<List<VoIntake>> res = intakeSv.getNeverOpenValveIntakes(qo);
- return BaseResponseUtils.buildSuccess(res);
- } catch (Exception e) {
- log.error("鑾峰彇璁板綍寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
- }
/**
* 鎸囧畾鏃堕棿娈靛唴绱Н娴侀噺(瀹氭椂鎶ラ噷鐨勭疮绉祦閲�)瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
@@ -444,11 +468,11 @@
return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈠紑濮嬫椂闂�");
}
if(timeStop == null || timeStop.trim().equals("")){
- return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈡埅姝㈡椂闂�");
+ return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈢粨鏉熸椂闂�");
}
long dur = DateTime.daysBetweenyyyy_MM_dd(timeStop, timeStart) ;
if(dur < 0){
- return BaseResponseUtils.buildErrorMsg("鎴鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+ return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
}
if(dur > 366){
return BaseResponseUtils.buildErrorMsg("鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�骞�");
@@ -480,11 +504,11 @@
return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈠紑濮嬫椂闂�");
}
if(timeStop == null || timeStop.trim().equals("")){
- return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈡埅姝㈡椂闂�");
+ return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈢粨鏉熸椂闂�");
}
long dur = DateTime.daysBetweenyyyy_MM_dd(timeStop, timeStart) ;
if(dur < 0){
- return BaseResponseUtils.buildErrorMsg("鎴鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+ return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
}
if(dur > 366){
return BaseResponseUtils.buildErrorMsg("鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�骞�");
--
Gitblit v1.8.0