From 00a9b9ede0f7caf0c43a6356d7f0a5d8da0a9d15 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 26 Aug 2022 14:43:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B8=A0=E9=81=93=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/channel/H5Controller.java | 6 +-- .../controller/channel/MpController.java | 6 +-- .../controller/channel/OaController.java | 40 +++++++++++++++- .../controller/channel/WxController.java | 6 +-- .../service/channel/IChannelOaService.java | 21 ++++++++ .../channel/impl/ChannelOaServiceImpl.java | 48 ++++++++++++++++++- 6 files changed, 115 insertions(+), 12 deletions(-) diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/H5Controller.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/H5Controller.java index 8ac82ee6..fb5c0661 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/H5Controller.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/H5Controller.java @@ -19,7 +19,7 @@ public class H5Controller { IChannelH5Service iChannelH5Service; /** - * H5渠道配置详情 + * H5渠道设置详情 * * @author fzr * @return Object @@ -31,13 +31,13 @@ public class H5Controller { } /** - * H5渠道配置保存 + * H5渠道设置保存 * * @author fzr * @param param 参数 * @return Object */ - @Log(title = "H5渠道保存") + @Log(title = "H5渠道设置保存") @PostMapping("/save") public Object save(@RequestBody Map param) { iChannelH5Service.save(param); diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/MpController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/MpController.java index fa07c0f0..54c29de9 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/MpController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/MpController.java @@ -19,7 +19,7 @@ public class MpController { IChannelMpService iChannelMpService; /** - * 微信小程序渠道配置详情 + * 微信小程序渠道设置详情 * * @author fzr * @return Object @@ -31,13 +31,13 @@ public class MpController { } /** - * 微信小程序渠道配置保存 + * 微信小程序渠道设置保存 * * @author fzr * @param param 参数 * @return Object */ - @Log(title = "微信小程序渠道保存") + @Log(title = "微信小程序渠道设置保存") @PostMapping("/save") public Object save(@RequestBody Map param) { iChannelMpService.save(param); diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaController.java index dd061638..12882fa4 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaController.java @@ -1,7 +1,13 @@ package com.mdd.admin.controller.channel; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.mdd.admin.config.aop.Log; +import com.mdd.admin.service.channel.IChannelH5Service; +import com.mdd.admin.service.channel.IChannelOaService; +import com.mdd.common.core.AjaxResult; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Map; /** * 微信公众号渠道设置 @@ -9,4 +15,34 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("api/channel/oa") public class OaController { + + @Resource + IChannelOaService iChannelOaService; + + /** + * 公众号渠道设置详情 + * + * @author fzr + * @return Object + */ + @GetMapping("/detail") + public Object detail() { + Map map = iChannelOaService.detail(); + return AjaxResult.success(map); + } + + /** + * 公众号渠道设置保存 + * + * @author fzr + * @param param 参数 + * @return Object + */ + @Log(title = "公众号渠道设置保存") + @PostMapping("/save") + public Object save(@RequestBody Map param) { + iChannelOaService.save(param); + return AjaxResult.success(); + } + } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/WxController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/WxController.java index 58053080..ead32ba5 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/WxController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/WxController.java @@ -20,7 +20,7 @@ public class WxController { IChannelWxService iChannelWxService; /** - * H5渠道配置详情 + * 开放平台渠道设置详情 * * @author fzr * @return Object @@ -32,13 +32,13 @@ public class WxController { } /** - * H5渠道配置保存 + * 开放平台渠道设置保存 * * @author fzr * @param param 参数 * @return Object */ - @Log(title = "微信开放平台渠道保存") + @Log(title = "开放平台渠道设置保存") @PostMapping("/save") public Object save(@RequestBody Map param) { iChannelWxService.save(param); diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaService.java b/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaService.java index 71837330..ebc2e9a0 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaService.java @@ -1,4 +1,25 @@ package com.mdd.admin.service.channel; +import java.util.Map; + +/** + * 公众号渠道设置服务接口类 + */ public interface IChannelOaService { + + /** + * 公众号设置详情 + * + * @author fzr + * @return Map + */ + Map detail(); + + /** + * 公众号设置保存 + * + * @author fzr + */ + void save(Map param); + } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaServiceImpl.java index 63c23488..7fdc09a7 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaServiceImpl.java @@ -1,4 +1,50 @@ package com.mdd.admin.service.channel.impl; -public class ChannelOaServiceImpl { +import com.mdd.admin.service.channel.IChannelOaService; +import com.mdd.common.utils.ConfigUtil; +import com.mdd.common.utils.UrlUtil; +import org.springframework.stereotype.Service; + +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * 公众号渠道设置服务实现类 + */ +@Service +public class ChannelOaServiceImpl implements IChannelOaService { + + /** + * 公众号渠道设置详情 + * + * @author fzr + * @return Map + */ + @Override + public Map detail() { + Map config = ConfigUtil.get("oa_channel"); + Map map = new LinkedHashMap<>(); + map.put("name", config.getOrDefault("name", "")); + map.put("primaryId", config.getOrDefault("primaryId", "")); + map.put("qrCode", UrlUtil.toAbsoluteUrl(config.getOrDefault("qrCode", ""))); + map.put("appId", config.getOrDefault("appId", "")); + map.put("appSecret", config.getOrDefault("appSecret", "")); + return map; + } + + /** + * 公众号渠道设置保存 + * + * @author fzr + * @param param 参数 + */ + @Override + public void save(Map param) { + ConfigUtil.set("mp_channel", "name", param.getOrDefault("name", "")); + ConfigUtil.set("mp_channel", "primaryId", param.getOrDefault("primaryId", "")); + ConfigUtil.set("mp_channel", "qrCode", UrlUtil.toRelativeUrl(param.getOrDefault("qrCode", ""))); + ConfigUtil.set("mp_channel", "appId", param.getOrDefault("appId", "")); + ConfigUtil.set("mp_channel", "appSecret", param.getOrDefault("appSecret", "")); + } + }