模板修改

模板修改

模板修改

模板修改

模板修改
This commit is contained in:
guoshengxiong 2025-06-11 09:15:26 +08:00
parent 502d11cac6
commit 11013f0cdd
7 changed files with 71 additions and 39 deletions

View File

@ -21,7 +21,10 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.oConvertUtils; import com.zhgd.jeecg.common.util.oConvertUtils;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import ${bussiPackage}.${entityPackage}.entity.${entityName}; 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 ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
import org.springframework.context.annotation.Lazy;
import org.simpleframework.xml.core.Validate; import org.simpleframework.xml.core.Validate;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -55,6 +58,7 @@ import com.alibaba.fastjson.JSON;
@Slf4j @Slf4j
@Api(tags = "${tableVo.ftlDescription}相关Api") @Api(tags = "${tableVo.ftlDescription}相关Api")
public class ${entityName}Controller { public class ${entityName}Controller {
@Lazy
@Autowired @Autowired
private I${entityName}Service ${entityName?uncap_first}Service; 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"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
}) })
@GetMapping(value = "/page") @GetMapping(value = "/page")
public Result<IPage<${entityName}>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) { public Result<IPage<${entityName}Vo>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
return Result.success(${entityName?uncap_first}Service.queryPageList(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}信息") @OperLog(operModul = "${tableVo.ftlDescription}管理", operType = "列表查询", operDesc = "列表查询${tableVo.ftlDescription}信息")
@ApiOperation(value = "列表查询${tableVo.ftlDescription}信息", notes = "列表查询${tableVo.ftlDescription}信息", httpMethod="GET") @ApiOperation(value = "列表查询${tableVo.ftlDescription}信息", notes = "列表查询${tableVo.ftlDescription}信息", httpMethod="GET")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<List<${entityName}>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) { public Result<List<${entityName}Vo>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
return Result.success(${entityName?uncap_first}Service.queryList(param)); return Result.success(${entityName?uncap_first}Service.queryList(param));
} }
/** /**
* 添加 * 添加
* @param ${entityName?uncap_first} * @param ${entityName?uncap_first}Dto
* @return * @return
*/ */
@OperLog(operModul = "${tableVo.ftlDescription}管理", operType = "添加", operDesc = "添加${tableVo.ftlDescription}信息") @OperLog(operModul = "${tableVo.ftlDescription}管理", operType = "添加", operDesc = "添加${tableVo.ftlDescription}信息")
@ApiOperation(value = "添加${tableVo.ftlDescription}信息", notes = "添加${tableVo.ftlDescription}信息" , httpMethod="POST") @ApiOperation(value = "添加${tableVo.ftlDescription}信息", notes = "添加${tableVo.ftlDescription}信息" , httpMethod="POST")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<${entityName}> add(@RequestBody @Validate ${entityName} ${entityName?uncap_first}) { public Result<${entityName}Vo> add(@RequestBody @Validate ${entityName}Dto ${entityName?uncap_first}Dto) {
${entityName?uncap_first}Service.add(${entityName?uncap_first}); ${entityName?uncap_first}Service.add(${entityName?uncap_first}Dto);
return Result.ok(); return Result.ok();
} }
/** /**
* 编辑 * 编辑
* @param ${entityName?uncap_first} * @param ${entityName?uncap_first}Dto
* @return * @return
*/ */
@OperLog(operModul = "${tableVo.ftlDescription}管理", operType = "编辑", operDesc = "编辑${tableVo.ftlDescription}信息") @OperLog(operModul = "${tableVo.ftlDescription}管理", operType = "编辑", operDesc = "编辑${tableVo.ftlDescription}信息")
@ApiOperation(value = "编辑${tableVo.ftlDescription}信息", notes = "编辑${tableVo.ftlDescription}信息" , httpMethod="POST") @ApiOperation(value = "编辑${tableVo.ftlDescription}信息", notes = "编辑${tableVo.ftlDescription}信息" , httpMethod="POST")
@PostMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<${entityName}> edit(@RequestBody ${entityName} ${entityName?uncap_first}) { public Result<${entityName}> edit(@RequestBody ${entityName}Dto ${entityName?uncap_first}Dto) {
${entityName?uncap_first}Service.edit(${entityName?uncap_first}); ${entityName?uncap_first}Service.edit(${entityName?uncap_first}Dto);
return Result.ok(); return Result.ok();
} }
@ -132,7 +136,7 @@ public class ${entityName}Controller {
@ApiOperation(value = "通过id查询${tableVo.ftlDescription}信息", notes = "通过id查询${tableVo.ftlDescription}信息" , httpMethod="GET") @ApiOperation(value = "通过id查询${tableVo.ftlDescription}信息", notes = "通过id查询${tableVo.ftlDescription}信息" , httpMethod="GET")
@ApiImplicitParam(name = "id", value = "${tableVo.ftlDescription}ID", paramType = "query", required = true, dataType = "Integer") @ApiImplicitParam(name = "id", value = "${tableVo.ftlDescription}ID", paramType = "query", required = true, dataType = "Integer")
@GetMapping(value = "/queryById") @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)); return Result.success(${entityName?uncap_first}Service.queryById(id));
} }

