Browse Source

Merge branch 'test' of http://git.tjyourong.com.cn/ctop/adsp-boot into test

yumeng 5 years ago
parent
commit
c1c7d5a271

+ 0 - 52
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/BidWarningServiceImpl.java

@@ -5,7 +5,6 @@ import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.MailLogMapper;
 import cn.com.ctop.common.module.mapper.ProjectMapper;
-import cn.com.ctop.common.module.service.ICorpFeishuUserService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.BigDecimalUtil;
 import cn.com.ctop.common.module.utils.Check;
@@ -13,9 +12,7 @@ import cn.com.ctop.common.module.utils.CorpWexinUtils;
 import cn.com.ctop.common.module.utils.SendMailUtil;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouGroupMapper;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertisePlanService;
-import cn.com.feishu.provider.MessageProvider;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
@@ -83,7 +80,6 @@ public class BidWarningServiceImpl implements IBidWarningService {
 
                             if (!Check.isNull(unitWarning)) {
                                 sendMessage(project.getMediaId(), accountId, projectId, project.getProjectName(), userAllocation.getAuthName(), unitWarning, maxBid);
-                                sendFeishumessage(project.getMediaId(), accountId, projectId, project.getProjectName(), userAllocation.getAuthName(), unitWarning, maxBid);
                             }
                         }
                     }
@@ -94,55 +90,7 @@ public class BidWarningServiceImpl implements IBidWarningService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-
-
     }
