From 9a7978c3a82ce66c87be2a42ca15beeb4617a096 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 20 八月 2025 14:42:24 +0800
Subject: [PATCH] 修改bug

---
 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
index 151ef98..e2ef459 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
@@ -9,9 +9,9 @@
 import com.dy.pipIrrGlobal.excel.CellWriteHandler;
 import com.dy.pipIrrGlobal.excel.ExcelUtil;
 import com.dy.pipIrrGlobal.pojoPr.PrIntake;
-import com.dy.pipIrrGlobal.voPr.VoIntake;
-import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
+import com.dy.pipIrrGlobal.voPr.*;
 import com.dy.pipIrrGlobal.voSe.VoActiveCard;
+import com.dy.pipIrrProject.intake.qo.QoIntake;
 import com.dy.pipIrrProject.result.ProjectResultCode;
 import com.taobao.api.ApiException;
 import io.swagger.v3.oas.annotations.Operation;
@@ -75,9 +75,9 @@
     })
     @GetMapping(path = "all")
     @SsoAop()
-    public BaseResponse<QueryResultVo<List<PrIntake>>> all() {
+    public BaseResponse<QueryResultVo<List<VoAllIntake>>> all() {
         try {
-            QueryResultVo<List<PrIntake>> res = this.intakeSv.selectAll();
+            QueryResultVo<List<VoAllIntake>> res = this.intakeSv.selectAll();
             if (res == null) {
                 return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
             } else {
@@ -103,13 +103,14 @@
                             schema = @Schema(implementation = PrIntake.class))}
             )
     })
-    @GetMapping(path = "one/{id}")
+    @GetMapping(path = "one")
     @SsoAop()
-    public BaseResponse<PrIntake> one(@PathVariable("id") Long id) {
-        if (this.intakeSv.selectById(id) == null) {
+    public BaseResponse<VoAllIntake> one(@RequestParam("id") Long id) {
+        VoAllIntake po = this.intakeSv.selectById(id) ;
+        if (po == null) {
             return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
         } else {
-            return BaseResponseUtils.buildSuccess(this.intakeSv.selectById(id));
+            return BaseResponseUtils.buildSuccess(po);
         }
     }
 
@@ -194,6 +195,33 @@
             count = this.intakeSv.update(po);
         } catch (Exception e) {
             log.error("淇濆瓨鍙栨按鍙ｅ紓甯�", e);
+            return BaseResponseUtils.buildException(e.getMessage());
+        }
+        if (count <= 0) {
+            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.UPDATE_INTAKE.getMessage());
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
+        }
+    }
+
+    /**
+     * app淇敼鍙栨按鍙ｇ粡绾害
+     * @param po
+     * @param bindingResult
+     * @return
+     */
+    @PostMapping(path = "updateIntakeLngLat", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @SsoAop()
+    public BaseResponse<Boolean> updateIntakeLngLat(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid IntakeUpdateLngLat po, @Parameter(hidden = true) BindingResult bindingResult) {
+        if (bindingResult != null && bindingResult.hasErrors()) {
+            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+        }
+        int count;
+        po.setOperateDt(new Date());
+        try {
+            count = this.intakeSv.updateIntakeLngLat(po);
+        } catch (Exception e) {
+            log.error("淇濆瓨鍙栨按鍙ｇ粡绾害寮傚父", e);
             return BaseResponseUtils.buildException(e.getMessage());
         }
         if (count <= 0) {
@@ -318,4 +346,20 @@
             return BaseResponseUtils.buildException(e.getMessage());
         }
     }
+
+    /**
+     * 鑾峰彇鏈粦瀹氬埌杞亴缁勭殑鍙栨按鍙ｅ垪琛�
+     * @return
+     */
+    @GetMapping(path = "getFreeIntakes")
+    @SsoAop()
+    public BaseResponse<List<VoIntakeSimple>> getFreeIntakes(QoIntake qo) {
+        try {
+            List<VoIntakeSimple> res = intakeSv.getFreeIntakes(qo);
+            return BaseResponseUtils.buildSuccess(res);
+        } catch (Exception e) {
+            log.error("鏌ヨ鍙栨按鍙ｅ紓甯�", e);
+            return BaseResponseUtils.buildException(e.getMessage());
+        }
+    }
 }

--
Gitblit v1.8.0