From c2976b80e8850be2d28dc2132c6659856b871f3c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 五月 2025 21:10:42 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java
index 569914e..721917a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java
@@ -1,8 +1,11 @@
package com.dy.pipIrrWechat.intake;
+import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.pojoPr.PrIntake;
+import com.dy.pipIrrGlobal.voPr.VoAllIntake;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import com.dy.pipIrrGlobal.voRm.VoOpenClostWechat;
import com.dy.pipIrrWechat.intake.qo.OnLineIntakesQO;
@@ -36,8 +39,23 @@
* @param qo
* @return
*/
- //@GetMapping(path = "one_intake")
@GetMapping(path = "all_intakes")
+ public BaseResponse<QueryResultVo<List<VoOnLineIntake>>> getSomeIntakes(OnLineIntakesQO qo) {
+ try {
+ return BaseResponseUtils.buildSuccess(intakeSv.selectSomeIntakes(qo));
+ } catch (Exception e) {
+ log.error("鏌ヨ鍙栨按鍙ｅ紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+
+ /**
+ * 鏍规嵁鍙栨按鍙ｇ紪鍙疯幏鍙栧彇姘村彛瀵硅薄
+ * @param qo
+ * @return
+ */
+ @GetMapping(path = "all_intakes1")
public BaseResponse<QueryResultVo<VoOnLineIntake>> getOneIntake(OnLineIntakesQO qo) {
try {
return BaseResponseUtils.buildSuccess(intakeSv.selectOneIntake(qo));
@@ -64,13 +82,17 @@
/**
* 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛锛堝湪绾垮拰涓嶅湪绾匡級
- * @param operator
+ * @param operatorId
* @return
*/
@GetMapping(path = "used_intakes")
- public BaseResponse<List<VoOnLineIntake>> getUsedIntakes(Long operator) {
+ public BaseResponse<List<VoOnLineIntake>> getUsedIntakes(Long operatorId) {
+ if(operatorId == null || operatorId <= 0) {
+ return BaseResponseUtils.buildErrorMsg("鎿嶄綔鍛樹笉鑳戒负绌�");
+ }
+
try {
- List<VoOnLineIntake> res = intakeSv.getUsedIntakes(operator);
+ List<VoOnLineIntake> res = intakeSv.getUsedIntakes(operatorId);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鏌ヨ鍙栨按鍙ｅ紓甯�", e);
@@ -109,4 +131,23 @@
return BaseResponseUtils.buildException(e.getMessage());
}
}
+
+ /**
+ * 鑾峰緱鍏ㄩ儴鍙栨按鍙�
+ * @return
+ */
+ @GetMapping(path = "all")
+ public BaseResponse<QueryResultVo<List<VoAllIntake>>> all() {
+ try {
+ QueryResultVo<List<VoAllIntake>> res = this.intakeSv.selectAll();
+ if (res == null) {
+ return BaseResponseUtils.buildErrorMsg("娌℃湁绗﹀悎鏉′欢鐨勫彇姘村彛鏁版嵁");
+ } else {
+ return BaseResponseUtils.buildSuccess(res);
+ }
+ } catch (Exception e) {
+ log.error("鏌ヨ鍙栨按鍙ｅ紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0