From e18c4a8ac170fea6e079047a27f72032c80eee67 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 30 九月 2024 14:12:18 +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 | 52 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 40 insertions(+), 12 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 2a1b61d..e8b00e6 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
@@ -12,6 +12,7 @@
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;
@@ -43,7 +44,7 @@
@Value("${user.defaultTrueRandomFalsePassword:true}")
private Boolean defaultTrueRandomFalsePassword;
- @Value("${user.defaultPassword:ABC123}")
+ @Value("${user.defaultPassword:abc_123}")
private String defaultPassword;
@Autowired
@@ -89,11 +90,18 @@
)
})
@GetMapping(path = "some")
+ //@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop()
public BaseResponse<QueryResultVo<List<VoUserInfo>>> some(QueryVo vo) {
try {
QueryResultVo<List<VoUserInfo>> res = this.sv.selectSome(vo);
- return BaseResponseUtils.buildSuccess(res);
+// 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());
@@ -143,7 +151,7 @@
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;//榛樿涓嶇鐢�
@@ -158,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);
@@ -200,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) {
@@ -276,7 +286,7 @@
/**
* 閲嶇疆瀵嗙爜
- * @param vo form琛ㄥ崟瀵硅薄
+ * @param
* @return 鏄惁鎴愬姛
*/
@Operation(summary = "閲嶇疆瀵嗙爜", description = "鎻愪氦鏁版嵁锛坒orm琛ㄥ崟json鏁版嵁锛夛紝杩涜瀵嗙爜閲嶇疆")
@@ -290,19 +300,19 @@
})
@PostMapping(path = "resetPassword", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop()
- public BaseResponse<Boolean> resetPassword(@RequestBody ResetPasswordVo vo) throws Exception {
- if (vo.id == null) {
+ 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);
@@ -495,6 +505,9 @@
public BaseResponse<QueryResultVo<VoUserInfo>> getUserInfos(@PathVariable("userId") Long userId) {
try {
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) {
@@ -502,4 +515,19 @@
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