mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加通知设置接口

This commit is contained in:
TinyAnts 2022-08-24 18:01:51 +08:00
parent 0d644bb957
commit 5e88c2ea5a
7 changed files with 191 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java
View File

@ -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<NoticeSettingListVo> list = iNoticeSettingService.list();
List<NoticeListVo> 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<String, Object> params) {
System.out.println(ToolsUtil.objectToMap(params.get("systemNotice")));
iNoticeSettingService.save(params);
iSettingNoticeService.save(params);
return AjaxResult.success();
}

26
server/like-admin/src/main/java/com/mdd/admin/service/notice/INoticeSettingService.java
View File

@ -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<NoticeSettingListVo>
*/
List<NoticeSettingListVo> list();
NoticeSettingDetailVo detail(Integer id);
void save(Map<String, Object> params);
}

154
server/like-admin/src/main/java/com/mdd/admin/service/notice/impl/NoticeSettingServiceImpl.java
View File

@ -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<NoticeSettingListVo>
*/
@Override
public List<NoticeSettingListVo> list() {
QueryWrapper<NoticeSetting> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_delete", 0);
queryWrapper.orderByAsc("id");
List<NoticeSetting> noticeSettings = noticeSettingMapper.selectList(queryWrapper);
List<NoticeSettingListVo> list = new LinkedList<>();
for (NoticeSetting n : noticeSettings) {
NoticeSettingListVo vo = new NoticeSettingListVo();
BeanUtils.copyProperties(n, vo);
Map<String, String> systemMap = ToolsUtil.jsonToMap(n.getSystemNotice());
Map<String, String> smsMap = ToolsUtil.jsonToMap(n.getSmsNotice());
Map<String, String> oaMap = ToolsUtil.jsonToMap(n.getOaNotice());
Map<String, String> 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<NoticeSetting>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
NoticeSettingDetailVo vo = new NoticeSettingDetailVo();
BeanUtils.copyProperties(noticeSetting, vo);
Map<String, Object> systemMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getSystemNotice());
Map<String, Object> smsMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getSmsNotice());
Map<String, Object> oaMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getOaNotice());
Map<String, Object> 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<String, Object> params) {
Integer id = Integer.parseInt(params.get("id").toString());
NoticeSetting noticeSetting = noticeSettingMapper.selectOne(new QueryWrapper<NoticeSetting>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Map<String, String> systemParam = ToolsUtil.objectToMap(params.get("systemNotice"));
Map<String, String> systemMap = ToolsUtil.jsonToMap(noticeSetting.getSystemNotice());
systemMap.put("title", systemParam.get("title"));
systemMap.put("content", systemParam.get("content"));
systemMap.put("status", systemParam.get("status"));
Map<String, String> smsParam = ToolsUtil.objectToMap(params.get("smsNotice"));
Map<String, String> smsMap = ToolsUtil.jsonToMap(noticeSetting.getSmsNotice());
smsMap.put("templateId", smsParam.get("templateId"));
smsMap.put("content", smsParam.get("content"));
smsMap.put("status", smsParam.get("status"));
Map<String, String> oaParam = ToolsUtil.objectToMap(params.get("oaNotice"));
Map<String, String> 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<String, String> mnpParam = ToolsUtil.objectToMap(params.get("mnpNotice"));
Map<String, String> 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);
}
}

34
server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingNoticeService.java
View File

@ -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<NoticeSettingListVo>
*/
List<NoticeListVo> list();
/**
* 通知设置详情
*
* @author fzr
* @param id 主键
* @return NoticeDetailVo
*/
NoticeDetailVo detail(Integer id);
/**
* 通知设置保存
*
* @author fzr
* @param params 参数
*/
void save(Map<String, Object> params);
}

148
server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java
View File

@ -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<NoticeSettingListVo>
*/
@Override
public List<NoticeListVo> list() {
QueryWrapper<NoticeSetting> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_delete", 0);
queryWrapper.orderByAsc("id");
List<NoticeSetting> noticeSettings = noticeSettingMapper.selectList(queryWrapper);
List<NoticeListVo> list = new LinkedList<>();
for (NoticeSetting n : noticeSettings) {
NoticeListVo vo = new NoticeListVo();
BeanUtils.copyProperties(n, vo);
Map<String, String> systemMap = ToolsUtil.jsonToMap(n.getSystemNotice());
Map<String, String> smsMap = ToolsUtil.jsonToMap(n.getSmsNotice());
Map<String, String> oaMap = ToolsUtil.jsonToMap(n.getOaNotice());
Map<String, String> 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<NoticeSetting>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
NoticeDetailVo vo = new NoticeDetailVo();
BeanUtils.copyProperties(noticeSetting, vo);
Map<String, Object> systemMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getSystemNotice());
Map<String, Object> smsMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getSmsNotice());
Map<String, Object> oaMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getOaNotice());
Map<String, Object> 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<String, Object> params) {
Integer id = Integer.parseInt(params.get("id").toString());
NoticeSetting noticeSetting = noticeSettingMapper.selectOne(new QueryWrapper<NoticeSetting>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Map<String, String> systemParam = ToolsUtil.objectToMap(params.get("systemNotice"));
Map<String, String> systemMap = ToolsUtil.jsonToMap(noticeSetting.getSystemNotice());
systemMap.put("title", systemParam.get("title"));
systemMap.put("content", systemParam.get("content"));
systemMap.put("status", systemParam.get("status"));
Map<String, String> smsParam = ToolsUtil.objectToMap(params.get("smsNotice"));
Map<String, String> smsMap = ToolsUtil.jsonToMap(noticeSetting.getSmsNotice());
smsMap.put("templateId", smsParam.get("templateId"));
smsMap.put("content", smsParam.get("content"));
smsMap.put("status", smsParam.get("status"));
Map<String, String> oaParam = ToolsUtil.objectToMap(params.get("oaNotice"));
Map<String, String> 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<String, String> mnpParam = ToolsUtil.objectToMap(params.get("mnpNotice"));
Map<String, String> 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);
}
}

4
server/like-admin/src/main/java/com/mdd/admin/vo/notice/NoticeSettingDetailVo.java → server/like-admin/src/main/java/com/mdd/admin/vo/setting/NoticeDetailVo.java
View File

@ -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;

4
server/like-admin/src/main/java/com/mdd/admin/vo/notice/NoticeSettingListVo.java → server/like-admin/src/main/java/com/mdd/admin/vo/setting/NoticeListVo.java
View File

@ -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;