eight
2024-09-09 cbfab93f4977c7f737938ffb4534560c4a003197
作业记录功能
已添加9个文件
已修改2个文件
498 ■■■■■ 文件已修改
jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/ErrorCodeConstants.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/JobRecordController.java 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/vo/JobRecordPageReqVO.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/vo/JobRecordRespVO.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/vo/JobRecordSaveReqVO.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/jobrecord/JobRecordDO.java 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/jobrecord/JobRecordMapper.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordService.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/resources/mapper/jobrecord/JobRecordMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sql/mysql/jh.sql 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/ErrorCodeConstants.java
@@ -26,4 +26,6 @@
    ErrorCode DEV_MODEL_NOT_EXISTS = new ErrorCode(1_010_005_000, "设备型号不存在");
    ErrorCode DEVICE_NOT_EXISTS = new ErrorCode(1_010_005_001,  "设备不存在");
    ErrorCode DEV_RENT_NOT_EXISTS = new ErrorCode(1_010_005_002, "租借不存在");
    ErrorCode JOB_RECORD_NOT_EXISTS = new ErrorCode(1_010_006_000, "工作记录不存在");
}
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/JobRecordController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,95 @@
package cn.lihu.jh.module.ecg.controller.admin.jobrecord;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import cn.lihu.jh.framework.common.pojo.PageParam;
import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.pojo.CommonResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
import cn.lihu.jh.framework.excel.core.util.ExcelUtils;
import cn.lihu.jh.framework.apilog.core.annotation.ApiAccessLog;
import static cn.lihu.jh.framework.apilog.core.enums.OperateTypeEnum.*;
import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordDO;
import cn.lihu.jh.module.ecg.service.jobrecord.JobRecordService;
@Tag(name = "管理后台 - å·¥ä½œè®°å½•")
@RestController
@RequestMapping("/ecg/job-record")
@Validated
public class JobRecordController {
    @Resource
    private JobRecordService jobRecordService;
    @PostMapping("/create")
    @Operation(summary = "创建工作记录")
    @PreAuthorize("@ss.hasPermission('ecg:job-record:create')")
    public CommonResult<Long> createJobRecord(@Valid @RequestBody JobRecordSaveReqVO createReqVO) {
        return success(jobRecordService.createJobRecord(createReqVO));
    }
    @PutMapping("/update")
    @Operation(summary = "更新工作记录")
    @PreAuthorize("@ss.hasPermission('ecg:job-record:update')")
    public CommonResult<Boolean> updateJobRecord(@Valid @RequestBody JobRecordSaveReqVO updateReqVO) {
        jobRecordService.updateJobRecord(updateReqVO);
        return success(true);
    }
    @DeleteMapping("/delete")
    @Operation(summary = "删除工作记录")
    @Parameter(name = "id", description = "编号", required = true)
    @PreAuthorize("@ss.hasPermission('ecg:job-record:delete')")
    public CommonResult<Boolean> deleteJobRecord(@RequestParam("id") Long id) {
        jobRecordService.deleteJobRecord(id);
        return success(true);
    }
    @GetMapping("/get")
    @Operation(summary = "获得工作记录")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('ecg:job-record:query')")
    public CommonResult<JobRecordRespVO> getJobRecord(@RequestParam("id") Long id) {
        JobRecordDO jobRecord = jobRecordService.getJobRecord(id);
        return success(BeanUtils.toBean(jobRecord, JobRecordRespVO.class));
    }
    @GetMapping("/page")
    @Operation(summary = "获得工作记录分页")
    @PreAuthorize("@ss.hasPermission('ecg:job-record:query')")
    public CommonResult<PageResult<JobRecordRespVO>> getJobRecordPage(@Valid JobRecordPageReqVO pageReqVO) {
        PageResult<JobRecordDO> pageResult = jobRecordService.getJobRecordPage(pageReqVO);
        return success(BeanUtils.toBean(pageResult, JobRecordRespVO.class));
    }
    @GetMapping("/export-excel")
    @Operation(summary = "导出工作记录 Excel")
    @PreAuthorize("@ss.hasPermission('ecg:job-record:export')")
    @ApiAccessLog(operateType = EXPORT)
    public void exportJobRecordExcel(@Valid JobRecordPageReqVO pageReqVO,
              HttpServletResponse response) throws IOException {
        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
        List<JobRecordDO> list = jobRecordService.getJobRecordPage(pageReqVO).getList();
        // å¯¼å‡º Excel
        ExcelUtils.write(response, "工作记录.xls", "数据", JobRecordRespVO.class,
                        BeanUtils.toBean(list, JobRecordRespVO.class));
    }
}
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/vo/JobRecordPageReqVO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,50 @@
package cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import cn.lihu.jh.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.lihu.jh.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - å·¥ä½œè®°å½•分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class JobRecordPageReqVO extends PageParam {
    @Schema(description = "作业类型", example = "1")
    private Integer jobType;
    @Schema(description = "医生编号", example = "24197")
    private Long docId;
    @Schema(description = "医生名称", example = "赵六")
    private String docName;
    @Schema(description = "设备编号", example = "9159")
    private String devId;
    @Schema(description = "患者编号", example = "19193")
    private String patId;
    @Schema(description = "患者名称", example = "芋艿")
    private String patName;
    @Schema(description = "作业时间")
    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
    private LocalDateTime[] jobTime;
    @Schema(description = "作业概要")
    private Integer summary;
    @Schema(description = "备注", example = "你猜")
    private String remark;
    @Schema(description = "创建时间")
    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
    private LocalDateTime[] createTime;
}
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/vo/JobRecordRespVO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,59 @@
package cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@Schema(description = "管理后台 - å·¥ä½œè®°å½• Response VO")
@Data
@ExcelIgnoreUnannotated
public class JobRecordRespVO {
    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "2037")
    @ExcelProperty("id")
    private Long id;
    @Schema(description = "作业类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
    @ExcelProperty("作业类型")
    private Integer jobType;
    @Schema(description = "医生编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "24197")
    @ExcelProperty("医生编号")
    private Long docId;
    @Schema(description = "医生名称", example = "赵六")
    @ExcelProperty("医生名称")
    private String docName;
    @Schema(description = "设备编号", example = "9159")
    @ExcelProperty("设备编号")
    private String devId;
    @Schema(description = "患者编号", example = "19193")
    @ExcelProperty("患者编号")
    private String patId;
    @Schema(description = "患者名称", example = "芋艿")
    @ExcelProperty("患者名称")
    private String patName;
    @Schema(description = "作业时间")
    @ExcelProperty("作业时间")
    private LocalDateTime jobTime;
    @Schema(description = "作业概要")
    @ExcelProperty("作业概要")
    private Integer summary;
    @Schema(description = "备注", example = "你猜")
    @ExcelProperty("备注")
    private String remark;
    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
    @ExcelProperty("创建时间")
    private LocalDateTime createTime;
}
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/vo/JobRecordSaveReqVO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
package cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import jakarta.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - å·¥ä½œè®°å½•新增/修改 Request VO")
@Data
public class JobRecordSaveReqVO {
    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "2037")
    private Long id;
    @Schema(description = "作业类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
    @NotNull(message = "作业类型不能为空")
    private Integer jobType;
    @Schema(description = "医生编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "24197")
    @NotNull(message = "医生编号不能为空")
    private Long docId;
    @Schema(description = "医生名称", example = "赵六")
    private String docName;
    @Schema(description = "设备编号", example = "9159")
    private String devId;
    @Schema(description = "患者编号", example = "19193")
    private String patId;
    @Schema(description = "患者名称", example = "芋艿")
    private String patName;
    @Schema(description = "作业时间")
    private LocalDateTime jobTime;
    @Schema(description = "作业概要")
    private Integer summary;
    @Schema(description = "备注", example = "你猜")
    private String remark;
}
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/jobrecord/JobRecordDO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,68 @@
package cn.lihu.jh.module.ecg.dal.dataobject.jobrecord;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import cn.lihu.jh.framework.mybatis.core.dataobject.BaseDO;
/**
 * å·¥ä½œè®°å½• DO
 *
 * @author èŠ‹é“æºç 
 */
@TableName("job_record")
@KeySequence("job_record_seq") // ç”¨äºŽ Oracle、PostgreSQL、Kingbase、DB2、H2 æ•°æ®åº“的主键自增。如果是 MySQL ç­‰æ•°æ®åº“,可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class JobRecordDO extends BaseDO {
    /**
     * id
     */
    @TableId
    private Long id;
    /**
     * ä½œä¸šç±»åž‹
     */
    private Integer jobType;
    /**
     * åŒ»ç”Ÿç¼–号
     */
    private Long docId;
    /**
     * åŒ»ç”Ÿåç§°
     */
    private String docName;
    /**
     * è®¾å¤‡ç¼–号
     */
    private String devId;
    /**
     * æ‚£è€…编号
     */
    private String patId;
    /**
     * æ‚£è€…名称
     */
    private String patName;
    /**
     * ä½œä¸šæ—¶é—´
     */
    private LocalDateTime jobTime;
    /**
     * ä½œä¸šæ¦‚要
     */
    private Integer summary;
    /**
     * å¤‡æ³¨
     */
    private String remark;
}
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/jobrecord/JobRecordMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
package cn.lihu.jh.module.ecg.dal.mysql.jobrecord;
import java.util.*;
import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.lihu.jh.framework.mybatis.core.mapper.BaseMapperX;
import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordDO;
import org.apache.ibatis.annotations.Mapper;
import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.*;
/**
 * å·¥ä½œè®°å½• Mapper
 *
 * @author èŠ‹é“æºç 
 */
@Mapper
public interface JobRecordMapper extends BaseMapperX<JobRecordDO> {
    default PageResult<JobRecordDO> selectPage(JobRecordPageReqVO reqVO) {
        return selectPage(reqVO, new LambdaQueryWrapperX<JobRecordDO>()
                .eqIfPresent(JobRecordDO::getJobType, reqVO.getJobType())
                .eqIfPresent(JobRecordDO::getDocId, reqVO.getDocId())
                .likeIfPresent(JobRecordDO::getDocName, reqVO.getDocName())
                .eqIfPresent(JobRecordDO::getDevId, reqVO.getDevId())
                .eqIfPresent(JobRecordDO::getPatId, reqVO.getPatId())
                .likeIfPresent(JobRecordDO::getPatName, reqVO.getPatName())
                .betweenIfPresent(JobRecordDO::getJobTime, reqVO.getJobTime())
                .eqIfPresent(JobRecordDO::getSummary, reqVO.getSummary())
                .eqIfPresent(JobRecordDO::getRemark, reqVO.getRemark())
                .betweenIfPresent(JobRecordDO::getCreateTime, reqVO.getCreateTime())
                .orderByDesc(JobRecordDO::getId));
    }
}
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
package cn.lihu.jh.module.ecg.service.jobrecord;
import java.util.*;
import jakarta.validation.*;
import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordDO;
import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.pojo.PageParam;
/**
 * å·¥ä½œè®°å½• Service æŽ¥å£
 *
 * @author èŠ‹é“æºç 
 */
public interface JobRecordService {
    /**
     * åˆ›å»ºå·¥ä½œè®°å½•
     *
     * @param createReqVO åˆ›å»ºä¿¡æ¯
     * @return ç¼–号
     */
    Long createJobRecord(@Valid JobRecordSaveReqVO createReqVO);
    /**
     * æ›´æ–°å·¥ä½œè®°å½•
     *
     * @param updateReqVO æ›´æ–°ä¿¡æ¯
     */
    void updateJobRecord(@Valid JobRecordSaveReqVO updateReqVO);
    /**
     * åˆ é™¤å·¥ä½œè®°å½•
     *
     * @param id ç¼–号
     */
    void deleteJobRecord(Long id);
    /**
     * èŽ·å¾—å·¥ä½œè®°å½•
     *
     * @param id ç¼–号
     * @return å·¥ä½œè®°å½•
     */
    JobRecordDO getJobRecord(Long id);
    /**
     * èŽ·å¾—å·¥ä½œè®°å½•åˆ†é¡µ
     *
     * @param pageReqVO åˆ†é¡µæŸ¥è¯¢
     * @return å·¥ä½œè®°å½•分页
     */
    PageResult<JobRecordDO> getJobRecordPage(JobRecordPageReqVO pageReqVO);
}
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,74 @@
package cn.lihu.jh.module.ecg.service.jobrecord;
import org.springframework.stereotype.Service;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordDO;
import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.pojo.PageParam;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
import cn.lihu.jh.module.ecg.dal.mysql.jobrecord.JobRecordMapper;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
/**
 * å·¥ä½œè®°å½• Service å®žçŽ°ç±»
 *
 * @author èŠ‹é“æºç 
 */
@Service
@Validated
public class JobRecordServiceImpl implements JobRecordService {
    @Resource
    private JobRecordMapper jobRecordMapper;
    @Override
    public Long createJobRecord(JobRecordSaveReqVO createReqVO) {
        // æ’å…¥
        JobRecordDO jobRecord = BeanUtils.toBean(createReqVO, JobRecordDO.class);
        jobRecordMapper.insert(jobRecord);
        // è¿”回
        return jobRecord.getId();
    }
    @Override
    public void updateJobRecord(JobRecordSaveReqVO updateReqVO) {
        // æ ¡éªŒå­˜åœ¨
        validateJobRecordExists(updateReqVO.getId());
        // æ›´æ–°
        JobRecordDO updateObj = BeanUtils.toBean(updateReqVO, JobRecordDO.class);
        jobRecordMapper.updateById(updateObj);
    }
    @Override
    public void deleteJobRecord(Long id) {
        // æ ¡éªŒå­˜åœ¨
        validateJobRecordExists(id);
        // åˆ é™¤
        jobRecordMapper.deleteById(id);
    }
    private void validateJobRecordExists(Long id) {
        if (jobRecordMapper.selectById(id) == null) {
            throw exception(JOB_RECORD_NOT_EXISTS);
        }
    }
    @Override
    public JobRecordDO getJobRecord(Long id) {
        return jobRecordMapper.selectById(id);
    }
    @Override
    public PageResult<JobRecordDO> getJobRecordPage(JobRecordPageReqVO pageReqVO) {
        return jobRecordMapper.selectPage(pageReqVO);
    }
}
jh-module-ecg/jh-module-ecg-biz/src/main/resources/mapper/jobrecord/JobRecordMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.lihu.jh.module.ecg.dal.mysql.jobrecord.JobRecordMapper">
    <!--
        ä¸€èˆ¬æƒ…况下,尽可能使用 Mapper è¿›è¡Œ CRUD å¢žåˆ æ”¹æŸ¥å³å¯ã€‚
        æ— æ³•满足的场景,例如说多表关联查询,才使用 XML ç¼–写 SQL。
        ä»£ç ç”Ÿæˆå™¨æš‚时只生成 Mapper XML æ–‡ä»¶æœ¬èº«ï¼Œæ›´å¤šæŽ¨è MybatisX å¿«é€Ÿå¼€å‘插件来生成查询。
        æ–‡æ¡£å¯è§ï¼šhttps://www.iocoder.cn/MyBatis/x-plugins/
     -->
</mapper>
sql/mysql/jh.sql
@@ -166,7 +166,7 @@
CREATE TABLE `job_record` (
  `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
  `job_type` int NOT NULL COMMENT '作业类型',
  `doc_id` varchar(45) DEFAULT NULL COMMENT '医生编号',
  `doc_id` bigint NOT NULL COMMENT '医生编号',
  `doc_name` varchar(45) DEFAULT NULL COMMENT '医生名称',
  `dev_id` varchar(45) DEFAULT NULL COMMENT '设备编号',
  `pat_id` varchar(45) DEFAULT NULL COMMENT '患者编号',