From c568a328a8c273531773710fe814ac429bafc48f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 29 一月 2024 14:09:12 +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 | 147 ++++++------------------------------------------
1 files changed, 19 insertions(+), 128 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 ed76f2d..a14f8a3 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
@@ -36,13 +36,7 @@
@SuppressWarnings("unchecked")//java鐗堟湰瓒婇珮锛屽娉涘瀷绾︽潫瓒婁弗锛屾墍浠ラ厤缃甋uppressWarnings("unchecked")
public class RoleCtrl {
- //private RoleSv sv ;
private final RoleSv roleSv;
-
- //@Autowired
- //private void setSv(RoleSv sv){
- // this.sv = sv ;
- //}
/**
* 鏍规嵁鎸囧畾鏉′欢锛堣鑹茬紪鍙枫�佽鑹插悕绉帮級鑾峰彇瑙掕壊鍒楄〃
@@ -80,68 +74,15 @@
}
/**
- * 娣诲姞瑙掕壊鍙婃潈闄愬垪琛紝娣诲姞鍓嶅垽鏂鑹插悕鏄惁宸插瓨鍦�
- * @param po 瑙掕壊浼犲叆瀵硅薄锛屽寘鎷鑹插悕绉般�佹潈闄愬垪琛ㄣ�佹搷浣滀汉缂栧彿
- * @param bindingResult
- * @return
- */
- @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 = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
- @Transactional(rollbackFor = Exception.class)
- @SsoAop()
- public BaseResponse<Boolean> save(@RequestBody @Valid DtoRole po, BindingResult bindingResult){
- if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
-
- // 鑾峰彇瑙掕壊鍚嶇О绾ф潈闄愬垪琛�
- String roleName = Optional.ofNullable(po.getRoleName()).orElse("");
- JSONArray permissions = Optional.ofNullable(JSONArray.parseArray(po.getPermissions())).orElse(JSONArray.parseArray("[]"));
- 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 {
- 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) {
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
-
- if(roleId <= 0)
- return BaseResponseUtils.buildFail(SystemResultCode.ADD_ROLE_FAIL.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) ;
- }
-
- /**
- * 瑙掕壊鎺堟潈锛屽綋瑙掕壊缂栧彿涓虹┖鏃讹紝瀹為檯涓烘坊鍔犺鑹插強鏉冮檺鍒楄〃
+ * 瑙掕壊鎺堟潈
+ * 1. 濡傛灉roleid鍜宺oleName閮界┖锛氭彁绀洪敊璇俊鎭�
+ * 2. 濡傛灉roleid涓虹┖锛氭柊寤鸿鑹蹭笖鎺堟潈
+ * 1. 娣诲姞瑙掕壊璁板綍
+ * 2. 娣诲姞瑙掕壊銆佹潈闄愬叧鑱旇褰�
+ * 3. 濡傛灉roleid涓嶄负绌猴細淇敼瑙掕壊鍙婃巿鏉�
+ * 1. 鍒犻櫎瑙掕壊銆佹潈闄愯褰�
+ * 2. 淇敼瑙掕壊淇℃伅
+ * 3. 娣诲姞瑙掕壊銆佹潈闄愯褰�
* @param po
* @param bindingResult
* @return
@@ -163,19 +104,8 @@
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- /**
- * 濡傛灉roleid鍜宺oleName閮界┖锛氭彁绀洪敊璇俊鎭�
- * 濡傛灉roleid涓虹┖锛氭柊寤鸿鑹蹭笖鎺堟潈
- * 1. 娣诲姞瑙掕壊璁板綍
- * 2. 娣诲姞瑙掕壊銆佹潈闄愬叧鑱旇褰�
- * 濡傛灉roleid涓嶄负绌猴細淇敼瑙掕壊鎺堟潈
- * 1. 鍒犻櫎瑙掕壊銆佹潈闄愯褰�
- * 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("");
JSONArray permissions = Optional.ofNullable(JSONArray.parseArray(po.getPermissions())).orElse(JSONArray.parseArray("[]"));
Long operator = Optional.ofNullable(po.getOperator()).orElse(0L);
@@ -199,60 +129,21 @@
return BaseResponseUtils.buildSuccess(true) ;
}
+ // 淇敼瑙掕壊淇℃伅
+ BaRole baRole = new BaRole();
+ baRole.setId(roleId);
+ baRole.setName(roleName);
+ baRole.setOperator(operator);
+ Date operateTime = new Date();
+ baRole.setOperateDt(operateTime);
+ roleSv.updateRole(baRole);
+
// 淇敼瑙掕壊鎺堟潈
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 = "鎻愪氦瑙掕壊鏁版嵁锛岃繘琛屼慨鏀�")
- @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());
- }
-
- // 鎺ユ敹瑙掕壊缂栧彿銆佽鑹插悕绉般�佹搷浣滀汉缂栧彿
- Long roleId = Optional.ofNullable(po.getId()).orElse(0L);
- String roleName = Optional.ofNullable(po.getName()).orElse("");
- Long operator = Optional.ofNullable(po.getOperator()).orElse(0L);
-
- // 鍒ゆ柇涓婚敭鏄惁涓虹┖
- if(roleId == 0)
- return BaseResponseUtils.buildFail(SystemResultCode.PLEASE_INPUT_ROLE_ID.getMessage()) ;
-
- Integer recordCount = 0;
- try {
- po.setName(roleName);
- po.setOperator(operator);
- Date operateTime = new Date();
- po.setOperateDt(operateTime);
-
- //po.deleted = null ;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
- recordCount = roleSv.updateRole(po);
- } catch (Exception e) {
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
-
- if(recordCount <= 0)
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
return BaseResponseUtils.buildSuccess(true) ;
}
--
Gitblit v1.8.0