From cac5a8bd1746e30e8506a729aecb8feed6f0698a Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 04 七月 2024 17:22:08 +0800
Subject: [PATCH] user模块 重构重置密码接口

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java |   18 +++++++++---------
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java       |    3 +++
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml                 |    2 +-
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml                      |    8 ++++++++
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java   |    2 +-
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java
index 061e395..0721be2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dy.pipIrrGlobal.pojoBa.BaUser;
+import com.dy.pipIrrGlobal.pojoPr.PrController;
 import com.dy.pipIrrGlobal.voBa.VoUserInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -12,6 +13,8 @@
 @Mapper
 public interface BaUserMapper extends BaseMapper<BaUser> {
 
+    BaUser selectByPrimaryKey(Long id);
+
     /**
      * 鐢ㄦ埛鐧诲綍
      * @param phone 鎵嬫満鍙�
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
index c8facfc..a07541e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -343,4 +343,12 @@
         WHERE userId = ${userId}
 
     </select>
+
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        <!--@mbg.generated-->
+        select
+        <include refid="Base_Column_List" />
+        from ba_user
+        where id = #{id,jdbcType=BIGINT}
+    </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/UserCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
index 92af42e..355834b 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
@@ -43,7 +43,7 @@
     @Value("${user.defaultTrueRandomFalsePassword:true}")
     private Boolean defaultTrueRandomFalsePassword;
 
-    @Value("${user.defaultPassword:ABC123}")
+    @Value("${user.defaultPassword:abc_123}")
     private String defaultPassword;
 
     @Autowired
@@ -285,7 +285,7 @@
 
     /**
      * 閲嶇疆瀵嗙爜
-     * @param vo form琛ㄥ崟瀵硅薄
+     * @param
      * @return 鏄惁鎴愬姛
      */
     @Operation(summary = "閲嶇疆瀵嗙爜", description = "鎻愪氦鏁版嵁锛坒orm琛ㄥ崟json鏁版嵁锛夛紝杩涜瀵嗙爜閲嶇疆")
@@ -297,21 +297,21 @@
                             schema = @Schema(implementation = Boolean.class))}
             )
     })
-    @PostMapping(path = "resetPassword", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(path = "resetPassword")
     @SsoAop()
-    public BaseResponse<Boolean> resetPassword(@RequestBody  ResetPasswordVo vo) throws Exception {
-        if (vo.id == null) {
+    public BaseResponse<Boolean> resetPassword(String id) throws Exception {
+        if (id == null || id == "") {
             return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
         }
-        String password = MD5.encrypt(vo.password);//杩涜鍔犲瘑鐮�
-        Long idLg = Long.parseLong(vo.id);
+        Long idLg = Long.parseLong(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);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
index 064851b..c11a566 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
@@ -50,7 +50,7 @@
      * @return 鐢ㄦ埛瀹炰綋
      */
     public BaUser selectById(Long id) {
-        return this.dao.selectById(id);
+        return this.dao.selectByPrimaryKey(id);
     }
 
     /**
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
index 28a280a..973e64a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
@@ -3,7 +3,7 @@
         include: global, database, database-ym, database-pj
 user:
     defaultTrueRandomFalsePassword: true #true:閲囩敤榛樿瀵嗙爜锛宖alse:绯荤粺浜х敓闅忔満瀵嗙爜
-    defaultPassword: "ABC123"
+    defaultPassword: "abc_123"
 
 #actutor鐨剋eb绔彛
 management:

--
Gitblit v1.8.0