初始化回收查询项目

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();
 
     /**
      * 按主键查询

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
-* 患者信息表 AddDTO
+ *
-*
+ * @author AutoGenerator
-* @author AutoGenerator
+ * @since 2023-09-13
-* @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;

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
-* 患者信息表 EditDTO
+ *
-*
+ * @author AutoGenerator
-* @author AutoGenerator
+ * @since 2023-09-13
-* @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;
-
 
 }

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
-* 系统登录用户表 AddDTO
+ *
-*
+ * @author AutoGenerator
-* @author AutoGenerator
+ * @since 2023-09-13
-* @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 = "登陆名")

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 = "登陆名")

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;
+
+
+}

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
-* @author AutoGenerator
+ * @since 2023-09-13
-* @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")

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);
+    }
+}

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("退出登录");
+    }
+
     /**
      * 按主键查询
      *

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<RcvBasicMapper, RcvBasic> imple
             Date endTime = searchDTO.getEndTime();
             query.le(RcvBasic::getCreateTime, endTime);
         }
-        //关键字比较，多个列or
+        Object recoveryState = searchDTO.getParams("recoveryState");
-        //if (!StringUtils.isEmpty(searchDTO.getKeyword())) {
+        if (Func.isNotEmpty(recoveryState)) {
-        //单个列用like
+            query.eq(RcvBasic::getRecoveryState, recoveryState);
-        //query. like(RcvBasic::getxxx, searchDTO.getKeyword());
+        }
-        //多个列用like
-        //query. and(sub -> sub.like(RcvBasic::getxx1, searchDTO.getKeyword())
-        // оr(). like(RcvBasic::getXX2, searchDTO.getKeyword()))
-        //);
-        //}
         //默认createTime倒序排序
         query.orderByDesc(RcvBasic::getCreateTime);
         List<RcvBasic> list = super.find(query);