From 3496e5390b866618efafd56159f36c91d0d22689 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 10 一月 2024 16:32:53 +0800
Subject: [PATCH] 2024-01-10 朱宝民 重构分水房3个接口

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java |  487 +++++++++++++++++++++++++++++++++--------------------
 1 files changed, 299 insertions(+), 188 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java
index be75abb..dbd6ed1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java
@@ -7,9 +7,10 @@
 import com.dy.common.webUtil.QueryResultVo;
 import com.dy.common.webUtil.ResultCodeMsg;
 import com.dy.pipIrrBase.result.SystemResultCode;
-import com.dy.pipIrrBase.user.QueryVo;
 import com.dy.pipIrrGlobal.pojoBa.BaRole;
 import com.dy.pipIrrGlobal.pojoBa.BaRolePermissions;
+import com.dy.pipIrrGlobal.voBa.VoRole;
+import com.dy.pipIrrGlobal.voSe.VoActiveCard;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -19,12 +20,12 @@
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -37,90 +38,158 @@
 @SuppressWarnings("unchecked")//java鐗堟湰瓒婇珮锛屽娉涘瀷绾︽潫瓒婁弗锛屾墍浠ラ厤缃甋uppressWarnings("unchecked")
 public class RoleCtrl {
 
-    private RoleSv sv ;
+    //private RoleSv sv ;
     private final RoleSv roleSv;
 
-    @Autowired
-    private void setSv(RoleSv sv){
-        this.sv = sv ;
+    //@Autowired
+    //private void setSv(RoleSv sv){
+    //    this.sv = sv ;
+    //}
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢锛堣鑹茬紪鍙枫�佽鑹插悕绉帮級鑾峰彇瑙掕壊鍒楄〃
+     * 褰撹幏鍙栦竴鏉¤褰曟椂锛屼紶鍏oleId鍗冲彲
+     * @param vo
+     * @return
+     */
+    @Operation(summary = "鑾峰緱涓�椤佃鑹茶褰�", description = "杩斿洖涓�椤佃鑹叉暟鎹�")
+    @ApiResponses(value = {
+            @ApiResponse(
+                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+                    description = "杩斿洖涓�椤垫帶鍒跺櫒鏁版嵁锛圔aseResponse.content:QueryResultVo[{}]锛�",
+                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                            schema = @Schema(implementation = VoActiveCard.class))}
+            )
+    })
+    @GetMapping(path = "/roles")
+    @SsoAop()
+    public BaseResponse<QueryResultVo<List<VoRole>>> getRoles(QueryVo vo){
+        try {
+            QueryResultVo<List<VoRole>> res = roleSv.getRoles(vo);
+            if(res.itemTotal != null && res.itemTotal > 0) {
+                return BaseResponseUtils.buildSuccess(res);
+            }else {
+                return BaseResponseUtils.buildFail(SystemResultCode.NO_ROLES.getMessage());
+            }
+        } catch (Exception e) {
+            log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
     }
 
     /**
      * 瀹㈡埛绔姹傚緱鍒版墍鏈夎鑹叉暟鎹�
      * @return 鎵�鏈夎鑹叉暟鎹�
      */
-    @Operation(summary = "鑾峰緱鍏ㄩ儴瑙掕壊", description = "杩斿洖鍏ㄩ儴瑙掕壊鏁版嵁")
-    @ApiResponses(value = {
-            @ApiResponse(
-                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
-                    description = "杩斿洖鍏ㄩ儴瑙掕壊鏁版嵁锛圔aseResponse.content:QueryResultVo[{}]锛�",
-                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
-                            schema = @Schema(implementation = BaRole.class))}
-            )
-    })
-    @GetMapping(path = "all")
-    @SsoAop()
-    public BaseResponse<QueryResultVo<List<BaRole>>> all(){
-        try {
-            QueryResultVo<List<BaRole>> res = this.sv.selectAll() ;
-            return BaseResponseUtils.buildSuccess(res);
-        } catch (Exception e) {
-            log.error("鏌ヨ瑙掕壊寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
-        }
-    }
+    //@Operation(summary = "鑾峰緱鍏ㄩ儴瑙掕壊", description = "杩斿洖鍏ㄩ儴瑙掕壊鏁版嵁")
+    //@ApiResponses(value = {
+    //        @ApiResponse(
+    //                responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+    //                description = "杩斿洖鍏ㄩ儴瑙掕壊鏁版嵁锛圔aseResponse.content:QueryResultVo[{}]锛�",
+    //                content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+    //                        schema = @Schema(implementation = BaRole.class))}
+    //        )
+    //})
+    //@GetMapping(path = "all")
+    //@SsoAop()
+    //public BaseResponse<QueryResultVo<List<BaRole>>> all(){
+    //    try {
+    //        QueryResultVo<List<BaRole>> res = this.sv.selectAll() ;
+    //        return BaseResponseUtils.buildSuccess(res);
+    //    } catch (Exception e) {
+    //        log.error("鏌ヨ瑙掕壊寮傚父", e);
+    //        return BaseResponseUtils.buildException(e.getMessage()) ;
+    //    }
+    //}
 
     /**
      * 瀹㈡埛绔姹傚緱鍒颁竴椤佃鑹叉暟鎹�
      * @return 鎵�鏈夎鑹叉暟鎹�
      */
-    @Operation(summary = "鑾峰緱涓�椤佃鑹�", description = "杩斿洖涓�椤佃鑹叉暟鎹�")
-    @ApiResponses(value = {
-            @ApiResponse(
-                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
-                    description = "杩斿洖涓�椤佃鑹叉暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
-                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
-                            schema = @Schema(implementation = BaRole.class))}
-            )
-    })
-    @PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
-    @SsoAop()
-    public BaseResponse<QueryResultVo<List<BaRole>>> some(@RequestBody @Valid QueryVo vo){
-        try {
-            QueryResultVo<List<BaRole>> res = this.sv.selectSome(vo) ;
-            return BaseResponseUtils.buildSuccess(res);
-        } catch (Exception e) {
-            log.error("鏌ヨ瑙掕壊寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
-        }
-    }
+    //@Operation(summary = "鑾峰緱涓�椤佃鑹�", description = "杩斿洖涓�椤佃鑹叉暟鎹�")
+    //@ApiResponses(value = {
+    //        @ApiResponse(
+    //                responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+    //                description = "杩斿洖涓�椤佃鑹叉暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+    //                content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+    //                        schema = @Schema(implementation = BaRole.class))}
+    //        )
+    //})
+    //@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
+    //@SsoAop()
+    //public BaseResponse<QueryResultVo<List<BaRole>>> some(@RequestBody @Valid QueryVo vo){
+    //    try {
+    //        QueryResultVo<List<BaRole>> res = this.sv.selectSome(vo) ;
+    //        return BaseResponseUtils.buildSuccess(res);
+    //    } catch (Exception e) {
+    //        log.error("鏌ヨ瑙掕壊寮傚父", e);
+    //        return BaseResponseUtils.buildException(e.getMessage()) ;
+    //    }
+    //}
 
     /**
      * 寰楀埌涓�涓鑹叉暟鎹�
      * @return 涓�涓鑹叉暟鎹�
      */
-    @Operation(summary = "涓�涓鑹�", description = "寰楀埌涓�涓鑹叉暟鎹�")
-    @ApiResponses(value = {
-            @ApiResponse(
-                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
-                    description = "杩斿洖涓�涓鑹叉暟鎹紙BaseResponse.content:{}锛�",
-                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
-                            schema = @Schema(implementation = BaRole.class))}
-            )
-    })
-    //@GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
-    @GetMapping(path = "one")
-    @SsoAop()
-    public BaseResponse<BaRole> one(Long id){
-        return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
-    }
+    //@Operation(summary = "涓�涓鑹�", description = "寰楀埌涓�涓鑹叉暟鎹�")
+    //@ApiResponses(value = {
+    //        @ApiResponse(
+    //                responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+    //                description = "杩斿洖涓�涓鑹叉暟鎹紙BaseResponse.content:{}锛�",
+    //                content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+    //                        schema = @Schema(implementation = BaRole.class))}
+    //        )
+    //})
+    ////@GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
+    //@GetMapping(path = "one")
+    //@SsoAop()
+    //public BaseResponse<BaRole> one(Long id){
+    //    return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
+    //}
 
     /**
      * 淇濆瓨瑙掕壊
      * @param po 淇濆瓨瑙掕壊form琛ㄥ崟瀵硅薄
      * @return 鏄惁鎴愬姛
      */
