Merge branch 'feat-1002263-zcy' into 'master'

未订阅主动回复

See merge request rays/pcloud-book!347

pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/SelfRobotKeywordBiz.java

@@ -34,4 +34,6 @@ public interface SelfRobotKeywordBiz {
     String getResource(Integer id, String robotId, String wxUserId);
 
     String joinGroup(Integer id, String robotId, String wxUserId);
+
+    void sendWhenNoReply(Integer id, String robotId, String wxUserId);
 }

pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/impl/SelfRobotKeywordBizImpl.java

@@ -26,6 +26,7 @@ import com.pcloud.book.keywords.enums.ReplyTypeEnum;
 import com.pcloud.book.keywords.vo.GuideWordVO;
 import com.pcloud.book.keywords.vo.LabelVO;
 import com.pcloud.book.keywords.vo.SelfRobotReplyVO;
+import com.pcloud.book.util.common.ThreadPoolUtils;
 import com.pcloud.channelcenter.wechat.dto.AccountSettingDto;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.page.PageBeanNew;
@@ -360,11 +361,11 @@ public class SelfRobotKeywordBizImpl implements SelfRobotKeywordBiz {
             //todo 根据全平台关键词查id 找关联任务id集合
             List<Integer> taskIds = new ArrayList<>();
             if (id == 1) {
-                taskIds = Arrays.asList(5);
+                taskIds = Arrays.asList(7);
             }else if (id == 2) {
-                taskIds = Arrays.asList(5, 6);
+                taskIds = Arrays.asList(6);
             }else {
-                taskIds = Arrays.asList(5, 6, 7);
+                taskIds = Arrays.asList(5);
             }
             List<TaskDto> taskDtoList = ResponseHandleUtil.parseList(timeControlTaskService.listTaskByIds4User(wxUserId, taskIds), TaskDto.class);
             if (!ListUtils.isEmpty(taskDtoList)) {
@@ -392,35 +393,37 @@ public class SelfRobotKeywordBizImpl implements SelfRobotKeywordBiz {
     @Override
     public String getResource(Integer id, String robotId, String wxUserId) {
         TempRobotSkill skill = tempRobotSkillDao.getById(id);
-        if("text".equals(skill.getResourceType())) {
-            // 发送文本
-            SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
-            sendTextMessageVO.setContent(skill.getText());
-            sendTextMessageVO.setCode(SendMessageTypeEnum.SELF.getCode());
-            sendTextMessageVO.setWxId(robotId);
-            sendTextMessageVO.setAltId(robotId);
-            sendTextMessageVO.setWxGroupId(wxUserId);
-            sendTextMessageVO.setIp(getIpByRobot(robotId));
-            WxGroupSDK.sendTextMessage(sendTextMessageVO);
-        } else if ("file".equals(skill.getResourceType()))  {
-            // 发送文件
-            SendFileVO sendFileVO = new SendFileVO();
-            sendFileVO.setFileUrl(skill.getFileUrl());
-            sendFileVO.setFileName(skill.getFileName());
-            sendFileVO.setIp(getIpByRobot(robotId));
-            sendFileVO.setAltId(robotId);
-            sendFileVO.setWxId(wxUserId);
-            WxGroupSDK.sendFile(sendFileVO);
-        } else if ("img".equals(skill.getResourceType()))  {
-            // 发送图片
-            SendPicMessageVO sendPicMessageVO = new SendPicMessageVO();
-            sendPicMessageVO.setCode(SendMessageTypeEnum.SELF.getCode());
-            sendPicMessageVO.setAltId(robotId);
-            sendPicMessageVO.setWxGroupId(wxUserId);
-            sendPicMessageVO.setPicUrl(skill.getImgUrl());
-            sendPicMessageVO.setIp(getIpByRobot(robotId));
-            WxGroupSDK.sendPicMessage(sendPicMessageVO);
-        }
+        ThreadPoolUtils.OTHER_THREAD_POOL.execute(() -> {
+            if("text".equals(skill.getResourceType())) {
+                // 发送文本
+                SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
+                sendTextMessageVO.setContent(skill.getText());
+                sendTextMessageVO.setCode(SendMessageTypeEnum.SELF.getCode());
+                sendTextMessageVO.setWxId(robotId);
+                sendTextMessageVO.setAltId(robotId);
+                sendTextMessageVO.setWxGroupId(wxUserId);
+                sendTextMessageVO.setIp(getIpByRobot(robotId));
+                WxGroupSDK.sendTextMessage(sendTextMessageVO);
+            } else if ("file".equals(skill.getResourceType()))  {
+                // 发送文件
+                SendFileVO sendFileVO = new SendFileVO();
+                sendFileVO.setFileUrl(skill.getFileUrl());
+                sendFileVO.setFileName(skill.getFileName());
+                sendFileVO.setIp(getIpByRobot(robotId));
+                sendFileVO.setAltId(robotId);
+                sendFileVO.setWxId(wxUserId);
+                WxGroupSDK.sendFile(sendFileVO);
+            } else if ("img".equals(skill.getResourceType()))  {
+                // 发送图片
+                SendPicMessageVO sendPicMessageVO = new SendPicMessageVO();
+                sendPicMessageVO.setCode(SendMessageTypeEnum.SELF.getCode());
+                sendPicMessageVO.setAltId(robotId);
+                sendPicMessageVO.setWxGroupId(wxUserId);
+                sendPicMessageVO.setPicUrl(skill.getImgUrl());
+                sendPicMessageVO.setIp(getIpByRobot(robotId));
+                WxGroupSDK.sendPicMessage(sendPicMessageVO);
+            }
+        });
         return skill.getReplyContent();
     }
 
@@ -444,17 +447,49 @@ public class SelfRobotKeywordBizImpl implements SelfRobotKeywordBiz {
     @Override
     public String joinGroup(Integer id, String robotId, String wxUserId) {
         TempRobotSkill skill = tempRobotSkillDao.getById(id);
-        // 发送群二维码图片
-        SendPicMessageVO sendPicMessageVO = new SendPicMessageVO();
-        sendPicMessageVO.setCode(SendMessageTypeEnum.SELF.getCode());
-        sendPicMessageVO.setAltId(robotId);
-        sendPicMessageVO.setWxGroupId(wxUserId);
-        sendPicMessageVO.setPicUrl(skill.getImgUrl());
-        sendPicMessageVO.setIp(getIpByRobot(robotId));
-        WxGroupSDK.sendPicMessage(sendPicMessageVO);
+        ThreadPoolUtils.OTHER_THREAD_POOL.execute(() -> {
+            // 发送群二维码图片
+            SendPicMessageVO sendPicMessageVO = new SendPicMessageVO();
+            sendPicMessageVO.setCode(SendMessageTypeEnum.SELF.getCode());
+            sendPicMessageVO.setAltId(robotId);
+            sendPicMessageVO.setWxGroupId(wxUserId);
+            sendPicMessageVO.setPicUrl(skill.getImgUrl());
+            sendPicMessageVO.setIp(getIpByRobot(robotId));
+            WxGroupSDK.sendPicMessage(sendPicMessageVO);
+        });
         return skill.getReplyContent();
     }
 
+    @Override
+    public void sendWhenNoReply(Integer id, String robotId, String wxUserId) {
+        SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
+        if (id == 1) {
+            sendTextMessageVO.setContent("怎么样？计划很棒吧，等你订阅哦");
+            sendTextMessageVO.setCode(SendMessageTypeEnum.SELF.getCode());
+            sendTextMessageVO.setWxId(robotId);
+            sendTextMessageVO.setAltId(robotId);
+            sendTextMessageVO.setWxGroupId(wxUserId);
+            sendTextMessageVO.setIp(getIpByRobot(robotId));
+            WxGroupSDK.sendTextMessage(sendTextMessageVO);
+        }else if (id == 2){
+            sendTextMessageVO.setContent("计划怎么样？我按照计划执行后效果很好哦，等你订阅后我们一起阅读");
+            sendTextMessageVO.setCode(SendMessageTypeEnum.SELF.getCode());
+            sendTextMessageVO.setWxId(robotId);
+            sendTextMessageVO.setAltId(robotId);
+            sendTextMessageVO.setWxGroupId(wxUserId);
+            sendTextMessageVO.setIp(getIpByRobot(robotId));
+            WxGroupSDK.sendTextMessage(sendTextMessageVO);
+        }else {
+            sendTextMessageVO.setContent(" 你还在犹豫吗？早起的鸟儿有虫吃，我先行动起来喽~");
+            sendTextMessageVO.setCode(SendMessageTypeEnum.SELF.getCode());
+            sendTextMessageVO.setWxId(robotId);
+            sendTextMessageVO.setAltId(robotId);
+            sendTextMessageVO.setWxGroupId(wxUserId);
+            sendTextMessageVO.setIp(getIpByRobot(robotId));
+            WxGroupSDK.sendTextMessage(sendTextMessageVO);
+        }
+    }
+
     @ParamLog("填充列表")
     private void fillSelfRobotKeyword(List<SelfRobotKeyword> selfRobotKeywords) {
         if (ListUtils.isEmpty(selfRobotKeywords)){

pcloud-service-book/src/main/java/com/pcloud/book/keywords/facade/SelfRobotKeywordFacade.java

@@ -117,4 +117,8 @@ public interface SelfRobotKeywordFacade {
     @ApiOperation(value = "进群", httpMethod = "GET")
     @GetMapping("joinGroup")
     ResponseDto<?> joinGroup(Integer id, String robotId, String wxUserId);
+
+    @ApiOperation(value = "用户点击引导语未操作时，主动回复", httpMethod = "GET")
+    @GetMapping("sendWhenNoReply")
+    ResponseDto<?> sendWhenNoReply(Integer id, String robotId, String wxUserId);
 }

pcloud-service-book/src/main/java/com/pcloud/book/keywords/facade/impl/SelfRobotKeywordFacadeImpl.java

@@ -178,4 +178,11 @@ public class SelfRobotKeywordFacadeImpl implements SelfRobotKeywordFacade {
         return new ResponseDto<>(selfRobotKeywordBiz.joinGroup(id, robotId, wxUserId));
     }
 
+    @Override
+    @GetMapping("sendWhenNoReply")
+    public ResponseDto<?> sendWhenNoReply(@RequestParam Integer id, @RequestParam String robotId, @RequestParam String wxUserId) {
+        selfRobotKeywordBiz.sendWhenNoReply(id, robotId, wxUserId);
+        return new ResponseDto<>();
+    }
+
 }