diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java index a22baae83..a94f16d44 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java @@ -1,6 +1,7 @@ package com.stdiet.web.controller.custom; import com.aliyun.vod20170321.models.GetPlayInfoResponseBody; +import com.stdiet.common.constant.HttpStatus; import com.stdiet.common.core.controller.BaseController; import com.stdiet.common.core.domain.AjaxResult; import com.stdiet.common.core.domain.entity.SysDictData; @@ -16,6 +17,7 @@ import com.stdiet.common.utils.sign.AesUtils; import com.stdiet.custom.domain.*; import com.stdiet.custom.dto.response.CustomerCaseResponse; import com.stdiet.custom.dto.response.MessageNoticeResponse; +import com.stdiet.custom.dto.response.NutritionQuestionResponse; import com.stdiet.custom.dto.response.NutritionalVideoResponse; import com.stdiet.custom.page.WxLogInfo; import com.stdiet.custom.service.*; @@ -77,13 +79,24 @@ public class WechatAppletController extends BaseController { * 查询微信小程序中展示的客户案例 */ @GetMapping("/caseList") - public TableDataInfo caseList(SysCustomerCase sysCustomerCase) { - startPage(); - sysCustomerCase.setKeywordArray(StringUtils.isNotEmpty(sysCustomerCase.getKeyword()) ? sysCustomerCase.getKeyword().split(",") : null); - List list = sysCustomerCaseService.getWxCustomerCaseList(sysCustomerCase); - //处理ID加密 - dealIdEnc(list); - return getDataTable(list); + public TableDataInfo caseList(SysCustomerCase sysCustomerCase, @RequestParam(value = "pageSize",required = false,defaultValue = "10")int pageSize, + @RequestParam(value="randomFlag",required = false,defaultValue = "false") boolean randomFlag) { + if(randomFlag){ + List reponseList = sysCustomerCaseService.getWxCustomerCaseByRandom(pageSize); + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("查询成功"); + rspData.setRows(reponseList); + rspData.setTotal(pageSize); + return rspData; + }else{ + startPage(); + sysCustomerCase.setKeywordArray(StringUtils.isNotEmpty(sysCustomerCase.getKeyword()) ? sysCustomerCase.getKeyword().split(",") : null); + List list = sysCustomerCaseService.getWxCustomerCaseList(sysCustomerCase); + //处理ID加密 + dealIdEnc(list); + return getDataTable(list); + } } /** @@ -327,14 +340,30 @@ public class WechatAppletController extends BaseController { } } + /** + * + */ /** * 获取小程序展示的营养小知识列表 + * @param sysNutritionQuestion 查询参数对象 + * @param pageNum 分页当前页码 + * @param pageSize 分页每页数量 + * @param randomFlag 随机标识 true 随机获取指定pageSize数量的营养小知识,不支持分页、模糊查询 false 则正常查询 + * @return */ @GetMapping(value = "/getNutritionQuestionList") - public AjaxResult getNutritionQuestionList(SysNutritionQuestion sysNutritionQuestion, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) { + public AjaxResult getNutritionQuestionList(SysNutritionQuestion sysNutritionQuestion, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize, + @RequestParam(value="randomFlag",required = false,defaultValue = "false") boolean randomFlag) { sysNutritionQuestion.setShowFlag(1); - Map result = sysNutritionQuestionService.getNutritionQuestionListByKey(sysNutritionQuestion, pageNum, pageSize); - return AjaxResult.success(result); + if(randomFlag){ + //随机获取指定条数 + sysNutritionQuestion.setKey(null); + List list = sysNutritionQuestionService.getNutritionQuestionByRandom(sysNutritionQuestion, pageSize); + return AjaxResult.success(list); + }else{ + Map result = sysNutritionQuestionService.getNutritionQuestionListByKey(sysNutritionQuestion, pageNum, pageSize); + return AjaxResult.success(result); + } } /** diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCustomerCaseMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCustomerCaseMapper.java index 9a5927622..1fd30bbc8 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCustomerCaseMapper.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCustomerCaseMapper.java @@ -75,4 +75,11 @@ public interface SysCustomerCaseMapper * @return */ public int updateWxShowByIds(@Param("wxShow")Integer wxShow, @Param("array") Long[] ids); + + /** + * 随机获取指定数量的客户案例 + * @param pageSize + * @return + */ + public List getWxCustomerCaseByRandom(@Param("pageSize")Integer pageSize); } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysNutritionQuestionMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysNutritionQuestionMapper.java index 0375c3cf0..1766f1d38 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysNutritionQuestionMapper.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysNutritionQuestionMapper.java @@ -2,6 +2,7 @@ package com.stdiet.custom.mapper; import java.util.List; import com.stdiet.custom.domain.SysNutritionQuestion; +import com.stdiet.custom.dto.response.NutritionQuestionResponse; import org.apache.ibatis.annotations.Param; /** @@ -87,4 +88,12 @@ public interface SysNutritionQuestionMapper * @return */ public int updateWxShowByIds(@Param("wxShow")Integer wxShow, @Param("array") Long[] ids); + + /** + * 随机获取指定数量的营养小知识 + * @param sysNutritionQuestion + * @param pageSize + * @return + */ + public List getNutritionQuestionByRandom(SysNutritionQuestion sysNutritionQuestion, @Param("pageSize")Integer pageSize); } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCustomerCaseService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCustomerCaseService.java index f17e6518e..9412c17d8 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCustomerCaseService.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCustomerCaseService.java @@ -82,4 +82,11 @@ public interface ISysCustomerCaseService { */ int updateWxShowByIds(Integer wxShow, Long[] ids); + /** + * 随机获取指定数量的客户案例 + * @param pageSize + * @return + */ + public List getWxCustomerCaseByRandom(Integer pageSize); + } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysNutritionQuestionService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysNutritionQuestionService.java index 93f504de8..96392412b 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysNutritionQuestionService.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysNutritionQuestionService.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import com.stdiet.custom.domain.SysNutritionQuestion; +import com.stdiet.custom.dto.response.NutritionQuestionResponse; /** * 营养知识小问答Service接口 @@ -81,4 +82,12 @@ public interface ISysNutritionQuestionService */ public int updateWxShowByIds(Integer wxShow, Long[] ids); + /** + * 随机获取指定数量的营养小知识 + * @param sysNutritionQuestion + * @param pageSize + * @return + */ + public List getNutritionQuestionByRandom(SysNutritionQuestion sysNutritionQuestion, Integer pageSize); + } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCustomerCaseServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCustomerCaseServiceImpl.java index bcd95bc91..8d5571639 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCustomerCaseServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCustomerCaseServiceImpl.java @@ -180,4 +180,14 @@ public class SysCustomerCaseServiceImpl implements ISysCustomerCaseService public int updateWxShowByIds(Integer wxShow, Long[] ids){ return sysCustomerCaseMapper.updateWxShowByIds(wxShow, ids); } + + /** + * 随机获取指定数量的客户案例 + * @param pageSize + * @return + */ + @Override + public List getWxCustomerCaseByRandom(Integer pageSize){ + return sysCustomerCaseMapper.getWxCustomerCaseByRandom(pageSize); + } } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysNutritionQuestionServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysNutritionQuestionServiceImpl.java index 67ec70667..7435d853f 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysNutritionQuestionServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysNutritionQuestionServiceImpl.java @@ -326,4 +326,14 @@ public class SysNutritionQuestionServiceImpl implements ISysNutritionQuestionSer } return 0; } + + /** + * 随机获取指定数量的营养小知识 + * @param sysNutritionQuestion + * @param pageSize + * @return + */ + public List getNutritionQuestionByRandom(SysNutritionQuestion sysNutritionQuestion, Integer pageSize){ + return sysNutritionQuestionMapper.getNutritionQuestionByRandom(sysNutritionQuestion, pageSize); + } } \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerCaseMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerCaseMapper.xml index d6e02d44f..b8f7ca9d9 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerCaseMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerCaseMapper.xml @@ -154,4 +154,10 @@ + + + \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysNutritionQuestionMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysNutritionQuestionMapper.xml index 608cda60f..68d861cbe 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysNutritionQuestionMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysNutritionQuestionMapper.xml @@ -24,7 +24,6 @@ - @@ -127,6 +126,12 @@ + + + \ No newline at end of file