-    @Operation(summary = "淇濆瓨瑙掕壊", description = "鎻愪氦瑙掕壊鏁版嵁锛坒orm琛ㄥ崟锛夛紝杩涜淇濆瓨")
+    //@Operation(summary = "淇濆瓨瑙掕壊", description = "鎻愪氦瑙掕壊鏁版嵁锛坒orm琛ㄥ崟锛夛紝杩涜淇濆瓨")
+    //@ApiResponses(value = {
+    //        @ApiResponse(
+    //                responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+    //                description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+    //                content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+    //                        schema = @Schema(implementation = Boolean.class))}
+    //        )
+    //})
+    //@PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
+    //@SsoAop()
+    //public BaseResponse<Boolean> save(@RequestBody @Valid BaRole po, BindingResult bindingResult){
+    //    if(bindingResult != null && bindingResult.hasErrors()){
+    //        return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+    //    }
+    //    po.id = null ;
+    //    Long count;
+    //    try {
+    //        po.deleted = Deleted.NO ;//榛樿涓嶅垹闄�
+    //        count = this.sv.save(po);
+    //    } catch (Exception e) {
+    //        log.error("淇濆瓨瑙掕壊寮傚父", e);
+    //        return BaseResponseUtils.buildException(e.getMessage()) ;
+    //    }
+    //    if(count <= 0){
+    //        return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+    //    }else{
+    //        return BaseResponseUtils.buildSuccess(true) ;
+    //    }
+    //}
+
+    /**
+     * 娣诲姞瑙掕壊鍙婃潈闄愬垪琛紝娣诲姞鍓嶅垽鏂鑹插悕鏄惁宸插瓨鍦�
+     * @param po 瑙掕壊浼犲叆瀵硅薄锛屽寘鎷鑹插悕绉般�佹潈闄愬垪琛ㄣ�佹搷浣滀汉缂栧彿
+     * @param bindingResult
+     * @return
+     */
+    @Operation(summary = "娣诲姞瑙掕壊", description = "鎻愪氦瑙掕壊鏁版嵁鍙婃潈闄愭暟鎹紝杩涜淇濆瓨")
     @ApiResponses(value = {
             @ApiResponse(
                     responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
@@ -130,136 +199,57 @@
             )
     })
     @PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @Transactional(rollbackFor = Exception.class)
     @SsoAop()
