正常发送 最近对接的客户在测试

This commit is contained in:
liuchengqian 2025-03-20 16:24:29 +08:00
parent 238b854ec3
commit 804758086e

View File

@ -2,9 +2,7 @@ package com.xkrs.service.impl;
import com.xkrs.common.encapsulation.PromptMessageEnum; import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.dao.*; import com.xkrs.dao.*;
import com.xkrs.model.entity.CountyCodeWeiXinEntity; import com.xkrs.model.entity.*;
import com.xkrs.model.entity.FirePointEntity;
import com.xkrs.model.entity.ShanDongFirePointEntity;
import com.xkrs.model.qo.FirePointQo; import com.xkrs.model.qo.FirePointQo;
import com.xkrs.model.vo.TianDiTuGeocodeVo; import com.xkrs.model.vo.TianDiTuGeocodeVo;
import com.xkrs.service.FirePointService; import com.xkrs.service.FirePointService;
@ -224,25 +222,25 @@ public class FirePointServiceImpl implements FirePointService {
//发送微信群聊消息 //发送微信群聊消息
sendWeChatGroupMessage(firePointEntity); sendWeChatGroupMessage(firePointEntity);
// if ("耕地".equals(firePointEntity.getLandType())) { if ("耕地".equals(firePointEntity.getLandType())) {
// //过滤短信通知收件人 //过滤短信通知收件人
// List<SysUserEntity> sysUserList = sysUserDao.findAll(); List<SysUserEntity> sysUserList = sysUserDao.findAll();
// boolean normalSmsEnable = 1L == globalConfigService.selectGlobalConfigValue(9L); boolean normalSmsEnable = 1L == globalConfigService.selectGlobalConfigValue(9L);
// boolean vipSmsEnable = 1L == globalConfigService.selectGlobalConfigValue(10L); boolean vipSmsEnable = 1L == globalConfigService.selectGlobalConfigValue(10L);
// List<SysUserEntity> smsReceiverList = FirePointCodeUtils.filterSmsReceiver(firePointEntity.getStreetCode(), sysUserList, normalSmsEnable, vipSmsEnable); List<SysUserEntity> smsReceiverList = FirePointCodeUtils.filterSmsReceiver(firePointEntity.getStreetCode(), sysUserList, normalSmsEnable, vipSmsEnable);
//// //推送 // //推送
//// try { // try {
//// List<String> userAccountList = pushHelper.obtainUserAccountList(smsReceiverList); // List<String> userAccountList = pushHelper.obtainUserAccountList(smsReceiverList);
//// pushHelper.dispatchPushMessage(userAccountList, firePointEntity); // pushHelper.dispatchPushMessage(userAccountList, firePointEntity);
//// } catch (Exception e) { // } catch (Exception e) {
//// e.printStackTrace(); // e.printStackTrace();
//// } // }
// //对短信通知收件人进行分组 //对短信通知收件人进行分组
// List<AgentOrgEntity> agentOrgList = agentOrgDao.findAll(); List<AgentOrgEntity> agentOrgList = agentOrgDao.findAll();
// Map<String, List<SysUserEntity>> agentOrgNameGroupMap = FirePointCodeUtils.groupSmsReceiver(smsReceiverList, agentOrgList); Map<String, List<SysUserEntity>> agentOrgNameGroupMap = FirePointCodeUtils.groupSmsReceiver(smsReceiverList, agentOrgList);
// //分发短信通知 //分发短信通知
// smsHelper.dispatchSMSMessage(agentOrgNameGroupMap, new String[]{firePointEntity.getFirePointAddress()}, new FirePointEntity[]{firePointEntity}); smsHelper.dispatchSMSMessage(agentOrgNameGroupMap, new String[]{firePointEntity.getFirePointAddress()}, new FirePointEntity[]{firePointEntity});
// } }
} }
/** /**