Browse Source

排查飞书消息发送代码逻辑

syh 5 years ago
parent
commit
d4bddc7284

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java

@@ -407,6 +407,9 @@ public class MaterialInfoController {
                 Project project = projectService.getById(materialInfoEntity.getProjectId());
                 String text = messageTemplate.getMaterialRejectTemplate(project.getProjectName(), materialInfoEntity.getMaterialName(), materialInfo.getRefuseReason());
                 sendMessageService.sendMessage(materialInfoEntity.getUserId(), text);
+
+                String feishuText = messageTemplate.getFeishuMaterialRejectTemplate(project.getProjectName(), materialInfoEntity.getMaterialName(), materialInfo.getRefuseReason());
+                sendMessageService.sendFeishuMessage(materialInfoEntity.getUserId(), feishuText);
             }
         }
 

+ 9 - 19
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -4,16 +4,13 @@ import cn.com.ctop.common.module.entity.BindAccountLogin;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.IBindAccountLoginService;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.crawler.modules.pangolin.entity.PangolinApp;
 import cn.com.ctop.crawler.modules.pangolin.service.PangolinAppService;
 import cn.com.ctop.crawler.modules.pangolin.service.PangolinCrawlerService;
 import cn.com.ctop.crawler.modules.pangolin.service.PangolinLoginService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
-import cn.com.ctop.toutiao.modules.report.service.IByteDanceVideoReportDailyService;
-import cn.com.ctop.toutiao.modules.report.service.IBytedanceReportService;
-import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
@@ -35,25 +32,18 @@ import java.util.concurrent.Executors;
 @Slf4j
 public class SampleTest {
     @Autowired
-    private IBytedanceReportService bytedanceReportService;
-    @Autowired
-    private IByteDanceVideoReportDailyService byteDanceVideoReportDailyService;
-    @Autowired
     private ICtopOauthTokenService oauthTokenService;
     @Autowired
-    private IReportService reportService;
-    @Autowired
-    private IUserAllocationService userAllocationService;
-
+    private IKuaishouInterfaceService kuaishouInterfaceService;
     @Test
     public void testOceanEngineJob() {
-       CtopOauthToken token = oauthTokenService.getTokenByAccountId(1657505911879694L);
-       CtopOauthToken token1 = oauthTokenService.getTokenByAccountId(1666111623537678L);
-       for(int i=20;i<80;i++){
-           Date startDate = DateUtils.addDay(new Date(),-i);
-           System.out.println(DateUtils.formatDate(startDate));
-           reportService.getAdvertiserReport(token,startDate,startDate,CtopAdConstant.KUAISHOU_LOAD_JOB_TYPE_DAILY);
-           reportService.getAdvertiserReport(token1,startDate,startDate,CtopAdConstant.KUAISHOU_LOAD_JOB_TYPE_DAILY);
+       List<CtopOauthToken> tokens = oauthTokenService.selectKuaiShouToken();
+        Date startDate = DateUtils.addDay(new Date(),-1);
+        Date startDate2 = DateUtils.addDay(new Date(),-2);
+        for(CtopOauthToken token:tokens){
+            kuaishouInterfaceService.getAdvertiserReportDaily(token, startDate, startDate);
+            //1: 获取广告主信息数据
+            kuaishouInterfaceService.getAdvertiserReportDaily(token, startDate2, startDate2);
        }
     }
 

+ 1 - 2
module-callback/src/main/resources/application.yml

@@ -1,8 +1,7 @@
 server:
   port: 8801
-  context-path: /
 xxl:
   mq:
     accessToken:
     admin:
-      address: http://129.28.150.229:8808/xxl-mq-admin
+      address: http://129.28.150.229:8808/xxl-mq-admin

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IMessageTemplate.java

@@ -6,4 +6,9 @@ public interface IMessageTemplate {
 
 
     String getMaterialRejectTemplate(String projectName, String materialName, String refuseReason);
+
+    String getFeishuMaterialSyncTemplate(String projectName, Long accountId, String accountName, String materialName, String reason);
+
+
+    String getFeishuMaterialRejectTemplate(String projectName, String materialName, String refuseReason);
 }

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

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

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

@@ -73,7 +73,9 @@ 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);
                 }
 
             }

+ 28 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MessageTemplateImpl.java

@@ -31,6 +31,19 @@ public class MessageTemplateImpl implements IMessageTemplate {
         return text.toString();
     }
 
+    @Override
+    public String getFeishuMaterialSyncTemplate(String projectName, Long accountId, String accountName, String materialName, String reason) {
+        StringBuilder text = new StringBuilder();
+        text.append("素材同步失败").append("\n\r")
+                .append("您的项目:").append(projectName + ",").append("\n\r")
+                .append("下的账户:").append(accountId + ",").append("\n\r")
+                .append("授权名称为:" + accountName).append("\n\r")
+                .append("同步素材失败。").append("\n\r")
+                .append("素材名称为:").append(materialName).append("\n\r")
+                .append("失败原因:").append(reason);
+        return text.toString();
+    }
+
 
     /**
      * 素材库素材驳回
@@ -54,4 +67,19 @@ public class MessageTemplateImpl implements IMessageTemplate {
         text.append("请您联系相关同学及时调整");
         return text.toString();
     }
+
+    @Override
+    public String getFeishuMaterialRejectTemplate(String projectName, String materialName, String refuseReason) {
+        StringBuilder text = new StringBuilder();
+        text.append("素材驳回通知").append("\n\r")
+                .append("您的项目:").append(projectName + ",").append("\n\r")
+                .append("素材名称为:").append(materialName).append("\n\r")
+                .append("已被驳回。").append("\n\r");
+        if (!Check.isNull(refuseReason)) {
+            text.append("驳回原因为:").append(refuseReason).append("\n\r");
+
+        }
+        text.append("请您联系相关同学及时调整");
+        return text.toString();
+    }
 }

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

@@ -26,6 +26,10 @@ public class SendMessageServiceImpl implements ISendMessageService {
             CorpWexinUtils.sendMessageByWeChatId(weChatId, text);
             log.info("消息发送成功,userId:{}", userId);
         }
+    }
+
+    @Override
+    public void sendFeishuMessage(String userId, String text) {
         CorpFeishuUser user = corpFeishuUserService.getByUserId(userId);
         if(null!=user){
             JSONArray openIds = new JSONArray();

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

@@ -237,6 +237,8 @@ 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);
                                     }
                                 }