量表代码提交

This commit is contained in:
jiangzhe 2024-04-07 15:12:27 +08:00
parent a4278fbcf2
commit e4e524aec1
12 changed files with 538 additions and 86 deletions

View File

@ -0,0 +1,105 @@
package org.dromara.scale.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.scale.domain.vo.SysScaleFactorRangeVo;
import org.dromara.scale.domain.bo.SysScaleFactorRangeBo;
import org.dromara.scale.service.ISysScaleFactorRangeService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 因子分段
*
* @author jiangzhe
* @date 2024-04-07
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/scale/scaleFactorRange")
public class SysScaleFactorRangeController extends BaseController {
private final ISysScaleFactorRangeService sysScaleFactorRangeService;
/**
* 查询因子分段列表
*/
@SaCheckPermission("scale:scaleFactorRange:list")
@GetMapping("/list")
public TableDataInfo<SysScaleFactorRangeVo> list(SysScaleFactorRangeBo bo, PageQuery pageQuery) {
return sysScaleFactorRangeService.queryPageList(bo, pageQuery);
}
/**
* 导出因子分段列表
*/
@SaCheckPermission("scale:scaleFactorRange:export")
@Log(title = "因子分段", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysScaleFactorRangeBo bo, HttpServletResponse response) {
List<SysScaleFactorRangeVo> list = sysScaleFactorRangeService.queryList(bo);
ExcelUtil.exportExcel(list, "因子分段", SysScaleFactorRangeVo.class, response);
}
/**
* 获取因子分段详细信息
*
* @param rangeId 主键
*/
@SaCheckPermission("scale:scaleFactorRange:query")
@GetMapping("/{rangeId}")
public R<SysScaleFactorRangeVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long rangeId) {
return R.ok(sysScaleFactorRangeService.queryById(rangeId));
}
/**
* 新增因子分段
*/
@SaCheckPermission("scale:scaleFactorRange:add")
@Log(title = "因子分段", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysScaleFactorRangeBo bo) {
return toAjax(sysScaleFactorRangeService.insertByBo(bo));
}
/**
* 修改因子分段
*/
@SaCheckPermission("scale:scaleFactorRange:edit")
@Log(title = "因子分段", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysScaleFactorRangeBo bo) {
return toAjax(sysScaleFactorRangeService.updateByBo(bo));
}
/**
* 删除因子分段
*
* @param rangeIds 主键串
*/
@SaCheckPermission("scale:scaleFactorRange:remove")
@Log(title = "因子分段", businessType = BusinessType.DELETE)
@DeleteMapping("/{rangeIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] rangeIds) {
return toAjax(sysScaleFactorRangeService.deleteWithValidByIds(List.of(rangeIds), true));
}
}

View File

@ -44,35 +44,14 @@ public class SysScale extends BaseEntity {
*/
private String status;
/**
* 量表的总分计分公式
*/
private Long formulaId;
/**
* 类型
*/
private String scaleType;
/**
* 预警分数
*/
private Long earlyWarningScore;
/**
* 测评开始时间
*/
private Date startTime;
/**
* 测评时间
*/
private String scaleTime;
/**
* 测评结束时间
*/
private Date endTime;
}

View File

@ -0,0 +1,72 @@
package org.dromara.scale.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.io.Serial;
/**
* 因子分段对象 sys_scale_factor_range
*
* @author jiangzhe
* @date 2024-04-07
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sys_scale_factor_range")
public class SysScaleFactorRange extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 分段id
*/
@TableId(value = "range_id")
private Long rangeId;
/**
* 分段名称
*/
private String rangeName;
/**
* 因子所属量表id
*/
private Long factorId;
/**
* 分数范围及结果提示
*/
private String factorResult;
/**
* 范围低阈值
*/
private BigDecimal minValue;
/**
* 范围高阈值
*/
private BigDecimal maxValue;
/**
* 问题描述
*/
private String evalDesc;
/**
* 问题建议
*/
private String evalPropose;
/**
* 严重度对应数据字典 YZD
*/
private Long situation;
}

View File

