fix 可重复看护

nb-service/app-assistant/pom.xml

@@ -13,6 +13,10 @@
 
 
     <dependencies>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.tuoren</groupId>
             <artifactId>app-msg-api</artifactId>

nb-service/app-assistant/src/main/java/com/nb/app/assistant/auth/AssistantPhoneGranter.java

@@ -70,7 +70,7 @@ public class AssistantPhoneGranter implements IAuthGranter {
             user.setId(IdWorker.getIdStr());
             user.setPhone(source.getUsername());
             user.setNickname(source.getUsername());
-            user.setPassword(SecurityUtil.encryptPassword("123456"));
+            user.setPassword(SecurityUtil.encryptPassword("A123456"));
             assistantUserService.save(user);
         }
         log.info("登录用户：{}", source.getUsername());

nb-service/app-assistant/src/main/java/com/nb/app/assistant/controller/PatientOperationController.java

@@ -2,6 +2,8 @@ package com.nb.app.assistant.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.druid.sql.visitor.functions.Bin;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.nb.app.assistant.api.enums.ApplyEnum;
 import com.nb.app.assistant.controller.vo.InviteCodePatientVo;
@@ -12,6 +14,8 @@ import com.nb.app.assistant.service.LocalAssistantUserBindService;
 import com.nb.app.assistant.service.dto.AssistPatientResult;
 import com.nb.app.assistant.service.dto.EditAssistBindDto;
 import com.nb.auth.utils.SecurityUtil;
+import com.nb.core.annotation.Log;
+import com.nb.core.enums.UserPlatformEnum;
 import com.nb.core.exception.CustomException;
 import com.nb.core.result.R;
 import com.nb.web.api.feign.IPatientClient;
@@ -113,8 +117,10 @@ public class PatientOperationController {
      * @return R
      */
     @PostMapping("/save")
+    @Log(title = "发起看护人申请",userPlatform = UserPlatformEnum.APP_ASSIST)
     @ApiOperation(value = "发起添加看护人申请")
     public R<Boolean> saveMonitor(@RequestBody MonitorAddVo vo){
+        log.info("发起看护申请{}", JSONUtil.toJsonStr(vo));
         if(ApplyEnum.INVITE_CODE.equals(vo.getApplyType())&& StrUtil.isEmpty(vo.getInviteCode())){
             throw new CustomException("邀请码不能为空");
         }
@@ -127,7 +133,7 @@ public class PatientOperationController {
         if(vo.getManageType()==null){
             vo.setManageType(patientClient.getManageType(vo.getPatientId()));
         }
-        judgePatient(vo.getPatientId());
+        judgePatient(vo.getPatientId(),String.valueOf(SecurityUtil.getId()));
         judgeUser();
         AssistantUserBindEntity resource = BeanUtil.copyProperties(vo, AssistantUserBindEntity.class);
         return R.success(userBindService.save(resource));
@@ -140,7 +146,7 @@ public class PatientOperationController {
         if(inviteCodeResult.getResult()==null){
             throw new CustomException("系统繁忙,请稍后重试");
         }
-        judgePatient(inviteCodeResult.getResult().getPatientId());
+//        judgePatient(inviteCodeResult.getResult().getPatientId());
         judgeUser();
         InviteCodePatientVo result = BeanUtil.copyProperties(inviteCodeResult.getResult(), InviteCodePatientVo.class);
         result.setTenantId(inviteCodeResult.getTenantId());
@@ -197,17 +203,19 @@ public class PatientOperationController {
      * @author lifang
      * @date 2022/8/12 14:45
      * @param patientId
+     * @param
      * @return void
      */
-    private void judgePatient(String patientId){
+    private void judgePatient(String patientId, String assistId){
         AssistantUserBindEntity userBind = userBindService.getOne(new QueryWrapper<AssistantUserBindEntity>()
                 .lambda()
-                .eq(AssistantUserBindEntity::getStatus, BindEnum.SUCCESS)
+                .eq(AssistantUserBindEntity::getAssistId,assistId)
+                .in(AssistantUserBindEntity::getStatus, BindEnum.WAITING, BindEnum.SUCCESS)
                 .eq(AssistantUserBindEntity::getPatientId, patientId)
         );
 
         if(userBind!=null){
-            throw new CustomException("该病号已被他人监护");
+            throw new CustomException("您已对该病号发起看护请求,请勿重复操作");
         }
     }
 

nb-service/app-assistant/src/main/java/com/nb/app/assistant/sms/AliSmsClientConfig.java

@@ -0,0 +1,19 @@
+//package com.nb.app.assistant.sms;
+//
+//import org.springframework.context.annotation.Configuration;
+//
+///**
+// * @author lifang
+// * @version 1.0.0
+// * @ClassName AliSmsClientConfig.java
+// * @Description TODO
+// * @createTime 2022年10月12日 10:52:00
+// */
+//@Configuration
+//public class AliSmsClientConfig {
+//    public static IAcsClient createClient(String accessKeyId, String accessKeySecret) throws Exception {
+//        DefaultProfile profile = DefaultProfile.getProfile("cn-shanghai", "<your-access-key-id>", "<your-access-key-secret>");
+//        IAcsClient client = new DefaultAcsClient(profile);
+//        return client;
+//    }
+//}

pom.xml

@@ -43,6 +43,7 @@
         <aliyun.iot.verison>7.31.0</aliyun.iot.verison>
         <aliyun.sdk.verison>4.5.6</aliyun.sdk.verison>
         <jms.verison>0.56.0</jms.verison>
+        <aliyun.sms.version>2.2.1</aliyun.sms.version>
     </properties>
 
     <modules>
@@ -71,6 +72,11 @@
     <!-- 依赖管理 -->
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.aliyun</groupId>
+                <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+                <version>${aliyun.sms.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.tuoren</groupId>
                 <artifactId>nb-im</artifactId>