diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappDraftTemplateController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappDraftTemplateController.java index 10d8ff25d..f0459be79 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappDraftTemplateController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappDraftTemplateController.java @@ -29,7 +29,7 @@ import java.util.List; */ @RestController @RequestMapping("/weappDraftTemplate") -@Api(description = "微信第三方开发平台-小程序草稿模板管理") +@Api(description = "微信第三方开发平台-小程序草稿/模板管理") public class WechatWeappDraftTemplateController { private final Logger logger = LoggerFactory.getLogger(getClass()); @Autowired @@ -37,12 +37,47 @@ public class WechatWeappDraftTemplateController { @GetMapping("/tempDraftList") - public List getTempDraftList() { + public ResultData getTempDraftList() { try { - return openService.getWxOpenComponentService().getTemplateDraftList(); + List list = openService.getWxOpenComponentService().getTemplateDraftList(); + return new ResultData(list); } catch (WxErrorException e) { logger.error(e.getMessage()); + return new ResultData(Result.ERROR, e.getMessage()); + } + + } + + @GetMapping("/tempList") + public ResultData getTempList() { + try { + List list = openService.getWxOpenComponentService().getTemplateList(); + return new ResultData(list); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + return new ResultData(Result.ERROR, e.getMessage()); + } + } + + @PostMapping("/addToTemplate") + public ResultData addToTemplate(Long draftId) { + try { + openService.getWxOpenComponentService().addToTemplate(draftId); + return new ResultData(); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + return new ResultData(Result.ERROR, e.getMessage()); + } + } + + @PostMapping("/deleteTemplate") + public ResultData deleteTemplate(Long templateId) { + try { + openService.getWxOpenComponentService().deleteTemplate(templateId); + return new ResultData(); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + return new ResultData(Result.ERROR, e.getMessage()); } - return null; } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappTemplateController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappTemplateController.java deleted file mode 100644 index 399ac980c..000000000 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappTemplateController.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.iformall.controller; - -import com.iformall.common.Result; -import com.iformall.common.ResultData; -import com.iformall.service.wechat.WxOpenService; -import io.swagger.annotations.Api; -import me.chanjar.weixin.common.error.WxErrorException; -import me.chanjar.weixin.open.api.WxOpenMaService; -import me.chanjar.weixin.open.bean.WxOpenMaCodeTemplate; -import me.chanjar.weixin.open.bean.ma.WxMaOpenCommitExtInfo; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * Stormeye Wu - */ -@RestController -@RequestMapping("/weappTemplate") -@Api(description = "微信第三方开发平台-小程序模板管理") -public class WechatWeappTemplateController { - private final Logger logger = LoggerFactory.getLogger(getClass()); - @Autowired - private WxOpenService openService; - - @GetMapping("/tempList") - @ResponseBody - public List getTempList() { - try { - return openService.getWxOpenComponentService().getTemplateList(); - } catch (WxErrorException e) { - logger.error(e.getMessage()); - } - return null; - } -}