fix: APP登录、注册、添加就诊人验证短信验证码拆成一个单独的接口

eitc-patient-app/src/main/java/com/eitc/patient/controller/AppLoginController.java

@@ -94,6 +94,13 @@ public class AppLoginController extends BaseController {
         return appUserService.sendCaptchaCode(phoneNumber);
     }
 
+    @PostMapping("/checkCaptchaCode")
+    @ApiOperation("验证短信验证码")
+    public AjaxResult checkCaptchaCode(String phoneNumber, String captchaCode) {
+        appUserService.checkCaptchaCode(phoneNumber, captchaCode);
+        return success();
+    }
+
     /**
      * 退出登录
      *

eitc-patient-base/src/main/java/com/eitc/patient/domain/NoticeManage.java

@@ -37,13 +37,13 @@ public class NoticeManage extends EitcBaseEntity {
 
     @TableField(value = "notice_start_time")
     @ApiModelProperty(value = "公告开始时间", name = "noticeStartTime")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @NotNull(message = "公告开始时间不能为空")
     private Date noticeStartTime;
 
     @TableField(value = "notice_end_time")
     @ApiModelProperty(value = "公告结束时间", name = "noticeEndTime")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @NotNull(message = "公告结束时间不能为空")
     private Date noticeEndTime;
 

eitc-patient-base/src/main/java/com/eitc/patient/mapper/AppUserMapper.java

@@ -15,8 +15,13 @@ import org.apache.ibatis.annotations.Update;
 @Mapper
 public interface AppUserMapper extends BaseMapper<AppUser> {
 
-
-
+    /**
+     * 回复删除数据
+     *
+     * @param id id
+     * @author mtx
+     * @date: 2024/6/13 10:33
+     */
     int updateRevert(@Param("id") String id);
 
 }

eitc-patient-base/src/main/java/com/eitc/patient/service/IAppUserService.java

@@ -107,6 +107,14 @@ public interface IAppUserService extends IService<AppUser> {
     AjaxResult synchronizeData(AppUser beforeAppUser);
 
     /**
+     * 验证短信验证码时候正确
+     *
+     * @param phoneNumber 手机号
+     * @param captchaCode 录入的验证码
+     */
+    void checkCaptchaCode(String phoneNumber, String captchaCode);
+
+    /**
      * 退出登录
      */
     void logout();

eitc-patient-base/src/main/java/com/eitc/patient/service/impl/AppUserServiceImpl.java

@@ -10,7 +10,6 @@ import com.eitc.common.core.redis.RedisCache;
 import com.eitc.common.utils.JWTUtil;
 import com.eitc.common.utils.PatientBaseUtil;
 import com.eitc.common.utils.SecurityUtils;
-import com.eitc.system.utils.SendSmsUtil;
 import com.eitc.patient.constant.PatientConstant;
 import com.eitc.patient.domain.AppUser;
 import com.eitc.patient.domain.AppUserPatients;
@@ -158,11 +157,6 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
                 throw new RuntimeException("用户不存在或密码错误");
             }
         } else if (String.valueOf(AppUserLoginTypeEnum.CAPTCHA.getCode()).equals(loginType)) {
-            // 手机验证码登录
-            String captchaCode = map.get("captchaCode");
-            if (checkCaptchaCode(phoneNumber, captchaCode)) {
-                throw new RuntimeException("验证码错误");
-            }
             AppUser user = getAppUserByPhoneNumber(phoneNumber);
             if (Objects.isNull(user)) {
                 throw new RuntimeException(phoneNumber + "用户不存在");
@@ -204,11 +198,6 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
                 throw new RuntimeException(phoneNumber + "用户不存在或密码错误");
             }
         } else if (String.valueOf(AppUserLoginTypeEnum.CAPTCHA.getCode()).equals(loginType)) {
-            // 手机验证码登录
-            String captchaCode = map.get("captchaCode");
-            if (checkCaptchaCode(phoneNumber, captchaCode)) {
-                throw new RuntimeException("验证码错误");
-            }
             SysUser sysUser = getPCUserByPhoneNumber(phoneNumber);
             if (Objects.isNull(sysUser)) {
                 throw new RuntimeException(phoneNumber + "用户不存在");
@@ -237,8 +226,6 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
         //生成JWt的令牌
         String token = JWTUtil.getToken(payload, secretKey);
         payload.put("token", token);
-        // 删除验证码
-        delCaptchaCode(appUser.getPhoneNumber());
         return payload;
     }
 
@@ -253,13 +240,10 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
         Map<String, String> payload = new HashMap<>();
         payload.put("id", userId);
         payload.put("phoneNumber", user.getPhonenumber());
-
         String secretKey = PatientBaseUtil.getSecretKey(userId);
         //生成JWt的令牌
         String token = JWTUtil.getToken(payload, secretKey);
         payload.put("token", token);
-        // 删除验证码
-        delCaptchaCode(user.getPhonenumber());
         return payload;
     }
 
