From fb3a9ec1ec9560b8387f53a4e7799c4d11ca9ee1 Mon Sep 17 00:00:00 2001 From: chen <2710907404@qq.com> Date: Wed, 8 Jan 2025 15:09:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?20250108=20=E6=9B=B4=E6=96=B0=20=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E6=A8=A1=E6=9D=BF=E5=88=B0=E5=90=8E=E5=8F=B0=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EntrustTemplateInfoController.java | 109 ------------------ .../entity/EntrustTemplateInfo.java | 55 --------- .../entrustment/enums/TemplateTypeEnums.java | 30 ----- .../mapper/EntrustTemplateInfoMapper.java | 20 ---- .../query/EntrustTemplateInfoQuery.java | 19 --- .../service/EntrustTemplateInfoService.java | 13 --- .../impl/EntrustTemplateInfoServiceImpl.java | 22 ---- .../mapper/EntrustTemplateInfoMapper.xml | 23 ---- 8 files changed, 291 deletions(-) delete mode 100644 src/main/java/digital/laboratory/platform/entrustment/controller/EntrustTemplateInfoController.java delete mode 100644 src/main/java/digital/laboratory/platform/entrustment/entity/EntrustTemplateInfo.java delete mode 100644 src/main/java/digital/laboratory/platform/entrustment/enums/TemplateTypeEnums.java delete mode 100644 src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustTemplateInfoMapper.java delete mode 100644 src/main/java/digital/laboratory/platform/entrustment/query/EntrustTemplateInfoQuery.java delete mode 100644 src/main/java/digital/laboratory/platform/entrustment/service/EntrustTemplateInfoService.java delete mode 100644 src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustTemplateInfoServiceImpl.java delete mode 100644 src/main/resources/mapper/EntrustTemplateInfoMapper.xml diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustTemplateInfoController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustTemplateInfoController.java deleted file mode 100644 index c6d0a78..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustTemplateInfoController.java +++ /dev/null @@ -1,109 +0,0 @@ -package digital.laboratory.platform.entrustment.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import digital.laboratory.platform.common.core.util.R; -import digital.laboratory.platform.entrustment.entity.EntrustTemplateInfo; -import digital.laboratory.platform.entrustment.enums.TemplateTypeEnums; -import digital.laboratory.platform.entrustment.query.EntrustTemplateInfoQuery; -import digital.laboratory.platform.entrustment.service.EntrustTemplateInfoService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -/** - * 委托检材--检出定性定量结果信息 - * - * @author chenjiangbao - * @describe 委托检材--检出定性定量结果信息相关接口 前端控制器 - */ -@RestController -@RequestMapping("/papp/entrustTemplateInfo") -@Api(tags = "019-委托送检中案情简要等内容的模板信息相关接口") -public class EntrustTemplateInfoController { - - @Resource - private EntrustTemplateInfoService entrustTemplateInfoService; - - // 内部静态类，用于封装枚举数据 - private static class EnumResponse { - private final int code; - private final String desc; - - public EnumResponse(int code, String desc) { - this.code = code; - this.desc = desc; - } - - public int getCode() { - return code; - } - - public String getDesc() { - return desc; - } - } - - @ApiOperation("获取所有模板的类型值") - @GetMapping("/allTemplateType") - public R> allTemplateType() { - List enumResponseList = Arrays.stream(TemplateTypeEnums.values()) - .map(value -> new EnumResponse(value.getCode(), value.getDesc())) - .collect(Collectors.toList()); - return R.ok(enumResponseList); - } - - @ApiOperation("获取模板的分页接口") - @PostMapping("/page") - public R> pageEntrustTemplateInfo(@RequestBody EntrustTemplateInfoQuery query) { - return R.ok( - entrustTemplateInfoService.page( - new Page<>(query.getCurrent(), query.getSize()), - Wrappers.lambdaQuery() - .eq(query.getType() != null, EntrustTemplateInfo::getTemplateType, query.getType()) - .orderByDesc(EntrustTemplateInfo::getCreateTime) - ) - ); - } - - @ApiOperation("录入模板信息") - @PostMapping("/save") - public R addEntrustTemplateInfo(@RequestBody @Valid EntrustTemplateInfo info) { - EntrustTemplateInfo isExist = entrustTemplateInfoService.getOne( - Wrappers.lambdaQuery() - .eq(EntrustTemplateInfo::getTemplateName, info.getTemplateName()) - .eq(EntrustTemplateInfo::getTemplateType, info.getTemplateType()) - ); - if (isExist != null) { - return R.failed(String.format("在模板类型为 [%s] 中已经存在模板名称为 [%s] 的模板！", - TemplateTypeEnums.fromCode(info.getTemplateType()).getDesc(), - info.getTemplateName())); - } - entrustTemplateInfoService.save(info); - return R.ok(info); - } - - @ApiOperation("更新模板信息") - @PutMapping("/update") - public R update(@RequestBody EntrustTemplateInfo info) { - EntrustTemplateInfo isExist = entrustTemplateInfoService.getById(info.getId()); - if (isExist == null) { - return R.failed("数据在系统中不存在！"); - } - entrustTemplateInfoService.updateById(info); - return R.ok(info); - } - - @ApiOperation("删除模板信息") - @PostMapping("/delete") - public R delete(@RequestBody List ids) { - return R.ok(entrustTemplateInfoService.removeByIds(ids)); - } -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustTemplateInfo.java b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustTemplateInfo.java deleted file mode 100644 index 3f11d89..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustTemplateInfo.java +++ /dev/null @@ -1,55 +0,0 @@ -package digital.laboratory.platform.entrustment.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import digital.laboratory.platform.common.mybatis.base.BaseEntity; -import java.io.Serializable; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -/** - * 委托送检中案情简要等内容的模板信息表 - * @TableName b_entrust_template_info - */ -@Data -@TableName(value ="b_entrust_template_info") -@ApiModel(value = "EntrustTemplateInfo", description = "委托送检中案情简要等内容的模板信息表") -public class EntrustTemplateInfo extends BaseEntity { - /** - * 主键id - */ - @ApiModelProperty("id主键") - @TableId(value = "ID", type = IdType.ASSIGN_ID) - private String id; - - /** - * 模板名称 - */ - @ApiModelProperty("模板名称") - @NotBlank(message = "模板名称不能为空！") - private String templateName; - - /** - * 模板内容 - */ - @ApiModelProperty("模板内容") - @NotBlank(message = "模板内容不能为空！") - private String templateContent; - - /** - * 模板类型，比如：0 - 案情简要 - */ - @ApiModelProperty("模板类型，比如：0 - 案情简要") - @NotNull(message = "模板类型不能为空！") - private Integer templateType; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/enums/TemplateTypeEnums.java b/src/main/java/digital/laboratory/platform/entrustment/enums/TemplateTypeEnums.java deleted file mode 100644 index ddb5a44..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/enums/TemplateTypeEnums.java +++ /dev/null @@ -1,30 +0,0 @@ -package digital.laboratory.platform.entrustment.enums; - -import lombok.Getter; - -@Getter -public enum TemplateTypeEnums { - - TEMPLATE_CASE_BRIEF(0, "案情简要模板"), - ; - - - private final Integer code; - - private final String desc; - - TemplateTypeEnums(Integer code, String desc) { - this.code = code; - this.desc = desc; - } - - // 根据名称获取状态值 - public static TemplateTypeEnums fromCode(Integer code) { - for (TemplateTypeEnums entrustAlterApplyStatus : values()) { - if (entrustAlterApplyStatus.getCode().equals(code)) { - return entrustAlterApplyStatus; - } - } - throw new IllegalArgumentException("No enum constant with code: " + code); - } -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustTemplateInfoMapper.java b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustTemplateInfoMapper.java deleted file mode 100644 index 30c692c..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustTemplateInfoMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package digital.laboratory.platform.entrustment.mapper; - -import digital.laboratory.platform.entrustment.entity.EntrustTemplateInfo; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** -* @author ChenJiangBao -* @description 针对表【b_entrust_template_info(委托送检中案情简要等内容的模板信息表)】的数据库操作Mapper -* @createDate 2025-01-08 14:12:41 -* @Entity digital.laboratory.platform.entrustment.entity.EntrustTemplateInfo -*/ -@Mapper -public interface EntrustTemplateInfoMapper extends BaseMapper { - -} - - - - diff --git a/src/main/java/digital/laboratory/platform/entrustment/query/EntrustTemplateInfoQuery.java b/src/main/java/digital/laboratory/platform/entrustment/query/EntrustTemplateInfoQuery.java deleted file mode 100644 index 6d8907c..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/query/EntrustTemplateInfoQuery.java +++ /dev/null @@ -1,19 +0,0 @@ -package digital.laboratory.platform.entrustment.query; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 申请修改委托消息 查询对象（分页查询、列表查询） - * - * @author Chen - * @since 1.0.0 2024-08-14 - */ -@Data -@ApiModel(description = "申请修改委托消息 查询对象（分页查询、列表查询）") -public class EntrustTemplateInfoQuery extends BaseQuery { - - @ApiModelProperty(value = "模板类型") - private Integer type; -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustTemplateInfoService.java b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustTemplateInfoService.java deleted file mode 100644 index b984893..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustTemplateInfoService.java +++ /dev/null @@ -1,13 +0,0 @@ -package digital.laboratory.platform.entrustment.service; - -import digital.laboratory.platform.entrustment.entity.EntrustTemplateInfo; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author ChenJiangBao -* @description 针对表【b_entrust_template_info(委托送检中案情简要等内容的模板信息表)】的数据库操作Service -* @createDate 2025-01-08 14:12:41 -*/ -public interface EntrustTemplateInfoService extends IService { - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustTemplateInfoServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustTemplateInfoServiceImpl.java deleted file mode 100644 index b68578c..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustTemplateInfoServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package digital.laboratory.platform.entrustment.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import digital.laboratory.platform.entrustment.entity.EntrustTemplateInfo; -import digital.laboratory.platform.entrustment.service.EntrustTemplateInfoService; -import digital.laboratory.platform.entrustment.mapper.EntrustTemplateInfoMapper; -import org.springframework.stereotype.Service; - -/** -* @author ChenJiangBao -* @description 针对表【b_entrust_template_info(委托送检中案情简要等内容的模板信息表)】的数据库操作Service实现 -* @createDate 2025-01-08 14:12:41 -*/ -@Service -public class EntrustTemplateInfoServiceImpl extends ServiceImpl - implements EntrustTemplateInfoService{ - -} - - - - diff --git a/src/main/resources/mapper/EntrustTemplateInfoMapper.xml b/src/main/resources/mapper/EntrustTemplateInfoMapper.xml deleted file mode 100644 index cee79f0..0000000 --- a/src/main/resources/mapper/EntrustTemplateInfoMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - id,template_name,template_content, - template_type,create_time,create_by, - update_time,update_by - - From 3c02cc625f44ad8158124c4c764762508d2fe294 Mon Sep 17 00:00:00 2001 From: chen <2710907404@qq.com> Date: Wed, 8 Jan 2025 17:11:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?20250108=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entrustment/service/impl/EntrustAlterApplyServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java index eef746f..40649e0 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java @@ -312,6 +312,8 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl