add 疼痛小管家

nb-admin/pom.xml

@@ -12,6 +12,10 @@
     <artifactId>nb-admin</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.tuoren</groupId>
+            <artifactId>app-assistant</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.tuoren</groupId>

nb-admin/src/main/java/com/nb/admin/AdminApplication.java

@@ -25,7 +25,8 @@ import org.tio.websocket.starter.EnableTioWebSocketServer;
         "com.nb.web",
         "com.nb.auth",
         "com.nb.admin",
-        "com.nb.app",
+        "com.nb.app.doctor",
+        "com.nb.app.assistant",
         "springfox.documentation.schema"},
 exclude = {RedisAutoConfiguration.class,RedissonAutoConfiguration.class})
 @Import(cn.hutool.extra.spring.SpringUtil.class)

nb-auth/src/main/java/com/nb/auth/controller/vo/AccountInfoVO.java

@@ -1,5 +1,6 @@
 package com.nb.auth.controller.vo;
 
+import com.nb.core.enums.SexEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -28,7 +29,7 @@ public class AccountInfoVO<T> implements Serializable {
      * 姓名
      */
     @Size(max = 100, message = "姓名长度不能超过100个字符")
-    private String realname;
+    private String realName;
 
     /**
      * 英文名
@@ -52,7 +53,7 @@ public class AccountInfoVO<T> implements Serializable {
      * 性别 1男；2女；3未知
      */
     @NotBlank(message = "性别不能为空")
-    private String sex;
+    private SexEnum sex;
 
     /**
      * 备注

nb-auth/src/main/java/com/nb/auth/enums/GrantTypeEnum.java

@@ -32,7 +32,11 @@ public enum GrantTypeEnum{
     /**
      * appkey、appSecret模式
      */
-    APP_DOCTOR("4", "app医生登录"),;
+    APP_DOCTOR("4", "app医生登录"),
+
+    APP_ASSISTANT_PASSWORD("5","疼痛小管家账密登录"),
+
+    APP_ASSISTANT_ONECLICK("6","疼痛小管家一键登录");;
 
     private String code;
     private String desc;

nb-auth/src/main/java/com/nb/auth/granter/TokenParameter.java

@@ -14,20 +14,22 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class TokenParameter {
 
-    @ApiModelProperty("授权方式，1、web账密登录 2、手机短信登录 3、第三方应用登陆 4、app医生登录")
+    @ApiModelProperty(value = "授权方式 ",allowableValues = "1(web账密登录), 2 (手机短信登录),3(第三方应用登陆), 4(app医生登录), 5(疼痛小管家手机账密登录)6(疼痛小管家手机一键登录)")
     GrantTypeEnum grantType;
 
+    @ApiModelProperty("用户名 账密登录、app医生登录、疼痛小管家账密（此处用户名即为用户的手机号）登录时使用")
     String username;
 
+    @ApiModelProperty("密码  账密登录、app医生登录、疼痛小管家账密登录时使用")
     String password;
 
-    String mobile;
-
+    @ApiModelProperty("验证码，web账密登录时使用")
     String code;
 
+    @ApiModelProperty("验证码key，web账密登录时使用")
     String codeKey;
 
-    @ApiModelProperty("appkey 第三方应用登录时使用，换取token")
+    @ApiModelProperty("第三方应用登陆时使用")
     String appKey;
 
     @ApiModelProperty("第三方应用登录时使用时的签名")

nb-core/src/main/java/com/nb/core/enums/SexEnum.java

@@ -31,5 +31,4 @@ public enum SexEnum  implements IEnum<Integer> {
 
     private Integer value;
     private String text;
-
 }

nb-service-api/app-doctor-api/src/main/java/com/nb/app/doctor/api/entity/AppDoctorUserEntity.java

@@ -1,8 +1,6 @@
 package com.nb.app.doctor.api.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.nb.common.config.mybatisplus.TenantNameHandler;
 import com.nb.core.entity.TenantGenericEntity;
 import com.nb.core.enums.SexEnum;
@@ -22,48 +20,57 @@ import org.hibernate.validator.constraints.Length;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @TableName(value = "app_doctor_user",autoResultMap = true)
-@ApiModel(value="常量人员", description="包括：病区、手术、ASA、镇痛、麻醉、药品分类、医嘱")
+@ApiModel(value="app医生用户")
 @ToString
 @NoArgsConstructor
 public class AppDoctorUserEntity extends TenantGenericEntity<String,String> {
-    @ApiModelProperty(value = "用户名")
+    @ApiModelProperty(value = "用户名，用户名不得超过32个字节")
     @Length(max = 32,message = "用户名不得超过32个字节",groups = {Insert.class,Update.class})
     @TableField(updateStrategy = FieldStrategy.NEVER)
     private String username;
 
-    @ApiModelProperty(value = "密码")
+    @ApiModelProperty(value = "密码,密码不得超过32位")
     @Length(max = 32,message = "密码不得超过32位",groups = {Insert.class,Update.class})
     @TableField(updateStrategy = FieldStrategy.NEVER)
     private String password;
 
-    @ApiModelProperty(value = "性别")
+    @ApiModelProperty(value = "性别 1、男 2、女 3、未知",allowableValues = "1,2,3")
     private SexEnum sex;
 
-    @ApiModelProperty(value = "医生名称")
+    @ApiModelProperty(value = "医生名称，医生名称不得超过32个字节")
     @Length(max = 32,message = "医生名称不得超过32个字节",groups = {Insert.class,Update.class})
     private String realName;
 
-    @ApiModelProperty(value = "职位")
+    @ApiModelProperty(value = "职位，职位不得超过32个字节")
     @Length(max = 32,message = "职位不得超过32个字节",groups = {Insert.class,Update.class})
     private String post;
 
     @ApiModelProperty(value = "头像")
     private String avatar;
 
-    @ApiModelProperty(value = "个人简历")
+    @ApiModelProperty(value = "个人简历，个人简历不得超过255个字节")
     @Length(max = 32,message = "个人简历不得超过255个字节",groups = {Insert.class,Update.class})
     private String resume;
 
-    @ApiModelProperty(value = "状态")
+    @ApiModelProperty(value = "状态 0、正常 1、停用",allowableValues = "0,1")
     private StatusEnum status;
 
-    @ApiModelProperty(value = "专业擅长")
+    @ApiModelProperty(value = "专业擅长，专业擅长不得超过255个字节")
     @Length(max = 32,message = "专业擅长不得超过255个字节",groups = {Insert.class,Update.class})
     private String skilled;
 
+    @ApiModelProperty(value = "科室，科室不得超过64个字节")
+    @Length(max = 32,message = "科室不得超过64个字节",groups = {Insert.class,Update.class})
+    private String dept;
+
+
     @Getter
     @TableField(value = "tenant_id",insertStrategy = FieldStrategy.NEVER,updateStrategy = FieldStrategy.NEVER,typeHandler = TenantNameHandler.class)
     private String tenantName;
 
 
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(hidden = true)
+    @TableLogic(value = "0",delval = "1")
+    private Boolean isDel;
 }

nb-service/app-assistant/pom.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>nb-service</artifactId>
+        <groupId>com.tuoren</groupId>
+        <version>1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>app-assistant</artifactId>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.tuoren</groupId>
+            <artifactId>config-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.tuoren</groupId>
+            <artifactId>crud-common</artifactId>
+        </dependency>
+    </dependencies>
+
+
+</project>

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

@@ -0,0 +1,39 @@
+package com.nb.app.assistant.auth;
+
+import cn.hutool.core.util.StrUtil;
+import com.nb.app.assistant.service.LocalAssistantUserService;
+import com.nb.auth.bean.LoginUser;
+import com.nb.auth.enums.GrantTypeEnum;
+import com.nb.auth.granter.IAuthGranter;
+import com.nb.auth.granter.TokenParameter;
+import com.nb.core.exception.CustomException;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName AppAssistantGranter.java
+ * @Description TODO
+ * @createTime 2022年08月10日 10:16:00
+ */
+@Component
+@AllArgsConstructor
+public class AppAssistantGranter implements IAuthGranter {
+    private final LocalAssistantUserService assistantUserService;
+    @Override
+    public GrantTypeEnum getType() {
+        return GrantTypeEnum.APP_ASSISTANT_PASSWORD;
+    }
+
+    @Override
+    public LoginUser grant(TokenParameter source) {
+        if (StrUtil.isBlank(source.getUsername())) {
+            throw new CustomException("用户名不能为空");
+        }
+        if (StrUtil.isBlank(source.getPassword())) {
+            throw new CustomException("密码不能为空");
+        }
+        return null;
+    }
+}

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

@@ -0,0 +1,57 @@
+package com.nb.app.assistant.auth;
+
+import com.nb.app.assistant.controller.vo.AssistantUserVo;
+import com.nb.auth.controller.vo.AccountInfoVO;
+import com.nb.auth.controller.vo.RouteItemVO;
+import com.nb.auth.controller.vo.UserInfoVO;
+import com.nb.auth.enums.GrantTypeEnum;
+import com.nb.auth.granter.IAccountOperator;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName AppAssistantUserOperator.java
+ * @Description 疼痛小管家用户操作
+ * @createTime 2022年08月10日 10:52:00
+ */
+@Component
+public class AppAssistantUserOperator implements IAccountOperator<AssistantUserVo> {
+    @Override
+    public boolean matchGrantType(GrantTypeEnum type) {
+        return GrantTypeEnum.APP_ASSISTANT_PASSWORD.equals(type);
+    }
+
+    @Override
+    public UserInfoVO getUserInfo() {
+        return null;
+    }
+
+    @Override
+    public Set<String> getPermCode() {
+        return null;
+    }
+
+    @Override
+    public List<RouteItemVO> getMenuList() {
+        return null;
+    }
+
+    @Override
+    public AccountInfoVO<AssistantUserVo> getAccountInfo() {
+        return null;
+    }
+
+    @Override
+    public void saveAccountInfo(AccountInfoVO<AssistantUserVo> req) {
+
+    }
+
+    @Override
+    public boolean updatePass(String oldPass, String newPass) {
+        return false;
+    }
+}

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

@@ -0,0 +1,14 @@
+package com.nb.app.assistant.controller.vo;
+
+import lombok.Data;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName AssistantUserVo.java
+ * @Description TODO
+ * @createTime 2022年08月10日 10:53:00
+ */
+@Data
+public class AssistantUserVo {
+}

nb-service/app-assistant/src/main/java/com/nb/app/assistant/doc/AppAssistantDocConfig.java

@@ -0,0 +1,30 @@
+package com.nb.app.assistant.doc;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName SwaggerDocConfig.java
+ * @Description TODO
+ * @createTime 2022年08月01日 22:01:00
+ */
+@Component
+public class AppAssistantDocConfig {
+
+    @Bean
+    public Docket appAssistant(){
+        return new Docket(DocumentationType.SWAGGER_2)
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.nb.app.assistant.controller"))
+                .paths(PathSelectors.any())
+                .build()
+                .groupName("疼痛小管家");
+    }
+
+}

nb-service/app-assistant/src/main/java/com/nb/app/assistant/entity/AssistantUserEntity.java

@@ -0,0 +1,44 @@
+package com.nb.app.assistant.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.nb.core.entity.GenericEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName AssistantUser.java
+ * @Description TODO
+ * @createTime 2022年08月10日 10:23:00
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName(value = "app_assistant_user",autoResultMap = true)
+@ApiModel(value="疼痛小助手用户")
+@ToString
+@NoArgsConstructor
+public class AssistantUserEntity extends GenericEntity<String> {
+    @ApiModelProperty(value = "用户密码")
+    @TableField(updateStrategy = FieldStrategy.NEVER)
+    private String password;
+
+    @ApiModelProperty(value = "用户头像")
+    private String avatar;
+
+    @ApiModelProperty(value = "手机号")
+    @TableField(updateStrategy = FieldStrategy.NEVER)
+    private String phone;
+
+    @ApiModelProperty(value = "昵称,昵称不得超过32个字节")
+    @Length(max = 32,message = "昵称不得超过32个字节",groups = {Insert.class,Update.class})
+    private String nickName;
+
+}

nb-service/app-assistant/src/main/java/com/nb/app/assistant/mapper/AssistantUserMapper.java

@@ -0,0 +1,16 @@
+package com.nb.app.assistant.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.nb.app.assistant.entity.AssistantUserEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName AssistantUserMapper.java
+ * @Description TODO
+ * @createTime 2022年08月10日 10:26:00
+ */
+@Mapper
+public interface AssistantUserMapper  extends BaseMapper<AssistantUserEntity> {
+}

nb-service/app-assistant/src/main/java/com/nb/app/assistant/service/LocalAssistantUserService.java

@@ -0,0 +1,31 @@
+package com.nb.app.assistant.service;
+
+import com.nb.app.assistant.entity.AssistantUserEntity;
+import com.nb.app.assistant.mapper.AssistantUserMapper;
+import com.nb.common.crud.BaseService;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName LocalAssistantUserService.java
+ * @Description TODO
+ * @createTime 2022年08月10日 10:27:00
+ */
+@Component
+public class LocalAssistantUserService extends BaseService<AssistantUserMapper, AssistantUserEntity,String> {
+    @Override
+    public void validateBeforeSave(AssistantUserEntity entity) {
+
+    }
+
+    @Override
+    public void validateBeforeUpdate(AssistantUserEntity entity) {
+
+    }
+
+    @Override
+    public void validateBeforeDelete(String id) {
+
+    }
+}

nb-service/app-doctor/src/main/java/com/nb/app/doctor/auth/AppDoctorUserAccountOperator.java

@@ -13,6 +13,7 @@ import com.nb.auth.controller.vo.UserInfoVO;
 import com.nb.auth.enums.GrantTypeEnum;
 import com.nb.auth.granter.IAccountOperator;
 import com.nb.auth.utils.SecurityUtil;
+import com.nb.core.enums.SexEnum;
 import com.nb.core.exception.CustomException;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -61,21 +62,32 @@ public class AppDoctorUserAccountOperator implements IAccountOperator<DoctorUser
 
     @Override
     public AccountInfoVO<DoctorUserVo> getAccountInfo() {
-        LoginUser<Long> loginUser = SecurityUtil.getLoginUser();
+        LoginUser<String> loginUser = SecurityUtil.getLoginUser();
         AppDoctorUserEntity appDoctorUser = doctorUserService.getById(loginUser.getId());
         DoctorUserVo vo = BeanUtil.copyProperties(appDoctorUser, DoctorUserVo.class);
 
         AccountInfoVO<DoctorUserVo> result = new AccountInfoVO();
         result.setExtendFields(vo);
         result.setAvatar(appDoctorUser.getAvatar());
-        result.setRealname(appDoctorUser.getRealName());
-        result.setSex(String.valueOf(appDoctorUser.getSex().getValue()));
+        result.setRealName(appDoctorUser.getRealName());
+        result.setSex(appDoctorUser.getSex());
         return result;
     }
 
     @Override
     public void saveAccountInfo(AccountInfoVO<DoctorUserVo> req) {
-
+        LoginUser<String> loginUser = SecurityUtil.getLoginUser();
+        DoctorUserVo extendFields = req.getExtendFields();
+        AppDoctorUserEntity source = new AppDoctorUserEntity();
+        source.setId(loginUser.getId());
+        source.setAvatar(req.getAvatar());
+        source.setRealName(req.getRealName());
+        source.setSex(req.getSex());
+        source.setResume(extendFields.getResume());
+        source.setPost(extendFields.getPost());
+        source.setSkilled(extendFields.getSkilled());
+        source.setDept(extendFields.getDept());
+        doctorUserService.updateById(source);
     }
 
     @Override

nb-service/app-doctor/src/main/java/com/nb/app/doctor/controller/vo/DoctorUserVo.java

@@ -30,4 +30,7 @@ public class DoctorUserVo implements Serializable {
     @ApiModelProperty(value = "专业擅长")
     @Length(max = 32,message = "专业擅长不得超过255个字节",groups = {GenericEntity.Insert.class, GenericEntity.Update.class})
     private String skilled;
+
+    @ApiModelProperty("科室")
+    private String dept;
 }

nb-service/app-doctor/src/main/java/com/nb/app/doctor/doc/AppDoctorDocConfig.java

@@ -25,7 +25,7 @@ public class AppDoctorDocConfig {
                 .apis(RequestHandlerSelectors.basePackage("com.nb.app.doctor.controller"))
                 .paths(PathSelectors.any())
                 .build()
-                .groupName("APP病人模块");
+                .groupName("APP医生模块");
     }
 
 }

nb-service/pom.xml

@@ -15,6 +15,7 @@
         <module>iot-service</module>
         <module>web-service</module>
         <module>app-doctor</module>
+        <module>app-assistant</module>
     </modules>
 
     <dependencies>

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusAppDoctorUserController.java

@@ -32,7 +32,7 @@ public class BusAppDoctorUserController {
     @PostMapping("/save")
     @SaCheckPermission("bus:doctor:save")
     @ApiOperation(value = "新增医院医生账户",notes = "权限【bus:doctor:save】")
-    public R saveBatch(@RequestBody List<AppDoctorUserEntity> sources){
+    public R saveBatch(@Validated@RequestBody List<AppDoctorUserEntity> sources){
         return R.success(appDoctorUserClient.saveBatch(sources));
     }
 

nb-service/web-service/src/main/java/com/nb/web/service/system/entity/SysUser.java

@@ -11,6 +11,7 @@ import com.nb.common.config.convert.ExcelDictConverter;
 import com.nb.core.entity.TenantGenericEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.nb.core.enums.SexEnum;
 import lombok.Data;
 import lombok.Getter;
 
@@ -113,9 +114,9 @@ public class SysUser extends TenantGenericEntity<Long,Long> {
     /**
      * 性别 1男；2女；3未知
      */
-    @ExcelProperty(value = "性别", index = 3, converter = ExcelDictConverter.class)
-    @ExcelDict("sys_sex")
-    private String sex;
+//    @ExcelProperty(value = "性别", index = 3, converter = ExcelDictConverter.class)
+//    @ExcelDict("sys_sex")
+    private SexEnum sex;
 
     /**
      * 部门ID

pom.xml

@@ -69,6 +69,11 @@
     <!-- 依赖管理 -->
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.tuoren</groupId>
+                <artifactId>app-assistant</artifactId>
+                <version>${nb.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.tuoren</groupId>
                 <artifactId>app-doctor-api</artifactId>