@@ -325,9 +309,6 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
         if (Objects.isNull(appUser)) {
             return AjaxResult.error("用户不存在");
         }
-        if (checkCaptchaCode(phoneNumber, captchaCode)) {
-            return AjaxResult.error("验证码错误");
-        }
         if (!password.equals(confirmPassword)) {
             return AjaxResult.error("两次密码不一致");
         }
@@ -337,8 +318,6 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
                 .eq(AppUser::getId, appUser.getId())
                 .set(AppUser::getPassword, SecurityUtils.encryptPassword(password)));
 
-        // 删除验证码
-        delCaptchaCode(phoneNumber);
         return AjaxResult.success();
     }
 
@@ -366,9 +345,6 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
         if (StringUtils.isEmpty(captchaCode)) {
             return AjaxResult.error("验证码不能为空");
         }
-        if (checkCaptchaCode(phoneNumber, captchaCode)) {
-            return AjaxResult.error("验证码错误");
-        }
         // 注册过的手机号不允许绑定
         if (appUserService.count(Wrappers.<AppUser>lambdaQuery().eq(AppUser::getPhoneNumber, phoneNumber)) > 0) {
             return AjaxResult.error("您所设置的手机号已绑定");
@@ -390,8 +366,6 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
                 .eq(AppUser::getId, JWTUtil.getAppUserId())
                 .set(AppUser::getPhoneNumber, phoneNumber));
 
-        // 删除验证码
-        delCaptchaCode(phoneNumber);
         return AjaxResult.success();
     }
 
@@ -583,16 +557,10 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
     @Override
     public boolean register(Map<String, String> map) {
         String phoneNumber = map.get("phoneNumber");
-        if (checkCaptchaCode(phoneNumber, map.get("captchaCode"))) {
-            throw new IllegalArgumentException("验证码错误");
-        }
         if (Objects.nonNull(getAppUserByPhoneNumber(phoneNumber))) {
             throw new IllegalArgumentException("手机号已注册");
         }
 
-        // 删除验证码
-        delCaptchaCode(phoneNumber);
-
         // 添加用户
         AppUser appUser = new AppUser();
         appUser.setPhoneNumber(phoneNumber);
@@ -673,15 +641,27 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
      *
      * @param phoneNumber 手机号
      * @param captchaCode 录入的验证码
-     * @return 是否相同 已经取反
      */
-    public boolean checkCaptchaCode(String phoneNumber, String captchaCode) {
+    @Override
+    public void checkCaptchaCode(String phoneNumber, String captchaCode) {
+        if (StringUtils.isEmpty(phoneNumber)) {
+            throw new IllegalArgumentException("手机号不能为空");
+        }
+        if (StringUtils.isEmpty(captchaCode)) {
+            throw new IllegalArgumentException("验证码不能为空");
+        }
+
         String key = PatientConstant.ERM_APP_CAPTCHA_CODE + phoneNumber;
         if (redisCache.hasKey(key)) {
             int code = redisCache.getCacheObject(key);
-            return !String.valueOf(code).equals(captchaCode);
+            boolean b = String.valueOf(code).equals(captchaCode);
+            if (b) {
+                // 删除验证码
+                delCaptchaCode(phoneNumber);
+                return;
+            }
         }
-        return true;
+        throw new IllegalArgumentException("验证码错误");
     }
 
     /**

eitc-patient-pc/src/main/java/com/eitc/patient/controller/NoticeManageController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.eitc.common.annotation.Log;
 import com.eitc.common.core.controller.BaseController;
 import com.eitc.common.core.domain.AjaxResult;
+import com.eitc.common.core.page.TableDataInfo;
 import com.eitc.common.enums.BusinessType;
 import com.eitc.common.utils.StringUtils;
 import com.eitc.patient.domain.NoticeManage;
@@ -44,14 +45,14 @@ public class NoticeManageController extends BaseController {
      */
     @GetMapping("/list")
     @ApiOperation("查询公告管理")
-    public AjaxResult list(NoticeManage noticeManage) {
+    public TableDataInfo list(NoticeManage noticeManage) {
         startPage();
         LambdaQueryWrapper<NoticeManage> wrapper = Wrappers.<NoticeManage>lambdaQuery().orderByDesc(NoticeManage::getCreateDate)
                 .like(StringUtils.isNotBlank(noticeManage.getNoticeTitle()), NoticeManage::getNoticeTitle, noticeManage.getNoticeTitle())
                 .like(Objects.nonNull(noticeManage.getPublishStatus()), NoticeManage::getPublishStatus, noticeManage.getPublishStatus())
                 .like(Objects.nonNull(noticeManage.getDisplayStatus()), NoticeManage::getDisplayStatus, noticeManage.getDisplayStatus());
         List<NoticeManage> list = noticeManageService.list(wrapper);
-        return success(list);
+        return getDataTable(list);
     }
 
     /**