mengff
/
jihe-dc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

发布相关整改

develop
wangsixiang 10 months ago
parent
f5ce18337d
commit
bcdef51afa
2 changed files with 58 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      zc-business/src/main/java/com/zc/business/controller/MsmController.java
  2. 90
      zc-business/src/main/java/com/zc/business/service/impl/MsmServiceImpl.java

22
zc-business/src/main/java/com/zc/business/controller/MsmController.java
View File

@ -53,17 +53,17 @@ public class MsmController extends BaseController {
// if (map == null || !map.containsKey("type")||StringUtils.isBlank(map.get("type").toString())) { // if (map == null || !map.containsKey("type")||StringUtils.isBlank(map.get("type").toString())) {
// return AjaxResult.error("参数错误"); // return AjaxResult.error("参数错误");
// } // }
// if (map == null ||!map.containsKey("content")|| StringUtils.isBlank(map.get("content").toString())) { if (map == null ||!map.containsKey("content")|| StringUtils.isBlank(map.get("content").toString())) {
// return AjaxResult.error("内容为空"); return AjaxResult.error("内容为空");
// } }
// if (!map.containsKey("eventId")|| StringUtils.isBlank(map.get("eventId").toString())) { if (!map.containsKey("eventId")|| StringUtils.isBlank(map.get("eventId").toString())) {
// return AjaxResult.error("事件id为空"); return AjaxResult.error("事件id为空");
// } }
// if (map.get("content").toString().length()>=200){ if (map.get("content").toString().length()>=200){
// return AjaxResult.error("内容长度超长"); return AjaxResult.error("内容长度超长");
// } }
// return msmService.putAll(map); return msmService.putAll(map);
return AjaxResult.error("功能开发中"); //return AjaxResult.error("功能开发中");
} }
//整合推送(弃用) //整合推送(弃用)
@PostMapping("/pushAllText") @PostMapping("/pushAllText")

90
zc-business/src/main/java/com/zc/business/service/impl/MsmServiceImpl.java
View File

