From c909bbf5cb0eb377865f444130be455c4a806670 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 11 Jun 2025 09:15:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 模板修改 模板修改 模板修改 模板修改 --- .../controller/${entityName}Controller.javai | 22 ++++++----- .../entity/dto/${entityName}Dto.javai | 11 ++++++ .../entity/vo/${entityName}Vo.javai | 11 ++++++ .../mapper/${entityName}Mapper.javai | 8 ++-- .../mapper/xml/${entityName}Mapper.xml | 4 +- .../service/I${entityName}Service.javai | 16 ++++---- .../impl/${entityName}ServiceImpl.javai | 38 ++++++++++--------- 7 files changed, 71 insertions(+), 39 deletions(-) create mode 100644 src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/dto/${entityName}Dto.javai create mode 100644 src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/vo/${entityName}Vo.javai diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index a81f274bf..9d7aa06ea 100644 --- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -21,7 +21,10 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.oConvertUtils; import org.apache.commons.collections.MapUtils; import ${bussiPackage}.${entityPackage}.entity.${entityName}; +import ${bussiPackage}.${entityPackage}.entity.vo.${entityName}Vo; +import ${bussiPackage}.${entityPackage}.entity.dto.${entityName}Dto; import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; +import org.springframework.context.annotation.Lazy; import org.simpleframework.xml.core.Validate; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -55,6 +58,7 @@ import com.alibaba.fastjson.JSON; @Slf4j @Api(tags = "${tableVo.ftlDescription}相关Api") public class ${entityName}Controller { + @Lazy @Autowired private I${entityName}Service ${entityName?uncap_first}Service; @@ -69,7 +73,7 @@ public class ${entityName}Controller { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), }) @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { return Result.success(${entityName?uncap_first}Service.queryPageList(param)); } @@ -80,33 +84,33 @@ public class ${entityName}Controller { @OperLog(operModul = "${tableVo.ftlDescription}管理", operType = "列表查询", operDesc = "列表查询${tableVo.ftlDescription}信息") @ApiOperation(value = "列表查询${tableVo.ftlDescription}信息", notes = "列表查询${tableVo.ftlDescription}信息", httpMethod="GET") @GetMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryList(@ApiIgnore @RequestParam HashMap param) { return Result.success(${entityName?uncap_first}Service.queryList(param)); } /** * 添加 - * @param ${entityName?uncap_first} + * @param ${entityName?uncap_first}Dto * @return */ @OperLog(operModul = "${tableVo.ftlDescription}管理", operType = "添加", operDesc = "添加${tableVo.ftlDescription}信息") @ApiOperation(value = "添加${tableVo.ftlDescription}信息", notes = "添加${tableVo.ftlDescription}信息" , httpMethod="POST") @PostMapping(value = "/add") - public Result<${entityName}> add(@RequestBody @Validate ${entityName} ${entityName?uncap_first}) { - ${entityName?uncap_first}Service.add(${entityName?uncap_first}); + public Result<${entityName}Vo> add(@RequestBody @Validate ${entityName}Dto ${entityName?uncap_first}Dto) { + ${entityName?uncap_first}Service.add(${entityName?uncap_first}Dto); return Result.ok(); } /** * 编辑 - * @param ${entityName?uncap_first} + * @param ${entityName?uncap_first}Dto * @return */ @OperLog(operModul = "${tableVo.ftlDescription}管理", operType = "编辑", operDesc = "编辑${tableVo.ftlDescription}信息") @ApiOperation(value = "编辑${tableVo.ftlDescription}信息", notes = "编辑${tableVo.ftlDescription}信息" , httpMethod="POST") @PostMapping(value = "/edit") - public Result<${entityName}> edit(@RequestBody ${entityName} ${entityName?uncap_first}) { - ${entityName?uncap_first}Service.edit(${entityName?uncap_first}); + public Result<${entityName}> edit(@RequestBody ${entityName}Dto ${entityName?uncap_first}Dto) { + ${entityName?uncap_first}Service.edit(${entityName?uncap_first}Dto); return Result.ok(); } @@ -132,7 +136,7 @@ public class ${entityName}Controller { @ApiOperation(value = "通过id查询${tableVo.ftlDescription}信息", notes = "通过id查询${tableVo.ftlDescription}信息" , httpMethod="GET") @ApiImplicitParam(name = "id", value = "${tableVo.ftlDescription}ID", paramType = "query", required = true, dataType = "Integer") @GetMapping(value = "/queryById") - public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) { + public Result<${entityName}Vo> queryById(@RequestParam(name="id",required=true) String id) { return Result.success(${entityName?uncap_first}Service.queryById(id)); } diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/dto/${entityName}Dto.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/dto/${entityName}Dto.javai new file mode 100644 index 000000000..013adc584 --- /dev/null +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/dto/${entityName}Dto.javai @@ -0,0 +1,11 @@ +package ${bussiPackage}.${entityPackage}.entity.dto; + +import ${bussiPackage}.${entityPackage}.entity.${entityName}; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +@Data +@ApiModel(value="${entityName}Dto实体类",description="${entityName}Dto实体类") +public class ${entityName}Dto extends ${entityName} { + +} diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/vo/${entityName}Vo.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/vo/${entityName}Vo.javai new file mode 100644 index 000000000..13d1c43d0 --- /dev/null +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/vo/${entityName}Vo.javai @@ -0,0 +1,11 @@ +package ${bussiPackage}.${entityPackage}.entity.vo; + +import ${bussiPackage}.${entityPackage}.entity.${entityName}; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +@Data +@ApiModel(value="${entityName}Vo实体类",description="${entityName}Vo实体类") +public class ${entityName}Vo extends ${entityName} { + +} diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai index 4de654f8c..19a010418 100644 --- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai @@ -3,6 +3,8 @@ package ${bussiPackage}.${entityPackage}.mapper; import java.util.List; import java.util.HashMap; import ${bussiPackage}.${entityPackage}.entity.${entityName}; +import ${bussiPackage}.${entityPackage}.entity.vo.${entityName}Vo; +import ${bussiPackage}.${entityPackage}.entity.dto.${entityName}Dto; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -28,7 +30,7 @@ public interface ${entityName}Mapper extends BaseMapper<${entityName}> { * @param param * @return */ - IPage<${entityName}> queryList(Page<${entityName}> page, @Param(Constants.WRAPPER) QueryWrapper<${entityName}> queryWrapper, @Param("param") HashMap param); + IPage<${entityName}Vo> queryList(Page<${entityName}Vo> page, @Param(Constants.WRAPPER) QueryWrapper<${entityName}Vo> queryWrapper, @Param("param") HashMap param); /** * 列表查询${tableVo.ftlDescription}信息 @@ -37,7 +39,7 @@ public interface ${entityName}Mapper extends BaseMapper<${entityName}> { * @param param * @return */ - List<${entityName}> queryList(@Param(Constants.WRAPPER) QueryWrapper<${entityName}> queryWrapper, @Param("param") HashMap param); + List<${entityName}Vo> queryList(@Param(Constants.WRAPPER) QueryWrapper<${entityName}Vo> queryWrapper, @Param("param") HashMap param); /** @@ -46,5 +48,5 @@ public interface ${entityName}Mapper extends BaseMapper<${entityName}> { * @param id * @return */ - ${entityName} queryById(String id); + ${entityName}Vo queryById(String id); } diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml index c89838cd8..257b40a77 100644 --- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml @@ -1,14 +1,14 @@ - select * from ( select t.* from ${tableName} t )t ${r"${ew.customSqlSegment}"} - select * from ( select t.* from ${tableName} t diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai index 6ddc192b1..0107f6d9e 100644 --- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai @@ -1,6 +1,8 @@ package ${bussiPackage}.${entityPackage}.service; import ${bussiPackage}.${entityPackage}.entity.${entityName}; +import ${bussiPackage}.${entityPackage}.entity.vo.${entityName}Vo; +import ${bussiPackage}.${entityPackage}.entity.dto.${entityName}Dto; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.HashMap; @@ -18,25 +20,25 @@ public interface I${entityName}Service extends IService<${entityName}> { * @param param 参数map * @return */ - IPage<${entityName}> queryPageList(HashMap param); + IPage<${entityName}Vo> queryPageList(HashMap param); /** * 列表查询${tableVo.ftlDescription}信息 * @param param 参数map * @return */ - List<${entityName}> queryList(HashMap param); + List<${entityName}Vo> queryList(HashMap param); /** * 添加${tableVo.ftlDescription}信息 - * @param ${entityName?uncap_first} ${tableVo.ftlDescription} + * @param ${entityName?uncap_first}Dto ${tableVo.ftlDescription} * @return */ - void add(${entityName} ${entityName?uncap_first}); + void add(${entityName}Dto ${entityName?uncap_first}Dto); /** * 编辑${tableVo.ftlDescription}信息 - * @param ${entityName?uncap_first} ${tableVo.ftlDescription} + * @param ${entityName?uncap_first}Dto ${tableVo.ftlDescription} * @return */ - void edit(${entityName} ${entityName?uncap_first}); + void edit(${entityName}Dto ${entityName?uncap_first}Dto); /** * 根据id删除${tableVo.ftlDescription}信息 * @param id ${tableVo.ftlDescription}的id @@ -48,6 +50,6 @@ public interface I${entityName}Service extends IService<${entityName}> { * @param id ${tableVo.ftlDescription}的id * @return */ - ${entityName} queryById(String id); + ${entityName}Vo queryById(String id); } diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai index dfe065e0a..78b072739 100644 --- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai @@ -2,6 +2,8 @@ package ${bussiPackage}.${entityPackage}.service.impl; import com.zhgd.jeecg.common.execption.OpenAlertException; import ${bussiPackage}.${entityPackage}.entity.${entityName}; +import ${bussiPackage}.${entityPackage}.entity.vo.${entityName}Vo; +import ${bussiPackage}.${entityPackage}.entity.dto.${entityName}Dto; import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper; import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; import org.springframework.stereotype.Service; @@ -28,43 +30,43 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ @Autowired private ${entityName}Mapper ${entityName?uncap_first}Mapper; @Override - public IPage<${entityName}> queryPageList(HashMap param) { - QueryWrapper<${entityName}> queryWrapper = this.getQueryWrapper(param); - Page<${entityName}> page = PageUtil.getPage(param); - IPage<${entityName}> pageList = baseMapper.queryList(page, queryWrapper,param); + public IPage<${entityName}Vo> queryPageList(HashMap param) { + QueryWrapper<${entityName}Vo> queryWrapper = this.getQueryWrapper(param); + Page<${entityName}Vo> page = PageUtil.getPage(param); + IPage<${entityName}Vo> pageList = baseMapper.queryList(page, queryWrapper,param); pageList.setRecords(this.dealList(pageList.getRecords())); return pageList; } @Override - public List<${entityName}> queryList(HashMap param) { - QueryWrapper<${entityName}> queryWrapper = getQueryWrapper(param); + public List<${entityName}Vo> queryList(HashMap param) { + QueryWrapper<${entityName}Vo> queryWrapper = getQueryWrapper(param); return dealList(baseMapper.queryList(queryWrapper,param)); } - private QueryWrapper<${entityName}> getQueryWrapper(HashMap param) { - QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initPageQueryWrapper(${entityName}.class, param, true); - queryWrapper.orderByDesc(RefUtil.fieldNameUlc(${entityName}::getId)); + private QueryWrapper<${entityName}Vo> getQueryWrapper(HashMap param) { + QueryWrapper<${entityName}Vo> queryWrapper = QueryGenerator.initPageQueryWrapper(${entityName}Vo.class, param, true); + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(${entityName}Vo::getId)); return queryWrapper; } - private List<${entityName}> dealList(List<${entityName}> list) { + private List<${entityName}Vo> dealList(List<${entityName}Vo> list) { return list; } @Override - public void add(${entityName} ${entityName?uncap_first}) { - ${entityName?uncap_first}.setId(null); - baseMapper.insert(${entityName?uncap_first}); + public void add(${entityName}Dto ${entityName?uncap_first}Dto) { + ${entityName?uncap_first}Dto.setId(null); + baseMapper.insert(${entityName?uncap_first}Dto); } @Override - public void edit(${entityName} ${entityName?uncap_first}) { - ${entityName} old${entityName} = baseMapper.selectById(${entityName?uncap_first}.getId()); + public void edit(${entityName}Dto ${entityName?uncap_first}Dto) { + ${entityName} old${entityName} = baseMapper.selectById(${entityName?uncap_first}Dto.getId()); if(old${entityName}==null) { throw new OpenAlertException("未找到对应实体"); } - baseMapper.updateById(${entityName?uncap_first}); + baseMapper.updateById(${entityName?uncap_first}Dto); } @Override @@ -77,8 +79,8 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ } @Override - public ${entityName} queryById(String id) { - ${entityName} entity = baseMapper.queryById(id); + public ${entityName}Vo queryById(String id) { + ${entityName}Vo entity = baseMapper.queryById(id); if (entity == null) { throw new OpenAlertException("未找到对应实体"); }