From 4ca7bd3844958b23c47864388b644fe9b76e69ef Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期六, 21 九月 2024 10:52:25 +0800
Subject: [PATCH] 2024-09-21 朱宝民 获取充值记录接口,返回值增加居委会名称

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
index 7ef677c..eb0b48b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
@@ -94,15 +94,12 @@
      * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鐗囧尯锛�2024-08-14鏂板锛屾浛鎹㈠師鏉ョ殑鐗囧尯鍒嗛〉鏌ヨ
      *
      * @param qo
-     * @param bindingResult
+     * @param
      * @return
      */
     @GetMapping(path = "/some")
     @SsoAop()
-    public BaseResponse<QueryResultVo<List<VoBlock>>> getBlocks(@Valid QueryVo qo, BindingResult bindingResult) {
-        if (bindingResult != null && bindingResult.hasErrors()) {
-            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
-        }
+    public BaseResponse<QueryResultVo<List<VoBlock>>> getBlocks(QueryVo qo) {
         try {
             return BaseResponseUtils.buildSuccess(this.sv.getBlocks(qo));
         } catch (Exception e) {
@@ -384,11 +381,26 @@
             return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
         }
 
-        // 鍒犻櫎鐗囧尯鍏宠仈鐨勫湴鍥惧浘褰�
-        this.sv.deleteMapGraph(id);
         // 鍒犻櫎鍦板浘鍥惧舰鍧愭爣
         this.sv.deleteMapCoordinates(id);
+        // 鍒犻櫎鐗囧尯鍏宠仈鐨勫湴鍥惧浘褰�
+        this.sv.deleteMapGraph(id);
 
         return BaseResponseUtils.buildSuccess(true);
     }
+
+    /**
+     * 鑾峰彇鐗囧尯銆佸垎姘存埧鑱斿姩瑙嗗浘锛屾坊鍔犲啘鎴锋椂浣跨敤
+     * @return
+     */
+    @GetMapping(path = "/block_divides")
+    @SsoAop()
+    public BaseResponse<JSONArray> getBlockDivides() {
+        try {
+            return BaseResponseUtils.buildSuccess(this.sv.getBlockDivides());
+        } catch (Exception e) {
+            log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
+            return BaseResponseUtils.buildException(e.getMessage());
+        }
+    }
 }

--
Gitblit v1.8.0