1
0
Ciallo преди 9 месеца
родител
ревизия
2b9f65dc6f
променени са 22 файла, в които са добавени 640 реда и са изтрити 33 реда
  1. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/work/api/config/TokenInterceptor.java
  2. 66 0
      ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/DgController.java
  3. 66 0
      ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/Pv1Controller.java
  4. 66 0
      ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/Pv2Controller.java
  5. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/UserController.java
  6. 53 0
      ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Dg.java
  7. 86 0
      ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Pv1.java
  8. 59 0
      ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Pv2.java
  9. 61 6
      ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/User.java
  10. 13 0
      ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/DgMapper.java
  11. 13 0
      ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/Pv1Mapper.java
  12. 13 0
      ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/Pv2Mapper.java
  13. 6 4
      ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/UserMapper.java
  14. 13 0
      ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IDgService.java
  15. 13 0
      ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IPv1Service.java
  16. 13 0
      ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IPv2Service.java
  17. 7 5
      ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IUserService.java
  18. 24 0
      ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/DgServiceImpl.java
  19. 24 0
      ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/Pv1ServiceImpl.java
  20. 24 0
      ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/Pv2ServiceImpl.java
  21. 11 9
      ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/UserServiceImpl.java
  22. 7 7
      ruoyi-admin/src/main/resources/application-druid.yml

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

+ 66 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/DgController.java

