From 9f3c4a33279f10ed420d604765487558ab0744f0 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 11 四月 2025 11:42:21 +0800
Subject: [PATCH] 获取已完成灌溉计划接口增加分页功能
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java | 50 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 33 insertions(+), 17 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 dba3c5e..34149e8 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;
@@ -226,7 +227,7 @@
/**
* 淇敼瀵嗙爜
*
- * @param id 鐢ㄦ埛ID
+ * @param vo
* @return 鏄惁鎴愬姛
*/
@Operation(summary = "淇敼瀵嗙爜", description = "鎻愪氦鐢ㄦ埛ID銆佹棫瀵嗙爜銆佹柊瀵嗙爜锛岃繘琛屾敼瀵嗙爜")
@@ -239,37 +240,37 @@
)
})
//@GetMapping(path = "changePassword", consumes = MediaType.TEXT_PLAIN_VALUE)
- @GetMapping(path = "changePassword")
+ @PostMapping(path = "changePassword")
@SsoAop()
- public BaseResponse<Boolean> changePassword(String id, String oldPassword, String newPassword) throws Exception {
- if (id == null) {
- return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
+ 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) {
@@ -277,7 +278,7 @@
return BaseResponseUtils.buildException(e.getMessage());
}
if (count <= 0) {
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ return BaseResponseUtils.buildErrorMsg("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
return BaseResponseUtils.buildSuccess(true);
}
@@ -514,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