Forráskód Böngészése

预警消息调整

yumeng 2 éve
szülő
commit
954320ba1a

+ 6 - 11
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MailLogMapper.xml

@@ -28,17 +28,12 @@
 
 
     <select id="selectWeiXinIdList" resultType="com.alibaba.fastjson.JSONObject">
-     select
-     t2.wexin_id,t2.corp_id
-     from
-     ctop_project_member t1
-     left join ctop_corp_wexin_user t2
-     on t1.user_id = t2.user_id
-     LEFT JOIN sys_user t3
-     on  t1.user_id = t3.id
-     where t1.project_id = #{projectId}
-     and t3.`status` = 1
-     and t2.wexin_id != ''
+     select t2.wexin_id, t2.corp_id
+from ctop_user_allocation t1
+         left join ctop_corp_wexin_user t2 on t1.user_id = t2.user_id
+where t1.project_id = #{projectId}
+  and t1.account_status = 0
+group by t1.user_id
     </select>
 
     <select id="getWChatIdByUserId" resultType="com.alibaba.fastjson.JSONObject">

+ 6 - 55
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/AccountWarningServiceImpl.java

@@ -78,7 +78,6 @@ public class AccountWarningServiceImpl implements IAccountWarningService {
                     }
                 }
             }
-
             if (!Check.isNull(nowCost) && nowCost.compareTo(new BigDecimal(0)) != 0) {
                 BigDecimal yesterdayHourCost = hourlyAccountMapper.getCost(accountId, maxHour, anotherDay);
                 if (!Check.isNull(yesterdayHourCost) && yesterdayHourCost.compareTo(new BigDecimal(0)) != 0) {
@@ -89,15 +88,18 @@ public class AccountWarningServiceImpl implements IAccountWarningService {
                     }
                 }
             }
-
         } catch (Exception e) {
             e.printStackTrace();
         }
 
     }
 
-    private void sendYesterdayMessage(Long accountId, String authName, Integer maxHour, BigDecimal nowCost, Long projectId, String projectName) {
 
+
+
+
+
+    private void sendYesterdayMessage(Long accountId, String authName, Integer maxHour, BigDecimal nowCost, Long projectId, String projectName) {
         StringBuilder text = new StringBuilder();
         text.append("较昨日同时段消耗预警").append("<br/>")
                 .append("您的项目:" + projectName + "下的,").append("<br/>")
@@ -105,39 +107,13 @@ public class AccountWarningServiceImpl implements IAccountWarningService {
                 .append("相较于昨日 " + maxHour + "时").append("<br/>")
                 .append("出现消耗暴涨,").append("消耗金额为:" + nowCost).append("<br/>")
                 .append("请您及时查看!");
-
-
-        QueryWrapper<MailLog> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("account_id", accountId);
-        queryWrapper.eq("hour", maxHour);
-        queryWrapper.eq("mail_type", 3);
-        queryWrapper.orderByDesc("create_time");
-        queryWrapper.last("limit 1");
-        MailLog checkMailLog = mailLogMapper.selectOne(queryWrapper);
-        if (Check.isNull(checkMailLog)) {
-            List<String> mailList = mailLogMapper.selectMailList(projectId);
-            String subject = "快手-较昨日同时段账户消耗预警";
-            try {
-                SendMailUtil.sendMail(mailList, subject, text.toString());
-                MailLog mailLog = new MailLog();
-                mailLog.setAccountId(accountId);
-                mailLog.setMailType(3);
-                mailLog.setHour(maxHour);
-                mailLog.setContent(text.toString());
-                mailLog.setSendEmil(JSON.toJSONString(mailList));
-                mailLog.setSubject(subject);
-                mailLogMapper.insert(mailLog);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
             List<JSONObject> wexinIds = mailLogMapper.selectWeiXinIdList(projectId);
             corpWexinUtils.sendMessage(wexinIds, text.toString());
-        }
+
     }
 
 
     private void sendMessage(Long accountId, String authName, Integer hour, BigDecimal amount, Long projectId, String projectName) {
-
         StringBuilder text = new StringBuilder();
         text.append("较上时段消耗预警").append("<br/>")
                 .append("您的项目:" + projectName + " 下的").append("<br/>")
@@ -145,31 +121,6 @@ public class AccountWarningServiceImpl implements IAccountWarningService {
                 .append(hour + " 时").append("相较于 " + (hour - 1) + " 时").append("<br/>")
                 .append("出现消耗暴涨,").append("消耗金额为:" + amount).append("<br/>")
                 .append("请您及时查看!");
-
-        QueryWrapper<MailLog> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("account_id", accountId);
-        queryWrapper.eq("hour", hour);
-        queryWrapper.eq("mail_type", 2);
-        queryWrapper.orderByDesc("create_time");
-        queryWrapper.last("limit 1");
-        MailLog checkMailLog = mailLogMapper.selectOne(queryWrapper);
-        if (Check.isNull(checkMailLog)) {
-            List<String> mailList = mailLogMapper.selectMailList(projectId);
-            String subject = "快手-账户消耗预警";
-            try {
-                SendMailUtil.sendMail(mailList, subject, text.toString());
-                MailLog mailLog = new MailLog();
-                mailLog.setAccountId(accountId);
-                mailLog.setMailType(2);
-                mailLog.setHour(hour);
-                mailLog.setContent(text.toString());
-                mailLog.setSendEmil(JSON.toJSONString(mailList));
-                mailLog.setSubject(subject);
-                mailLogMapper.insert(mailLog);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
         List<JSONObject> wexinIds = mailLogMapper.selectWeiXinIdList(projectId);
         corpWexinUtils.sendMessage(wexinIds, text.toString());