From 040d2e6579bceff1b7cb54b2d06a9e9c958618d8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 26 十二月 2024 15:46:45 +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 | 22 +++++++++++-----------
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/ChangePasswordVo.java | 23 +++++++++++++++++++++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml | 7 ++++++-
3 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml
index c7f927a..44bb383 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml
@@ -119,7 +119,7 @@
oi.start_time AS startTime,
oi.stop_time AS stopTime
FROM `ope_inspect` oi
- INNER JOIN `ba_user` ON oi.inspector_id = ba_user.id
+ INNER JOIN `ba_user` ON oi.inspector_id = ba_user.id
<where>
ba_user.deleted = 0
<if test="inspectorId != null">
@@ -135,5 +135,10 @@
AND oi.start_time BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
</select>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/ChangePasswordVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/ChangePasswordVo.java
new file mode 100644
index 0000000..a0c5e3e
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/ChangePasswordVo.java
@@ -0,0 +1,23 @@
+package com.dy.pipIrrBase.user;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.dy.common.po.BaseEntity;
+import lombok.*;
+
+/**
+ * @author :WuZeYu
+ * @Date :2024/12/24 14:41
+ * @LastEditTime :2024/12/24 14:41
+ * @Description
+ */
+@Data
+public class ChangePasswordVo implements BaseEntity {
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public String id;
+
+ public String oldPassword;
+
+ public String newPassword;
+}
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 90fbbba..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
@@ -227,7 +227,7 @@
/**
* 淇敼瀵嗙爜
*
- * @param id 鐢ㄦ埛ID
+ * @param vo
* @return 鏄惁鎴愬姛
*/
@Operation(summary = "淇敼瀵嗙爜", description = "鎻愪氦鐢ㄦ埛ID銆佹棫瀵嗙爜銆佹柊瀵嗙爜锛岃繘琛屾敼瀵嗙爜")
@@ -240,16 +240,16 @@
)
})
//@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) {
+ public BaseResponse<Boolean> changePassword(@RequestBody ChangePasswordVo vo) throws Exception {
+ if (vo.id == null) {
return BaseResponseUtils.buildErrorMsg("id涓嶈兘涓虹┖");
}
- if (StringUtils.isNullOrEmpty(oldPassword)) {
+ if (StringUtils.isNullOrEmpty(vo.oldPassword)) {
return BaseResponseUtils.buildErrorMsg("鏃у瘑鐮佷笉鑳戒负绌�");
}
- if (StringUtils.isNullOrEmpty(newPassword)) {
+ if (StringUtils.isNullOrEmpty(vo.newPassword)) {
return BaseResponseUtils.buildErrorMsg("鏂板瘑鐮佷笉鑳戒负绌�");
}
/*
@@ -257,20 +257,20 @@
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.buildErrorMsg("鏈緱鍒扮敤鎴凤紝璇锋眰澶辫触");
} else {
- if (!po.password.equalsIgnoreCase(oldPassword)) {
+ 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) {
--
Gitblit v1.8.0