|
@@ -6,11 +6,10 @@ import com.alibaba.fastjson2.JSONObject;
|
|
|
import com.yunfeiyun.agmp.common.constant.Constants;
|
|
import com.yunfeiyun.agmp.common.constant.Constants;
|
|
|
import com.yunfeiyun.agmp.common.constant.PtsMsgBizType;
|
|
import com.yunfeiyun.agmp.common.constant.PtsMsgBizType;
|
|
|
import com.yunfeiyun.agmp.common.core.domain.entity.SysUser;
|
|
import com.yunfeiyun.agmp.common.core.domain.entity.SysUser;
|
|
|
-import com.yunfeiyun.agmp.common.core.domain.model.IBaseUser;
|
|
|
|
|
import com.yunfeiyun.agmp.common.enums.RedisCacheKey;
|
|
import com.yunfeiyun.agmp.common.enums.RedisCacheKey;
|
|
|
import com.yunfeiyun.agmp.common.framework.manager.RedisCacheManager;
|
|
import com.yunfeiyun.agmp.common.framework.manager.RedisCacheManager;
|
|
|
-import com.yunfeiyun.agmp.common.framework.mq.MessageContentService;
|
|
|
|
|
-import com.yunfeiyun.agmp.common.framework.mq.MsgbatchContent;
|
|
|
|
|
|
|
+import com.yunfeiyun.agmp.common.framework.message.MessageContentService;
|
|
|
|
|
+import com.yunfeiyun.agmp.common.framework.message.MsgbatchContent;
|
|
|
import com.yunfeiyun.agmp.common.msg.config.SmsCodeConfig;
|
|
import com.yunfeiyun.agmp.common.msg.config.SmsCodeConfig;
|
|
|
import com.yunfeiyun.agmp.common.msg.service.SmsService;
|
|
import com.yunfeiyun.agmp.common.msg.service.SmsService;
|
|
|
import com.yunfeiyun.agmp.common.utils.ConfigUtils;
|
|
import com.yunfeiyun.agmp.common.utils.ConfigUtils;
|
|
@@ -800,7 +799,7 @@ public class WarnService {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- String isIotWarnPushMuteEnabledStr = sysConfigService.selectConfigValueByKey(ConfigUtils.ConfigKeyEnum.IOT_WARN_PUSH_MUTE_ENABLED.getKey());
|
|
|
|
|
|
|
+ String isIotWarnPushMuteEnabledStr = sysConfigService.selectConfigValueByCommonKey(ConfigUtils.ConfigKeyEnum.IOT_WARN_PUSH_MUTE_ENABLED.getKey());
|
|
|
boolean isIotWarnPushMuteEnabled = Boolean.parseBoolean(isIotWarnPushMuteEnabledStr);
|
|
boolean isIotWarnPushMuteEnabled = Boolean.parseBoolean(isIotWarnPushMuteEnabledStr);
|
|
|
if(isIotWarnPushMuteEnabled){
|
|
if(isIotWarnPushMuteEnabled){
|
|
|
if("0".equals(findWarnlog.getWcPushtype()) ){
|
|
if("0".equals(findWarnlog.getWcPushtype()) ){
|
|
@@ -879,10 +878,10 @@ public class WarnService {
|
|
|
|
|
|
|
|
//取出所有手机号
|
|
//取出所有手机号
|
|
|
List<String> phoneList = new ArrayList<>();
|
|
List<String> phoneList = new ArrayList<>();
|
|
|
- List<IBaseUser> userList = userMapper.selectUserListOfAuth(new SysUser());
|
|
|
|
|
|
|
+ List<SysUser> userList = userMapper.selectUserListOfAuth(new SysUser());
|
|
|
|
|
|
|
|
for (String item:idList) {
|
|
for (String item:idList) {
|
|
|
- for (IBaseUser itemUser:userList) {
|
|
|
|
|
|
|
+ for (SysUser itemUser:userList) {
|
|
|
if (itemUser.getUserId().equals(item)) {
|
|
if (itemUser.getUserId().equals(item)) {
|
|
|
phoneList.add(itemUser.getUserMobile());
|
|
phoneList.add(itemUser.getUserMobile());
|
|
|
}
|
|
}
|
|
@@ -938,11 +937,11 @@ public class WarnService {
|
|
|
|
|
|
|
|
SysUser param = new SysUser();
|
|
SysUser param = new SysUser();
|
|
|
param.setRoleId(roleId);
|
|
param.setRoleId(roleId);
|
|
|
- List<IBaseUser> list = userMapper.selectUserList(param);
|
|
|
|
|
|
|
+ List<SysUser> list = userMapper.selectUserList(param);
|
|
|
|
|
|
|
|
List<String> useridList = new ArrayList<>();
|
|
List<String> useridList = new ArrayList<>();
|
|
|
|
|
|
|
|
- for (IBaseUser item: list
|
|
|
|
|
|
|
+ for (SysUser item: list
|
|
|
) {
|
|
) {
|
|
|
useridList.add(item.getUserId());
|
|
useridList.add(item.getUserId());
|
|
|
}
|
|
}
|