修改patient表

ruoyi-admin/src/main/java/com/ruoyi/web/work/api/config/TokenInterceptor.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.web.work.domain.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.HandlerInterceptor;
-import com.ruoyi.web.work.api.config.TokenServices;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/UserController.java

@@ -1,82 +0,0 @@
-package com.ruoyi.web.work.controller;
-
-import java.util.Arrays;
-import java.util.List;
-
-import com.ruoyi.common.annotation.Anonymous;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.web.work.domain.User;
-import com.ruoyi.web.work.service.IUserService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 小程序用户
- * @author lsw
- * @date 2024-07-19
- */
-@Api(tags = "小程序用户管理")
-@Anonymous
-@RestController
-@RequestMapping("/work/user")
-public class UserController extends BaseController {
-    @Autowired
-    private IUserService userService;
-
-    @ApiOperation(value = "获取小程序用户")
-    @Anonymous
-    //@PreAuthorize("@ss.hasPermi('work:user:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(User user){
-        startPage();
-        List<User> list = userService.selectList(user);
-        return getDataTable(list);
-    }
-
-    @ApiOperation(value = "根据id查询小程序用户")
-    @Anonymous
-    //@PreAuthorize("@ss.hasPermi('work:user:query')")
-    @GetMapping(value = "/detail/{id}")
-    public AjaxResult detail(@PathVariable("id") Long id){
-        return AjaxResult.success(userService.getById(id));
-    }
-
-    @ApiOperation(value = "添加小程序用户")
-    @Anonymous
-    //@PreAuthorize("@ss.hasPermi('work:user:add')")
-    @Log(title = "小程序用户", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    public AjaxResult add(@RequestBody User user){
-        return toAjax(userService.save(user));
-    }
-
-    @ApiOperation(value = "修改小程序用户")
-    @Anonymous
-    //@PreAuthorize("@ss.hasPermi('work:user:edit')")
-    @Log(title = "小程序用户", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody User user){
-        return toAjax(userService.updateById(user));
-    }
-
-    @ApiOperation(value = "删除小程序用户")
-    @Anonymous
-    //@PreAuthorize("@ss.hasPermi('work:user:remove')")
-    @Log(title = "小程序用户", businessType = BusinessType.DELETE)
-    @GetMapping("/remove/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids){
-        return toAjax(userService.removeByIds(Arrays.asList(ids)));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/User.java

@@ -1,16 +1,17 @@
 package com.ruoyi.web.work.domain;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.experimental.Accessors;
+
+import java.util.Date;
 /**
  * @author lsw
- * @date 2024-07-19
+ * @date 2024-07-16
  */
 @Data
 @TableName(value = "tb_user")
@@ -23,14 +24,8 @@ public class User{
     @ApiModelProperty(value = "微信id")
     private String openId;
 
-    @ApiModelProperty(value = "姓名")
-    private String name;
-
-    @ApiModelProperty(value = "头像")
-    private String avatar;
-
     @ApiModelProperty(value = "状态:0=正常,1=停用")
-    private Long state;
+    private Integer state;
 
     @TableField(fill = FieldFill.INSERT)
     private String createBy;
@@ -46,57 +41,7 @@ public class User{
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
-    @ApiModelProperty(value = "卫宁患者ID")
-    private String patId;
-
-    @ApiModelProperty(value = "患者标识符")
-    private String patientId;
-
-    @ApiModelProperty(value = "就诊卡号")
-    private String cardId;
-
-    @ApiModelProperty(value = "出生时间")
-    private String birthDate;
-
-    @ApiModelProperty(value = "性别")
-    private String sex;
-
-    @ApiModelProperty(value = "患者地址")
-    private String address;
-
-    @ApiModelProperty(value = "电话")
-    private String phone;
-
-    @ApiModelProperty(value = "工作电话")
-    private String workPhone;
-
-    @ApiModelProperty(value = "婚姻状况")
-    private String marital;
-
-    @ApiModelProperty(value = "民族")
-    private String nation;
-
-    @ApiModelProperty(value = "职业")
-    private String career;
-
-    @ApiModelProperty(value = "国籍")
-    private String nationality;
-
-    @ApiModelProperty(value = "病历号")
-    private String blh;
-
-    @ApiModelProperty(value = "卡号")
-    private String brkh;
-
-    @ApiModelProperty(value = "身份证号")
-    private String sfzh;
-
-    @ApiModelProperty(value = "婴儿序号")
-    private String yexh;
-
-    //token字段不在数据库中，mybatis不会映射
     @TableField(exist = false)
     private String token;
 
-
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/UserMapper.java

@@ -1,19 +0,0 @@
-package com.ruoyi.web.work.mapper;
-
-import java.util.List;
-import com.ruoyi.web.work.domain.User;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * @author lsw
- * @date 2024-07-19
- */
-@Mapper
-public interface UserMapper extends BaseMapper<User> {
-    List<User> selectList(User user);
-
-    User selectByOpenId(@Param("openId") String openId);
-
-}

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IUserService.java

@@ -1,50 +0,0 @@
-package com.ruoyi.web.work.service;
-
-import java.rmi.ServerException;
-import java.util.List;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.web.work.domain.User;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.web.work.domain.dto.LoginDto;
-import com.ruoyi.web.work.domain.dto.UserEditDto;
-
-/**
- * @author lsw
- * @date 2024-07-19
- */
-public interface IUserService extends IService<User>{
-    List<User> selectList(User user);
-
-
-    /**
-     * 微信登陆
-     *
-     * @param dto
-     * @return
-     */
-    AjaxResult login(LoginDto dto) throws ServerException;
-
-
-    /**
-     * 编辑用户信息
-     *
-     * @param dto
-     * @return
-     */
-    AjaxResult edit(UserEditDto dto);
-
-    /**
-     * 退出登陆
-     *
-     * @return
-     */
-    AjaxResult exit();
-
-    /**
-     * 用户详情
-     * @return
-     */
-    AjaxResult info();
-
-}

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/UserServiceImpl.java

@@ -1,97 +0,0 @@
-package com.ruoyi.web.work.service.impl;
-
-import java.rmi.ServerException;
-import java.util.List;
-
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.web.work.api.config.TokenServices;
-import com.ruoyi.web.work.api.util.AppUtil;
-import com.ruoyi.web.work.domain.dto.LoginDto;
-import com.ruoyi.web.work.domain.dto.UserEditDto;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.stereotype.Service;
-import com.ruoyi.web.work.mapper.UserMapper;
-import com.ruoyi.web.work.domain.User;
-import com.ruoyi.web.work.service.IUserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @author lsw
- * @date 2024-07-19
- */
-@Service
-public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {
-    @Autowired
-    private UserMapper userMapper;
-
-    @Autowired
-    private TokenServices tokenService;
-
-    @Autowired
-    private Environment env;
-
-    @Override
-    public List<User> selectList(User user) {
-        return userMapper.selectList(user);
-    }
-
-
-    @Override
-    public AjaxResult login(LoginDto dto) throws ServerException {
-        JSONObject res = JSON.parseObject(HttpUtils.sendGet("https://api.weixin.qq.com/sns/jscode2session?appid=" + env.getProperty("wx.appid") + "&secret=" + env.getProperty("wx.appSecret") + "&js_code=" + dto.getCode() + "&grant_type=authorization_code", null));
-        if (StringUtils.isNotEmpty(res.getString("errmsg"))) {
-            return AjaxResult.error("获取openid失败");
-        }
-        User user = userMapper.selectByOpenId(res.getString("openid"));
-        if (user == null) {
-            user = new User();
-            user.setOpenId(res.getString("openid"));
-            user.setState(0L);
-            if (!save(user)) {
-                throw new ServerException("登录失败,请联系管理员");
-            }
-            return AjaxResult.success(new AjaxResult().put("token", tokenService.createToken(user)));
-        }
-        if (user.getState() == 1) {
-            return AjaxResult.error(403, "你的账号被锁定，请联系管理员");
-        }
-        if (!updateById(user)) {
-            throw new ServerException("登录失败,请联系管理员");
-        }
-        return AjaxResult.success(new AjaxResult().put("token", tokenService.createToken(user)));
-    }
-
-    @Override
-    public AjaxResult edit(UserEditDto dto) {
-        User user = new User();
-        BeanUtils.copyProperties(dto, user);
-        user.setId(AppUtil.getUser().getId());
-        if (!updateById(user)) {
-            throw new ServiceException("编辑用户信息失败");
-        }
-        return AjaxResult.success();
-    }
-
-    @Override
-    public AjaxResult exit() {
-        try {
-            tokenService.delLoginUser(AppUtil.getUser().getToken());
-            return AjaxResult.success();
-        } catch (Exception e) {
-            return AjaxResult.error("退出登录失败");
-        }
-    }
-
-    @Override
-    public AjaxResult info() {
-        return AjaxResult.success(getById(AppUtil.getUser().getId()));
-    }
-
-}