From fdd5c3422b2c819e0807d76aeb11662048b99418 Mon Sep 17 00:00:00 2001
From: zhangchenbiao <chenbiao.zhang@coolcollege.cn>
Date: Thu, 17 Aug 2023 10:59:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B7=9F=E8=BF=9B=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=9A=84=E6=B6=88=E6=81=AF=E7=B1=BB=E5=9E=8B=EF=BC=8C?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=8F=91=E9=80=81=E5=81=9A=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cool/store/enums/MessageTypeEnum.java   |  3 ++-
 .../java/com/cool/store/http/ISVHttpRequest.java     | 12 ++++++------
 .../com/cool/store/controller/TestController.java    |  8 ++++++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageTypeEnum.java
index 952ec104a..ffc700bb0 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageTypeEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageTypeEnum.java
@@ -8,7 +8,8 @@ package com.cool.store.enums;
  */
 public enum MessageTypeEnum {
 
-    SCHEDULE_REMINDER("schedule_reminder", "日历提醒事件", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag")
+    SCHEDULE_REMINDER("schedule_reminder", "日历提醒事件", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag"),
+    FOLLOW_TASK("follow_task", "跟进任务提醒", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag")
 
 
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java b/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java
index 28c75b286..1c9b27d71 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java
@@ -10,14 +10,11 @@ import com.cool.store.dto.enterprise.SysDepartmentDTO;
 import com.cool.store.dto.login.UserIdInfoDTO;
 import com.cool.store.dto.message.SendCardMessageDTO;
 import com.cool.store.dto.response.ResultDTO;
-import com.cool.store.entity.EnterpriseUserDO;
-import com.cool.store.enums.ErrorCodeEnum;
+import com.cool.store.enums.MessageTypeEnum;
 import com.cool.store.exception.ApiException;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.mq.util.HttpRestTemplateService;
-import com.cool.store.request.EnterpriseUserRequest;
 import com.cool.store.utils.RestTemplateUtil;
-import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -27,7 +24,6 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
@@ -361,7 +357,11 @@ public class ISVHttpRequest {
         String url = isvDomain + "/sendFeiShuCardMessage";
         ResultDTO responseEntity = null;
         try {
-            responseEntity = httpRestTemplateService.postForObject(url, param, ResultDTO.class);
+            MessageTypeEnum messageType = param.getMessageType();
+            String messageTypeStr = JSONObject.toJSONString(messageType);
+            JSONObject request = JSONObject.parseObject(JSONObject.toJSONString(param));
+            request.put("messageType", messageTypeStr);
+            responseEntity = httpRestTemplateService.postForObject(url, request, ResultDTO.class);
             log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity));
         } catch (Exception e) {
             log.info("调用isv出错{}", e);
diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java
index 299a69b2e..f060e5380 100644
--- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java
@@ -60,6 +60,8 @@ public class TestController {
     private HyPartnerTaskInfoLogDAO hyPartnerTaskInfoLogDAO;
     @Resource
     private OpenAreaService openAreaService;
+    @Resource
+    private FollowTaskService followTaskService;
 
     @PostMapping("/post")
     public ResponseResult<Boolean> get(@RequestBody List<TestRequest> testRequestList){
@@ -266,4 +268,10 @@ public class TestController {
         }
         return null;
     }
+
+    @GetMapping("/followTaskAnHourAgoRemind")
+    public ResponseResult followTaskAnHourAgoRemind() {
+        followTaskService.followTaskAnHourAgoRemind();
+        return ResponseResult.success();
+    }
 }