@@ -0,0 +1,66 @@
+package com.ruoyi.web.work.controller;
+
+import java.util.Arrays;
+import java.util.List;
+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.Dg;
+import com.ruoyi.web.work.service.IDgService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 诊断
+ * @author lsw
+ * @date 2024-07-19
+ */
+@RestController
+@RequestMapping("/work/dg")
+public class DgController extends BaseController {
+    @Autowired
+    private IDgService dgService;
+
+    @PreAuthorize("@ss.hasPermi('work:dg:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Dg dg){
+        startPage();
+        List<Dg> list = dgService.selectList(dg);
+        return getDataTable(list);
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:dg:query')")
+    @GetMapping(value = "/detail/{id}")
+    public AjaxResult detail(@PathVariable("id") Long id){
+        return AjaxResult.success(dgService.getById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:dg:add')")
+    @Log(title = "诊断", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody Dg dg){
+        return toAjax(dgService.save(dg));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:dg:edit')")
+    @Log(title = "诊断", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody Dg dg){
+        return toAjax(dgService.updateById(dg));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:dg:remove')")
+    @Log(title = "诊断", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids){
+        return toAjax(dgService.removeByIds(Arrays.asList(ids)));
+    }
+}

+ 66 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/Pv1Controller.java

@@ -0,0 +1,66 @@
+package com.ruoyi.web.work.controller;
+
+import java.util.Arrays;
+import java.util.List;
+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.Pv1;
+import com.ruoyi.web.work.service.IPv1Service;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 住院信息
+ * @author lsw
+ * @date 2024-07-19
+ */
+@RestController
+@RequestMapping("/work/pv1")
+public class Pv1Controller extends BaseController {
+    @Autowired
+    private IPv1Service pv1Service;
+
+    @PreAuthorize("@ss.hasPermi('work:pv1:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Pv1 pv1){
+        startPage();
+        List<Pv1> list = pv1Service.selectList(pv1);
+        return getDataTable(list);
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:pv1:query')")
+    @GetMapping(value = "/detail/{id}")
+    public AjaxResult detail(@PathVariable("id") Long id){
+        return AjaxResult.success(pv1Service.getById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:pv1:add')")
+    @Log(title = "住院信息", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody Pv1 pv1){
+        return toAjax(pv1Service.save(pv1));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:pv1:edit')")
+    @Log(title = "住院信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody Pv1 pv1){
+        return toAjax(pv1Service.updateById(pv1));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:pv1:remove')")
+    @Log(title = "住院信息", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids){
+        return toAjax(pv1Service.removeByIds(Arrays.asList(ids)));
+    }
+}

+ 66 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/Pv2Controller.java

@@ -0,0 +1,66 @@
+package com.ruoyi.web.work.controller;
+
+import java.util.Arrays;
+import java.util.List;
+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.Pv2;
+import com.ruoyi.web.work.service.IPv2Service;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 住院信息2
+ * @author lsw
+ * @date 2024-07-19
+ */
+@RestController
+@RequestMapping("/work/pv2")
+public class Pv2Controller extends BaseController {
+    @Autowired
+    private IPv2Service pv2Service;
+
+    @PreAuthorize("@ss.hasPermi('work:pv2:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Pv2 pv2){
+        startPage();
+        List<Pv2> list = pv2Service.selectList(pv2);
+        return getDataTable(list);
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:pv2:query')")
+    @GetMapping(value = "/detail/{id}")
+    public AjaxResult detail(@PathVariable("id") Long id){
+        return AjaxResult.success(pv2Service.getById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:pv2:add')")
+    @Log(title = "住院信息2", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody Pv2 pv2){
+        return toAjax(pv2Service.save(pv2));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:pv2:edit')")
+    @Log(title = "住院信息2", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody Pv2 pv2){
+        return toAjax(pv2Service.updateById(pv2));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:pv2:remove')")
+    @Log(title = "住院信息2", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids){
+        return toAjax(pv2Service.removeByIds(Arrays.asList(ids)));
+    }
+}

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

@@ -21,7 +21,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 /**
  * 小程序用户
  * @author lsw
- * @date 2024-07-16
+ * @date 2024-07-19
  */
 @RestController
 @RequestMapping("/work/user")

+ 53 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Dg.java

@@ -0,0 +1,53 @@
+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 io.swagger.annotations.ApiModelProperty;
+import lombok.experimental.Accessors;
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
+@Data
+@TableName(value = "tb_dg")
+@Accessors(chain = true)
+public class Dg{
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    @ApiModelProperty(value = "患者ID")
+    private String patientId;
+
+    @ApiModelProperty(value = "诊断代码")
+    private String diagnosticCode;
+
+    @ApiModelProperty(value = "诊断时间")
+    private String diagnosisTime;
+
+    @ApiModelProperty(value = "诊断类型代码: 0-主要诊断 1-第一辅诊 2-第二辅诊")
+    private String diagnosticType;
+
+    @ApiModelProperty(value = "诊断类别代码: 0-门诊诊断 1-入院诊断 2-出院诊断 3-中医入院诊断 4-中医出院诊断 5-修正诊断 6-最终诊断 7-初步诊断 8 目前诊断 9-术前诊断 10-术后诊断 11-产后诊断 99-其他诊断")
+    private String diagnosticCategoryCode;
+
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @TableField(fill = FieldFill.UPDATE)
+    private String updateBy;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+
+}

+ 86 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Pv1.java

@@ -0,0 +1,86 @@
+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 io.swagger.annotations.ApiModelProperty;
+import lombok.experimental.Accessors;
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
+@Data
+@TableName(value = "tb_pv1")
+@Accessors(chain = true)
+public class Pv1{
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    @ApiModelProperty(value = "患者ID")
+    private Long patientId;
+
+    @ApiModelProperty(value = "就诊卡号")
+    private Long cardId;
+
+    @ApiModelProperty(value = "患者类别")
+    private String patientCategory;
+
+    @ApiModelProperty(value = "患者位置")
+    private String bed;
+
+    @ApiModelProperty(value = "主治医师")
+    private String physician;
+
+    @ApiModelProperty(value = "主管护士代码")
+    private String nurseCode;
+
+    @ApiModelProperty(value = "入院次数")
+    private String hospitalizedNumber;
+
+    @ApiModelProperty(value = "收费类别")
+    private String feeCategory;
+
+    @ApiModelProperty(value = "出院方式 1-治愈 2-好转 3 -稳定 4-恶化 5-死亡 9 -其他")
+    private String dischargeMethod;
+
+    @ApiModelProperty(value = "医疗机构代码")
+    private String medicalCode;
+
+    @ApiModelProperty(value = " 在院状态 0 入院登记 1 病区分床 2 病人出区 3 病人出院 4 取消结算 5 进入 ICU 6 进入产房 7 转科状态 8 数据转出 9 入院作")
+    private String hospitalStatus;
+
+    @ApiModelProperty(value = "门诊挂号状态: 0-有效 1-无效")
+    private String registrationStatus;
+
+    @ApiModelProperty(value = "入院时间")
+    private String admissionTime;
+
+    @ApiModelProperty(value = "出院时间")
+    private String dischargeTime;
+
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @TableField(fill = FieldFill.UPDATE)
+    private String updateBy;
+
+    @ApiModelProperty(value = "患者ID")
+    private Long msgId;
+
+    @ApiModelProperty(value = "科室")
+    private String department;
+
+
+}

+ 59 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Pv2.java

@@ -0,0 +1,59 @@
+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 io.swagger.annotations.ApiModelProperty;
+import lombok.experimental.Accessors;
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
+@Data
+@TableName(value = "tb_pv2")
+@Accessors(chain = true)
+public class Pv2{
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    @ApiModelProperty(value = "患者ID")
+    private Long patientId;
+
+    @ApiModelProperty(value = "危重级别: 0-一般病人 1-危重病人")
+    private String level;
+
+    @ApiModelProperty(value = "入区时间")
+    private String entryTime;
+
+    @ApiModelProperty(value = "出区时间")
+    private String exitTime;
+
+    @ApiModelProperty(value = "出区原因: 治愈 好转稳定 恶化 死亡")
+    private String reasonArea;
+
+    @ApiModelProperty(value = "婴儿信息标识:Y-是 N-否")
+    private String babyCode;
+
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @TableField(fill = FieldFill.UPDATE)
+    private String updateBy;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "患者ID")
+    private String msgId;
+
+
+}

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

@@ -1,17 +1,16 @@
 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-16
+ * @date 2024-07-19
  */
 @Data
 @TableName(value = "tb_user")
@@ -24,8 +23,14 @@ public class User{
     @ApiModelProperty(value = "微信id")
     private String openId;
 
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "头像")
+    private String avatar;
+
     @ApiModelProperty(value = "状态:0=正常,1=停用")
-    private Integer state;
+    private Long state;
 
     @TableField(fill = FieldFill.INSERT)
     private String createBy;
@@ -41,7 +46,57 @@ 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;
 
+
 }

+ 13 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/DgMapper.java

@@ -0,0 +1,13 @@
+package com.ruoyi.web.work.mapper;
+
+import java.util.List;
+import com.ruoyi.web.work.domain.Dg;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
+public interface DgMapper extends BaseMapper<Dg> {
+    List<Dg> selectList(Dg dg);
+}

+ 13 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/Pv1Mapper.java

@@ -0,0 +1,13 @@
+package com.ruoyi.web.work.mapper;
+
+import java.util.List;
+import com.ruoyi.web.work.domain.Pv1;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
+public interface Pv1Mapper extends BaseMapper<Pv1> {
+    List<Pv1> selectList(Pv1 pv1);
+}

+ 13 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/Pv2Mapper.java

@@ -0,0 +1,13 @@
+package com.ruoyi.web.work.mapper;
+
+import java.util.List;
+import com.ruoyi.web.work.domain.Pv2;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
+public interface Pv2Mapper extends BaseMapper<Pv2> {
+    List<Pv2> selectList(Pv2 pv2);
+}

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

@@ -1,17 +1,19 @@
 package com.ruoyi.web.work.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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;
 
-import java.util.List;
-
 /**
  * @author lsw
- * @date 2024-07-16
+ * @date 2024-07-19
  */
+@Mapper
 public interface UserMapper extends BaseMapper<User> {
     List<User> selectList(User user);
 
     User selectByOpenId(@Param("openId") String openId);
+
 }

+ 13 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IDgService.java

@@ -0,0 +1,13 @@
+package com.ruoyi.web.work.service;
+
+import java.util.List;
+import com.ruoyi.web.work.domain.Dg;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
+public interface IDgService extends IService<Dg>{
+    List<Dg> selectList(Dg dg);
+}

+ 13 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IPv1Service.java

@@ -0,0 +1,13 @@
+package com.ruoyi.web.work.service;
+
+import java.util.List;
+import com.ruoyi.web.work.domain.Pv1;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
+public interface IPv1Service extends IService<Pv1>{
+    List<Pv1> selectList(Pv1 pv1);
+}

+ 13 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IPv2Service.java

@@ -0,0 +1,13 @@
+package com.ruoyi.web.work.service;
+
+import java.util.List;
+import com.ruoyi.web.work.domain.Pv2;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
+public interface IPv2Service extends IService<Pv2>{
+    List<Pv2> selectList(Pv2 pv2);
+}

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

@@ -1,21 +1,22 @@
 package com.ruoyi.web.work.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+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;
 
-import java.rmi.ServerException;
-import java.util.List;
-
 /**
  * @author lsw
- * @date 2024-07-16LoginDto
+ * @date 2024-07-19
  */
 public interface IUserService extends IService<User>{
     List<User> selectList(User user);
 
+
     /**
      * 微信登陆
      *
@@ -45,4 +46,5 @@ public interface IUserService extends IService<User>{
      * @return
      */
     AjaxResult info();
+
 }

+ 24 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/DgServiceImpl.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.work.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.web.work.mapper.DgMapper;
+import com.ruoyi.web.work.domain.Dg;
+import com.ruoyi.web.work.service.IDgService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
+@Service
+public class DgServiceImpl extends ServiceImpl<DgMapper, Dg> implements IDgService {
+    @Autowired
+    private DgMapper dgMapper;
+
+    @Override
+    public List<Dg> selectList(Dg dg) {
+        return dgMapper.selectList(dg);
+    }
+}

+ 24 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/Pv1ServiceImpl.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.work.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.web.work.mapper.Pv1Mapper;
+import com.ruoyi.web.work.domain.Pv1;
+import com.ruoyi.web.work.service.IPv1Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
+@Service
+public class Pv1ServiceImpl extends ServiceImpl<Pv1Mapper, Pv1> implements IPv1Service {
+    @Autowired
+    private Pv1Mapper pv1Mapper;
+
+    @Override
+    public List<Pv1> selectList(Pv1 pv1) {
+        return pv1Mapper.selectList(pv1);
+    }
+}

+ 24 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/Pv2ServiceImpl.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.work.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.web.work.mapper.Pv2Mapper;
+import com.ruoyi.web.work.domain.Pv2;
+import com.ruoyi.web.work.service.IPv2Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
+@Service
+public class Pv2ServiceImpl extends ServiceImpl<Pv2Mapper, Pv2> implements IPv2Service {
+    @Autowired
+    private Pv2Mapper pv2Mapper;
+
+    @Override
+    public List<Pv2> selectList(Pv2 pv2) {
+        return pv2Mapper.selectList(pv2);
+    }
+}

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

@@ -1,30 +1,30 @@
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.User;
 import com.ruoyi.web.work.domain.dto.LoginDto;
 import com.ruoyi.web.work.domain.dto.UserEditDto;
-import com.ruoyi.web.work.mapper.UserMapper;
-import com.ruoyi.web.work.service.IUserService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
-
-import java.rmi.ServerException;
-import java.util.List;
+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-16
+ * @date 2024-07-19
  */
 @Service
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {
@@ -42,6 +42,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         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));
@@ -52,7 +53,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if (user == null) {
             user = new User();
             user.setOpenId(res.getString("openid"));
-            user.setState(0);
+            user.setState(0L);
             if (!save(user)) {
                 throw new ServerException("登录失败,请联系管理员");
             }
@@ -92,4 +93,5 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     public AjaxResult info() {
         return AjaxResult.success(getById(AppUtil.getUser().getId()));
     }
+
 }

+ 7 - 7
ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,16 +6,16 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://123.60.57.26:3306/hospital?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/hospital?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: gogo-2636616
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -35,7 +35,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -54,4 +54,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true