@@ -43,11 +43,11 @@ public class ${classInfo.className}Controller {
4343 if(old${classInfo.className} !=null){
4444 ${classInfo.className?uncap_first } Mapper.updateById(${classInfo.className?uncap_first } );
4545 }else{
46- if(${classInfo.className?uncap_first } Mapper.selectOne(new QueryWrapper<${classInfo.className} >().eq("${classInfo.className?uncap_first } _name",${classInfo.className?uncap_first } .get${classInfo.className} Name()))!=null){
47- return ${returnUtilFailure} ("保存失败,名字重复");
48- }
49- ${classInfo.className?uncap_first } .setCreateTime(new Date());
50- ${classInfo.className?uncap_first } Mapper.insert(${classInfo.className?uncap_first } );
46+ if(${classInfo.className?uncap_first } Mapper.selectOne(new QueryWrapper<${classInfo.className} >().eq("${classInfo.className?uncap_first } _name",${classInfo.className?uncap_first } .get${classInfo.className} Name()))!=null){
47+ return ${returnUtilFailure} ("保存失败,名字重复");
48+ }
49+ ${classInfo.className?uncap_first } .setCreateTime(new Date());
50+ ${classInfo.className?uncap_first } Mapper.insert(${classInfo.className?uncap_first } );
5151 }
5252 return ${returnUtilSuccess} ("保存成功");
5353 }
@@ -83,43 +83,51 @@ public class ${classInfo.className}Controller {
8383 * 自动分页查询
8484 */
8585 @PostMapping("/list")
86- public Object list(String searchParams,
87- @RequestParam(required = false, defaultValue = "0") int page,
88- @RequestParam(required = false, defaultValue = "10") int limit) {
86+ public Object list(@RequestBody ${classInfo.className} ${classInfo.className?uncap_first } ,@RequestParam(required = false, defaultValue = "0") int page,@RequestParam(required = false, defaultValue = "10") int limit) {
8987 log.info("page:"+page+"-limit:"+limit+"-json:"+ JSON.toJSONString(searchParams));
9088 //分页构造器
9189 Page<${classInfo.className} > buildPage = new Page<${classInfo.className} >(page,limit);
9290 //条件构造器
9391 QueryWrapper<${classInfo.className} > queryWrapper = new QueryWrapper<${classInfo.className} >();
94- if(StringUtils.isNotEmpty(searchParams)&&JSON.isValid(searchParams)) {
95- ${classInfo.className} ${classInfo.className?uncap_first } = JSON.parseObject(searchParams, ${classInfo.className} .class);
96- queryWrapper.eq(StringUtils.isNoneEmpty(${classInfo.className?uncap_first } .get${classInfo.className} Name()), "${classInfo.className?uncap_first } _name", ${classInfo.className?uncap_first } .get${classInfo.className} Name());
92+ if(JSON.stringify(${classInfo.className?uncap_first } ).length()>2) {
93+ //自行删除不需要动态查询字段
94+ queryWrapper.
95+ <#list classInfo.fieldList as fieldItem >
96+ eq(StringUtils.isNoneEmpty(${classInfo.className?uncap_first } .get${fieldItem.fieldName} ()), "${fieldItem.fieldName} ", ${classInfo.className?uncap_first } .get${fieldItem.fieldName} ())
97+ </#list >
98+ ;
9799 }
98100 //执行分页
99101 IPage<${classInfo.className} > pageList = ${classInfo.className?uncap_first } Mapper.selectPage(buildPage, queryWrapper);
100102 //返回结果
101103 return ${returnUtil} .PAGE(pageList.getRecords(),pageList.getTotal());
102104 }
105+
103106 /**
104- * 手工分页查询(按需使用)
107+ * 动态条件手工分页查询
108+ * 根据对象属性自动构建条件,如果字段有值则进行分页+指定条件查询,否则仅进行分页查询
105109 */
106- /*@PostMapping("/list2")
107- public Object list2(String searchParams,
108- @RequestParam(required = false, defaultValue = "0") int page,
109- @RequestParam(required = false, defaultValue = "10") int limit) {
110- log.info("searchParams:"+ JSON.toJSONString(searchParams));
111- //通用模式
112- ${classInfo.className} queryParamDTO = JSON.parseObject(searchParams, ${classInfo.className} .class);
113- //专用DTO模式
114- //QueryParamDTO queryParamDTO = JSON.parseObject(searchParams, QueryParamDTO.class);
115- //queryParamDTO.setPage((page - 1)* limit);
116- //queryParamDTO.setLimit(limit);
117- //(page - 1) * limit, limit
118- List<${classInfo.className} > itemList = ${classInfo.className?uncap_first } Mapper.pageAll(queryParamDTO,(page - 1)* limit,limit);
119- Integer itemCount = ${classInfo.className?uncap_first } Mapper.countAll(queryParamDTO);
110+ @PostMapping("/list")
111+ public Object list(String searchParams, @RequestParam(required = false, defaultValue = "1") int page, @RequestParam(required = false, defaultValue = "10") int limit) {
112+ log.info("page:"+page+"-limit:"+limit+"-json:"+ JSON.toJSONString(searchParams));
113+
114+ // 分页参数处理
115+ int offset = (page - 1) * limit;
116+
117+ // 查询参数处理
118+ ${classInfo.className} queryParamDTO = new ${classInfo.className} ();
119+ if(StringUtils.isNotEmpty(searchParams) && JSON.isValid(searchParams)) {
120+ queryParamDTO = JSON.parseObject(searchParams, ${classInfo.className} .class);
121+ }
122+
123+ // 使用动态条件查询
124+ List<${classInfo.className} > itemList = ${classInfo.className?uncap_first } Mapper.selectPageByCondition(queryParamDTO, offset, limit);
125+ int itemCount = ${classInfo.className?uncap_first } Mapper.selectPageByConditionCount(queryParamDTO);
126+
120127 //返回结果
121- return ${returnUtilSuccess} .PAGE(itemList,itemCount);
122- }*/
128+ return ${returnUtil} .PAGE(itemList, itemCount);
129+ }
130+
123131 @GetMapping("/list")
124132 public ModelAndView listPage(){
125133 return new ModelAndView("${classInfo.className?uncap_first } -list");
@@ -132,16 +140,16 @@ public class ${classInfo.className}Controller {
132140 }
133141
134142 /**
135- * 发布/暂停 (如不需要请屏蔽)
143+ * 激活/停用 (如不需要请屏蔽)
136144 */
137- @PostMapping("/publish ")
138- public Object publish (int id,Integer status){
145+ @PostMapping("/active ")
146+ public Object active (int id,Integer status){
139147 ${classInfo.className} ${classInfo.className?uncap_first } = ${classInfo.className?uncap_first } Mapper.selectOne(new QueryWrapper<${classInfo.className} >().eq("${classInfo.className?uncap_first } _id",id));
140148 if(${classInfo.className?uncap_first } !=null){
141149 ${classInfo.className?uncap_first } .setUpdateTime(new Date());
142150 ${classInfo.className?uncap_first } .setStatus(status);
143151 ${classInfo.className?uncap_first } Mapper.updateById(${classInfo.className?uncap_first } );
144- return ${returnUtilSuccess} ((status==1)?"已发布 ":"已暂停 ");
152+ return ${returnUtilSuccess} ((status==1)?"已激活 ":"已停用 ");
145153 }else if(status.equals(${classInfo.className?uncap_first } .getStatus())){
146154 return ${returnUtilFailure} ("状态不正确");
147155 }else{
@@ -150,13 +158,13 @@ public class ${classInfo.className}Controller {
150158 }
151159
152160 /**
153- * 执行 (如不需要请屏蔽)
161+ * 测试 (如不需要请屏蔽)
154162 */
155- @PostMapping ("/execute ")
156- public Object execute (){
163+ @GetMapping ("/test ")
164+ public Object test (){
157165 return ${returnUtilSuccess} ;
158166 }
159- }
167+
160168}
161169
162170
0 commit comments