From 00d54db361d697cf8fdf2f15940f4650b21b3185 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 21 四月 2025 15:05:35 +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/user/UserCtrl.java | 147 +++++++++++++++++++++++++++++-------------------
1 files changed, 88 insertions(+), 59 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 ffe2d73..6a76675 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,13 @@
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.VoSimpleUser;
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;
@@ -43,7 +44,7 @@
@Value("${user.defaultTrueRandomFalsePassword:true}")
private Boolean defaultTrueRandomFalsePassword;
- @Value("${user.defaultPassword:ABC123}")
+ @Value("${user.defaultPassword:abc_123}")
private String defaultPassword;
@Autowired
@@ -88,12 +89,19 @@
schema = @Schema(implementation = BaUser.class))}
)
})
- @PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")
- public BaseResponse<QueryResultVo<List<BaUser>>> some(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) @Valid QueryVo vo) {
+ @GetMapping(path = "some")
+ //@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @SsoAop()
+ 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.buildSuccess(SystemResultCode.THE_USER_NOT_EXIST.getMessage());
+// }else {
+ return BaseResponseUtils.buildSuccess(res);
+// }
+
+
} catch (Exception e) {
log.error("鏌ヨ鐢ㄦ埛寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
@@ -114,9 +122,10 @@
schema = @Schema(implementation = BaUser.class))}
)
})
- @GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")
- public BaseResponse<BaUser> one(@Parameter(description = "瀹炰綋id", required = true) String id) {
+ //@GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
+ @GetMapping(path = "one")
+ @SsoAop()
+ public BaseResponse<BaUser> one(String id) {
return BaseResponseUtils.buildSuccess(this.sv.selectById(Long.parseLong(id)));
}
@@ -136,13 +145,13 @@
)
})
@PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> save(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaUser po, @Parameter(hidden = true) BindingResult bindingResult) {
+ @SsoAop()
+ 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;
+ Long userId;
try {
po.supperAdmin = Constant.no.byteValue() ;
po.disabled = Disabled.NO;//榛樿涓嶇鐢�
@@ -157,13 +166,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);
@@ -186,8 +195,8 @@
)
})
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaUser po, @Parameter(hidden = true) BindingResult bindingResult) {
+ @SsoAop()
+ public BaseResponse<Boolean> update(@RequestBody @Valid BaUser po, BindingResult bindingResult) {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
@@ -199,6 +208,8 @@
po.supperAdmin = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
po.deleted = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
po.orgTag = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
+// 淇敼鐢ㄦ埛淇℃伅涓嶈繘琛屽瘑鐮佷慨鏀�
+// po.password = MD5.encrypt(po.password);//杩涜鍔犲瘑
count = this.sv.update(po);
this.sv.setRoles(po.id, po.roleIds);
} catch (Exception e) {
@@ -216,7 +227,7 @@
/**
* 淇敼瀵嗙爜
*
- * @param id 鐢ㄦ埛ID
+ * @param vo
* @return 鏄惁鎴愬姛
*/
@Operation(summary = "淇敼瀵嗙爜", description = "鎻愪氦鐢ㄦ埛ID銆佹棫瀵嗙爜銆佹柊瀵嗙爜锛岃繘琛屾敼瀵嗙爜")
@@ -228,39 +239,38 @@
schema = @Schema(implementation = Boolean.class))}
)
})
- @GetMapping(path = "changePassword", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
- 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 {
- if (id == null) {
- return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
+ //@GetMapping(path = "changePassword", consumes = MediaType.TEXT_PLAIN_VALUE)
+ @PostMapping(path = "changePassword")
+ @SsoAop()
+ public BaseResponse<Boolean> changePassword(@RequestBody ChangePasswordVo vo) throws Exception {
+ if (vo.id == null) {
+ return BaseResponseUtils.buildErrorMsg("id涓嶈兘涓虹┖");
}
- if (StringUtils.isNullOrEmpty(oldPassword)) {
- return BaseResponseUtils.buildFail("鏃у瘑鐮佷笉鑳戒负绌�");
+ if (StringUtils.isNullOrEmpty(vo.oldPassword)) {
+ return BaseResponseUtils.buildErrorMsg("鏃у瘑鐮佷笉鑳戒负绌�");
}
- if (StringUtils.isNullOrEmpty(newPassword)) {
- return BaseResponseUtils.buildFail("鏂板瘑鐮佷笉鑳戒负绌�");
+ if (StringUtils.isNullOrEmpty(vo.newPassword)) {
+ return BaseResponseUtils.buildErrorMsg("鏂板瘑鐮佷笉鑳戒负绌�");
}
/*
濡傛灉鍓嶇杩涜浜哹ase64鍔犲瘑
oldPassword = new String(Base64.getDecoder().decode(oldPassword)) ;
newPassword = new String(Base64.getDecoder().decode(newPassword)) ;
*/
- oldPassword = MD5.encrypt(oldPassword);//杩涜鍔犲瘑鐮�
- newPassword = MD5.encrypt(newPassword);//杩涜鍔犲瘑鐮�
+ vo.oldPassword = MD5.encrypt(vo.oldPassword);//杩涜鍔犲瘑鐮�
+ vo.newPassword = MD5.encrypt(vo.newPassword);//杩涜鍔犲瘑鐮�
- Long idLg = Long.parseLong(id);
+ Long idLg = Long.parseLong(vo.id);
int count;
try {
BaUser po = this.sv.selectById(idLg);
if (Objects.isNull(po)) {
- return BaseResponseUtils.buildFail("鏈緱鍒扮敤鎴凤紝璇锋眰澶辫触");
+ return BaseResponseUtils.buildErrorMsg("鏈緱鍒扮敤鎴凤紝璇锋眰澶辫触");
} else {
- if (!po.password.equalsIgnoreCase(oldPassword)) {
- return BaseResponseUtils.buildFail("鏃у瘑鐮佷笉姝ｇ‘锛岃姹傚け璐�");
+ if (!po.password.equalsIgnoreCase(vo.oldPassword)) {
+ return BaseResponseUtils.buildErrorMsg("鏃у瘑鐮佷笉姝ｇ‘锛岃姹傚け璐�");
} else {
- count = this.sv.changePassword(idLg, newPassword);
+ count = this.sv.changePassword(idLg, vo.newPassword);
}
}
} catch (Exception e) {
@@ -268,7 +278,7 @@
return BaseResponseUtils.buildException(e.getMessage());
}
if (count <= 0) {
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ return BaseResponseUtils.buildErrorMsg("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
return BaseResponseUtils.buildSuccess(true);
}
@@ -276,7 +286,7 @@
/**
* 閲嶇疆瀵嗙爜
- * @param vo form琛ㄥ崟瀵硅薄
+ * @param
* @return 鏄惁鎴愬姛
*/
@Operation(summary = "閲嶇疆瀵嗙爜", description = "鎻愪氦鏁版嵁锛坒orm琛ㄥ崟json鏁版嵁锛夛紝杩涜瀵嗙爜閲嶇疆")
@@ -289,20 +299,20 @@
)
})
@PostMapping(path = "resetPassword", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> resetPassword(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) ResetPasswordVo vo) throws Exception {
- if (vo.id == null) {
+ @SsoAop()
+ public BaseResponse<Boolean> resetPassword(@RequestBody ResetPasswordVo vo) throws Exception {
+ if (vo.id == null || vo.id == "") {
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
}
- String password = MD5.encrypt(vo.password);//杩涜鍔犲瘑鐮�
Long idLg = Long.parseLong(vo.id);
int count;
try {
BaUser po = this.sv.selectById(idLg);
if (Objects.isNull(po)) {
return BaseResponseUtils.buildFail("鏈緱鍒扮敤鎴凤紝璇锋眰澶辫触");
- } else {
- count = this.sv.changePassword(idLg, password);
+ }else {
+ String defaultPassword1 = MD5.encrypt(defaultPassword);//杩涜鍔犲瘑鐮�
+ count = this.sv.changePassword(idLg, defaultPassword1);
}
} catch (Exception e) {
log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
@@ -331,8 +341,8 @@
)
})
@GetMapping(path = "resetPasswordByDefault", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> resetPasswordByDefault(@Parameter(description = "瀹炰綋id", required = true) String id) throws Exception {
+ @SsoAop()
+ public BaseResponse<Boolean> resetPasswordByDefault(String id) throws Exception {
if (id == null) {
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
}
@@ -374,8 +384,8 @@
)
})
@GetMapping(path = "resetPasswordByRandom", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<String> resetPasswordByRandom(@Parameter(description = "瀹炰綋id", required = true) String id) throws Exception {
+ @SsoAop()
+ public BaseResponse<String> resetPasswordByRandom(String id) throws Exception {
if (id == null) {
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
}
@@ -419,8 +429,8 @@
)
})
@GetMapping(path = "setRoles", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> setRoles(@Parameter(description = "瀹炰綋id", required = true) String id,
+ @SsoAop()
+ public BaseResponse<Boolean> setRoles(String id,
@Parameter(description = "瑙掕壊id鏁扮粍") String[] roleIds) {
Long[] roleId_lg = null;
if (roleIds != null && roleIds.length > 0) {
@@ -455,9 +465,10 @@
schema = @Schema(implementation = Boolean.class))}
)
})
- @GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> delete(@Parameter(description = "瀹炰綋id", required = true) String id) {
+ //@GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
+ @GetMapping(path = "delete")
+ @SsoAop()
+ public BaseResponse<Boolean> delete(String id) {
if (id == null) {
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
}
@@ -469,7 +480,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,15 +501,33 @@
)
})
@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);
- System.out.println(" :" + res);
+ 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) {
log.error("鏌ヨ鐢ㄦ埛淇℃伅寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
}
+
+ /**
+ * 鑾峰彇绠�鍗曠敤鎴锋暟鎹垪琛紝鏁版嵁鍒楄〃鏌ヨ鏉′欢涓娇鐢�
+ * @return
+ */
+ @GetMapping(path = "simple_users")
+ @SsoAop()
+ public BaseResponse<List<VoSimpleUser>> getSimpleUsers(){
+ try {
+ return BaseResponseUtils.buildSuccess(sv.getSimpleUsers());
+ } catch (Exception e) {
+ log.error("鏌ヨ绠�鍗曠敤鎴蜂俊鎭紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0