@ -228,54 +228,57 @@ public class MsmServiceImpl implements IMsmService {
DcPublishManage dcPublishManage = new DcPublishManage(); DcPublishManage dcPublishManage = new DcPublishManage();
String eventId = map.get("eventId").toString();//事件id String eventId = map.get("eventId").toString();//事件id
String content = map.get("content").toString();//信息内容 String content = map.get("content").toString();//信息内容
Integer eventType = dcPublishManageMapper.selectEventType(eventId);//事件类型 // Integer eventType = dcPublishManageMapper.selectEventType(eventId);//事件类型
DcPublishingChannels publishManage = dcPublishManageMapper.selectPublishManage(eventType);//渠道信息 // DcPublishingChannels publishManage = dcPublishManageMapper.selectPublishManage(eventType);//渠道信息
if (publishManage!=null){ // if (publishManage!=null){
dcPublishManage.setPublishChannelsId(publishManage.getId());//渠道id // dcPublishManage.setPublishChannelsId(publishManage.getId());//渠道id
} // }
dcPublishManage.setEventId(eventId);//事件id dcPublishManage.setEventId(eventId);//事件id
dcPublishManage.setPublisher(SecurityUtils.getUsername());//发布人 dcPublishManage.setPublisher(SecurityUtils.getUsername());//发布人
dcPublishManage.setPublishTime(DateUtils.getNowDate());//发布时间 dcPublishManage.setPublishTime(DateUtils.getNowDate());//发布时间
dcPublishManage.setCreateTime(DateUtils.getNowDate());//创建时间 dcPublishManage.setCreateTime(DateUtils.getNowDate());//创建时间
dcPublishManage.setContentDetails(map.get("content").toString()); dcPublishManage.setContentDetails(map.get("content").toString());
ArrayList<String> array = (ArrayList<String>) map.get("type"); dcPublishManage.setPublishChannels(8);//发布渠道类型：企业微信
Boolean send = null;
Integer data = null;
String weiXin = ""; // 初始化为成功状态
String message = ""; // 初始化为失败状态
for (String type : array) {
if ("1".equals(type)) { //短信
if (map == null || StringUtils.isBlank(map.get("phone").toString())) {
return AjaxResult.error("手机号为空");
}
String string = map.get("phone").toString();
send = msmService.send(string);
if (send == true) {
message = "短信推送成功"; // 如果 send 为 true，则短信推送成功
dcPublishManage.setPublishStatus(1);//发布成功 dcPublishManage.setPublishStatus(1);//发布成功
}else {
dcPublishManage.setPublishStatus(2);//发布失败
message = "短信推送失败";
}
dcPublishManage.setPublishChannels(1);//发布渠道类型：短信
dcPublishManageMapper.insertDcPublishManage(dcPublishManage);//加入推送记录 dcPublishManageMapper.insertDcPublishManage(dcPublishManage);//加入推送记录
continue; // ArrayList<String> array = (ArrayList<String>) map.get("type");
} // Boolean send = null;
if ("2".equals(type)) { //微信 // Integer data = null;
JSONArray objects = msmService.wenXinSend(content); // String weiXin = ""; // 初始化为成功状态
data = (Integer) objects.get(0); // String message = ""; // 初始化为失败状态
if (data == 0) { // for (String type : array) {
weiXin = "微信推送成功"; // 如果所有 dateValue 都为0，则微信推送成功 // if ("1".equals(type)) { //短信
dcPublishManage.setPublishStatus(1);//发布成功 // if (map == null || StringUtils.isBlank(map.get("phone").toString())) {
}else { // return AjaxResult.error("手机号为空");
dcPublishManage.setPublishStatus(2);//发布失败 // }
weiXin = "微信推送失败"; // String string = map.get("phone").toString();
} // send = msmService.send(string);
dcPublishManage.setPublishChannels(2);//发布渠道类型：微信公众号 // if (send == true) {
dcPublishManageMapper.insertDcPublishManage(dcPublishManage);//加入推送记录 // message = "短信推送成功"; // 如果 send 为 true，则短信推送成功
continue; // dcPublishManage.setPublishStatus(1);//发布成功
} // }else {
} // dcPublishManage.setPublishStatus(2);//发布失败
// message = "短信推送失败";
// }
// dcPublishManage.setPublishChannels(1);//发布渠道类型：短信
// dcPublishManageMapper.insertDcPublishManage(dcPublishManage);//加入推送记录
// continue;
// }
// if ("2".equals(type)) { //微信
// JSONArray objects = msmService.wenXinSend(content);
// data = (Integer) objects.get(0);
// if (data == 0) {
// weiXin = "微信推送成功"; // 如果所有 dateValue 都为0，则微信推送成功
// dcPublishManage.setPublishStatus(1);//发布成功
// }else {
// dcPublishManage.setPublishStatus(2);//发布失败
// weiXin = "微信推送失败";
// }
// dcPublishManage.setPublishChannels(2);//发布渠道类型：微信公众号
// dcPublishManageMapper.insertDcPublishManage(dcPublishManage);//加入推送记录
// continue;
// }
// }
DcEventProcess dcEventProcess = new DcEventProcess(); DcEventProcess dcEventProcess = new DcEventProcess();
dcEventProcess.setEventId(eventId); dcEventProcess.setEventId(eventId);
dcEventProcess.setSource(1); dcEventProcess.setSource(1);
@ -283,9 +286,6 @@ public class MsmServiceImpl implements IMsmService {
String context = "出行信息发布：" + content; String context = "出行信息发布：" + content;
dcEventProcess.setContext(context); dcEventProcess.setContext(context);
dcEventProcessService.insertDcEventProcess(dcEventProcess); dcEventProcessService.insertDcEventProcess(dcEventProcess);
if ("短信推送失败".equals(message)||"微信推送失败".equals(weiXin)){ return AjaxResult.success("发布成功");
return AjaxResult.error(message + weiXin);
}
return AjaxResult.success(message + weiXin);
} }
} }

Write Preview
Loading…
Cancel
Save