KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix bug】querylist方法，添加属性

Browse Source
This commit is contained in:
梁琦涛
2023-03-14 15:50:47 +08:00
parent bb8c87bfac
commit 73965ebe7c
6 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+7 -4
View File
@@ -41,7 +41,7 @@ import com.jero.common.aspect.annotation.AutoLog;
public class ${entityName}Controller extends JeroController<${entityName}, I${entityName}Service> { public class ${entityName}Controller extends JeroController<${entityName}, I${entityName}Service> {
@Autowired @Autowired
private I${entityName}Service ${entityName?uncap_first}Service; private I${entityName}Service ${entityName?uncap_first}Service;
/** /**
* 分页列表查询 * 分页列表查询
* *
@@ -59,7 +59,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()); QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap());
Page<${entityName}> page = new Page<${entityName}>(pageNo, pageSize); Page<${entityName}> page = new Page<>(pageNo, pageSize);
IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
} }
@@ -67,13 +67,16 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en
/** /**
* 列表查询 * 列表查询
* *
* @param ${entityName?uncap_first}
* @param req
* @return * @return
*/ */
@AutoLog(value = "${tableVo.ftlDescription}-列表查询") @AutoLog(value = "${tableVo.ftlDescription}-列表查询")
@ApiOperation(value="${tableVo.ftlDescription}-列表查询", notes="${tableVo.ftlDescription}-列表查询") @ApiOperation(value="${tableVo.ftlDescription}-列表查询", notes="${tableVo.ftlDescription}-列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<List<${entityName}>> queryList() { public Result<List<${entityName}>> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req) {
List<${entityName}> list = ${entityName?uncap_first}Service.queryList(); QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap());
List<${entityName}> list = ${entityName?uncap_first}Service.queryList(queryWrapper);
return Result.OK(list); return Result.OK(list);
} }
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
+3 -1
View File
@@ -1,5 +1,6 @@
package ${bussiPackage}.${entityPackage}.service; package ${bussiPackage}.${entityPackage}.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import ${bussiPackage}.${entityPackage}.entity.${entityName}; import ${bussiPackage}.${entityPackage}.entity.${entityName};
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List; import java.util.List;
@@ -55,7 +56,8 @@ public interface I${entityName}Service extends IService<${entityName}> {
/** /**
* 列表查询 * 列表查询
* *
* @param queryWrapper
* @return * @return
*/ */
List<${entityName}> queryList(); List<${entityName}> queryList(QueryWrapper<${entityName}> queryWrapper);
} }
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
+4 -2
View File
@@ -9,6 +9,7 @@ import com.jero.common.exception.JeroBootException;
import java.util.List; import java.util.List;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/** /**
* @Description: ${tableVo.ftlDescription} * @Description: ${tableVo.ftlDescription}
@@ -83,10 +84,11 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $
/** /**
* 列表查询 * 列表查询
* *
* @param queryWrapper
* @return * @return
*/ */
@Override @Override
public List<${entityName}> queryList() { public List<${entityName}> queryList(QueryWrapper<${entityName}> queryWrapper) {
return list(); return list(queryWrapper);
} }
} }
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+9 -8
View File
@@ -48,7 +48,7 @@ import io.swagger.annotations.ApiOperation;
public class ${entityName}Controller extends JeroController<${entityName}, I${entityName}Service> { public class ${entityName}Controller extends JeroController<${entityName}, I${entityName}Service> {
@Autowired @Autowired
private I${entityName}Service ${entityName?uncap_first}Service; private I${entityName}Service ${entityName?uncap_first}Service;
/** /**
* 分页列表查询 * 分页列表查询
* *
@@ -66,7 +66,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()); QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap());
Page<${entityName}> page = new Page<${entityName}>(pageNo, pageSize); Page<${entityName}> page = new Page<>(pageNo, pageSize);
IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
} }
@@ -79,8 +79,9 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en
@AutoLog(value = "${tableVo.ftlDescription}-列表查询") @AutoLog(value = "${tableVo.ftlDescription}-列表查询")
@ApiOperation(value="${tableVo.ftlDescription}-列表查询", notes="${tableVo.ftlDescription}-列表查询") @ApiOperation(value="${tableVo.ftlDescription}-列表查询", notes="${tableVo.ftlDescription}-列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<List<${entityName}>> queryList() { public Result<List<${entityName}>> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req) {
List<?> list = ${entityName?uncap_first}Service.queryList(); QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap());
List<?> list = ${entityName?uncap_first}Service.queryList(queryWrapper);
return Result.OK(list); return Result.OK(list);
} }
@@ -97,7 +98,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en
${entityName?uncap_first}Service.add(${entityName?uncap_first}); ${entityName?uncap_first}Service.add(${entityName?uncap_first});
return Result.OK("操作成功!"); return Result.OK("操作成功!");
} }
/** /**
* 编辑 * 编辑
* *
@@ -111,7 +112,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en
${entityName?uncap_first}Service.editById(${entityName?uncap_first}); ${entityName?uncap_first}Service.editById(${entityName?uncap_first});
return Result.OK("操作成功!"); return Result.OK("操作成功!");
} }
/** /**
* 通过id删除 * 通过id删除
* *
@@ -125,7 +126,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en
${entityName?uncap_first}Service.deleteById(id); ${entityName?uncap_first}Service.deleteById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
/** /**
* 批量删除 * 批量删除
* *
@@ -139,7 +140,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en
this.${entityName?uncap_first}Service.deleteByIds(Arrays.asList(ids.split(","))); this.${entityName?uncap_first}Service.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功！"); return Result.OK("批量删除成功！");
} }
/** /**
* 通过id查询 * 通过id查询
* *
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
+2 -1
View File
@@ -54,7 +54,8 @@ public interface I${entityName}Service extends IService<${entityName}> {
/** /**
* 列表查询 * 列表查询
* *
* @param queryWrapper
* @return * @return
*/ */
List<${entityName}> queryList(); List<${entityName}> queryList(QueryWrapper<${entityName}> queryWrapper);
} }
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
+3 -2
View File
@@ -76,10 +76,11 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $
/** /**
* 列表查询 * 列表查询
* *
* @param queryWrapper
* @return * @return
*/ */
@Override @Override
List<${entityName}> queryList() { List<${entityName}> queryList(QueryWrapper<${entityName}> queryWrapper) {
return list(); return list(queryWrapper);
} }
} }