From 8910275656c9bf398832dc14957a03684a593e96 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 30 八月 2024 15:16:58 +0800
Subject: [PATCH] 2024-08-30 朱宝民 修改配置文件bug

---
 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java
index 167cecd..3b1096a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java
@@ -71,7 +71,7 @@
             if(res.itemTotal != null && res.itemTotal > 0) {
                 return BaseResponseUtils.buildSuccess(res);
             }else {
-                return BaseResponseUtils.buildFail(ProjectResultCode.NO_DIVIDES.getMessage());
+                return BaseResponseUtils.buildSuccess(ProjectResultCode.NO_DIVIDES.getMessage());
             }
         } catch (Exception e) {
             log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
@@ -101,7 +101,7 @@
             if(res != null) {
                 return BaseResponseUtils.buildSuccess(res);
             }else {
-                return BaseResponseUtils.buildFail(ProjectResultCode.NO_DIVIDES.getMessage());
+                return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_DIVIDES.getMessage());
             }
         } catch (Exception e) {
             log.error("鏌ヨ鍐滄埛寮傚父", e);
@@ -129,7 +129,7 @@
     @SsoAop()
     public BaseResponse<Boolean> add(@RequestBody @Valid DtoDivide po, BindingResult bindingResult){
         if(bindingResult != null && bindingResult.hasErrors()){
-            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
         // 鎺ユ敹鏉戠紪鍙凤紙涓婚敭锛�
         Long villageId = po.getVillageId();
@@ -142,7 +142,7 @@
              */
             Map map_districts = Optional.ofNullable(divideSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
             if(map_districts.size() <= 0) {
-                return BaseResponseUtils.buildFail("鍖哄垝淇℃伅鏈夎");
+                return BaseResponseUtils.buildErrorMsg("鍖哄垝淇℃伅鏈夎");
             }
             Long countryId = Long.parseLong(map_districts.get("countryId").toString());
             Long townId = Long.parseLong(map_districts.get("townId").toString());
@@ -155,7 +155,7 @@
         prDivide.setDeleted((byte)0);
         Integer rec = Optional.ofNullable(divideSv.addDivide(prDivide)).orElse(0);
         if(rec == 0) {
-            return BaseResponseUtils.buildFail(ProjectResultCode.DIVIDE_FAIL.getMessage());
+            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DIVIDE_FAIL.getMessage());
         }
         return BaseResponseUtils.buildSuccess(true) ;
     }
@@ -186,7 +186,7 @@
         try {
             Integer res = Optional.ofNullable(divideSv.deleteDivideById(id)).orElse(0);
             if(res == 0)
-                return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_DIVIDE_FAIL.getMessage());
+                return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_DIVIDE_FAIL.getMessage());
 
             return BaseResponseUtils.buildSuccess(true);
         } catch (Exception e) {
@@ -213,13 +213,15 @@
     @PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Transactional(rollbackFor = Exception.class)
     @SsoAop()
-    public BaseResponse<Boolean> update(@RequestBody @Valid PrDivide po, BindingResult bindingResult){
+    public BaseResponse<Boolean> update(@RequestBody @Valid DtoDivide po, BindingResult bindingResult){
         if(bindingResult != null && bindingResult.hasErrors()){
-            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
 
         // 鎺ユ敹鏉戠紪鍙凤紙涓婚敭锛�
-        Long villageId = po.getVillageid();
+        Long villageId = po.getVillageId();
+
+        PrDivide prDivide = DtoToDividePojo.INSTANCT.po2vo(po);
 
         if (villageId!=null){
             /**
@@ -227,20 +229,20 @@
              */
             Map map_districts = Optional.ofNullable(divideSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
             if(map_districts.size() <= 0) {
-                return BaseResponseUtils.buildFail("鍖哄垝淇℃伅鏈夎");
+                return BaseResponseUtils.buildErrorMsg("鍖哄垝淇℃伅鏈夎");
             }
             Long countryId = Long.parseLong(map_districts.get("countryId").toString());
             Long townId = Long.parseLong(map_districts.get("townId").toString());
-            po.setCountyid(countryId);
-            po.setTownid(townId);
+            prDivide.setCountyid(countryId);
+            prDivide.setTownid(townId);
         }
 
         Date operateTime = new Date();
-        po.setOperatedt(operateTime);
+        prDivide.setOperatedt(operateTime);
 
-        Integer rec = Optional.ofNullable(divideSv.updateByPrimaryKey(po)).orElse(0);
+        Integer rec = Optional.ofNullable(divideSv.updateByPrimaryKey(prDivide)).orElse(0);
         if(rec == 0) {
-            return BaseResponseUtils.buildFail("鍒嗘按鎴夸慨鏀瑰け璐�");
+            return BaseResponseUtils.buildErrorMsg("鍒嗘按鎴夸慨鏀瑰け璐�");
         }
         return BaseResponseUtils.buildSuccess(true) ;
     }

--
Gitblit v1.8.0