From a30be18fa7896e36943462aef9e9949f0acf7f5e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 21 十二月 2023 14:34:45 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 3 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 a115dea..df75fe1 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
@@ -6,8 +6,10 @@
import com.dy.common.webUtil.BaseResponseUtils;
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 io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
@@ -16,23 +18,26 @@
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
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.List;
-import java.util.Objects;
+import java.util.*;
@Slf4j
@Tag(name = "瑙掕壊绠＄悊", description = "瑙掕壊澧炲垹鏀规煡绛夋搷浣�")
@RestController
@RequestMapping(path="role")
+@RequiredArgsConstructor
@SuppressWarnings("unchecked")//java鐗堟湰瓒婇珮锛屽娉涘瀷绾︽潫瓒婁弗锛屾墍浠ラ厤缃甋uppressWarnings("unchecked")
public class RoleCtrl {
private RoleSv sv ;
+ private final RoleSv roleSv;
@Autowired
private void setSv(RoleSv sv){
@@ -129,7 +134,7 @@
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
po.id = null ;
- int count;
+ Long count;
try {
po.deleted = Deleted.NO ;//榛樿涓嶅垹闄�
count = this.sv.save(po);
@@ -252,4 +257,55 @@
}
}
+ @Operation(summary = "鎺堟潈", description = "鎺堟潈")
+ @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 = "addPermissions", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop("-1")//@SsoAop(power = "-1")
+ public BaseResponse<Boolean> permission(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaRolePermissions po, @Parameter(hidden = true) BindingResult bindingResult){
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ /**
+ * 濡傛灉roleid鍜宺oleName閮界┖锛氭彁绀洪敊璇俊鎭�
+ * 濡傛灉roleid涓虹┖锛氭柊寤鸿鑹蹭笖鎺堟潈
+ * 1. 娣诲姞瑙掕壊璁板綍
+ * 2. 娣诲姞瑙掕壊銆佹潈闄愬叧鑱旇褰�
+ * 濡傛灉roleid涓嶄负绌猴細淇敼瑙掕壊鎺堟潈
+ * 1. 鍒犻櫎瑙掕壊銆佹潈闄愯褰�
+ * 2. 娣诲姞瑙掕壊銆佹潈闄愯褰�
+ */
+
+ Long roleid = Optional.ofNullable(po.getRoleid()).orElse(0L);
+ String roleName = Optional.ofNullable(po.getRoleName()).orElse("");
+ String permissions = Optional.ofNullable(po.getPermissions()).orElse("");
+
+ if(roleid == 0 && roleName.length() == 0) {
+ return BaseResponseUtils.buildFail(SystemResultCode.PERMISSION_ERROR.getMessage());
+ }
+
+ // 鏂板缓瑙掕壊涓旀巿鏉�
+ if(roleid == 0) {
+ BaRole baRole = new BaRole();
+ baRole.setName(roleName);
+ roleid = Optional.ofNullable(roleSv.save(baRole)).orElse(0L);
+ po.setRoleid(roleid);
+ roleSv.addPermissions(po);
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
+
+ // 淇敼瑙掕壊鎺堟潈
+ roleSv.delPermissionsByRoleId(roleid);
+ roleSv.addPermissions(po);
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
+
}
--
Gitblit v1.8.0