From b27d0ba5ab7a11ac6615e0cfee3cf428a7ae834f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 29 五月 2024 08:56:34 +0800
Subject: [PATCH] 完善代码
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java | 71 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
index 760b054..3604402 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
@@ -9,12 +9,12 @@
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.pipIrrGlobal.pojoBa.BaUser;
import com.dy.pipIrrGlobal.util.Constant;
import com.dy.pipIrrGlobal.voBa.VoUserInfo;
import com.mysql.cj.util.StringUtils;
import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -88,12 +88,19 @@
schema = @Schema(implementation = BaUser.class))}
)
})
- @PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @GetMapping(path = "some")
+ //@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop()
- public BaseResponse<QueryResultVo<List<BaUser>>> some(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) @Valid QueryVo vo) {
+ public BaseResponse<QueryResultVo<List<VoUserInfo>>> some(QueryVo vo) {
try {
- QueryResultVo<List<BaUser>> res = this.sv.selectSome(vo);
- return BaseResponseUtils.buildSuccess(res);
+ QueryResultVo<List<VoUserInfo>> res = this.sv.selectSome(vo);
+ if(res.itemTotal == 0) {
+ return BaseResponseUtils.buildFail(SystemResultCode.THE_USER_NOT_EXIST.getMessage());
+ }else {
+ return BaseResponseUtils.buildSuccess(res);
+ }
+
+
} catch (Exception e) {
log.error("鏌ヨ鐢ㄦ埛寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
@@ -114,9 +121,10 @@
schema = @Schema(implementation = BaUser.class))}
)
})
- @GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
+ //@GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
+ @GetMapping(path = "one")
@SsoAop()
- public BaseResponse<BaUser> one(@Parameter(description = "瀹炰綋id", required = true) String id) {
+ public BaseResponse<BaUser> one(String id) {
return BaseResponseUtils.buildSuccess(this.sv.selectById(Long.parseLong(id)));
}
@@ -137,12 +145,12 @@
})
@PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop()
- public BaseResponse<Boolean> save(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaUser po, @Parameter(hidden = true) BindingResult bindingResult) {
+ public BaseResponse<Boolean> save(@RequestBody @Valid BaUser po, BindingResult bindingResult) {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- po.id = null;
- int count;
+ po.userId = null;
+ Long userId;
try {
po.supperAdmin = Constant.no.byteValue() ;
po.disabled = Disabled.NO;//榛樿涓嶇鐢�
@@ -157,13 +165,13 @@
} else {
po.password = MD5.encrypt(defaultPassword);
}
- count = this.sv.save(po);
- this.sv.setRoles(po.id, po.roleIds);
+ userId = this.sv.save(po);
+ this.sv.setRoles(userId, po.roleIds);
} catch (Exception e) {
log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
- if (count <= 0) {
+ if (userId <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
return BaseResponseUtils.buildSuccess(true);
@@ -187,11 +195,11 @@
})
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop()
- public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaUser po, @Parameter(hidden = true) BindingResult bindingResult) {
+ public BaseResponse<Boolean> update(@RequestBody @Valid BaUser po, BindingResult bindingResult) {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- if (po.id == null) {
+ if (po.userId == null) {
return BaseResponseUtils.buildFail("鏃犳暟鎹疄浣揑D");
}
int count;
@@ -200,7 +208,7 @@
po.deleted = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
po.orgTag = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
count = this.sv.update(po);
- this.sv.setRoles(po.id, po.roleIds);
+ this.sv.setRoles(po.userId, po.roleIds);
} catch (Exception e) {
log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
@@ -228,11 +236,10 @@
schema = @Schema(implementation = Boolean.class))}
)
})
- @GetMapping(path = "changePassword", consumes = MediaType.TEXT_PLAIN_VALUE)
+ //@GetMapping(path = "changePassword", consumes = MediaType.TEXT_PLAIN_VALUE)
+ @GetMapping(path = "changePassword")
@SsoAop()
- public BaseResponse<Boolean> changePassword(@Parameter(description = "瀹炰綋id", required = true) String id,
- @Parameter(description = "鏃у瘑鐮�", required = true) String oldPassword,
- @Parameter(description = "鏂板瘑鐮�", required = true) String newPassword) throws Exception {
+ public BaseResponse<Boolean> changePassword(String id, String oldPassword, String newPassword) throws Exception {
if (id == null) {
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
}
@@ -290,7 +297,7 @@
})
@PostMapping(path = "resetPassword", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop()
- public BaseResponse<Boolean> resetPassword(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) ResetPasswordVo vo) throws Exception {
+ public BaseResponse<Boolean> resetPassword(@RequestBody ResetPasswordVo vo) throws Exception {
if (vo.id == null) {
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
}
@@ -332,7 +339,7 @@
})
@GetMapping(path = "resetPasswordByDefault", consumes = MediaType.TEXT_PLAIN_VALUE)
@SsoAop()
- public BaseResponse<Boolean> resetPasswordByDefault(@Parameter(description = "瀹炰綋id", required = true) String id) throws Exception {
+ public BaseResponse<Boolean> resetPasswordByDefault(String id) throws Exception {
if (id == null) {
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
}
@@ -375,7 +382,7 @@
})
@GetMapping(path = "resetPasswordByRandom", consumes = MediaType.TEXT_PLAIN_VALUE)
@SsoAop()
- public BaseResponse<String> resetPasswordByRandom(@Parameter(description = "瀹炰綋id", required = true) String id) throws Exception {
+ public BaseResponse<String> resetPasswordByRandom(String id) throws Exception {
if (id == null) {
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
}
@@ -420,7 +427,7 @@
})
@GetMapping(path = "setRoles", consumes = MediaType.TEXT_PLAIN_VALUE)
@SsoAop()
- public BaseResponse<Boolean> setRoles(@Parameter(description = "瀹炰綋id", required = true) String id,
+ public BaseResponse<Boolean> setRoles(String id,
@Parameter(description = "瑙掕壊id鏁扮粍") String[] roleIds) {
Long[] roleId_lg = null;
if (roleIds != null && roleIds.length > 0) {
@@ -455,9 +462,10 @@
schema = @Schema(implementation = Boolean.class))}
)
})
- @GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
+ //@GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
+ @GetMapping(path = "delete")
@SsoAop()
- public BaseResponse<Boolean> delete(@Parameter(description = "瀹炰綋id", required = true) String id) {
+ public BaseResponse<Boolean> delete(String id) {
if (id == null) {
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
}
@@ -469,7 +477,7 @@
return BaseResponseUtils.buildException(e.getMessage());
}
if (count <= 0) {
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ return BaseResponseUtils.buildFail(SystemResultCode.USER_NOT_EXIST.getMessage());
} else {
return BaseResponseUtils.buildSuccess(true);
}
@@ -490,10 +498,13 @@
)
})
@GetMapping("/getUserInfos/{userId}")
- @SsoAop("-1")
- public BaseResponse<QueryResultVo<List<VoUserInfo>>> getUserInfos(@PathVariable("userId") Long userId) {
+ @SsoAop()
+ public BaseResponse<QueryResultVo<VoUserInfo>> getUserInfos(@PathVariable("userId") Long userId) {
try {
- List<VoUserInfo> res = this.sv.getUserInfos(userId);
+ VoUserInfo res = this.sv.getUserInfos(userId);
+ if(res == null) {
+ return BaseResponseUtils.buildException(SystemResultCode.THE_USER_NOT_EXIST.getMessage());
+ }
System.out.println(" :" + res);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
--
Gitblit v1.8.0