Explorar o código

Merge remote-tracking branch 'origin/master'

yumeng %!s(int64=3) %!d(string=hai) anos
pai
achega
7f10f2371e

+ 15 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/alarm/modules/service/impl/RuleGroupServiceImpl.java

@@ -31,6 +31,7 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.service.IRuleDataAccountKuaishouService;
 import cn.com.ctop.common.module.service.IRuleDataAccountService;
 import cn.com.ctop.common.module.service.ISendMessageService;
+import cn.com.ctop.common.module.service.ISysUserService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.SendMailUtil;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroup;
@@ -47,6 +48,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xxl.job.core.enums.NoEn;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.entity.SysUser;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -127,6 +129,9 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
     @Resource
     private ExternalLinkService externalLinkService;
 
+    @Autowired
+    private ISysUserService userService;
+
     private JSONObject userObj = null;
     private final static String ACCOUNT = "account";
     private final static String UNIT = "unit";
@@ -1320,7 +1325,14 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
             } else if ("TEL".equals(sendType)) {
             } else {
 //                sendMessageService.sendMessage("1b3deb8258e84df994f1371a51cfc14a", msg);
-                sendMessageService.sendMessage(user.getString("id"), msg);
+                String userId = user.getString("id");
+                sendMessageService.sendMessage(userId, msg);
+                String leaderId = user.getString("leader_id");
+                if (!Check.isNull(leaderId)) {
+                    String realname = user.getString("realname");
+                    msg = msg.replace("请您及时查看并调整", "(预警来自组员:" + realname + ")");
+                    sendMessageService.sendMessage(leaderId, msg);
+                }
                 Thread.sleep(100);
             }
             if (!Check.isNull(msg)) {
@@ -1399,7 +1411,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                         }
                     }
                 }
-                msg += "现已被关停,请您及时查看并调整";
+                msg += "现已被关停,请您及时查看并调整";
             } else {
                 msg = msg + "(F)获取签证失败!请联系管理员!";
             }
@@ -1443,7 +1455,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                             }
                         }
                     }
-                    msg += "现已被关停,请您及时查看并调整";
+                    msg += "现已被关停,请您及时查看并调整";
                 }
             }
         } catch (Exception e) {