@ -8,7 +8,9 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
@ -25,62 +27,39 @@ public class SysScaleBo extends BaseEntity {
/**
* 测评id
*/
@NotNull(message = "测评id不能为空", groups = { EditGroup.class })
@NotNull(message = "测评id不能为空", groups = {EditGroup.class})
private Long scaleId;
/**
* 测评标题
*/
@NotBlank(message = "测评标题不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "测评标题不能为空", groups = {AddGroup.class, EditGroup.class})
private String scaleTitle;
/**
* 测评详情
*/
@NotBlank(message = "测评详情不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "测评详情不能为空", groups = {AddGroup.class, EditGroup.class})
private String scaleDetails;
/**
* 状态0正常 1停用
*/
@NotBlank(message = "状态0正常 1停用不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "状态0正常 1停用不能为空", groups = {AddGroup.class, EditGroup.class})
private String status;
/**
* 量表的总分计分公式
*/
@NotNull(message = "量表的总分计分公式不能为空", groups = { AddGroup.class, EditGroup.class })
private Long formulaId;
/**
* 类型
*/
@NotBlank(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "类型不能为空", groups = {AddGroup.class, EditGroup.class})
private String scaleType;
/**
* 预警分数
*/
@NotNull(message = "预警分数不能为空", groups = { AddGroup.class, EditGroup.class })
private Long earlyWarningScore;
/**
* 测评开始时间
*/
@NotNull(message = "测评开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date startTime;
/**
* 测评时间
*/
@NotBlank(message = "测评时间不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "测评时间不能为空", groups = {AddGroup.class, EditGroup.class})
private String scaleTime;
/**
* 测评结束时间
*/
@NotNull(message = "测评结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date endTime;
}

View File

@ -0,0 +1,79 @@
package org.dromara.scale.domain.bo;
import org.dromara.scale.domain.SysScaleFactorRange;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
/**
* 因子分段业务对象 sys_scale_factor_range
*
* @author jiangzhe
* @date 2024-04-07
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = SysScaleFactorRange.class, reverseConvertGenerate = false)
public class SysScaleFactorRangeBo extends BaseEntity {
/**
* 分段id
*/
@NotNull(message = "分段id不能为空", groups = { EditGroup.class })
private Long rangeId;
/**
* 分段名称
*/
@NotBlank(message = "分段名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String rangeName;
/**
* 因子所属量表id
*/
@NotNull(message = "因子所属量表id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long factorId;
/**
* 分数范围及结果提示
*/
@NotBlank(message = "分数范围及结果提示不能为空", groups = { AddGroup.class, EditGroup.class })
private String factorResult;
/**
* 范围低阈值
*/
@NotNull(message = "范围低阈值不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal minValue;
/**
* 范围高阈值
*/
@NotNull(message = "范围高阈值不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal maxValue;
/**
* 问题描述
*/
@NotBlank(message = "问题描述不能为空", groups = { AddGroup.class, EditGroup.class })
private String evalDesc;
/**
* 问题建议
*/
@NotBlank(message = "问题建议不能为空", groups = { AddGroup.class, EditGroup.class })
private String evalPropose;
/**
* 严重度对应数据字典 YZD
*/
@NotNull(message = "严重度,对应数据字典 YZD不能为空", groups = { AddGroup.class, EditGroup.class })
private Long situation;
}

View File

@ -0,0 +1,87 @@
package org.dromara.scale.domain.vo;
import java.math.BigDecimal;
import org.dromara.scale.domain.SysScaleFactorRange;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 因子分段视图对象 sys_scale_factor_range
*
* @author jiangzhe
* @date 2024-04-07
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = SysScaleFactorRange.class)
public class SysScaleFactorRangeVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 分段id
*/
@ExcelProperty(value = "分段id")
private Long rangeId;
/**
* 分段名称
*/
@ExcelProperty(value = "分段名称")
private String rangeName;
/**
* 因子所属量表id
*/
@ExcelProperty(value = "因子所属量表id")
private Long factorId;
/**
* 分数范围及结果提示
*/
@ExcelProperty(value = "分数范围及结果提示")
private String factorResult;
/**
* 范围低阈值
*/
@ExcelProperty(value = "范围低阈值")
private BigDecimal minValue;
/**
* 范围高阈值
*/
@ExcelProperty(value = "范围高阈值")
private BigDecimal maxValue;
/**
* 问题描述
*/
@ExcelProperty(value = "问题描述")
private String evalDesc;
/**
* 问题建议
*/
@ExcelProperty(value = "问题建议")
private String evalPropose;
/**
* 严重度对应数据字典 YZD
*/
@ExcelProperty(value = "严重度,对应数据字典 YZD")
private Long situation;
}

View File

@ -55,16 +55,6 @@ public class SysScaleVo implements Serializable {
@ExcelDictFormat(readConverterExp = "0=正常,1=停用")
private String status;
/**
* 量表的总分计分公式
*/
@ExcelProperty(value = "量表的总分计分公式")
private Long formulaId;
/**
* 计分公式
*/
private String formulaName;
/**
* 类型
@ -77,29 +67,10 @@ public class SysScaleVo implements Serializable {
*/
private String scaleTypeName;
/**
* 预警分数
*/
@ExcelProperty(value = "预警分数")
private Long earlyWarningScore;
/**
* 测评开始时间
*/
@ExcelProperty(value = "测评开始时间")
private Date startTime;
/**
* 测评时间
*/
@ExcelProperty(value = "测评时间")
private String scaleTime;
/**
* 测评结束时间
*/
@ExcelProperty(value = "测评结束时间")
private Date endTime;
}

View File

@ -0,0 +1,15 @@
package org.dromara.scale.mapper;
import org.dromara.scale.domain.SysScaleFactorRange;
import org.dromara.scale.domain.vo.SysScaleFactorRangeVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 因子分段Mapper接口
*
* @author jiangzhe
* @date 2024-04-07
*/
public interface SysScaleFactorRangeMapper extends BaseMapperPlus<SysScaleFactorRange, SysScaleFactorRangeVo> {
}

View File

@ -0,0 +1,49 @@
package org.dromara.scale.service;
import org.dromara.scale.domain.SysScaleFactorRange;
import org.dromara.scale.domain.vo.SysScaleFactorRangeVo;
import org.dromara.scale.domain.bo.SysScaleFactorRangeBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 因子分段Service接口
*
* @author jiangzhe
* @date 2024-04-07
*/
public interface ISysScaleFactorRangeService {
/**
* 查询因子分段
*/
SysScaleFactorRangeVo queryById(Long rangeId);
/**
* 查询因子分段列表
*/
TableDataInfo<SysScaleFactorRangeVo> queryPageList(SysScaleFactorRangeBo bo, PageQuery pageQuery);
/**
* 查询因子分段列表
*/
List<SysScaleFactorRangeVo> queryList(SysScaleFactorRangeBo bo);
/**
* 新增因子分段
*/
Boolean insertByBo(SysScaleFactorRangeBo bo);
/**
* 修改因子分段
*/
Boolean updateByBo(SysScaleFactorRangeBo bo);
/**
* 校验并批量删除因子分段信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

View File

@ -0,0 +1,116 @@
package org.dromara.scale.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.dromara.scale.domain.bo.SysScaleFactorRangeBo;
import org.dromara.scale.domain.vo.SysScaleFactorRangeVo;
import org.dromara.scale.domain.SysScaleFactorRange;
import org.dromara.scale.mapper.SysScaleFactorRangeMapper;
import org.dromara.scale.service.ISysScaleFactorRangeService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 因子分段Service业务层处理
*
* @author jiangzhe
* @date 2024-04-07
*/
@RequiredArgsConstructor
@Service
public class SysScaleFactorRangeServiceImpl implements ISysScaleFactorRangeService {
private final SysScaleFactorRangeMapper baseMapper;
/**
* 查询因子分段
*/
@Override
public SysScaleFactorRangeVo queryById(Long rangeId){
return baseMapper.selectVoById(rangeId);
}
/**
* 查询因子分段列表
*/
@Override
public TableDataInfo<SysScaleFactorRangeVo> queryPageList(SysScaleFactorRangeBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SysScaleFactorRange> lqw = buildQueryWrapper(bo);
Page<SysScaleFactorRangeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询因子分段列表
*/
@Override
public List<SysScaleFactorRangeVo> queryList(SysScaleFactorRangeBo bo) {
LambdaQueryWrapper<SysScaleFactorRange> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<SysScaleFactorRange> buildQueryWrapper(SysScaleFactorRangeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysScaleFactorRange> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getRangeName()), SysScaleFactorRange::getRangeName, bo.getRangeName());
lqw.eq(bo.getFactorId() != null, SysScaleFactorRange::getFactorId, bo.getFactorId());
lqw.eq(StringUtils.isNotBlank(bo.getFactorResult()), SysScaleFactorRange::getFactorResult, bo.getFactorResult());
lqw.eq(bo.getMinValue() != null, SysScaleFactorRange::getMinValue, bo.getMinValue());
lqw.eq(bo.getMaxValue() != null, SysScaleFactorRange::getMaxValue, bo.getMaxValue());
lqw.eq(StringUtils.isNotBlank(bo.getEvalDesc()), SysScaleFactorRange::getEvalDesc, bo.getEvalDesc());
lqw.eq(StringUtils.isNotBlank(bo.getEvalPropose()), SysScaleFactorRange::getEvalPropose, bo.getEvalPropose());
lqw.eq(bo.getSituation() != null, SysScaleFactorRange::getSituation, bo.getSituation());
return lqw;
}
/**
* 新增因子分段
*/
@Override
public Boolean insertByBo(SysScaleFactorRangeBo bo) {
SysScaleFactorRange add = MapstructUtils.convert(bo, SysScaleFactorRange.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setRangeId(add.getRangeId());
}
return flag;
}
/**
* 修改因子分段
*/
@Override
public Boolean updateByBo(SysScaleFactorRangeBo bo) {
SysScaleFactorRange update = MapstructUtils.convert(bo, SysScaleFactorRange.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(SysScaleFactorRange entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除因子分段
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

View File

@ -54,9 +54,6 @@ public class SysScaleServiceImpl implements ISysScaleService {
LambdaQueryWrapper<SysScale> lqw = buildQueryWrapper(bo);
Page<SysScaleVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
for (SysScaleVo record : result.getRecords()) {
SysScaleFormula sysScaleFormula = sysScaleFormulaMapper.selectById(record.getFormulaId());
record.setFormulaName(sysScaleFormula.getFormulaName());
SysDictDataVo sysScaleType = sysDictDataMapper.selectDictDataByTypeAndDictValue("sys_scale_type", record.getScaleType());
record.setScaleTypeName(sysScaleType.getDictLabel());
}
@ -78,12 +75,8 @@ public class SysScaleServiceImpl implements ISysScaleService {
lqw.eq(StringUtils.isNotBlank(bo.getScaleTitle()), SysScale::getScaleTitle, bo.getScaleTitle());
lqw.eq(StringUtils.isNotBlank(bo.getScaleDetails()), SysScale::getScaleDetails, bo.getScaleDetails());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysScale::getStatus, bo.getStatus());
lqw.eq(bo.getFormulaId() != null, SysScale::getFormulaId, bo.getFormulaId());
lqw.eq(StringUtils.isNotBlank(bo.getScaleType()), SysScale::getScaleType, bo.getScaleType());
lqw.eq(bo.getEarlyWarningScore() != null, SysScale::getEarlyWarningScore, bo.getEarlyWarningScore());
lqw.eq(bo.getStartTime() != null, SysScale::getStartTime, bo.getStartTime());
lqw.eq(StringUtils.isNotBlank(bo.getScaleTime()), SysScale::getScaleTime, bo.getScaleTime());
lqw.eq(bo.getEndTime() != null, SysScale::getEndTime, bo.getEndTime());
return lqw;
}

View File

@ -0,0 +1,7 @@
<?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="org.dromara.scale.mapper.SysScaleFactorRangeMapper">
</mapper>