From 32eec90c488181ee4d5426ffe719ec309609aeff Mon Sep 17 00:00:00 2001 From: linrf Date: Wed, 13 Sep 2023 15:43:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=9B=9E=E6=94=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/api/recovery/RcvSysUserApi.java | 12 +++ .../dto/recovery/rcvbasic/AddRcvBasicDTO.java | 20 ++--- .../recovery/rcvbasic/EditRcvBasicDTO.java | 74 ++----------------- .../recovery/rcvsysuser/AddRcvSysUserDTO.java | 19 ++--- .../rcvsysuser/EditRcvSysUserDTO.java | 6 +- .../rcvsysuser/LoginRcvSysUserDTO.java | 33 +++++++++ .../server/entity/recovery/RcvBasic.java | 28 ++++--- .../docus/server/enums/RecoveryStateEnum.java | 34 +++++++++ .../controller/RcvSysUserController.java | 23 ++++++ .../dao/impl/RcvBasicDaoImpl.java | 14 ++-- 10 files changed, 142 insertions(+), 121 deletions(-) create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvsysuser/LoginRcvSysUserDTO.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/enums/RecoveryStateEnum.java diff --git a/docus-client-interface/src/main/java/com/docus/server/api/recovery/RcvSysUserApi.java b/docus-client-interface/src/main/java/com/docus/server/api/recovery/RcvSysUserApi.java index 14b86e0..8b71862 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/recovery/RcvSysUserApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/recovery/RcvSysUserApi.java @@ -5,6 +5,7 @@ import com.docus.infrastructure.web.response.PageResult; import com.docus.server.dto.recovery.rcvsysuser.AddRcvSysUserDTO; import com.docus.server.dto.recovery.rcvsysuser.DeleteRcvSysUserDTO; import com.docus.server.dto.recovery.rcvsysuser.EditRcvSysUserDTO; +import com.docus.server.dto.recovery.rcvsysuser.LoginRcvSysUserDTO; import com.docus.server.vo.recovery.rcvsysuser.RcvSysUserVO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.DeleteMapping; @@ -30,6 +31,17 @@ import java.util.List; @FeignClient(value = "docus-recovery", contextId = "docus-recovery.RcvSysUserApi") @RequestMapping("/rcv/sysUser") public interface RcvSysUserApi { + /** + * 登录 + */ + @PostMapping("/login") + void login(@RequestBody LoginRcvSysUserDTO loginRcvSysUserDTO); + + /** + * 退出登录 + */ + @GetMapping("/logout") + void logout(); /** * 按主键查询 diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvbasic/AddRcvBasicDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvbasic/AddRcvBasicDTO.java index f59f271..9e8ff85 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvbasic/AddRcvBasicDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvbasic/AddRcvBasicDTO.java @@ -1,31 +1,27 @@ package com.docus.server.dto.recovery.rcvbasic; +import com.docus.server.enums.RecoveryStateEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import com.docus.server.enums.*; import java.io.Serializable; import java.util.Date; /** -* -* 患者信息表 AddDTO -* -* @author AutoGenerator -* @since 2023-09-13 -*/ + * 患者信息表 AddDTO + * + * @author AutoGenerator + * @since 2023-09-13 + */ @Data @Builder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value="AddRcvBasicDTO对象", description="患者信息表") +@ApiModel(value = "AddRcvBasicDTO对象", description = "患者信息表") public class AddRcvBasicDTO implements Serializable { @ApiModelProperty(value = "主键") @@ -80,7 +76,7 @@ public class AddRcvBasicDTO implements Serializable { private Integer fileSource; @ApiModelProperty(value = "回收状态 0：待回收 1：已回收") - private String recoveryState; + private RecoveryStateEnum recoveryState; @ApiModelProperty(value = "回收时间") private Date revoveryTime; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvbasic/EditRcvBasicDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvbasic/EditRcvBasicDTO.java index 1d5eb45..515c60f 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvbasic/EditRcvBasicDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvbasic/EditRcvBasicDTO.java @@ -6,45 +6,22 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import com.docus.server.enums.*; import java.io.Serializable; -import java.util.Date; /** -* -* 患者信息表 EditDTO -* -* @author AutoGenerator -* @since 2023-09-13 -*/ + * 患者信息表 EditDTO + * + * @author AutoGenerator + * @since 2023-09-13 + */ @Data @Builder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value="EditRcvBasicDTO对象", description="患者信息表") +@ApiModel(value = "EditRcvBasicDTO对象", description = "患者信息表") public class EditRcvBasicDTO implements Serializable { - @ApiModelProperty(value = "主键") - private Long id; - - @ApiModelProperty(value = "病案主键") - private String patientId; - - @ApiModelProperty(value = "住院次数") - private Integer admissTimes; - - @ApiModelProperty(value = "病案号") - private String inpatientNo; - - @ApiModelProperty(value = "记账号(省中医住院就诊号)") - private String jzh; - - @ApiModelProperty(value = "住院号") - private String admissId; @ApiModelProperty(value = "患者姓名") private String name; @@ -52,47 +29,8 @@ public class EditRcvBasicDTO implements Serializable { @ApiModelProperty(value = "流水号") private String serialNumber; - @ApiModelProperty(value = "住院日期") - private Date admissDate; - - @ApiModelProperty(value = "住院科室") - private String admissDept; - @ApiModelProperty(value = "住院科室名称") private String admissDeptName; - @ApiModelProperty(value = "出院日期") - private Date disDate; - - @ApiModelProperty(value = "出院科室") - private String disDept; - - @ApiModelProperty(value = "出院科室名称") - private String disDeptName; - - @ApiModelProperty(value = "实际住院天数") - private Integer admissDays; - - @ApiModelProperty(value = "住院医师") - private String attendingName; - - @ApiModelProperty(value = "1 现场扫描，2 其他来源") - private Integer fileSource; - - @ApiModelProperty(value = "回收状态 0：待回收 1：已回收") - private String recoveryState; - - @ApiModelProperty(value = "回收时间") - private Date revoveryTime; - - @ApiModelProperty(value = "回收人") - private String revoveryUser; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - } diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvsysuser/AddRcvSysUserDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvsysuser/AddRcvSysUserDTO.java index aa94071..133e48e 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvsysuser/AddRcvSysUserDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvsysuser/AddRcvSysUserDTO.java @@ -6,29 +6,24 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import com.docus.server.enums.*; import java.io.Serializable; import java.util.Date; /** -* -* 系统登录用户表 AddDTO -* -* @author AutoGenerator -* @since 2023-09-13 -*/ + * 系统登录用户表 AddDTO + * + * @author AutoGenerator + * @since 2023-09-13 + */ @Data @Builder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value="AddRcvSysUserDTO对象", description="系统登录用户表") +@ApiModel(value = "AddRcvSysUserDTO对象", description = "系统登录用户表") public class AddRcvSysUserDTO implements Serializable { - @ApiModelProperty(value = "") + @ApiModelProperty(value = "主键") private Long userId; @ApiModelProperty(value = "登陆名") diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvsysuser/EditRcvSysUserDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvsysuser/EditRcvSysUserDTO.java index 442ab74..4c4c938 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvsysuser/EditRcvSysUserDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvsysuser/EditRcvSysUserDTO.java @@ -6,10 +6,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import com.docus.server.enums.*; import java.io.Serializable; import java.util.Date; @@ -28,7 +24,7 @@ import java.util.Date; @ApiModel(value="EditRcvSysUserDTO对象", description="系统登录用户表") public class EditRcvSysUserDTO implements Serializable { - @ApiModelProperty(value = "") + @ApiModelProperty(value = "主键") private Long userId; @ApiModelProperty(value = "登陆名") diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvsysuser/LoginRcvSysUserDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvsysuser/LoginRcvSysUserDTO.java new file mode 100644 index 0000000..749994c --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvsysuser/LoginRcvSysUserDTO.java @@ -0,0 +1,33 @@ +package com.docus.server.dto.recovery.rcvsysuser; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 系统登录用户表 AddDTO + * + * @author AutoGenerator + * @since 2023-09-13 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "LoginRcvSysUserDTO", description = "系统登录用户表") +public class LoginRcvSysUserDTO implements Serializable { + + + @ApiModelProperty(value = "登陆名") + private String userName; + + @ApiModelProperty(value = "用户密码") + private String userPwd; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/recovery/RcvBasic.java b/docus-client-interface/src/main/java/com/docus/server/entity/recovery/RcvBasic.java index 79c786b..358c305 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/recovery/RcvBasic.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/recovery/RcvBasic.java @@ -1,36 +1,34 @@ package com.docus.server.entity.recovery; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.docus.server.enums.RecoveryStateEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; +import lombok.NoArgsConstructor; -import com.docus.server.enums.*; +import java.io.Serializable; +import java.util.Date; /** -* -* 患者信息表 -* -* @author AutoGenerator -* @since 2023-09-13 -*/ + * 患者信息表 + * + * @author AutoGenerator + * @since 2023-09-13 + */ @Data @Builder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = false) @TableName("rcv_basic") -@ApiModel(value="RcvBasic对象", description="患者信息表") +@ApiModel(value = "RcvBasic对象", description = "患者信息表") public class RcvBasic implements Serializable { @ApiModelProperty(value = "主键") @@ -103,7 +101,7 @@ public class RcvBasic implements Serializable { @ApiModelProperty(value = "回收状态 0：待回收 1：已回收") @TableField("recovery_state") - private String recoveryState; + private RecoveryStateEnum recoveryState; @ApiModelProperty(value = "回收时间") @TableField("revovery_time") diff --git a/docus-client-interface/src/main/java/com/docus/server/enums/RecoveryStateEnum.java b/docus-client-interface/src/main/java/com/docus/server/enums/RecoveryStateEnum.java new file mode 100644 index 0000000..261a4f8 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/enums/RecoveryStateEnum.java @@ -0,0 +1,34 @@ +package com.docus.server.enums; + +import com.docus.infrastructure.core.db.enums.IIntegerEnum; + +/** + * 回收状态 + */ +public enum RecoveryStateEnum implements IIntegerEnum { + RECYCLED_WAITING(0, "待回收"), + RECYCLED_ALREADY(1, "已回收"); + + private Integer value; + private String display; + + RecoveryStateEnum(Integer value, String display) { + this.value = value; + this.display = display; + } + + @Override + public Integer getValue() { + return value; + } + + @Override + public String getDisplay() { + + return display; + } + + public static RecoveryStateEnum fromValue(Integer value) { + return IIntegerEnum.fromValue(RecoveryStateEnum.class, value); + } +} diff --git a/docus-recovery/src/main/java/com/docus/server/controller/RcvSysUserController.java b/docus-recovery/src/main/java/com/docus/server/controller/RcvSysUserController.java index f9e403a..7310deb 100644 --- a/docus-recovery/src/main/java/com/docus/server/controller/RcvSysUserController.java +++ b/docus-recovery/src/main/java/com/docus/server/controller/RcvSysUserController.java @@ -6,13 +6,17 @@ import com.docus.server.api.recovery.RcvSysUserApi; import com.docus.server.dto.recovery.rcvsysuser.AddRcvSysUserDTO; import com.docus.server.dto.recovery.rcvsysuser.DeleteRcvSysUserDTO; import com.docus.server.dto.recovery.rcvsysuser.EditRcvSysUserDTO; +import com.docus.server.dto.recovery.rcvsysuser.LoginRcvSysUserDTO; import com.docus.server.service.IRcvSysUserService; import com.docus.server.vo.recovery.rcvsysuser.RcvSysUserVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import java.io.Serializable; import java.util.Collection; import java.util.List; @@ -29,6 +33,25 @@ public class RcvSysUserController implements RcvSysUserApi { @Resource private IRcvSysUserService iRcvSysUserService; + + @ApiOperation("登录") + @Override + public void login(LoginRcvSysUserDTO userDTO) { + System.out.println(userDTO.getUserName() + userDTO.getUserPwd()); + HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest(); + request.getSession().setAttribute("USER_NAME", userDTO.getUserName()); + request.getSession().setAttribute("SESSION_PASSWORD", userDTO.getUserPwd()); + } + + @ApiOperation("退出登录") + @Override + public void logout() { + HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest(); + request.getSession().removeAttribute("USER_NAME"); + request.getSession().removeAttribute("SESSION_PASSWORD"); + System.out.println("退出登录"); + } + /** * 按主键查询 * diff --git a/docus-recovery/src/main/java/com/docus/server/infrastructure/dao/impl/RcvBasicDaoImpl.java b/docus-recovery/src/main/java/com/docus/server/infrastructure/dao/impl/RcvBasicDaoImpl.java index 5614b5b..fd87ac0 100644 --- a/docus-recovery/src/main/java/com/docus/server/infrastructure/dao/impl/RcvBasicDaoImpl.java +++ b/docus-recovery/src/main/java/com/docus/server/infrastructure/dao/impl/RcvBasicDaoImpl.java @@ -2,6 +2,7 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.core.util.Func; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; @@ -78,15 +79,10 @@ public class RcvBasicDaoImpl extends BaseDaoImpl imple Date endTime = searchDTO.getEndTime(); query.le(RcvBasic::getCreateTime, endTime); } - //关键字比较，多个列or - //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { - //单个列用like - //query. like(RcvBasic::getxxx, searchDTO.getKeyword()); - //多个列用like - //query. and(sub -> sub.like(RcvBasic::getxx1, searchDTO.getKeyword()) - // оr(). like(RcvBasic::getXX2, searchDTO.getKeyword())) - //); - //} + Object recoveryState = searchDTO.getParams("recoveryState"); + if (Func.isNotEmpty(recoveryState)) { + query.eq(RcvBasic::getRecoveryState, recoveryState); + } //默认createTime倒序排序 query.orderByDesc(RcvBasic::getCreateTime); List list = super.find(query);