From b7958ecca69ab5708c939ab42c4bfcf8935b3d6e Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Mon, 30 May 2022 21:50:15 +0800 Subject: [PATCH] zh --- .../controller/ReferenceController.java | 32 +++++++++---------- .../RewardRuleTemplateController.java | 10 ++++-- .../mapper/RewardRuleTemplateMapper.java | 4 +++ .../service/IRewardRuleTemplateService.java | 5 +++ .../RewardRuleTemplateServiceImpl.java | 8 +++++ .../zh/project0512/utils/MybatisPlusUtil.java | 2 +- .../mapper/RewardRuleTemplateMapper.xml | 4 ++- 7 files changed, 45 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/zh/project0512/controller/ReferenceController.java b/src/main/java/com/zh/project0512/controller/ReferenceController.java index 15dddda..de2cba5 100644 --- a/src/main/java/com/zh/project0512/controller/ReferenceController.java +++ b/src/main/java/com/zh/project0512/controller/ReferenceController.java @@ -193,27 +193,27 @@ public class ReferenceController { @Data static class ListRParam { - - @Schema(title = "名称") - private String title; - @Schema(title = "文件地址") - private String fileUrl; - @Schema(title = "封面图片地址") - private String coverUrl; + private int pageNum; + private int pageSize; + @Schema(title = "素材分组id") + private Integer groupId; + @Schema(title = "月份区间") + private Integer month; } @Operation(summary = "素材列表") @PostMapping("/list") - public Result list(@RequestBody(required = false) JSONObject obj) { - Wrapper queryWrapper = new QueryWrapper<>(); - IPage iPage = referenceService.selectPage(MybatisPlusUtil.SetPage(obj), queryWrapper); - List referenceList = iPage.getRecords(); - for (int i = referenceList.size() - 1; i >= 0; i--) { - Reference reference = (Reference) referenceList.get(i); - int id = reference.getId(); - reference.setTagList(referenceTagService.selByReferenceId(id)); - reference.setBrandList(referenceBrandService.selByReferenceId(id)); + public Result list(@Validated @RequestBody ListRParam param) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + JSONObject obj = new JSONObject(); + obj.put("pageNum",param.getPageNum()); + obj.put("pageSize",param.getPageSize()); + Integer groupId = param.groupId; + if(groupId != null){ + queryWrapper.eq("groupId",groupId); } + queryWrapper.orderByDesc("creatAt"); + IPage iPage = referenceService.selectPage(MybatisPlusUtil.SetPage(obj), queryWrapper); return Result.success(iPage); } diff --git a/src/main/java/com/zh/project0512/controller/RewardRuleTemplateController.java b/src/main/java/com/zh/project0512/controller/RewardRuleTemplateController.java index 8e10e4c..4314582 100644 --- a/src/main/java/com/zh/project0512/controller/RewardRuleTemplateController.java +++ b/src/main/java/com/zh/project0512/controller/RewardRuleTemplateController.java @@ -4,7 +4,7 @@ package com.zh.project0512.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.IPage; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.zh.project0512.model.Reference; import com.zh.project0512.model.RewardRule; import com.zh.project0512.model.RewardRuleTemplate; @@ -128,7 +128,13 @@ public class RewardRuleTemplateController { @Operation(summary = "模版列表") @PostMapping("/list") public Result list(@RequestBody(required = false) @Parameter(hidden = true) JSONObject obj) { - return Result.success(rewardRuleTemplateService.rewardRuleTemplateList((MybatisPlusUtil.SetPage(obj)))); + IPage ipage = rewardRuleTemplateService.idList(MybatisPlusUtil.SetPage(obj)); + List idList = ipage.getRecords(); + if(idList.size()>0){ + ipage.setRecords(rewardRuleTemplateService.rrList(idList)); + } +// List list = rewardRuleTemplateService.rewardRuleTemplateList((MybatisPlusUtil.SetPage(obj))); + return Result.success(ipage); } @Data diff --git a/src/main/java/com/zh/project0512/mapper/RewardRuleTemplateMapper.java b/src/main/java/com/zh/project0512/mapper/RewardRuleTemplateMapper.java index 36a34fc..308a47b 100644 --- a/src/main/java/com/zh/project0512/mapper/RewardRuleTemplateMapper.java +++ b/src/main/java/com/zh/project0512/mapper/RewardRuleTemplateMapper.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.zh.project0512.model.RewardRule; import com.zh.project0512.model.RewardRuleTemplate; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zh.project0512.model.Task; import org.apache.ibatis.annotations.*; import java.util.List; @@ -26,4 +27,7 @@ public interface RewardRuleTemplateMapper extends BaseMapper void setDefault(int id); RewardRuleTemplate rewardRuleTemplateDetail(int id); + @Select("SELECT id from task") + IPage idList(IPage iPage); + List rrList(List list); } diff --git a/src/main/java/com/zh/project0512/service/IRewardRuleTemplateService.java b/src/main/java/com/zh/project0512/service/IRewardRuleTemplateService.java index a09ecc2..305a214 100644 --- a/src/main/java/com/zh/project0512/service/IRewardRuleTemplateService.java +++ b/src/main/java/com/zh/project0512/service/IRewardRuleTemplateService.java @@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zh.project0512.model.RewardRuleTemplate; import com.baomidou.mybatisplus.extension.service.IService; +import com.zh.project0512.model.Task; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -19,4 +21,7 @@ public interface IRewardRuleTemplateService extends IService List rewardRuleTemplateList(IPage page); void setDefault(int id); RewardRuleTemplate rewardRuleTemplateDetail(int id); + @Select("SELECT id from task") + IPage idList(IPage iPage); + List rrList(List list); } diff --git a/src/main/java/com/zh/project0512/serviceImpl/RewardRuleTemplateServiceImpl.java b/src/main/java/com/zh/project0512/serviceImpl/RewardRuleTemplateServiceImpl.java index a5de431..caa3ada 100644 --- a/src/main/java/com/zh/project0512/serviceImpl/RewardRuleTemplateServiceImpl.java +++ b/src/main/java/com/zh/project0512/serviceImpl/RewardRuleTemplateServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zh.project0512.mapper.RewardRuleMapper; import com.zh.project0512.model.RewardRuleTemplate; import com.zh.project0512.mapper.RewardRuleTemplateMapper; +import com.zh.project0512.model.Task; import com.zh.project0512.service.IRewardRuleTemplateService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; @@ -35,4 +36,11 @@ public class RewardRuleTemplateServiceImpl extends ServiceImpl idList(IPage iPage) { + return rewardRuleTemplateMapper.idList(iPage); + } + + public List rrList(List list) { + return rewardRuleTemplateMapper.rrList(list); + } } diff --git a/src/main/java/com/zh/project0512/utils/MybatisPlusUtil.java b/src/main/java/com/zh/project0512/utils/MybatisPlusUtil.java index 73a2d97..5c94a6c 100644 --- a/src/main/java/com/zh/project0512/utils/MybatisPlusUtil.java +++ b/src/main/java/com/zh/project0512/utils/MybatisPlusUtil.java @@ -16,7 +16,7 @@ public class MybatisPlusUtil { } Integer pageNum = obj.getInteger("pageNum"); Integer pageSize = obj.getInteger("pageSize"); - return new Page(pageNum !=null?pageNum:1,pageSize!=null?pageSize:10); + return new Page(pageNum !=null?pageNum:1,(pageSize!=null&&pageSize!=0)?pageSize:10); } public static Result sqlResult(Boolean result,String sqlOperate){ if (result) { diff --git a/src/main/resources/mapper/RewardRuleTemplateMapper.xml b/src/main/resources/mapper/RewardRuleTemplateMapper.xml index b5ac99c..01fb390 100644 --- a/src/main/resources/mapper/RewardRuleTemplateMapper.xml +++ b/src/main/resources/mapper/RewardRuleTemplateMapper.xml @@ -29,11 +29,13 @@ - SELECT t1.id,t1.title,t2.id as ruleId,t2.reward,t2.max,t2.min,t2.templateId from rewardRuleTemplate as t1 left JOIN rewardRule AS t2 on t1.id =t2.templateId + WHERE t1.id in + #{item} ORDER BY t1.id