diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/ZdAssortApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/ZdAssortApi.java new file mode 100644 index 0000000..664dde4 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/ZdAssortApi.java @@ -0,0 +1,72 @@ +package com.docus.server.api.segmentation; + +import com.docus.server.dto.segmentation.zdassort.AddZdAssortDTO; +import com.docus.server.dto.segmentation.zdassort.EditZdAssortDTO; +import com.docus.server.dto.segmentation.zdassort.DeleteZdAssortDTO; +import com.docus.server.vo.segmentation.zdassort.ZdAssortVO; +import com.docus.server.entity.segmentation.ZdAssort; +import org.springframework.cloud.openfeign.FeignClient; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import java.util.List; + + +/** +* +* 病案分类 API +* +* @author AutoGenerator +* @since 2023-08-30 +*/ +@FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.ZdAssortApi") +@RequestMapping("/zdAssort") +public interface ZdAssortApi { + + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + @GetMapping("/find/{id}") + ZdAssortVO findById(@PathVariable(value = "id") Long id); + + /** + * 查询所有 + * @return 实体 + */ + @GetMapping("/findAll") + List findAll(); + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @PostMapping("/search") + PageResult search(@RequestBody SearchDTO searchDTO); + + /** + * 新增 + * @param addZdAssortDTO 新增参数 + */ + @PostMapping("/add") + void add(@RequestBody AddZdAssortDTO addZdAssortDTO); + + /** + * 编辑 + * @param editZdAssortDTO 编辑参数 + */ + @PutMapping("/edit") + void edit(@RequestBody EditZdAssortDTO editZdAssortDTO); + + /** + * 批量删除 + * @param deleteZdAssortDTO 删除参数 + * @return 成功或失败 + */ + @DeleteMapping("/delete") + int delete(@RequestBody DeleteZdAssortDTO deleteZdAssortDTO); +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/zdassort/AddZdAssortDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/zdassort/AddZdAssortDTO.java new file mode 100644 index 0000000..670333e --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/zdassort/AddZdAssortDTO.java @@ -0,0 +1,65 @@ +package com.docus.server.dto.segmentation.zdassort; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* 病案分类 AddDTO +* +* @author AutoGenerator +* @since 2023-08-30 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="AddZdAssortDTO对象", description="病案分类") +public class AddZdAssortDTO implements Serializable { + + @ApiModelProperty(value = "分类id") + private String assortId; + + @ApiModelProperty(value = "分类名称") + private String assortName; + + @ApiModelProperty(value = "分类排序") + private Integer assortSort; + + @ApiModelProperty(value = "是否启用 1是,0否") + private Integer effective; + + @ApiModelProperty(value = "是否校验 1是,0否") + private Integer isCheck; + + @ApiModelProperty(value = "代码分类") + private String assortCode; + + @ApiModelProperty(value = "等级") + private Integer level; + + @ApiModelProperty(value = "") + private String typeCode; + + @ApiModelProperty(value = "召回可查询角色") + private String recallRole; + + @ApiModelProperty(value = "采集器id") + private String collectId; + + @ApiModelProperty(value = "分段来源,参考基础库字典 file_source_code") + private String assortSource; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/zdassort/DeleteZdAssortDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/zdassort/DeleteZdAssortDTO.java new file mode 100644 index 0000000..0fc72ce --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/zdassort/DeleteZdAssortDTO.java @@ -0,0 +1,34 @@ +package com.docus.server.dto.segmentation.zdassort; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* 病案分类 DeleteDTO +* +* @author AutoGenerator +* @since 2023-08-30 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="DeleteZdAssortDTO对象", description="病案分类") +public class DeleteZdAssortDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/zdassort/EditZdAssortDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/zdassort/EditZdAssortDTO.java new file mode 100644 index 0000000..81936d0 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/zdassort/EditZdAssortDTO.java @@ -0,0 +1,65 @@ +package com.docus.server.dto.segmentation.zdassort; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* 病案分类 EditDTO +* +* @author AutoGenerator +* @since 2023-08-30 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="EditZdAssortDTO对象", description="病案分类") +public class EditZdAssortDTO implements Serializable { + + @ApiModelProperty(value = "分类id") + private String assortId; + + @ApiModelProperty(value = "分类名称") + private String assortName; + + @ApiModelProperty(value = "分类排序") + private Integer assortSort; + + @ApiModelProperty(value = "是否启用 1是,0否") + private Integer effective; + + @ApiModelProperty(value = "是否校验 1是,0否") + private Integer isCheck; + + @ApiModelProperty(value = "代码分类") + private String assortCode; + + @ApiModelProperty(value = "等级") + private Integer level; + + @ApiModelProperty(value = "") + private String typeCode; + + @ApiModelProperty(value = "召回可查询角色") + private String recallRole; + + @ApiModelProperty(value = "采集器id") + private String collectId; + + @ApiModelProperty(value = "分段来源,参考基础库字典 file_source_code") + private String assortSource; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/ZdAssort.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/ZdAssort.java new file mode 100644 index 0000000..9ba2ba6 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/ZdAssort.java @@ -0,0 +1,80 @@ +package com.docus.server.entity.segmentation; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +/** +* +* 病案分类 +* +* @author AutoGenerator +* @since 2023-08-30 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +@TableName("zd_assort") +@ApiModel(value="ZdAssort对象", description="病案分类") +public class ZdAssort implements Serializable { + + @ApiModelProperty(value = "分类id") + @TableId(value = "assort_id", type = IdType.ASSIGN_UUID) + private String assortId; + + @ApiModelProperty(value = "分类名称") + @TableField("assort_name") + private String assortName; + + @ApiModelProperty(value = "分类排序") + @TableField("assort_sort") + private Integer assortSort; + + @ApiModelProperty(value = "是否启用 1是,0否") + @TableField("effective") + private Integer effective; + + @ApiModelProperty(value = "是否校验 1是,0否") + @TableField("is_check") + private Integer isCheck; + + @ApiModelProperty(value = "代码分类") + @TableField("assort_code") + private String assortCode; + + @ApiModelProperty(value = "等级") + @TableField("level") + private Integer level; + + @ApiModelProperty(value = "") + @TableField("type_code") + private String typeCode; + + @ApiModelProperty(value = "召回可查询角色") + @TableField("recall_role") + private String recallRole; + + @ApiModelProperty(value = "采集器id") + @TableField("collect_id") + private String collectId; + + @ApiModelProperty(value = "分段来源,参考基础库字典 file_source_code") + @TableField("assort_source") + private String assortSource; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/zdassort/ZdAssortVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/zdassort/ZdAssortVO.java new file mode 100644 index 0000000..58eff02 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/zdassort/ZdAssortVO.java @@ -0,0 +1,65 @@ +package com.docus.server.vo.segmentation.zdassort; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* 病案分类 VO +* +* @author AutoGenerator +* @since 2023-08-30 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="ZdAssortVO对象", description="病案分类") +public class ZdAssortVO implements Serializable { + + @ApiModelProperty(value = "分类id") + private String assortId; + + @ApiModelProperty(value = "分类名称") + private String assortName; + + @ApiModelProperty(value = "分类排序") + private Integer assortSort; + + @ApiModelProperty(value = "是否启用 1是,0否") + private Integer effective; + + @ApiModelProperty(value = "是否校验 1是,0否") + private Integer isCheck; + + @ApiModelProperty(value = "代码分类") + private String assortCode; + + @ApiModelProperty(value = "等级") + private Integer level; + + @ApiModelProperty(value = "") + private String typeCode; + + @ApiModelProperty(value = "召回可查询角色") + private String recallRole; + + @ApiModelProperty(value = "采集器id") + private String collectId; + + @ApiModelProperty(value = "分段来源,参考基础库字典 file_source_code") + private String assortSource; + + +} diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/ZdAssortController.java b/docus-segmentation/src/main/java/com/docus/server/controller/ZdAssortController.java new file mode 100644 index 0000000..a772d41 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/controller/ZdAssortController.java @@ -0,0 +1,92 @@ +package com.docus.server.controller; + +import com.docus.server.dto.segmentation.zdassort.AddZdAssortDTO; +import com.docus.server.dto.segmentation.zdassort.EditZdAssortDTO; +import com.docus.server.dto.segmentation.zdassort.DeleteZdAssortDTO; +import com.docus.server.vo.segmentation.zdassort.ZdAssortVO; +import com.docus.server.entity.segmentation.ZdAssort; +import com.docus.server.api.segmentation.ZdAssortApi; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.service.IZdAssortService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; + +/** +* +* 病案分类 控制器类 +* +* @author AutoGenerator +* @since 2023-08-30 +*/ +@Api(value = "病案分类", tags = "病案分类") +@RestController +public class ZdAssortController implements ZdAssortApi { + @Resource + private IZdAssortService iZdAssortService; + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @ApiOperation("按主键查询") + @Override + public ZdAssortVO findById(Long id) { + return iZdAssortService.findById(id); + } + + /** + *查询所有 + * @return 实体 + */ + @ApiOperation("查询所有") + @Override + public List findAll() { + return iZdAssortService.findAll(); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @ApiOperation("关键字搜索") + @Override + public PageResult search(SearchDTO searchDTO) { + return iZdAssortService.search(searchDTO); + } + + /** + * 新增 + * @param addZdAssortDTO 编辑参数 + */ + @ApiOperation("新增") + @Override + public void add(AddZdAssortDTO addZdAssortDTO) { + iZdAssortService.add(addZdAssortDTO); + } + + /** + * 编辑 + * @param editZdAssortDTO 编辑参数 + */ + @ApiOperation("编辑") + @Override + public void edit(EditZdAssortDTO editZdAssortDTO) { + iZdAssortService.edit(editZdAssortDTO); + } + + /** + * 批量删除 + * @param deleteZdAssortDTO 删除参数 + * @return 成功或失败 + */ + @ApiOperation("批量删除") + @Override + public int delete(DeleteZdAssortDTO deleteZdAssortDTO) { + return iZdAssortService.delete(deleteZdAssortDTO); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/ZdAssortConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/ZdAssortConvert.java new file mode 100644 index 0000000..97ab31c --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/convert/ZdAssortConvert.java @@ -0,0 +1,49 @@ +package com.docus.server.convert; + +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.ZdAssort; + import com.docus.server.dto.segmentation.zdassort.AddZdAssortDTO; + import com.docus.server.dto.segmentation.zdassort.EditZdAssortDTO; + import com.docus.server.dto.segmentation.zdassort.DeleteZdAssortDTO; +import com.docus.server.vo.segmentation.zdassort.ZdAssortVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** +* +* 病案分类 服务转换器 +* +* @author AutoGenerator +* @since 2023-08-30 +*/ +@Mapper +public interface ZdAssortConvert { + + ZdAssortConvert INSTANCE = Mappers.getMapper(ZdAssortConvert.class); + + @Mappings({}) + ZdAssort convertDO(AddZdAssortDTO addZdAssortDTO); + + @Mappings({}) + ZdAssort convertDO(EditZdAssortDTO editZdAssortDTO); + + @Mappings({}) + List convertAddDOList(List addZdAssortDTO); + + @Mappings({}) + List convertEditDOList(List editZdAssortDTO); + + @Mappings({}) + ZdAssortVO convertVO(ZdAssort zdAssort); + + @Mappings({}) + List convertVO(List zdAssortList); + + @Mappings({}) + PageResult convertVO(PageResult pageResult); +} + diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IZdAssortDao.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IZdAssortDao.java new file mode 100644 index 0000000..9f300c5 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IZdAssortDao.java @@ -0,0 +1,52 @@ +package com.docus.server.infrastructure.dao; +import com.docus.server.entity.segmentation.ZdAssort; +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import java.util.List; +/** + * + * 病案分类 数据访问接口 + * + * @author AutoGenerator + * @since 2023-08-30 + */ +public interface IZdAssortDao extends IBaseDao { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + ZdAssort findById(Long id); + /** + * 新增 + * @param zdAssort 新增参数 + * @return 成功或失败 + */ + boolean add(ZdAssort zdAssort); + /** + * 编辑 + * @param zdAssort 编辑参数 + * @return 成功或失败 + */ + boolean edit(ZdAssort zdAssort); + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + int delete(List ids); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + int findByIdAndName(Long id, String name); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/ZdAssortDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/ZdAssortDaoImpl.java new file mode 100644 index 0000000..d320706 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/ZdAssortDaoImpl.java @@ -0,0 +1,120 @@ +package com.docus.server.infrastructure.dao.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.core.util.Func; +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.ZdAssort; +import com.docus.server.infrastructure.mapper.ZdAssortMapper; +import com.docus.server.infrastructure.dao.IZdAssortDao; +import com.github.pagehelper.PageHelper; +import org.springframework.stereotype.Repository; +import java.util.Date; +import java.util.List; + +/** + * + * 病案分类 数据访问实现类 + * + * @author AutoGenerator + * @since 2023-08-30 + */ +@Repository +public class ZdAssortDaoImpl extends BaseDaoImpl implements IZdAssortDao { + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public ZdAssort findById(Long id) { + return super.findById(id); + } + + /** + * 新增 + * @param zdAssort 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean add(ZdAssort zdAssort) { + return super.save(zdAssort); + } + + /** + * 编辑 + * @param zdAssort 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean edit(ZdAssort zdAssort) { + return super.updateById(zdAssort); + } + + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + @Override + public int delete(List ids) { + return super.deleteByIds(ids); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + //分页 + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); + LambdaQueryWrapper query = Wrappers.lambdaQuery() ; +// //时间范围,默认按createTime +// if (searchDTO.getBeginTime() != null) { +// query.ge(ZdAssort::getCreateTime, searchDTO.getBeginTime()); +// } +// if (searchDTO.getEndTime() != null) { +// Date endTime = searchDTO.getEndTime(); +// query.le(ZdAssort::getCreateTime, endTime); +// } + //关键字比较,多个列or + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { + //单个列用like + //query. like(ZdAssort::getxxx, searchDTO.getKeyword()); + //多个列用like + //query. and(sub -> sub.like(ZdAssort::getxx1, searchDTO.getKeyword()) + // оr(). like(ZdAssort::getXX2, searchDTO.getKeyword())) + //); + //} + query.eq(ZdAssort::getAssortSource,3); + query.eq(ZdAssort::getEffective,1); + + //默认createTime倒序排序 + query.orderByDesc(ZdAssort::getAssortSort); + List list = super.find(query); + return new PageResult<>(list); + } + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + @Override + public int findByIdAndName(Long id, String name) { + LambdaQueryWrapper query = Wrappers.lambdaQuery(); +// if (id != null) { +// query.ne(ZdAssort::getId, id); +// } + //if (Func.isNotBlank(name)) { + // query.eq(ZdAssort::getName, name); + //} + + return baseMapper.selectCount(query); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/ZdAssortMapper.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/ZdAssortMapper.java new file mode 100644 index 0000000..6f44ba3 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/ZdAssortMapper.java @@ -0,0 +1,20 @@ +package com.docus.server.infrastructure.mapper; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.docus.server.entity.segmentation.ZdAssort; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* +* 病案分类 Mapper 接口 +* +* @author AutoGenerator +* @since 2023-08-30 +*/ +@Mapper +@DS("archive") +public interface ZdAssortMapper extends BaseMapper { + + +} diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IZdAssortService.java b/docus-segmentation/src/main/java/com/docus/server/service/IZdAssortService.java new file mode 100644 index 0000000..b1b90f4 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/IZdAssortService.java @@ -0,0 +1,57 @@ +package com.docus.server.service; + +import com.docus.server.dto.segmentation.zdassort.AddZdAssortDTO; +import com.docus.server.dto.segmentation.zdassort.EditZdAssortDTO; +import com.docus.server.dto.segmentation.zdassort.DeleteZdAssortDTO; +import com.docus.server.vo.segmentation.zdassort.ZdAssortVO; +import com.docus.server.entity.segmentation.ZdAssort; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; + +import java.util.List; + +/** +* +* 病案分类 服务接口 +* +* @author AutoGenerator +* @since 2023-08-30 +*/ +public interface IZdAssortService { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + ZdAssortVO findById(Long id); + /** + * 查询所有 + * @return 实体 + */ + List findAll(); + /** + * 新增 + * @param addZdAssortDTO 新增参数 + * @return 成功或失败 + */ + boolean add(AddZdAssortDTO addZdAssortDTO); + /** + * 编辑 + * @param editZdAssortDTO 编辑参数 + * @return 成功或失败 + */ + boolean edit(EditZdAssortDTO editZdAssortDTO); + /** + * 批量删除 + * @param deleteZdAssortDTO 删除参数 + * @return 成功或失败 + */ + int delete(DeleteZdAssortDTO deleteZdAssortDTO); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/ZdAssortServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/ZdAssortServiceImpl.java new file mode 100644 index 0000000..3827ed7 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/ZdAssortServiceImpl.java @@ -0,0 +1,144 @@ +package com.docus.server.service.impl; + +import com.docus.server.dto.segmentation.zdassort.AddZdAssortDTO; +import com.docus.server.dto.segmentation.zdassort.EditZdAssortDTO; +import com.docus.server.dto.segmentation.zdassort.DeleteZdAssortDTO; +import com.docus.server.vo.segmentation.zdassort.ZdAssortVO; + import com.docus.server.entity.segmentation.ZdAssort; +import com.docus.server.convert.ZdAssortConvert; +import com.docus.server.infrastructure.dao.IZdAssortDao; +import com.docus.server.service.IZdAssortService; +import com.docus.core.util.Func; +import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.infrastructure.redis.service.IdService; +import com.docus.infrastructure.web.exception.ApiException; +import com.docus.infrastructure.web.exception.ExceptionCode; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; +import java.util.List; +import java.time.LocalDateTime; + +/** + * + * 病案分类 服务实现类 + * + * @author AutoGenerator + * @since 2023-08-30 + */ +@Service +public class ZdAssortServiceImpl implements IZdAssortService { + @Resource + private IZdAssortDao iZdAssortDao; + @Resource + private IdService idService; + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public ZdAssortVO findById(Long id) { + return ZdAssortConvert.INSTANCE.convertVO(iZdAssortDao.findById(id)); + } + + /** + *查询所有 + * @return 实体 + */ + @Override + public List findAll() { + return ZdAssortConvert.INSTANCE.convertVO(iZdAssortDao.findAll()); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + return ZdAssortConvert.INSTANCE.convertVO(iZdAssortDao.search(searchDTO)); + + //PageResult result = ZdAssortConvert.INSTANCE.convertVO(iZdAssortDao.search(searchDTO)); + + //if (CollectionUtils.isEmpty(result.getList())) { + //return new PageResult<>(); + //} + + //Map map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVO::getCollectorId)); + + //result.getList().forEach(p -> { + // String collectorId = String.valueOf(p.getCollectorId()); + // if (map.containsKey(collectorId)) { + // p.setCollectorName(map.get(collectorId).getParamName()); + // } + //}); + + //return result; + } + + /** + * 新增 + * @param addZdAssortDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(AddZdAssortDTO addZdAssortDTO) { + ZdAssort zdAssort =ZdAssortConvert.INSTANCE.convertDO(addZdAssortDTO); +// zdAssort.setId(idService.getDateSeq()); + return iZdAssortDao.add(zdAssort); + + // String name = addZdAssortDTO.getName(); + + //ZdAssort zdAssort = iZdAssortDao.findOneBy("name", name); + + //if (Func.notNull(zdAssort)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "病案分类已经存在"); + // } + + // ZdAssort zdAssort =ZdAssortConvert.INSTANCE.convertDO(addZdAssortDTO); + // zdAssort.setId(idService.getDateSeq()); + + // return iZdAssortDao.add(schCollector); + + } + + /** + * 编辑 + * @param editZdAssortDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean edit(EditZdAssortDTO editZdAssortDTO) { + ZdAssort zdAssort =ZdAssortConvert.INSTANCE.convertDO(editZdAssortDTO); + return iZdAssortDao.edit(zdAssort); + + // Long id = editZdAssortDTO.getId(); + + // ZdAssort zdAssort = iZdAssortDao.findById(id); + + // if (Func.isNull(zdAssort)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "病案分类,无法更新!"); + // } + + // zdAssort.setUpdateTime(LocalDateTime.now()); + // return iZdAssortDao.edit(zdAssort); + } + + /** + * 批量删除 + * @param deleteZdAssortDTO 删除参数 + * @return 成功或失败 + */ + @Override + public int delete(DeleteZdAssortDTO deleteZdAssortDTO) { + return iZdAssortDao.delete(deleteZdAssortDTO.getIds()); + } +} + diff --git a/docus-segmentation/src/main/resources/bootstrap.yml b/docus-segmentation/src/main/resources/bootstrap.yml index 5cb1129..d0af12e 100644 --- a/docus-segmentation/src/main/resources/bootstrap.yml +++ b/docus-segmentation/src/main/resources/bootstrap.yml @@ -17,6 +17,12 @@ spring: password: docus702 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource + archive: + url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_archivefile?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai + username: docus + password: docus702 + driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + type: com.alibaba.druid.pool.DruidDataSource servlet: multipart: max-file-size: 100MB diff --git a/docus-segmentation/src/main/resources/mapper/ZdAssortMapper.xml b/docus-segmentation/src/main/resources/mapper/ZdAssortMapper.xml new file mode 100644 index 0000000..625e28a --- /dev/null +++ b/docus-segmentation/src/main/resources/mapper/ZdAssortMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + assort_id, assort_name, assort_sort, effective, is_check, assort_code, level, type_code, recall_role, collect_id, assort_source + + +