View File

@ -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} {
}

View File

@ -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} {
}

View File

@ -3,6 +3,8 @@ package ${bussiPackage}.${entityPackage}.mapper;
import java.util.List; import java.util.List;
import java.util.HashMap; import java.util.HashMap;
import ${bussiPackage}.${entityPackage}.entity.${entityName}; 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.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
@ -28,7 +30,7 @@ public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
* @param param * @param param
* @return * @return
*/ */
IPage<${entityName}> queryList(Page<${entityName}> page, @Param(Constants.WRAPPER) QueryWrapper<${entityName}> queryWrapper, @Param("param") HashMap<String, Object> param); IPage<${entityName}Vo> queryList(Page<${entityName}Vo> page, @Param(Constants.WRAPPER) QueryWrapper<${entityName}Vo> queryWrapper, @Param("param") HashMap<String, Object> param);
/** /**
* 列表查询${tableVo.ftlDescription}信息 * 列表查询${tableVo.ftlDescription}信息
@ -37,7 +39,7 @@ public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
* @param param * @param param
* @return * @return
*/ */
List<${entityName}> queryList(@Param(Constants.WRAPPER) QueryWrapper<${entityName}> queryWrapper, @Param("param") HashMap<String, Object> param); List<${entityName}Vo> queryList(@Param(Constants.WRAPPER) QueryWrapper<${entityName}Vo> queryWrapper, @Param("param") HashMap<String, Object> param);
/** /**
@ -46,5 +48,5 @@ public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
* @param id * @param id
* @return * @return
*/ */
${entityName} queryById(String id); ${entityName}Vo queryById(String id);
} }

