Merge remote-tracking branch 'origin/master'

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/IDateReportsPushService.java

@@ -7,4 +7,6 @@ public interface IDateReportsPushService {
      * 零点15执行的 比上一天多了个描述
      */
     void preSend();
+
+    public void send12hour();
 }

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/impl/DateReportsPushServiceImpl.java

@@ -35,18 +35,67 @@ public class DateReportsPushServiceImpl implements IDateReportsPushService {
 
     private static final String TEMPLATE_VERSION = "1.0.3";
     private static final String TEMPLATE_ID = "AAqRhJzMBoO0E";
+
+    /**
+     * 10点正式推送
+     */
     @Override
     public void send() {
-        sendParam("");
+        List<String> userIds = Arrays.asList(
+                "44fbaed6" //zhaotx
+//                ,"ebeeced9" //yumeng
+//                ,"265g9ef1" //wangshu
+//                ,"ee518161" //zhaozhicheng
+//                ,"c5f6b59d" //yuyang
+//                ,"d834552b" //hemenghao
+//                ,"a3235a61" //louzijun
+//                ,"58e7a98a"  //xsq
+        );
+        List<String> chatid = Arrays.asList(
+                "oc_275f17aa4bf8fae649ef281a2b9250f6"
+        );
+        sendParam("", userIds, chatid);
+    }
+
+    /**
+     * 12点推送
+     */
+    public void send12hour(){
+        List<String> userIds = Arrays.asList(
+                "44fbaed6" //zhaotx
+//                ,"ebeeced9" //yumeng
+//                ,"265g9ef1" //wangshu
+//                ,"ee518161" //zhaozhicheng
+//                ,"c5f6b59d" //yuyang
+//                ,"d834552b" //hemenghao
+//                ,"a3235a61" //louzijun
+//                ,"58e7a98a"  //xsq
+        );
+        List<String> chatid = Arrays.asList(
+                "oc_275f17aa4bf8fae649ef281a2b9250f6"
+        );
+        sendParam("注：当天ROI数据有微小1%-2%差异，以次日10点推送为准，番茄ROI数据需要次日9点左右获取", userIds, chatid);
     }
 
+    /**
+     * 9点预推送给开发人员
+     */
     @Override
     public void preSend() {
-        sendParam("注：当天ROI数据有微小1%-2%差异，以次日9点推送为准");
+        List<String> userIds = Arrays.asList(
+                "44fbaed6" //zhaotx
+                ,"ebeeced9" //yumeng
+                ,"58e7a98a"  //xsq
+                ,"2ga9669f" //angaoqi
+                ,"43gb7fbc" //huangpingkang
+        );
+        List<String> chatid = Arrays.asList(
+        );
+        sendParam("", userIds, chatid);
     }
 
 
-    private void sendParam(String description){
+    private void sendParam(String description, List<String> userIds, List<String> chatid){
         String token;
         try {
             token = FeishuRobotUtil.getTenantToken(APP_ID, APP_KEY);
@@ -142,23 +191,11 @@ public class DateReportsPushServiceImpl implements IDateReportsPushService {
         template_variable.put("deptRank", deptRank);
         template_variable.put("description", description);
 
-        List<String> userIds = Arrays.asList(
-                "44fbaed6" //zhaotx
-//                ,"ebeeced9" //yumeng
-//                ,"265g9ef1" //wangshu
-//                ,"ee518161" //zhaozhicheng
-//                ,"c5f6b59d" //yuyang
-//                ,"d834552b" //hemenghao
-//                ,"a3235a61" //louzijun
-//                ,"58e7a98a"  //xsq
-        );
+
         for (String userId : userIds) {
             sendToFeishu(token, template_variable, userId);
         }
 
-        List<String> chatid = Arrays.asList(
-                "oc_275f17aa4bf8fae649ef281a2b9250f6"
-        );
         for (String chat : chatid) {
             sendToChatGroup(token, template_variable, chat);
         }

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/FeishuPushJob.java

@@ -56,6 +56,11 @@ public class FeishuPushJob {
 
     @XxlJob("preDateReportsPush")
     public void preDataReportsPush(){
+        dateReportsPushService.send12hour();
+    }
+
+    @XxlJob("dataReportsToDeveloper")
+    public void dataReportsToDeveloper(){
         dateReportsPushService.preSend();
     }
 }