feat:

1、实现风险推送数据管理

app/src/main/java/com/yiring/app/domain/broadcast/BroadcastAudio.java

@@ -10,6 +10,7 @@ import javax.persistence.Table;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
+import lombok.experimental.SuperBuilder;
 import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.CreationTimestamp;
 
@@ -23,7 +24,7 @@ import org.hibernate.annotations.CreationTimestamp;
 @Getter
 @Setter
 @ToString
-@Builder
+@SuperBuilder(toBuilder = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @FieldNameConstants

app/src/main/java/com/yiring/app/domain/key/KeyAlarm.java

@@ -13,6 +13,7 @@ import javax.persistence.*;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
+import lombok.experimental.SuperBuilder;
 import org.hibernate.annotations.Comment;
 import org.locationtech.jts.geom.Point;
 
@@ -26,7 +27,7 @@ import org.locationtech.jts.geom.Point;
 @Getter
 @Setter
 @ToString
-@Builder
+@SuperBuilder(toBuilder = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @FieldNameConstants

app/src/main/java/com/yiring/app/domain/key/KeyAlarmLog.java

@@ -13,6 +13,7 @@ import javax.persistence.Table;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
+import lombok.experimental.SuperBuilder;
 import org.hibernate.annotations.Comment;
 
 /**
@@ -25,7 +26,7 @@ import org.hibernate.annotations.Comment;
 @Getter
 @Setter
 @ToString
-@Builder
+@SuperBuilder(toBuilder = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @FieldNameConstants

app/src/main/java/com/yiring/app/domain/key/KeyAlarmRule.java

@@ -13,6 +13,7 @@ import javax.persistence.*;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
+import lombok.experimental.SuperBuilder;
 import org.hibernate.annotations.Comment;
 
 /**
@@ -25,7 +26,7 @@ import org.hibernate.annotations.Comment;
 @Getter
 @Setter
 @ToString
-@Builder
+@SuperBuilder(toBuilder = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @FieldNameConstants

basic-auth/src/main/java/com/yiring/auth/service/MessageService.java

@@ -99,4 +99,12 @@ public class MessageService {
             return Result.no(Status.INTERNAL_SERVER_ERROR);
         }
     }
+
+    /**
+     * 销毁验证码
+     * @param phone String
+     */
+    public void deleteCode(String phone) {
+        redisTemplate.delete(phone);
+    }
 }

basic-auth/src/main/java/com/yiring/auth/service/user/impl/UserServiceImpl.java

@@ -230,20 +230,20 @@ public class UserServiceImpl implements UserService {
             return Result.no(Status.BAD_REQUEST, "原密码与新密码相同");
         }
 
-        Optional<User> userOptional = userRepository.findById(idParam);
+        Optional<User> userOptional = userRepository.findById(idParam.getId());
         if (userOptional.isEmpty()) {
             return Result.no(Status.BAD_REQUEST, "用户信息不存在");
         }
 
         User user = userOptional.get();
-        String pwd = SaSecureUtil.sha256(param.getConfirmPwd());
+        String pwd = SaSecureUtil.sha256(param.getOldPassword());
         if (!StrUtil.equals(pwd, user.getPassword())) {
             return Result.no(Status.BAD_REQUEST, "原密码输入错误");
         }
 
-        user.setPassword(pwd);
+        user.setPassword(SaSecureUtil.sha256(param.getConfirmPwd()));
         userRepository.save(user);
-
+        StpUtil.logout(idParam.getId());
         return Result.ok();
     }
 
@@ -257,7 +257,7 @@ public class UserServiceImpl implements UserService {
             return Result.no(Status.BAD_REQUEST, "验证码输入错误");
         }
 
-        Optional<User> userOptional = userRepository.findById(idParam);
+        Optional<User> userOptional = userRepository.findById(idParam.getId());
         if (userOptional.isEmpty()) {
             return Result.no(Status.BAD_REQUEST, "用户信息不存在");
         }
@@ -265,13 +265,13 @@ public class UserServiceImpl implements UserService {
         User user = userOptional.get();
         user.setMobile(param.getMobile());
         userRepository.save(user);
-
+        messageService.deleteCode(param.getType() + param.getMobile());
         return Result.ok();
     }
 
     @Override
     public Result<String> sendCode(UserPhoneParam param) {
-        if (!StrUtil.equals(param.getCode(), "phone") || !StrUtil.equals(param.getCode(), "pwd")) {
+        if (!StrUtil.equals(param.getType(), "phone") && !StrUtil.equals(param.getType(), "pwd")) {
             return Result.no(Status.BAD_REQUEST);
         }
         return messageService.sendSmsCode(param.getType() + param.getMobile());
@@ -301,6 +301,7 @@ public class UserServiceImpl implements UserService {
 
         User user = userOptional.get();
         user.setPassword(SaSecureUtil.sha256(userPwdParam.getConfirmPwd()));
+        messageService.deleteCode(userPhoneParam.getType() + userPhoneParam.getMobile());
         return Result.ok();
     }
 }