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

修复通知设置bug

This commit is contained in:
TinyAnts 2022-11-16 15:01:40 +08:00
parent ca9a251176
commit 7a37ac18ac
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingNoticeController.java
View File

@ -57,6 +57,7 @@ public class SettingNoticeController {
*/ */
@PostMapping("/save") @PostMapping("/save")
public AjaxResult<Object> save(@RequestBody Map<String, Object> params) { public AjaxResult<Object> save(@RequestBody Map<String, Object> params) {
System.out.println("黄金基金");
iSettingNoticeService.save(params); iSettingNoticeService.save(params);
return AjaxResult.success(); return AjaxResult.success();
} }

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

@ -8,6 +8,7 @@ import com.mdd.admin.vo.setting.SettingNoticeDetailVo;
import com.mdd.admin.vo.setting.SettingNoticeListedVo; import com.mdd.admin.vo.setting.SettingNoticeListedVo;
import com.mdd.common.entity.notice.NoticeSetting; import com.mdd.common.entity.notice.NoticeSetting;
import com.mdd.common.mapper.notice.NoticeSettingMapper; import com.mdd.common.mapper.notice.NoticeSettingMapper;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.utils.TimeUtil; import com.mdd.common.utils.TimeUtil;
import com.mdd.common.utils.ToolsUtil; import com.mdd.common.utils.ToolsUtil;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@ -91,9 +92,11 @@ public class SettingNoticeServiceImpl implements ISettingNoticeService {
Map<String, Object> mnpMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getMnpNotice()); Map<String, Object> mnpMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getMnpNotice());
Map<String, Object> smsMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getSmsNotice()); Map<String, Object> smsMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getSmsNotice());
smsMap.put("tips", JSON.parseArray(smsMap.get("tips").toString()));
SettingNoticeDetailVo vo = new SettingNoticeDetailVo(); SettingNoticeDetailVo vo = new SettingNoticeDetailVo();
BeanUtils.copyProperties(noticeSetting, vo); BeanUtils.copyProperties(noticeSetting, vo);
vo.setType(noticeSetting.getType()==1?"业务通知":"验证码"); vo.setType(noticeSetting.getType().equals(1)?"业务通知":"验证码");
vo.setSystemNotice(systemMap); vo.setSystemNotice(systemMap);
vo.setOaNotice(oaMap); vo.setOaNotice(oaMap);
vo.setMnpNotice(mnpMap); vo.setMnpNotice(mnpMap);
@ -117,32 +120,44 @@ public class SettingNoticeServiceImpl implements ISettingNoticeService {
Map<String, String> systemParam = ToolsUtil.objectToMap(params.get("systemNotice")); Map<String, String> systemParam = ToolsUtil.objectToMap(params.get("systemNotice"));
Map<String, String> systemMap = ToolsUtil.jsonToMap(noticeSetting.getSystemNotice()); Map<String, String> systemMap = ToolsUtil.jsonToMap(noticeSetting.getSystemNotice());
systemMap.put("title", systemParam.get("title")); if (!StringUtil.isNotEmpty(systemMap)) {
systemMap.put("content", systemParam.get("content")); systemMap.put("title", systemParam.getOrDefault("title", ""));
systemMap.put("status", systemParam.get("status")); systemMap.put("content", systemParam.getOrDefault("content", ""));
systemMap.put("tips", systemParam.getOrDefault("tips", ""));
systemMap.put("status", systemParam.getOrDefault("status", "0"));
}
Map<String, String> smsParam = ToolsUtil.objectToMap(params.get("smsNotice")); Map<String, String> smsParam = ToolsUtil.objectToMap(params.get("smsNotice"));
Map<String, String> smsMap = ToolsUtil.jsonToMap(noticeSetting.getSmsNotice()); Map<String, String> smsMap = ToolsUtil.jsonToMap(noticeSetting.getSmsNotice());
smsMap.put("templateId", smsParam.get("templateId")); if (!StringUtil.isNotEmpty(smsMap)) {
smsMap.put("content", smsParam.get("content")); smsMap.put("templateId", smsParam.getOrDefault("templateId", ""));
smsMap.put("status", smsParam.get("status")); smsMap.put("content", smsParam.getOrDefault("content", ""));
smsMap.put("tips", smsParam.getOrDefault("tips", ""));
smsMap.put("status", smsParam.getOrDefault("status", ""));
}
Map<String, String> oaParam = ToolsUtil.objectToMap(params.get("oaNotice")); Map<String, String> oaParam = ToolsUtil.objectToMap(params.get("oaNotice"));
Map<String, String> oaMap = ToolsUtil.jsonToMap(noticeSetting.getOaNotice()); Map<String, String> oaMap = ToolsUtil.jsonToMap(noticeSetting.getOaNotice());
oaMap.put("name", oaParam.getOrDefault("name", "")); if (!StringUtil.isNotEmpty(oaMap)) {
oaMap.put("first", oaParam.get("first")); oaMap.put("name", oaParam.getOrDefault("name", ""));
oaMap.put("remark", oaParam.get("remark")); oaMap.put("first", oaParam.getOrDefault("first", ""));
oaMap.put("templateId", oaParam.get("templateId")); oaMap.put("remark", oaParam.getOrDefault("remark", ""));
oaMap.put("templateSn", oaParam.get("templateSn")); oaMap.put("templateId", oaParam.getOrDefault("templateId", ""));
oaMap.put("tpl", JSON.toJSONString(oaParam.get("tpl"))); oaMap.put("templateSn", oaParam.getOrDefault("templateSn", ""));
oaMap.put("status", oaParam.get("status")); oaMap.put("tpl", oaParam.getOrDefault("tpl", ""));
oaMap.put("tips", oaParam.getOrDefault("tips", ""));
oaMap.put("status", oaParam.getOrDefault("status", ""));
}
Map<String, String> mnpParam = ToolsUtil.objectToMap(params.get("mnpNotice")); Map<String, String> mnpParam = ToolsUtil.objectToMap(params.get("mnpNotice"));
Map<String, String> mnpMap = ToolsUtil.jsonToMap(noticeSetting.getMnpNotice()); Map<String, String> mnpMap = ToolsUtil.jsonToMap(noticeSetting.getMnpNotice());
mnpMap.put("templateId", mnpParam.get("templateId")); if (!StringUtil.isNotEmpty(mnpParam)) {
mnpMap.put("templateSn", mnpParam.get("templateSn")); mnpMap.put("templateId", mnpParam.get("templateId"));
mnpMap.put("tpl", mnpParam.get("tpl")); mnpMap.put("templateSn", mnpParam.get("templateSn"));
mnpMap.put("status", mnpParam.get("status")); mnpMap.put("tpl", mnpParam.get("tpl"));
mnpMap.put("tips", mnpParam.get("tips"));
mnpMap.put("status", mnpParam.getOrDefault("status", "0"));
}
noticeSetting.setSystemNotice(JSON.toJSONString(systemMap)); noticeSetting.setSystemNotice(JSON.toJSONString(systemMap));
noticeSetting.setSmsNotice(JSON.toJSONString(smsMap)); noticeSetting.setSmsNotice(JSON.toJSONString(smsMap));