-    private void sendFeishumessage(String mediaId, Long accountId, Long projectId, String projectName, String authName, List<String> unitWarning, Long maxBid) throws Exception {
-        String createTime = DateUtils.getNowDate("yyyy-MM-dd");
-        Integer count = mailLogMapper.selectCountByAccountIdAndDate(accountId, createTime, Integer.getInteger(mediaId));
-        StringBuilder text = new StringBuilder();
-        String s = "";
-        for (int i = 0; i < unitWarning.size(); i++) {
-            s += unitWarning.get(i) + "," + "\n\r";
-
-        }
-        text.append("项目出价预警").append("\n\r").append("您的项目:").append(projectName + ",").append("\n\r")
-                .append("授权名称为:" + authName + " 下的,").append("\n\r").append(s)
-                .append("大于项目设置的最高出价:").append(maxBid / 1000).append(" 元! 请您及时调整。");
-        if (count < 3) {
-            List<String> mailList = mailLogMapper.selectMailList(projectId);
-            String subject;
-            if ("1".equals(mediaId)) {
-                subject = "头条-广告计划出价预警";
-
-            } else {
-                subject = "快手-广告组出价预警";
-            }
-            try {
-                SendMailUtil.sendMail(mailList, subject, text.toString());
-                MailLog mailLog = new MailLog();
-                mailLog.setAccountId(accountId);
-                mailLog.setMailType(1);
-                mailLog.setContent(text.toString());
-                mailLog.setSendEmil(JSON.toJSONString(mailList));
-                mailLog.setSubject(subject);
-                mailLogMapper.insert(mailLog);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        JSONArray openIds = corpFeishuUserService.getOpenIdByParams(projectId);
-        if(null == openIds||openIds.isEmpty()){
-            log.error("该项目下运营飞书账号尚未绑定邮箱=>projectId:{}",projectId);
-            return;
-        }
-        MessageProvider.batchSend(null,openIds,null,text.toString());
-    }
-
-    @Autowired
-    private ICorpFeishuUserService corpFeishuUserService;
-
     private void sendMessage(String mediaId, Long accountId, Long projectId, String projectName, String authName, List<String> unitWarning, Long maxBid) {
         String createTime = DateUtils.getNowDate("yyyy-MM-dd");
         Integer count = mailLogMapper.selectCountByAccountIdAndDate(accountId, createTime, 1);

+ 0 - 50
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CpaBidWarningServiceImpl.java

@@ -4,7 +4,6 @@ import cn.com.ctop.common.module.entity.MailLog;
 import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.MailLogMapper;
-import cn.com.ctop.common.module.service.ICorpFeishuUserService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.BigDecimalUtil;
 import cn.com.ctop.common.module.utils.Check;
@@ -12,9 +11,7 @@ import cn.com.ctop.common.module.utils.CorpWexinUtils;
 import cn.com.ctop.common.module.utils.SendMailUtil;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouGroupMapper;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertisePlanService;
-import cn.com.feishu.provider.MessageProvider;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.ctop.service.ICpaBidWarningService;
@@ -40,8 +37,6 @@ public class CpaBidWarningServiceImpl implements ICpaBidWarningService {
     private MailLogMapper mailLogMapper;
     @Autowired
     private IByteDanceAdvertisePlanService byteDanceAdvertisePlanService;
-    @Autowired
-    private ICorpFeishuUserService corpFeishuUserService;
 
     /**
      * 预警
@@ -67,7 +62,6 @@ public class CpaBidWarningServiceImpl implements ICpaBidWarningService {
 
                     if (!Check.isNull(unitWarning)) {
                         sendMessage(project.getMediaId(), accountId, project.getId(), project.getProjectName(), userAllocation.getAuthName(), unitWarning, maxDeepCpaBid);
-                        sendFeishuMessage(project.getMediaId(), accountId, project.getId(), project.getProjectName(), userAllocation.getAuthName(), unitWarning, maxDeepCpaBid);
                     }
                 }
             }
@@ -77,50 +71,6 @@ public class CpaBidWarningServiceImpl implements ICpaBidWarningService {
         }
     }
 
-    private void sendFeishuMessage(String mediaId, Long accountId, Long projectId, String projectName, String authName, List<String> unitWarning, BigDecimal maxCpaBid) throws Exception {
-        BigDecimal maxBid = BigDecimalUtil.divideBigDecimal(maxCpaBid, new BigDecimal(1000));
-        String createTime = DateUtils.getNowDate("yyyy-MM-dd");
-        Integer count = mailLogMapper.selectCountByAccountIdAndDate(accountId, createTime, Integer.getInteger(mediaId));
-        StringBuilder text = new StringBuilder();
-        String s = "";
-        for (int i = 0; i < unitWarning.size(); i++) {
-            s += unitWarning.get(i) + "," + "\n\r";
-
-        }
-        text.append("项目深度出价预警").append("\n\r").append("您的项目:").append(projectName + ",").append("\n\r")
-                .append("授权名称为:" + authName + " 下的,").append("\n\r").append(s)
-                .append("大于项目设置的最高深度转化出价:").append(maxBid).append(" 元! 请您及时调整。");
-        if (count < 3) {
-            List<String> mailList = mailLogMapper.selectMailList(projectId);
-            String subject;
-            if ("1".equals(mediaId)) {
-                subject = "头条-广告计划深度转化出价预警";
-
-            } else {
-                subject = "快手-广告组深度转化出价预警";
-            }
-
-            try {
-                SendMailUtil.sendMail(mailList, subject, text.toString());
-                MailLog mailLog = new MailLog();
-                mailLog.setAccountId(accountId);
-                mailLog.setMailType(1);
-                mailLog.setContent(text.toString());
-                mailLog.setSendEmil(JSON.toJSONString(mailList));
-                mailLog.setSubject(subject);
-                mailLogMapper.insert(mailLog);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        JSONArray openIds = corpFeishuUserService.getOpenIdByParams(projectId);
-        if(null == openIds||openIds.isEmpty()){
-            log.error("该项目下运营飞书账号尚未绑定邮箱=>projectId:{}",projectId);
-            return;
-        }
-        MessageProvider.batchSend(null,openIds,null,text.toString());
-    }
-
     private void sendMessage(String mediaId, Long accountId, Long projectId, String projectName, String authName, List<String> unitWarning, BigDecimal maxCpaBid) {
         BigDecimal maxBid = BigDecimalUtil.divideBigDecimal(maxCpaBid, new BigDecimal(1000));
         String createTime = DateUtils.getNowDate("yyyy-MM-dd");

+ 0 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/ISendMessageService.java

@@ -2,5 +2,4 @@ package cn.com.ctop.common.module.service;
 
 public interface ISendMessageService {
     void sendMessage(String id, String text);
-    void sendFeishuMessage(String userId, String text);
 }

+ 0 - 2
module-common/src/main/java/cn/com/ctop/common/module/service/impl/FileInfoServiceImpl.java

@@ -73,9 +73,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
                 } else {
                     UserAllocation allocation = userAllocationService.getByAccountId(Long.valueOf(accountId));
                     String message = messageTemplate.getMaterialSyncTemplate(allocation.getProjectName(), Long.valueOf(accountId), allocation.getAuthName(), materialName, jsonObject.getString("message"));
-                    String feishuMessage = messageTemplate.getFeishuMaterialSyncTemplate(allocation.getProjectName(), Long.valueOf(accountId), allocation.getAuthName(), materialName, jsonObject.getString("message"));
                     sendMessageService.sendMessage(userId, message);
-                    sendMessageService.sendFeishuMessage(userId,feishuMessage);
                 }
 
             }else{

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -72,7 +72,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
     public void watermarkVideo(String materialId, Long videoWatermarkTemplateId, String userId) {
         TencentWatermarkTemplate tentcentWatermarkTemplate = tencentWatermarkTemplateService.getById(videoWatermarkTemplateId);
         MaterialInfo materialInfo = this.getById(materialId);
-        String path = materialInfo.getUrl().substring(materialInfo.getUrl().indexOf("/", 10) + 1, materialInfo.getUrl().length());
+        String path = URLDecoder.decode(materialInfo.getUrl().substring(materialInfo.getUrl().indexOf("/", 10) + 1, materialInfo.getUrl().length()));
         String taskId = videoWatermarkHandle(path, tentcentWatermarkTemplate.getTemplateId());
         DescribeTaskDetailResponse taskDetailResponse = null;
         for (int i = 0; i < 10; i++) {

+ 0 - 18
module-common/src/main/java/cn/com/ctop/common/module/service/impl/SendMessageServiceImpl.java

@@ -1,13 +1,10 @@
 package cn.com.ctop.common.module.service.impl;
 
-import cn.com.ctop.common.module.entity.CorpFeishuUser;
 import cn.com.ctop.common.module.mapper.MailLogMapper;
 import cn.com.ctop.common.module.service.ICorpFeishuUserService;
 import cn.com.ctop.common.module.service.ISendMessageService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.CorpWexinUtils;
-import cn.com.feishu.provider.MessageProvider;
-import com.alibaba.fastjson.JSONArray;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,19 +24,4 @@ public class SendMessageServiceImpl implements ISendMessageService {
             log.info("消息发送成功,userId:{}", userId);
         }
     }
-
-    @Override
-    public void sendFeishuMessage(String userId, String text) {
-        CorpFeishuUser user = corpFeishuUserService.getByUserId(userId);
-        if(null!=user){
-            JSONArray openIds = new JSONArray();
-            openIds.add(user.getOpenId());
-            try {
-                MessageProvider.batchSend(null,openIds,null,text);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
 }

+ 0 - 2
module-ctop/src/main/java/cn/com/ctop/manage/modules/material/service/impl/MaterialUploadServiceImpl.java

@@ -237,8 +237,6 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
                                         UserAllocation allocation = userAllocationService.getByAccountId(accountId);
                                         String message = messageTemplate.getMaterialSyncTemplate(allocation.getProjectName(), accountId, allocation.getAuthName(), materialInfo.getMaterialName(), resultJson.getString("message"));
                                         sendMessageService.sendMessage(userId, message);
-                                        String feishuMessage = messageTemplate.getFeishuMaterialSyncTemplate(allocation.getProjectName(), accountId, allocation.getAuthName(), materialInfo.getMaterialName(), resultJson.getString("message"));
-                                        sendMessageService.sendFeishuMessage(userId, feishuMessage);
                                     }
                                 }
 

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

@@ -4,15 +4,12 @@ import cn.com.ctop.common.module.entity.MailLog;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.MailLogMapper;
 import cn.com.ctop.common.module.mapper.UserAllocationMapper;
-import cn.com.ctop.common.module.service.ICorpFeishuUserService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.CorpWexinUtils;
 import cn.com.ctop.common.module.utils.SendMailUtil;
 import cn.com.ctop.kuaishou.modules.batch.service.IAccountWarningService;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportHourlyAccountMapper;
-import cn.com.feishu.provider.MessageProvider;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,7 +66,6 @@ public class AccountWarningServiceImpl implements IAccountWarningService {
                         BigDecimal divide = nowCost.divide(lastHourCost, 2, RoundingMode.HALF_UP);
                         if (subtract.compareTo(warningAmount) > -1 && divide.compareTo(warningProportion) > -1) {
                             sendMessage(accountId, userAllocation.getAuthName(), maxHour, nowCost, userAllocation.getProjectId(), userAllocation.getProjectName());
-                            sendFeishuMessage(accountId, userAllocation.getAuthName(), maxHour, nowCost, userAllocation.getProjectId(), userAllocation.getProjectName());
                         }
                     }
                 }
@@ -82,7 +78,6 @@ public class AccountWarningServiceImpl implements IAccountWarningService {
                     BigDecimal divide = nowCost.divide(yesterdayHourCost, 2, RoundingMode.HALF_UP);
                     if (subtract.compareTo(warningAmount) > -1 && divide.compareTo(warningProportion) > -1) {
                         sendYesterdayMessage(accountId, userAllocation.getAuthName(), maxHour, nowCost, userAllocation.getProjectId(), userAllocation.getProjectName());
-                        sendYesterdayFeishuMessage(accountId, userAllocation.getAuthName(), maxHour, nowCost, userAllocation.getProjectId(), userAllocation.getProjectName());
                     }
                 }
             }
@@ -93,103 +88,6 @@ public class AccountWarningServiceImpl implements IAccountWarningService {
 
     }
 
-    private void sendYesterdayFeishuMessage(Long accountId, String authName, Integer maxHour, BigDecimal nowCost, Long projectId, String projectName) {
-
-        StringBuilder text = new StringBuilder();
-        text.append("较昨日同时段消耗预警").append("\n\r")
-                .append("您的项目:" + projectName + "下的,").append("\n\r")
-                .append("账号:").append(accountId + ",").append("授权名称为:" + authName).append("\n\r")
-                .append("相较于昨日 " + maxHour + "时").append("\n\r")
-                .append("出现消耗暴涨,").append("消耗金额为:" + nowCost).append("\n\r")
-                .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();
-            }
-            JSONArray openIds = corpFeishuUserService.getOpenIdByParams(projectId);
-            if(null == openIds||openIds.isEmpty()){
-                log.error("该项目下运营飞书账号尚未绑定邮箱=>projectId:{}",projectId);
-                return;
-            }
-            try {
-                MessageProvider.batchSend(null,openIds,null,text.toString());
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    @Autowired
-    private ICorpFeishuUserService corpFeishuUserService;
-
-    private void sendFeishuMessage(Long accountId, String authName, Integer hour, BigDecimal amount, Long projectId, String projectName) {
-
-        StringBuilder text = new StringBuilder();
-        text.append("较上时段消耗预警").append("\n\r")
-                .append("您的项目:" + projectName + " 下的").append("\n\r")
-                .append("账号:").append(accountId + ",").append("授权名称为:" + authName).append("\n\r")
-                .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();
-            }
-        }
-        JSONArray openIds = corpFeishuUserService.getOpenIdByParams(projectId);
-        if(null == openIds||openIds.isEmpty()){
-            log.error("该项目下运营飞书账号尚未绑定邮箱=>projectId:{}",projectId);
-            return;
-        }
-        try {
-            MessageProvider.batchSend(null,openIds,null,text.toString());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
     private void sendYesterdayMessage(Long accountId, String authName, Integer maxHour, BigDecimal nowCost, Long projectId, String projectName) {
 
         StringBuilder text = new StringBuilder();

+ 0 - 49
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/material/service/impl/KuaishouBidWarningServiceImpl.java

@@ -4,7 +4,6 @@ import cn.com.ctop.common.module.entity.MailLog;
 import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.MailLogMapper;
-import cn.com.ctop.common.module.service.ICorpFeishuUserService;
 import cn.com.ctop.common.module.service.IProjectService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.Check;
@@ -12,9 +11,7 @@ import cn.com.ctop.common.module.utils.CorpWexinUtils;
 import cn.com.ctop.common.module.utils.SendMailUtil;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouGroupMapper;
 import cn.com.ctop.kuaishou.modules.material.service.IKuaishouBidWarningService;
-import cn.com.feishu.provider.MessageProvider;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,7 +62,6 @@ public class KuaishouBidWarningServiceImpl implements IKuaishouBidWarningService
                         if ("2".equals(userAllocation.getMediaId())) {
                             unitWarning = groupMapper.selectWarningGroup(accountId, maxBid);
                             sendMessage(project.getMediaId(), accountId, projectId, project.getProjectName(), userAllocation.getAuthName(), unitWarning, maxBid);
-                            sendFeishumessage(project.getMediaId(), accountId, projectId, project.getProjectName(), userAllocation.getAuthName(), unitWarning, maxBid);
                         }
                     }
                 }
@@ -75,51 +71,6 @@ public class KuaishouBidWarningServiceImpl implements IKuaishouBidWarningService
             e.printStackTrace();
         }
     }
-    private void sendFeishumessage(String mediaId, Long accountId, Long projectId, String projectName, String authName, List<String> unitWarning, Long maxBid) throws Exception {
-        String createTime = DateUtils.getNowDate("yyyy-MM-dd");
-        Integer count = mailLogMapper.selectCountByAccountIdAndDate(accountId, createTime, Integer.getInteger(mediaId));
-        StringBuilder text = new StringBuilder();
-        String s = "";
-        for (int i = 0; i < unitWarning.size(); i++) {
-            s += unitWarning.get(i) + "," + "\n\r";
-
-        }
-        text.append("项目出价预警").append("\n\r").append("您的项目:").append(projectName + ",").append("\n\r")
-                .append("授权名称为:" + authName + " 下的,").append("\n\r").append(s)
-                .append("大于项目设置的最高出价:").append(maxBid / 1000).append(" 元! 请您及时调整。");
-        if (count < 3) {
-            List<String> mailList = mailLogMapper.selectMailList(projectId);
-            String subject;
-            if ("1".equals(mediaId)) {
-                subject = "头条-广告计划出价预警";
-
-            } else {
-                subject = "快手-广告组出价预警";
-            }
-            try {
-                SendMailUtil.sendMail(mailList, subject, text.toString());
-                MailLog mailLog = new MailLog();
-                mailLog.setAccountId(accountId);
-                mailLog.setMailType(1);
-                mailLog.setContent(text.toString());
-                mailLog.setSendEmil(JSON.toJSONString(mailList));
-                mailLog.setSubject(subject);
-                mailLogMapper.insert(mailLog);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        JSONArray openIds = corpFeishuUserService.getOpenIdByParams(projectId);
-        if(null == openIds||openIds.isEmpty()){
-            XxlJobLogger.log("该项目下运营飞书账号尚未绑定邮箱=>projectId:{}",projectId);
-            return;
-        }
-        MessageProvider.batchSend(null,openIds,null,text.toString());
-    }
-
-    @Autowired
-    private ICorpFeishuUserService corpFeishuUserService;
 
     private void sendMessage(String mediaId, Long accountId, Long projectId, String projectName, String authName, List<String> unitWarning, Long maxBid) {
         String createTime = DateUtils.getNowDate("yyyy-MM-dd");

+ 0 - 46
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/BytedanceBidWarningServiceImpl.java

@@ -13,9 +13,7 @@ import cn.com.ctop.common.module.utils.CorpWexinUtils;
 import cn.com.ctop.common.module.utils.SendMailUtil;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertisePlanService;
 import cn.com.ctop.toutiao.modules.material.service.IBytedanceBidWarningService;
-import cn.com.feishu.provider.MessageProvider;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.xxl.job.core.log.XxlJobLogger;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
@@ -72,7 +70,6 @@ public class BytedanceBidWarningServiceImpl implements IBytedanceBidWarningServi
                         unitWarning = byteDanceAdvertisePlanService.selectWarningGroup(accountId, bigDecimal);
                         if (!Check.isNull(unitWarning)) {
                             sendMessage(project.getMediaId(), accountId, projectId, project.getProjectName(), userAllocation.getAuthName(), unitWarning, maxBid);
-                            sendFeishumessage(project.getMediaId(), accountId, projectId, project.getProjectName(), userAllocation.getAuthName(), unitWarning, maxBid);
                         }
                     }
                 }
@@ -85,49 +82,6 @@ public class BytedanceBidWarningServiceImpl implements IBytedanceBidWarningServi
 
     }
 
-    private void sendFeishumessage(String mediaId, Long accountId, Long projectId, String projectName, String authName, List<String> unitWarning, Long maxBid) throws Exception {
-        String createTime = DateUtils.getNowDate("yyyy-MM-dd");
-        Integer count = mailLogMapper.selectCountByAccountIdAndDate(accountId, createTime, Integer.getInteger(mediaId));
-        StringBuilder text = new StringBuilder();
-        String s = "";
-        for (int i = 0; i < unitWarning.size(); i++) {
-            s += unitWarning.get(i) + "," + "\n\r";
-
-        }
-        text.append("项目出价预警").append("\n\r").append("您的项目:").append(projectName + ",").append("\n\r")
-                .append("授权名称为:" + authName + " 下的,").append("\n\r").append(s)
-                .append("大于项目设置的最高出价:").append(maxBid / 1000).append(" 元! 请您及时调整。");
-        if (count < 3) {
-            List<String> mailList = mailLogMapper.selectMailList(projectId);
-            String subject;
-            if ("1".equals(mediaId)) {
-                subject = "头条-广告计划出价预警";
-
-            } else {
-                subject = "快手-广告组出价预警";
-            }
-            try {
-                SendMailUtil.sendMail(mailList, subject, text.toString());
-                MailLog mailLog = new MailLog();
-                mailLog.setAccountId(accountId);
-                mailLog.setMailType(1);
-                mailLog.setContent(text.toString());
-                mailLog.setSendEmil(JSON.toJSONString(mailList));
-                mailLog.setSubject(subject);
-                mailLogMapper.insert(mailLog);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        JSONArray openIds = corpFeishuUserService.getOpenIdByParams(projectId);
-        if(null == openIds||openIds.isEmpty()){
-            log.error("该项目下运营飞书账号尚未绑定邮箱=>projectId:{}",projectId);
-            return;
-        }
-        MessageProvider.batchSend(null,openIds,null,text.toString());
-    }
-
     private void sendMessage(String mediaId, Long accountId, Long projectId, String projectName, String authName, List<String> unitWarning, Long maxBid) {
         String createTime = DateUtils.getNowDate("yyyy-MM-dd");
         Integer count = mailLogMapper.selectCountByAccountIdAndDate(accountId, createTime, 1);

+ 0 - 87
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/ByteDanceHourlyAccountWarningServiceImpl.java

@@ -3,16 +3,13 @@ package cn.com.ctop.toutiao.modules.report.service.impl;
 import cn.com.ctop.common.module.entity.MailLog;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.MailLogMapper;
-import cn.com.ctop.common.module.service.ICorpFeishuUserService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.CorpWexinUtils;
 import cn.com.ctop.common.module.utils.SendMailUtil;
 import cn.com.ctop.toutiao.modules.report.mapper.BytedanceAdvertiserHourlyReportMapper;
 import cn.com.ctop.toutiao.modules.report.service.IByteDanceHourlyAccountWarningService;
-import cn.com.feishu.provider.MessageProvider;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,7 +74,6 @@ public class ByteDanceHourlyAccountWarningServiceImpl implements IByteDanceHourl
                     BigDecimal divide = nowCost.divide(yesterdayHourCost, 2, RoundingMode.HALF_UP);
                     if (subtract.compareTo(warningAmount) > -1 && divide.compareTo(warningProportion) > -1) {
                         sendYesterdayMessage(accountId, userAllocation.getAuthName(), maxHour, cost, userAllocation.getProjectId(), userAllocation.getProjectName());
-                        sendYesterdayFeishuMessage(accountId, userAllocation.getAuthName(), maxHour, cost, userAllocation.getProjectId(), userAllocation.getProjectName());
                     }
                 }
             }
@@ -122,89 +118,6 @@ public class ByteDanceHourlyAccountWarningServiceImpl implements IByteDanceHourl
             CorpWexinUtils.sendMessage(wexinIds, text.toString());
         }
     }
-
-    private void sendYesterdayFeishuMessage(Long accountId, String authName, Integer maxHour, BigDecimal nowCost, Long projectId, String projectName) throws Exception {
-        StringBuilder text = new StringBuilder();
-        text.append("较昨日同时段消耗预警").append("\n\r")
-                .append("您的项目:" + projectName + "下的,").append("\n\r")
-                .append("账号:").append(accountId + ",").append("授权名称为:" + authName).append("\n\r")
-                .append("相较于昨日 " + maxHour + "时").append("\n\r")
-                .append("出现消耗暴涨,").append("消耗金额为:" + nowCost).append("\n\r")
-                .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();
-            }
-            JSONArray openIds = feishuUserService.getOpenIdByParams(projectId);
-            MessageProvider.batchSend(null,openIds,null,text.toString());
-        }
-    }
-
-
-
-    private void sendFeishuMessage(Long accountId, String authName, Integer hour, BigDecimal amount, Long projectId, String projectName) throws Exception {
-        StringBuilder text = new StringBuilder();
-        text.append("较上时段消耗预警").append("\n\r")
-                .append("您的项目:" + projectName + " 下的").append("\n\r")
-                .append("账号:").append(accountId + ",").append("授权名称为:" + authName).append("\n\r")
-                .append(hour + " 时").append("相较于 " + (hour - 1) + " 时").append("\n\r")
-                .append("出现消耗暴涨,").append("消耗金额为:" + amount).append("\n\r")
-                .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();
-            }
-        }
-        JSONArray openIds = feishuUserService.getOpenIdByParams(projectId);
-        if(null == openIds&&openIds.isEmpty()){
-            log.error("该项目下运营飞书账号尚未绑定邮箱=>projectId:{}",projectId);
-            return;
-        }
-        MessageProvider.batchSend(null,openIds,null, text.toString());
-    }
-
-    @Autowired
-    private ICorpFeishuUserService feishuUserService;
-
     private void sendMessage(Long accountId, String authName, Integer hour, BigDecimal amount, Long projectId, String projectName) {
 
         StringBuilder text = new StringBuilder();