-    public BaseResponse<Boolean> save(@RequestBody @Valid BaRole po, BindingResult bindingResult){
+    public BaseResponse<Boolean> save(@RequestBody @Valid DtoRole po, BindingResult bindingResult){
         if(bindingResult != null && bindingResult.hasErrors()){
             return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
-        po.id = null ;
-        Long count;
+
+        // 鑾峰彇瑙掕壊鍚嶇О绾ф潈闄愬垪琛�
+        String roleName = Optional.ofNullable(po.getRoleName()).orElse("");
+        String permissions = Optional.ofNullable(po.getPermissions()).orElse("");
+        Long operator = Optional.ofNullable(po.getOperator()).orElse(0L);
+
+        // 鍒ゆ柇瑙掕壊鍚嶇О鏄惁閲嶅悕
+        Integer recordCount = Optional.ofNullable(roleSv.getRecordCountByName(roleName)).orElse(0);
+        if(recordCount > 0)
+            return BaseResponseUtils.buildFail(SystemResultCode.ROLE_NAME_EXIST.getMessage());
+
+        // 娣诲姞瑙掕壊
+        BaRole baRole = new BaRole();
+        Long roleId = 0L;
         try {
-            po.deleted = Deleted.NO ;//榛樿涓嶅垹闄�
-            count = this.sv.save(po);
+            baRole.setName(roleName);
+            baRole.setOperator(operator);
+            Date operateTime = new Date();
+            baRole.setOperateDt(operateTime);
+            baRole.setDeleted(Deleted.NO.getCode());
+            roleId = roleSv.addRole(baRole);
         } catch (Exception e) {
-            log.error("淇濆瓨瑙掕壊寮傚父", e);
             return BaseResponseUtils.buildException(e.getMessage()) ;
         }
-        if(count <= 0){
-            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
-        }else{
-            return BaseResponseUtils.buildSuccess(true) ;
-        }
-    }
 
-    /**
-     * 缂栬緫淇敼瑙掕壊
-     * @param po 淇濆瓨瑙掕壊form琛ㄥ崟瀵硅薄
-     * @return 鏄惁鎴愬姛
-     */
-    @Operation(summary = "缂栬緫淇敼瑙掕壊", description = "鎻愪氦瑙掕壊鏁版嵁锛坒orm琛ㄥ崟锛夛紝杩涜淇敼")
-    @ApiResponses(value = {
-            @ApiResponse(
-                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
-                    description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
-                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
-                            schema = @Schema(implementation = Boolean.class))}
-            )
-    })
-    @PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
-    @SsoAop()
-    public BaseResponse<Boolean> update(@RequestBody @Valid BaRole po, BindingResult bindingResult){
-        if(bindingResult != null && bindingResult.hasErrors()){
-            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
-        }
-        if(po.id == null){
-            return BaseResponseUtils.buildFail("鏃犳暟鎹疄浣揑D") ;
-        }
-        int count;
-        try {
-            po.deleted = null ;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
-            count = this.sv.update(po);
-        } catch (Exception e) {
-            log.error("淇濆瓨瑙掕壊寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
-        }
-        if(count <= 0){
-            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
-        }else{
-            return BaseResponseUtils.buildSuccess(true) ;
-        }
-    }
+        if(roleId <= 0)
+            return BaseResponseUtils.buildFail(SystemResultCode.ADD_ROLE_FAIL.getMessage());
 
-
-
-    /**
-     * 璁剧疆瑙掕壊鏉冮檺
-     * @param id 瑙掕壊ID
-     * @return 鏄惁鎴愬姛
-     */
-    @Operation(summary = "璁剧疆瑙掕壊鏉冮檺", description = "鎻愪氦瑙掕壊ID锛屽強鎵�閫夋嫨鐨勬潈闄怚D闆嗗悎锛堟暟缁勶級")
-    @ApiResponses(value = {
-            @ApiResponse(
-                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
-                    description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
-                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
-                            schema = @Schema(implementation = Boolean.class))}
-            )
-    })
-    //@GetMapping(path = "setPrivs", consumes = MediaType.APPLICATION_JSON_VALUE)
-    @PostMapping(path = "setPrivs", consumes = MediaType.APPLICATION_JSON_VALUE)
-    @SsoAop()
-    public BaseResponse<Boolean> setPrivileges(Long id, Long[] privIds){
-        Long[] privIds_lg = null ;
-        if(privIds != null && privIds.length > 0){
-            privIds_lg = new Long[privIds.length] ;
-            int index = 0 ;
-            for(Long privId : privIds){
-                privIds_lg[index++] = privId ;
-            }
-        }
-        try {
-            this.sv.setRoles(id, privIds_lg);
-        } catch (Exception e) {
-            log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+        // 娣诲姞鏉冮檺鍒楄〃
+        BaRolePermissions  baRolePermissions = new BaRolePermissions();
+        baRolePermissions.setRoleid(roleId);
+        baRolePermissions.setPermissions(permissions);
+        Integer rc = Optional.ofNullable(roleSv.addPermissions(baRolePermissions)).orElse(0);
+        if(rc <= 0) {
+            return BaseResponseUtils.buildFail(SystemResultCode.ADD_ROLE_FAIL.getMessage());
         }
         return BaseResponseUtils.buildSuccess(true) ;
     }
-    /**
-     * 鍒犻櫎瑙掕壊
-     * @param id 瑙掕壊ID
-     * @return 鏄惁鎴愬姛
-     */
-    @Operation(summary = "鍒犻櫎瑙掕壊", description = "鎻愪氦瑙掕壊ID锛岃繘琛岄�昏緫鍒犻櫎")
-    @ApiResponses(value = {
-            @ApiResponse(
-                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
-                    description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
-                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
-                            schema = @Schema(implementation = Boolean.class))}
-            )
-    })
-    //@GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
-    @GetMapping(path = "delete")
-    @SsoAop()
-    public BaseResponse<Boolean> delete(Long id){
-        if(id == null){
-            return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
-        }
-        int count;
-        try {
-            count = this.sv.delete(id);
-        } catch (Exception e) {
-            log.error("淇濆瓨瑙掕壊寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
-        }
-        if(count <= 0){
-            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
-        }else{
-            return BaseResponseUtils.buildSuccess(true) ;
-        }
-    }
 
+    /**
+     * 瑙掕壊鎺堟潈锛屽綋瑙掕壊缂栧彿涓虹┖鏃讹紝瀹為檯涓烘坊鍔犺鑹插強鏉冮檺鍒楄〃
+     * @param po
+     * @param bindingResult
+     * @return
+     */
     @Operation(summary = "鎺堟潈", description = "鎺堟潈")
     @ApiResponses(value = {
             @ApiResponse(
@@ -272,7 +262,7 @@
     @PostMapping(path = "addPermissions", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Transactional(rollbackFor = Exception.class)
     @SsoAop()
-    public BaseResponse<Boolean> permission(@RequestBody  @Valid BaRolePermissions po, BindingResult bindingResult){
+    public BaseResponse<Boolean> permission(@RequestBody  @Valid DtoRole po, BindingResult bindingResult){
         if(bindingResult != null && bindingResult.hasErrors()){
             return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
@@ -287,28 +277,149 @@
          *      2. 娣诲姞瑙掕壊銆佹潈闄愯褰�
          */
 
-        Long roleid = Optional.ofNullable(po.getRoleid()).orElse(0L);
+        Long roleId = Optional.ofNullable(po.getRoleid()).orElse(0L);
         String roleName = Optional.ofNullable(po.getRoleName()).orElse("");
         String permissions = Optional.ofNullable(po.getPermissions()).orElse("");
+        Long operator = Optional.ofNullable(po.getOperator()).orElse(0L);
 
-        if(roleid == 0 && roleName.length() == 0) {
+        if(roleId == 0 && roleName.length() == 0)
             return BaseResponseUtils.buildFail(SystemResultCode.PERMISSION_ERROR.getMessage());
-        }
 
         // 鏂板缓瑙掕壊涓旀巿鏉�
-        if(roleid == 0) {
+        if(roleId == 0) {
             BaRole baRole = new BaRole();
             baRole.setName(roleName);
-            roleid = Optional.ofNullable(roleSv.save(baRole)).orElse(0L);
-            po.setRoleid(roleid);
-            roleSv.addPermissions(po);
+            baRole.setOperator(operator);
+            Date operateTime = new Date();
+            baRole.setOperateDt(operateTime);
+            baRole.setDeleted(Deleted.NO.getCode());
+            roleId = Optional.ofNullable(roleSv.addRole(baRole)).orElse(0L);
+
+            BaRolePermissions baRolePermissions = new BaRolePermissions();
+            baRolePermissions.setRoleid(roleId);
+            baRolePermissions.setPermissions(permissions);
+            roleSv.addPermissions(baRolePermissions);
             return BaseResponseUtils.buildSuccess(true) ;
         }
 
         // 淇敼瑙掕壊鎺堟潈
-        roleSv.delPermissionsByRoleId(roleid);
-        roleSv.addPermissions(po);
+        BaRolePermissions baRolePermissions = new BaRolePermissions();
+        baRolePermissions.setRoleid(roleId);
+        baRolePermissions.setPermissions(permissions);
+        roleSv.delPermissionsByRoleId(roleId);
+        roleSv.addPermissions(baRolePermissions);
         return BaseResponseUtils.buildSuccess(true) ;
     }
 
+    /**
+     * 缂栬緫淇敼瑙掕壊
+     * @param po 淇濆瓨瑙掕壊form琛ㄥ崟瀵硅薄
+     * @return 鏄惁鎴愬姛
+     */
+    //@Operation(summary = "缂栬緫淇敼瑙掕壊", description = "鎻愪氦瑙掕壊鏁版嵁锛坒orm琛ㄥ崟锛夛紝杩涜淇敼")
+    //@ApiResponses(value = {
+    //        @ApiResponse(
+    //                responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+    //                description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+    //                content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+    //                        schema = @Schema(implementation = Boolean.class))}
+    //        )
+    //})
+    //@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
+    //@SsoAop()
+    //public BaseResponse<Boolean> update(@RequestBody @Valid BaRole po, BindingResult bindingResult){
+    //    if(bindingResult != null && bindingResult.hasErrors()){
+    //        return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+    //    }
+    //    if(po.id == null){
+    //        return BaseResponseUtils.buildFail("鏃犳暟鎹疄浣揑D") ;
+    //    }
+    //    int count;
+    //    try {
+    //        po.deleted = null ;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
+    //        count = this.sv.update(po);
+    //    } catch (Exception e) {
+    //        log.error("淇濆瓨瑙掕壊寮傚父", e);
+    //        return BaseResponseUtils.buildException(e.getMessage()) ;
+    //    }
+    //    if(count <= 0){
+    //        return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+    //    }else{
+    //        return BaseResponseUtils.buildSuccess(true) ;
+    //    }
+    //}
+
+
+
+    ///**
+    // * 璁剧疆瑙掕壊鏉冮檺
+    // * @param id 瑙掕壊ID
+    // * @return 鏄惁鎴愬姛
+    // */
+    //@Operation(summary = "璁剧疆瑙掕壊鏉冮檺", description = "鎻愪氦瑙掕壊ID锛屽強鎵�閫夋嫨鐨勬潈闄怚D闆嗗悎锛堟暟缁勶級")
+    //@ApiResponses(value = {
+    //        @ApiResponse(
+    //                responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+    //                description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+    //                content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+    //                        schema = @Schema(implementation = Boolean.class))}
+    //        )
+    //})
+    ////@GetMapping(path = "setPrivs", consumes = MediaType.APPLICATION_JSON_VALUE)
+    //@PostMapping(path = "setPrivs", consumes = MediaType.APPLICATION_JSON_VALUE)
+    //@SsoAop()
+    //public BaseResponse<Boolean> setPrivileges(Long id, Long[] privIds){
+    //    Long[] privIds_lg = null ;
+    //    if(privIds != null && privIds.length > 0){
+    //        privIds_lg = new Long[privIds.length] ;
+    //        int index = 0 ;
+    //        for(Long privId : privIds){
+    //            privIds_lg[index++] = privId ;
+    //        }
+    //    }
+    //    try {
+    //        this.sv.setRoles(id, privIds_lg);
+    //    } catch (Exception e) {
+    //        log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
+    //        return BaseResponseUtils.buildException(e.getMessage()) ;
+    //    }
+    //    return BaseResponseUtils.buildSuccess(true) ;
+    //}
+    ///**
+    // * 鍒犻櫎瑙掕壊
+    // * @param id 瑙掕壊ID
+    // * @return 鏄惁鎴愬姛
+    // */
+    //@Operation(summary = "鍒犻櫎瑙掕壊", description = "鎻愪氦瑙掕壊ID锛岃繘琛岄�昏緫鍒犻櫎")
+    //@ApiResponses(value = {
+    //        @ApiResponse(
+    //                responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+    //                description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+    //                content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+    //                        schema = @Schema(implementation = Boolean.class))}
+    //        )
+    //})
+    ////@GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
+    //@GetMapping(path = "delete")
+    //@SsoAop()
+    //public BaseResponse<Boolean> delete(Long id){
+    //    if(id == null){
+    //        return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
+    //    }
+    //    int count;
+    //    try {
+    //        count = this.sv.delete(id);
+    //    } catch (Exception e) {
+    //        log.error("淇濆瓨瑙掕壊寮傚父", e);
+    //        return BaseResponseUtils.buildException(e.getMessage()) ;
+    //    }
+    //    if(count <= 0){
+    //        return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+    //    }else{
+    //        return BaseResponseUtils.buildSuccess(true) ;
+    //    }
+    //}
+
+
+
 }

--
Gitblit v1.8.0