View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper"> <mapper namespace="${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper">
<select id="queryList" resultType="${bussiPackage}.${entityPackage}.entity.${entityName}"> <select id="queryList" resultType="${bussiPackage}.${entityPackage}.entity.vo.${entityName}Vo">
select * from ( select * from (
select t.* select t.*
from ${tableName} t from ${tableName} t
)t )t
${r"${ew.customSqlSegment}"} ${r"${ew.customSqlSegment}"}
</select> </select>
<select id="queryById" resultType="${bussiPackage}.${entityPackage}.entity.${entityName}"> <select id="queryById" resultType="${bussiPackage}.${entityPackage}.entity.vo.${entityName}Vo">
select * from ( select * from (
select t.* select t.*
from ${tableName} t from ${tableName} t

View File

@ -1,6 +1,8 @@
package ${bussiPackage}.${entityPackage}.service; package ${bussiPackage}.${entityPackage}.service;
import ${bussiPackage}.${entityPackage}.entity.${entityName}; 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.extension.service.IService;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.HashMap; import java.util.HashMap;
@ -18,25 +20,25 @@ public interface I${entityName}Service extends IService<${entityName}> {
* @param param 参数map * @param param 参数map
* @return * @return
*/ */
IPage<${entityName}> queryPageList(HashMap<String, Object> param); IPage<${entityName}Vo> queryPageList(HashMap<String, Object> param);
/** /**
* 列表查询${tableVo.ftlDescription}信息 * 列表查询${tableVo.ftlDescription}信息
* @param param 参数map * @param param 参数map
* @return * @return
*/ */
List<${entityName}> queryList(HashMap<String, Object> param); List<${entityName}Vo> queryList(HashMap<String, Object> param);
/** /**
* 添加${tableVo.ftlDescription}信息 * 添加${tableVo.ftlDescription}信息
* @param ${entityName?uncap_first} ${tableVo.ftlDescription} * @param ${entityName?uncap_first}Dto ${tableVo.ftlDescription}
* @return * @return
*/ */
void add(${entityName} ${entityName?uncap_first}); void add(${entityName}Dto ${entityName?uncap_first}Dto);
/** /**
* 编辑${tableVo.ftlDescription}信息 * 编辑${tableVo.ftlDescription}信息
* @param ${entityName?uncap_first} ${tableVo.ftlDescription} * @param ${entityName?uncap_first}Dto ${tableVo.ftlDescription}
* @return * @return
*/ */
void edit(${entityName} ${entityName?uncap_first}); void edit(${entityName}Dto ${entityName?uncap_first}Dto);
/** /**
* 根据id删除${tableVo.ftlDescription}信息 * 根据id删除${tableVo.ftlDescription}信息
* @param id ${tableVo.ftlDescription}的id * @param id ${tableVo.ftlDescription}的id
@ -48,6 +50,6 @@ public interface I${entityName}Service extends IService<${entityName}> {
* @param id ${tableVo.ftlDescription}的id * @param id ${tableVo.ftlDescription}的id
* @return * @return
*/ */
${entityName} queryById(String id); ${entityName}Vo queryById(String id);
} }

View File

@ -2,6 +2,8 @@ package ${bussiPackage}.${entityPackage}.service.impl;
import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.execption.OpenAlertException;
import ${bussiPackage}.${entityPackage}.entity.${entityName}; 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}.mapper.${entityName}Mapper;
import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -28,43 +30,43 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $
@Autowired @Autowired
private ${entityName}Mapper ${entityName?uncap_first}Mapper; private ${entityName}Mapper ${entityName?uncap_first}Mapper;
@Override @Override
public IPage<${entityName}> queryPageList(HashMap<String, Object> param) { public IPage<${entityName}Vo> queryPageList(HashMap<String, Object> param) {
QueryWrapper<${entityName}> queryWrapper = this.getQueryWrapper(param); QueryWrapper<${entityName}Vo> queryWrapper = this.getQueryWrapper(param);
Page<${entityName}> page = PageUtil.getPage(param); Page<${entityName}Vo> page = PageUtil.getPage(param);
IPage<${entityName}> pageList = baseMapper.queryList(page, queryWrapper,param); IPage<${entityName}Vo> pageList = baseMapper.queryList(page, queryWrapper,param);
pageList.setRecords(this.dealList(pageList.getRecords())); pageList.setRecords(this.dealList(pageList.getRecords()));
return pageList; return pageList;
} }
@Override @Override
public List<${entityName}> queryList(HashMap<String, Object> param) { public List<${entityName}Vo> queryList(HashMap<String, Object> param) {
QueryWrapper<${entityName}> queryWrapper = getQueryWrapper(param); QueryWrapper<${entityName}Vo> queryWrapper = getQueryWrapper(param);
return dealList(baseMapper.queryList(queryWrapper,param)); return dealList(baseMapper.queryList(queryWrapper,param));
} }
private QueryWrapper<${entityName}> getQueryWrapper(HashMap<String, Object> param) { private QueryWrapper<${entityName}Vo> getQueryWrapper(HashMap<String, Object> param) {
QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initPageQueryWrapper(${entityName}.class, param, true); QueryWrapper<${entityName}Vo> queryWrapper = QueryGenerator.initPageQueryWrapper(${entityName}Vo.class, param, true);
queryWrapper.orderByDesc(RefUtil.fieldNameUlc(${entityName}::getId)); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(${entityName}Vo::getId));
return queryWrapper; return queryWrapper;
} }
private List<${entityName}> dealList(List<${entityName}> list) { private List<${entityName}Vo> dealList(List<${entityName}Vo> list) {
return list; return list;
} }
@Override @Override
public void add(${entityName} ${entityName?uncap_first}) { public void add(${entityName}Dto ${entityName?uncap_first}Dto) {
${entityName?uncap_first}.setId(null); ${entityName?uncap_first}Dto.setId(null);
baseMapper.insert(${entityName?uncap_first}); baseMapper.insert(${entityName?uncap_first}Dto);
} }
@Override @Override
public void edit(${entityName} ${entityName?uncap_first}) { public void edit(${entityName}Dto ${entityName?uncap_first}Dto) {
${entityName} old${entityName} = baseMapper.selectById(${entityName?uncap_first}.getId()); ${entityName} old${entityName} = baseMapper.selectById(${entityName?uncap_first}Dto.getId());
if(old${entityName}==null) { if(old${entityName}==null) {
throw new OpenAlertException("未找到对应实体"); throw new OpenAlertException("未找到对应实体");
} }
baseMapper.updateById(${entityName?uncap_first}); baseMapper.updateById(${entityName?uncap_first}Dto);
} }
@Override @Override
@ -77,8 +79,8 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $
} }
@Override @Override
public ${entityName} queryById(String id) { public ${entityName}Vo queryById(String id) {
${entityName} entity = baseMapper.queryById(id); ${entityName}Vo entity = baseMapper.queryById(id);
if (entity == null) { if (entity == null) {
throw new OpenAlertException("未找到对应实体"); throw new OpenAlertException("未找到对应实体");
} }