From 5e88c2ea5a25f0bb3fa330f69bb5eb3f99885aa3 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 24 Aug 2022 18:01:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=9A=E7=9F=A5=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/setting/NoticeController.java | 16 +- .../service/notice/INoticeSettingService.java | 26 --- .../notice/impl/NoticeSettingServiceImpl.java | 154 ------------------ .../setting/ISettingNoticeService.java | 34 +++- .../impl/SettingNoticeServiceImpl.java | 148 ++++++++++++++++- .../NoticeDetailVo.java} | 4 +- .../NoticeListVo.java} | 4 +- 7 files changed, 191 insertions(+), 195 deletions(-) delete mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/notice/INoticeSettingService.java delete mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/notice/impl/NoticeSettingServiceImpl.java rename server/like-admin/src/main/java/com/mdd/admin/vo/{notice/NoticeSettingDetailVo.java => setting/NoticeDetailVo.java} (78%) rename server/like-admin/src/main/java/com/mdd/admin/vo/{notice/NoticeSettingListVo.java => setting/NoticeListVo.java} (86%) diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java index 2ce3d2e2..ad9a149d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java @@ -1,10 +1,9 @@ package com.mdd.admin.controller.setting; -import com.mdd.admin.service.notice.INoticeSettingService; -import com.mdd.admin.vo.notice.NoticeSettingDetailVo; -import com.mdd.admin.vo.notice.NoticeSettingListVo; +import com.mdd.admin.service.setting.ISettingNoticeService; +import com.mdd.admin.vo.setting.NoticeDetailVo; +import com.mdd.admin.vo.setting.NoticeListVo; import com.mdd.common.core.AjaxResult; -import com.mdd.common.utils.ToolsUtil; import com.mdd.common.validator.annotation.IDMust; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -21,7 +20,7 @@ import java.util.Map; public class NoticeController { @Resource - INoticeSettingService iNoticeSettingService; + ISettingNoticeService iSettingNoticeService; /** * 通知设置列表 @@ -31,7 +30,7 @@ public class NoticeController { */ @GetMapping("/list") public Object list() { - List list = iNoticeSettingService.list(); + List list = iSettingNoticeService.list(); return AjaxResult.success(list); } @@ -44,7 +43,7 @@ public class NoticeController { */ @GetMapping("/detail") public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { - NoticeSettingDetailVo vo = iNoticeSettingService.detail(id); + NoticeDetailVo vo = iSettingNoticeService.detail(id); return AjaxResult.success(vo); } @@ -57,8 +56,7 @@ public class NoticeController { */ @PostMapping("/save") public Object save(@RequestBody Map params) { - System.out.println(ToolsUtil.objectToMap(params.get("systemNotice"))); - iNoticeSettingService.save(params); + iSettingNoticeService.save(params); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/notice/INoticeSettingService.java b/server/like-admin/src/main/java/com/mdd/admin/service/notice/INoticeSettingService.java deleted file mode 100644 index 16f394ea..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/notice/INoticeSettingService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.mdd.admin.service.notice; - -import com.mdd.admin.vo.notice.NoticeSettingDetailVo; -import com.mdd.admin.vo.notice.NoticeSettingListVo; - -import java.util.List; -import java.util.Map; - -/** - * 通知设置服务接口类 - */ -public interface INoticeSettingService { - - /** - * 通知设置列表 - * - * @author fzr - * @return List - */ - List list(); - - NoticeSettingDetailVo detail(Integer id); - - void save(Map params); - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/notice/impl/NoticeSettingServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/notice/impl/NoticeSettingServiceImpl.java deleted file mode 100644 index d92606c7..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/notice/impl/NoticeSettingServiceImpl.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.mdd.admin.service.notice.impl; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.mdd.admin.service.notice.INoticeSettingService; -import com.mdd.admin.vo.notice.NoticeSettingDetailVo; -import com.mdd.admin.vo.notice.NoticeSettingListVo; -import com.mdd.common.entity.notice.NoticeSetting; -import com.mdd.common.mapper.notice.NoticeSettingMapper; -import com.mdd.common.utils.TimeUtil; -import com.mdd.common.utils.ToolsUtil; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -@Service -public class NoticeSettingServiceImpl implements INoticeSettingService { - - @Resource - NoticeSettingMapper noticeSettingMapper; - - /** - * 通知设置列表 - * - * @author fzr - * @return List - */ - @Override - public List list() { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("is_delete", 0); - queryWrapper.orderByAsc("id"); - - List noticeSettings = noticeSettingMapper.selectList(queryWrapper); - - List list = new LinkedList<>(); - for (NoticeSetting n : noticeSettings) { - NoticeSettingListVo vo = new NoticeSettingListVo(); - BeanUtils.copyProperties(n, vo); - - Map systemMap = ToolsUtil.jsonToMap(n.getSystemNotice()); - Map smsMap = ToolsUtil.jsonToMap(n.getSmsNotice()); - Map oaMap = ToolsUtil.jsonToMap(n.getOaNotice()); - Map mnpMap = ToolsUtil.jsonToMap(n.getMnpNotice()); - - vo.setType(n.getType()==1?"业务通知":"验证码"); - vo.setSystemStatus(Integer.parseInt(systemMap.get("status"))); - vo.setSmsStatus(Integer.parseInt(smsMap.get("status"))); - vo.setOaStatus(Integer.parseInt(oaMap.get("status"))); - vo.setMnpStatus(Integer.parseInt(mnpMap.get("status"))); - vo.setCreateTime(TimeUtil.timestampToDate(n.getCreateTime())); - vo.setUpdateTime(TimeUtil.timestampToDate(n.getUpdateTime())); - list.add(vo); - } - - return list; - } - - /** - * 通知设置详情 - * - * @author fzr - * @param id 主键 - * @return NoticeSettingDetailVo - * - */ - @Override - public NoticeSettingDetailVo detail(Integer id) { - NoticeSetting noticeSetting = noticeSettingMapper.selectOne(new QueryWrapper() - .eq("id", id) - .eq("is_delete", 0) - .last("limit 1")); - - NoticeSettingDetailVo vo = new NoticeSettingDetailVo(); - BeanUtils.copyProperties(noticeSetting, vo); - - Map systemMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getSystemNotice()); - Map smsMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getSmsNotice()); - Map oaMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getOaNotice()); - Map mnpMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getMnpNotice()); - - systemMap.put("tips", JSONArray.toJSON(systemMap.get("tips"))); - smsMap.put("tips", JSONArray.toJSON(smsMap.get("tips"))); - oaMap.put("tips", JSONArray.toJSON(oaMap.get("tips"))); - oaMap.put("tpl", JSONArray.toJSON(oaMap.get("tpl"))); - mnpMap.put("tips", JSONArray.toJSON(mnpMap.get("tips"))); - mnpMap.put("tpl", JSONArray.toJSON(mnpMap.get("tpl"))); - - vo.setType(noticeSetting.getType()==1?"业务通知":"验证码"); - vo.setSystemNotice(systemMap); - vo.setSmsNotice(smsMap); - vo.setOaNotice(oaMap); - vo.setMnpNotice(mnpMap); - - return vo; - } - - /** - * 通知设置保存 - * - * @author fzr - * @param params 参数 - */ - @Override - public void save(Map params) { - Integer id = Integer.parseInt(params.get("id").toString()); - NoticeSetting noticeSetting = noticeSettingMapper.selectOne(new QueryWrapper() - .eq("id", id) - .eq("is_delete", 0) - .last("limit 1")); - - Map systemParam = ToolsUtil.objectToMap(params.get("systemNotice")); - Map systemMap = ToolsUtil.jsonToMap(noticeSetting.getSystemNotice()); - systemMap.put("title", systemParam.get("title")); - systemMap.put("content", systemParam.get("content")); - systemMap.put("status", systemParam.get("status")); - - Map smsParam = ToolsUtil.objectToMap(params.get("smsNotice")); - Map smsMap = ToolsUtil.jsonToMap(noticeSetting.getSmsNotice()); - smsMap.put("templateId", smsParam.get("templateId")); - smsMap.put("content", smsParam.get("content")); - smsMap.put("status", smsParam.get("status")); - - Map oaParam = ToolsUtil.objectToMap(params.get("oaNotice")); - Map oaMap = ToolsUtil.jsonToMap(noticeSetting.getOaNotice()); - oaMap.put("name", oaParam.getOrDefault("name", "")); - oaMap.put("first", oaParam.get("first")); - oaMap.put("remark", oaParam.get("remark")); - oaMap.put("templateId", oaParam.get("templateId")); - oaMap.put("templateSn", oaParam.get("templateSn")); - oaMap.put("tpl", JSON.toJSONString(oaParam.get("tpl"))); - oaMap.put("status", oaParam.get("status")); - - Map mnpParam = ToolsUtil.objectToMap(params.get("mnpNotice")); - Map mnpMap = ToolsUtil.jsonToMap(noticeSetting.getMnpNotice()); - mnpMap.put("templateId", mnpParam.get("templateId")); - mnpMap.put("templateSn", mnpParam.get("templateSn")); - mnpMap.put("tpl", mnpParam.get("tpl")); - mnpMap.put("status", mnpParam.get("status")); - - noticeSetting.setSystemNotice(JSON.toJSONString(systemMap)); - noticeSetting.setSmsNotice(JSON.toJSONString(smsMap)); - noticeSetting.setOaNotice(JSON.toJSONString(oaMap)); - noticeSetting.setMnpNotice(JSON.toJSONString(mnpMap)); - noticeSetting.setUpdateTime(System.currentTimeMillis() / 1000); - noticeSettingMapper.updateById(noticeSetting); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingNoticeService.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingNoticeService.java index bded2377..de3020a0 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingNoticeService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingNoticeService.java @@ -1,7 +1,39 @@ package com.mdd.admin.service.setting; +import com.mdd.admin.vo.setting.NoticeDetailVo; +import com.mdd.admin.vo.setting.NoticeListVo; + +import java.util.List; +import java.util.Map; + /** - * 通知配置接口类 + * 通知设置服务接口类 */ public interface ISettingNoticeService { + + /** + * 通知设置列表 + * + * @author fzr + * @return List + */ + List list(); + + /** + * 通知设置详情 + * + * @author fzr + * @param id 主键 + * @return NoticeDetailVo + */ + NoticeDetailVo detail(Integer id); + + /** + * 通知设置保存 + * + * @author fzr + * @param params 参数 + */ + void save(Map params); + } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java index 31476010..5f03b578 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java @@ -1,11 +1,157 @@ package com.mdd.admin.service.setting.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mdd.admin.service.setting.ISettingNoticeService; +import com.mdd.admin.vo.setting.NoticeDetailVo; +import com.mdd.admin.vo.setting.NoticeListVo; +import com.mdd.common.entity.notice.NoticeSetting; +import com.mdd.common.mapper.notice.NoticeSettingMapper; +import com.mdd.common.utils.TimeUtil; +import com.mdd.common.utils.ToolsUtil; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + /** - * 通知配置服务实现类 + * 通知设置服务实现类 */ @Service public class SettingNoticeServiceImpl implements ISettingNoticeService { + + @Resource + NoticeSettingMapper noticeSettingMapper; + + /** + * 通知设置列表 + * + * @author fzr + * @return List + */ + @Override + public List list() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("is_delete", 0); + queryWrapper.orderByAsc("id"); + + List noticeSettings = noticeSettingMapper.selectList(queryWrapper); + + List list = new LinkedList<>(); + for (NoticeSetting n : noticeSettings) { + NoticeListVo vo = new NoticeListVo(); + BeanUtils.copyProperties(n, vo); + + Map systemMap = ToolsUtil.jsonToMap(n.getSystemNotice()); + Map smsMap = ToolsUtil.jsonToMap(n.getSmsNotice()); + Map oaMap = ToolsUtil.jsonToMap(n.getOaNotice()); + Map mnpMap = ToolsUtil.jsonToMap(n.getMnpNotice()); + + vo.setType(n.getType()==1?"业务通知":"验证码"); + vo.setSystemStatus(Integer.parseInt(systemMap.get("status"))); + vo.setSmsStatus(Integer.parseInt(smsMap.get("status"))); + vo.setOaStatus(Integer.parseInt(oaMap.get("status"))); + vo.setMnpStatus(Integer.parseInt(mnpMap.get("status"))); + vo.setCreateTime(TimeUtil.timestampToDate(n.getCreateTime())); + vo.setUpdateTime(TimeUtil.timestampToDate(n.getUpdateTime())); + list.add(vo); + } + + return list; + } + + /** + * 通知设置详情 + * + * @author fzr + * @param id 主键 + * @return NoticeSettingDetailVo + * + */ + @Override + public NoticeDetailVo detail(Integer id) { + NoticeSetting noticeSetting = noticeSettingMapper.selectOne(new QueryWrapper() + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + NoticeDetailVo vo = new NoticeDetailVo(); + BeanUtils.copyProperties(noticeSetting, vo); + + Map systemMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getSystemNotice()); + Map smsMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getSmsNotice()); + Map oaMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getOaNotice()); + Map mnpMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getMnpNotice()); + + systemMap.put("tips", JSONArray.toJSON(systemMap.get("tips"))); + smsMap.put("tips", JSONArray.toJSON(smsMap.get("tips"))); + oaMap.put("tips", JSONArray.toJSON(oaMap.get("tips"))); + oaMap.put("tpl", JSONArray.toJSON(oaMap.get("tpl"))); + mnpMap.put("tips", JSONArray.toJSON(mnpMap.get("tips"))); + mnpMap.put("tpl", JSONArray.toJSON(mnpMap.get("tpl"))); + + vo.setType(noticeSetting.getType()==1?"业务通知":"验证码"); + vo.setSystemNotice(systemMap); + vo.setSmsNotice(smsMap); + vo.setOaNotice(oaMap); + vo.setMnpNotice(mnpMap); + + return vo; + } + + /** + * 通知设置保存 + * + * @author fzr + * @param params 参数 + */ + @Override + public void save(Map params) { + Integer id = Integer.parseInt(params.get("id").toString()); + NoticeSetting noticeSetting = noticeSettingMapper.selectOne(new QueryWrapper() + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Map systemParam = ToolsUtil.objectToMap(params.get("systemNotice")); + Map systemMap = ToolsUtil.jsonToMap(noticeSetting.getSystemNotice()); + systemMap.put("title", systemParam.get("title")); + systemMap.put("content", systemParam.get("content")); + systemMap.put("status", systemParam.get("status")); + + Map smsParam = ToolsUtil.objectToMap(params.get("smsNotice")); + Map smsMap = ToolsUtil.jsonToMap(noticeSetting.getSmsNotice()); + smsMap.put("templateId", smsParam.get("templateId")); + smsMap.put("content", smsParam.get("content")); + smsMap.put("status", smsParam.get("status")); + + Map oaParam = ToolsUtil.objectToMap(params.get("oaNotice")); + Map oaMap = ToolsUtil.jsonToMap(noticeSetting.getOaNotice()); + oaMap.put("name", oaParam.getOrDefault("name", "")); + oaMap.put("first", oaParam.get("first")); + oaMap.put("remark", oaParam.get("remark")); + oaMap.put("templateId", oaParam.get("templateId")); + oaMap.put("templateSn", oaParam.get("templateSn")); + oaMap.put("tpl", JSON.toJSONString(oaParam.get("tpl"))); + oaMap.put("status", oaParam.get("status")); + + Map mnpParam = ToolsUtil.objectToMap(params.get("mnpNotice")); + Map mnpMap = ToolsUtil.jsonToMap(noticeSetting.getMnpNotice()); + mnpMap.put("templateId", mnpParam.get("templateId")); + mnpMap.put("templateSn", mnpParam.get("templateSn")); + mnpMap.put("tpl", mnpParam.get("tpl")); + mnpMap.put("status", mnpParam.get("status")); + + noticeSetting.setSystemNotice(JSON.toJSONString(systemMap)); + noticeSetting.setSmsNotice(JSON.toJSONString(smsMap)); + noticeSetting.setOaNotice(JSON.toJSONString(oaMap)); + noticeSetting.setMnpNotice(JSON.toJSONString(mnpMap)); + noticeSetting.setUpdateTime(System.currentTimeMillis() / 1000); + noticeSettingMapper.updateById(noticeSetting); + } + } diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/notice/NoticeSettingDetailVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/NoticeDetailVo.java similarity index 78% rename from server/like-admin/src/main/java/com/mdd/admin/vo/notice/NoticeSettingDetailVo.java rename to server/like-admin/src/main/java/com/mdd/admin/vo/setting/NoticeDetailVo.java index 4d5db766..d2031484 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/notice/NoticeSettingDetailVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/NoticeDetailVo.java @@ -1,11 +1,11 @@ -package com.mdd.admin.vo.notice; +package com.mdd.admin.vo.setting; import lombok.Data; import java.io.Serializable; @Data -public class NoticeSettingDetailVo implements Serializable { +public class NoticeDetailVo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/notice/NoticeSettingListVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/NoticeListVo.java similarity index 86% rename from server/like-admin/src/main/java/com/mdd/admin/vo/notice/NoticeSettingListVo.java rename to server/like-admin/src/main/java/com/mdd/admin/vo/setting/NoticeListVo.java index f393a482..db9590c8 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/notice/NoticeSettingListVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/NoticeListVo.java @@ -1,4 +1,4 @@ -package com.mdd.admin.vo.notice; +package com.mdd.admin.vo.setting; import lombok.Data; @@ -8,7 +8,7 @@ import java.io.Serializable; * 通知设置列表Vo */ @Data -public class NoticeSettingListVo implements Serializable { +public class NoticeListVo implements Serializable { private static final long serialVersionUID = 1L;