From 4d7775ecb9d52da2558cef3f19bd5fab1746afae Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 16 五月 2024 17:53:55 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV
---
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java | 101 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 86 insertions(+), 15 deletions(-)
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java
index 01091c5..409f9d5 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java
@@ -5,6 +5,7 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pmsGlobal.aop.Log;
import com.dy.pmsGlobal.pojoBa.BaRole;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
@@ -13,6 +14,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Objects;
/**
* 瑙掕壊绠＄悊
@@ -35,15 +37,25 @@
* @return
*/
@PostMapping(path="save")
- @SsoPowerAop(power = "10100011")
- public BaseResponse<BaRole> save(@RequestBody @Valid BaRole role,BindingResult bindingResult){
+ @SsoPowerAop(power = "10100003")
+ @Log("淇濆瓨瑙掕壊淇℃伅")
+ public BaseResponse<Boolean> save(@RequestBody @Valid BaRole role,BindingResult bindingResult){
+ int count;
try {
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
role.setDeleted(false);
role.setDisabled(false);
- return BaseResponseUtils.buildSuccess(roleSv.save(role));
+ count = roleSv.save(role);
}catch (Exception e){
log.error("淇濆瓨瑙掕壊寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -55,30 +67,69 @@
* @return
*/
@PostMapping(path="update")
- @SsoPowerAop(power = "10100011")
+ @SsoPowerAop(power = "10100003")
+ @Log("鏇存柊瑙掕壊淇℃伅")
public BaseResponse<BaRole> update(@RequestBody @Valid BaRole role,BindingResult bindingResult){
+ int count;
try {
- return BaseResponseUtils.buildSuccess(roleSv.update(role));
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+ count = roleSv.update(role);
}catch (Exception e){
log.error("鏇存柊瑙掕壊寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
/**
* 鍒犻櫎瑙掕壊淇℃伅
* @param id
- * @param bindingResult
* @return
*/
- @PostMapping(path="delete")
- @SsoPowerAop(power = "10100011")
- public BaseResponse<BaRole> delete(String id,BindingResult bindingResult){
+ @GetMapping(path="delete")
+ @SsoPowerAop(power = "10100003")
+ @Log("鍒犻櫎瑙掕壊淇℃伅")
+ public BaseResponse<Boolean> delete(String id){
+ int count;
try {
- return BaseResponseUtils.buildSuccess(roleSv.delete(Long.parseLong(id)));
+ count = roleSv.delete(Long.parseLong(id));
}catch (Exception e){
log.error("鍒犻櫎瑙掕壊寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
+ }
+
+ /**
+ * 绂佺敤瑙掕壊淇℃伅
+ * @param role
+ * @return
+ */
+ @PostMapping(path="disabled")
+ @SsoPowerAop(power = "10100003")
+ @Log("绂佺敤鎴栧惎鐢ㄨ鑹蹭俊鎭�")
+ public BaseResponse<Boolean> disabled(@RequestBody BaRole role){
+ int count;
+ try {
+ count = roleSv.disabled(role.id,role.disabled);
+ }catch (Exception e){
+ log.error("绂佺敤瑙掕壊寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -88,7 +139,8 @@
* @return
*/
@GetMapping(path="one")
- @SsoPowerAop(power = "10100010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @SsoPowerAop(power = "10100004") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @Log("鏍规嵁ID鏌ヨ瑙掕壊淇℃伅")
public BaseResponse<BaRole> one(String id){
try{
BaRole role=roleSv.selectById(id);
@@ -100,17 +152,36 @@
}
/**
- * 鍒嗛〉鏌ヨ瑙掕壊淇℃伅
+ * 鏌ヨ鎵�鏈夎鑹�
+ * @return
+ */
+ @GetMapping(path="all")
+ @SsoPowerAop(power = "10100004") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @Log("鏌ヨ鎵�鏈夎鑹�")
+ public BaseResponse<List<BaRole>> all(String id){
+ try{
+ List<BaRole> roles=roleSv.selectAll();
+ return BaseResponseUtils.buildSuccess(roles);
+ }catch (Exception e){
+ log.error("鏌ヨ鎵�鏈夎鑹插紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+ /**
+ * 鏌ヨ瑙掕壊淇℃伅
* @param vo
* @return
*/
@PostMapping(path="some")
- @SsoPowerAop(power = "10100010")
+ @SsoPowerAop(power = "10100004")
+ @Log("鏌ヨ瑙掕壊淇℃伅")
public BaseResponse<QueryResultVo<List<BaRole>>> some(@RequestBody QueryVo vo){
try {
- return BaseResponseUtils.buildSuccess(roleSv.selectSome(vo));
+ QueryResultVo<List<BaRole>> list = roleSv.selectSome(vo) ;
+ return BaseResponseUtils.buildSuccess(list);
}catch (Exception e){
- log.error("鍒嗛〉鏌ヨ瑙掕壊寮傚父", e);
+ log.error("鏌ヨ瑙掕壊寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
}
--
Gitblit v1.8.0