From 533e6d746e4019ca2cf1c5238c390977fbe81e68 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 31 May 2021 15:15:05 +0800 Subject: [PATCH] tt --- .../controller/msg/WxMsgController.java | 24 +++++++++++++++++++ .../iformall/controller/WxMsgController.java | 9 +++++++ .../com/iformall/domain/po/WxTemplateMsg.java | 3 +++ .../com/iformall/enums/EnumTemplateType.java | 3 +-- .../resources/mapper/WxTemplateMsgMapper.xml | 7 +++++- .../controller/msg/WxMsgController.java | 24 +++++++++++++++++++ 6 files changed, 67 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java index af1e096a0..c9ef03487 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java @@ -12,6 +12,7 @@ import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.WxMsg; import com.iformall.enums.EnumSendWay; +import com.iformall.enums.EnumTemplateType; import com.iformall.service.WxMsgService; import com.iformall.service.WxTemplateMsgService; import io.swagger.annotations.ApiImplicitParam; @@ -71,6 +72,29 @@ public class WxMsgController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgController::list"); if (null == wxTemplateMsg) wxTemplateMsg = new WxTemplateMsg(); wxTemplateMsg.updateTenantInfo(getTenantInfo()); + List types = new ArrayList<>(); + types.add(EnumTemplateType.ACTIVITY_REMIND.getCode()); + types.add(EnumTemplateType.LIVE_REMIND.getCode()); + wxTemplateMsg.setTypes(types); + final PageInfo page = wxTemplateMsgService.listAsPageForMiniApp(wxTemplateMsg, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("模板分页列表接口") + @GetMapping("templateListV1") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "moban-列表") + public ResultData templateListV1(@ModelAttribute WxTemplateMsg wxTemplateMsg, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMsgController::list"); + if (null == wxTemplateMsg) wxTemplateMsg = new WxTemplateMsg(); + wxTemplateMsg.updateTenantInfo(getTenantInfo()); + List types = new ArrayList<>(); + types.add(EnumTemplateType.ACTIVITY_REMIND.getCode()); + types.add(EnumTemplateType.LIVE_REMIND.getCode()); + types.add(EnumTemplateType.CREDIT_UPD_REMIND.getCode()); + wxTemplateMsg.setTypes(types); final PageInfo page = wxTemplateMsgService.listAsPageForMiniApp(wxTemplateMsg, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgController.java index efdd478ad..c7164cc59 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgController.java @@ -3,6 +3,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxTemplateMsg; +import com.iformall.enums.EnumTemplateType; import com.iformall.service.WxTemplateMsgService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,6 +13,9 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; +import java.util.List; + /** * @author gongbiao @@ -33,6 +37,11 @@ public class WxMsgController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgController::list"); if (null == wxTemplateMsg) wxTemplateMsg = new WxTemplateMsg(); wxTemplateMsg.updateTenantInfo(getTenantInfo()); + List types = new ArrayList<>(); + types.add(EnumTemplateType.ACTIVITY_REMIND.getCode()); + types.add(EnumTemplateType.LIVE_REMIND.getCode()); + types.add(EnumTemplateType.CREDIT_UPD_REMIND.getCode()); + wxTemplateMsg.setTypes(types); final PageInfo page = wxTemplateMsgService.listAsPageForMiniApp(wxTemplateMsg, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java index 025a579f8..97d53e234 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java @@ -33,6 +33,9 @@ public class WxTemplateMsg extends TenantEntity { @TableField(exist = false) private String typeName; + @TableField(exist = false) + private List types; + public String getTypeName(){ if(this.getType() != null) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java b/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java index 54faf97c1..6b149f0dd 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java @@ -12,8 +12,7 @@ public enum EnumTemplateType { PRESS_SUCCESS(3, "砍价成功消息",""), // 小程序(作废) /** - * *******(4...99)留作模板消息 - * *******(4...49)留作全局推送 + * */ ACTIVITY_REMIND(4, "活动开始提醒","386"), // 小程序 LIVE_REMIND(5, "直播开播提醒","8501"), // 小程序 diff --git a/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml b/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml index 957729308..1bf6ec3bf 100644 --- a/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml @@ -50,6 +50,12 @@ and `on_off` = #{onOff} + + and `type` in + + #{item} + + and id in @@ -71,7 +77,6 @@ from wx_template_msg - and `type` > 3 and `type` < 50 diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java index af1e096a0..c9ef03487 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java @@ -12,6 +12,7 @@ import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.WxMsg; import com.iformall.enums.EnumSendWay; +import com.iformall.enums.EnumTemplateType; import com.iformall.service.WxMsgService; import com.iformall.service.WxTemplateMsgService; import io.swagger.annotations.ApiImplicitParam; @@ -71,6 +72,29 @@ public class WxMsgController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgController::list"); if (null == wxTemplateMsg) wxTemplateMsg = new WxTemplateMsg(); wxTemplateMsg.updateTenantInfo(getTenantInfo()); + List types = new ArrayList<>(); + types.add(EnumTemplateType.ACTIVITY_REMIND.getCode()); + types.add(EnumTemplateType.LIVE_REMIND.getCode()); + wxTemplateMsg.setTypes(types); + final PageInfo page = wxTemplateMsgService.listAsPageForMiniApp(wxTemplateMsg, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("模板分页列表接口") + @GetMapping("templateListV1") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "moban-列表") + public ResultData templateListV1(@ModelAttribute WxTemplateMsg wxTemplateMsg, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMsgController::list"); + if (null == wxTemplateMsg) wxTemplateMsg = new WxTemplateMsg(); + wxTemplateMsg.updateTenantInfo(getTenantInfo()); + List types = new ArrayList<>(); + types.add(EnumTemplateType.ACTIVITY_REMIND.getCode()); + types.add(EnumTemplateType.LIVE_REMIND.getCode()); + types.add(EnumTemplateType.CREDIT_UPD_REMIND.getCode()); + wxTemplateMsg.setTypes(types); final PageInfo page = wxTemplateMsgService.listAsPageForMiniApp(wxTemplateMsg, pageNum, pageSize); return new ResultData(page); }