1

src/main/java/com/pipihelper/project/feishu/controller/FeiShuEventController.java

@@ -331,6 +331,15 @@ public class FeiShuEventController {
             log.info("发送应用内容消息提醒");
             log.info("发送应用内容消息提醒");
             feiShuApiService.patchUrgentApp(messageId, noticeMsg);
             feiShuApiService.patchUrgentApp(messageId, noticeMsg);
         }
         }
+        //按摩群中同步发送按摩进度信息
+        FeiShuMsgDTO feiShuMsgDTO = new FeiShuMsgDTO();
+        String msg = "当前按摩进度：" + userString;
+        JSONObject content = new JSONObject();
+        content.put("text", msg);
+        feiShuMsgDTO.setMsgType("text");
+        feiShuMsgDTO.setContent(content.toString());
+        feiShuMsgDTO.setReceiveId((String) CacheUtil.get("chatId"));
+        feiShuApiService.sendMsg(feiShuMsgDTO, "chat_id");
         return ResultGenerator.genSuccessResult();
         return ResultGenerator.genSuccessResult();
     }
     }
 
 

src/main/java/com/pipihelper/project/scheduled/MassageNoticeScheduleService.java

@@ -35,7 +35,7 @@ public class MassageNoticeScheduleService {
     @Autowired
     @Autowired
     private FeiShuApiService feiShuApiService;
     private FeiShuApiService feiShuApiService;
     /**
     /**
-     * 每周四定时生成要按摩的人员名单，并发送大群和单人消息
+     * TODO 每周四定时生成要按摩的人员名单，并发送大群和单人消息
      */
      */
     @Async
     @Async
     @Scheduled(cron = "0 0 10 * * ?")
     @Scheduled(cron = "0 0 10 * * ?")
@@ -79,26 +79,4 @@ public class MassageNoticeScheduleService {
 
 
     }
     }
 
 
-
-//    /**
-//     * 当天时间2:55，给第一波三个人更新卡片，并发送应用内提醒
-//     */
-//    @Async
-//    @Scheduled(cron = "0 0 10 * * ?")
-//    public void massageStart(){
-//        List<Pain> pains = painService.findListAsc(3);
-//        for(Pain pain:pains){
-//            String messageId = pain.getMessageId();
-//            massageService.updateSingleMassageMsgCardWhenBegin(messageId);
-//            //1代表正在按
-//            pain.setStatus(1);
-//            painService.update(pain);
-//            JSONObject noticeMsg = new JSONObject();
-//            noticeMsg.put("user_id_list", Arrays.asList(pain.getOpenId()));
-//            //发送应用内提醒
-//            log.info("发送应用内容消息提醒");
-//            feiShuApiService.patchUrgentApp(messageId, noticeMsg);
-//        }
-//
-//    }
 }
 }

src/main/resources/templates/massage-msg-card-rob-end.json

@@ -7,7 +7,7 @@
     {
     {
       "tag": "div",
       "tag": "div",
       "text": {
       "text": {
-        "content": "已经被抢啦啦啦~",
+        "content": "已抢完~",
         "tag": "lark_md"
         "tag": "lark_md"
       }
       }
     }
     }
@@ -15,7 +15,7 @@
   "header": {
   "header": {
     "template": "turquoise",
     "template": "turquoise",
     "title": {
     "title": {
-      "content": "👻  按摩提醒请查收！",
+      "content": "👻  有按摩名额空余啦！",
       "tag": "plain_text"
       "tag": "plain_text"
     }
     }
   }
   }

src/main/resources/templates/massage-msg-card-rob.json

@@ -7,7 +7,7 @@
     {
     {
       "tag": "div",
       "tag": "div",
       "text": {
       "text": {
-        "content": "当前空余一个名额",
+        "content": "有人怕疼放弃了，快来抢吧！",
         "tag": "lark_md"
         "tag": "lark_md"
       }
       }
     },
     },
@@ -16,7 +16,7 @@
         {
         {
           "tag": "button",
           "tag": "button",
           "text": {
           "text": {
-            "content": "😁  我抢",
+            "content": "😁  我不怕",
             "tag": "plain_text"
             "tag": "plain_text"
           },
           },
           "type": "default",
           "type": "default",
@@ -31,7 +31,7 @@
   "header": {
   "header": {
     "template": "turquoise",
     "template": "turquoise",
     "title": {
     "title": {
-      "content": "👻  按摩提醒请查收！",
+      "content": "👻  有按摩名额空余啦！",
       "tag": "plain_text"
       "tag": "plain_text"
     }
     }
   }
   }

src/main/resources/templates/massage-singel-msg-card.json

@@ -7,7 +7,7 @@
     {
     {
       "tag": "div",
       "tag": "div",
       "text": {
       "text": {
-        "content": "欢呼吧，你排到了按摩哦！",
+        "content": "欢呼吧，你本周有按摩名额哦！",
         "tag": "lark_md"
         "tag": "lark_md"
       }
       }
     },
     },
@@ -38,7 +38,7 @@
         {
         {
           "tag": "button",
           "tag": "button",
           "text": {
           "text": {
-            "content": "😢  等一下",
+            "content": "😢  我最后来",
             "tag": "plain_text"
             "tag": "plain_text"
           },
           },
           "type": "default",
           "type": "default",

src/main/resources/templates/massage-single-msg-card-next.json

@@ -7,7 +7,7 @@
     {
     {
       "tag": "div",
       "tag": "div",
       "text": {
       "text": {
-        "content": "欢呼吧，你排到了按摩哦！",
+        "content": "按摩到你了哦！",
         "tag": "lark_md"
         "tag": "lark_md"
       }
       }
     },
     },