feat-1002599 qq定制服务

pcloud-service-book/pom.xml

@@ -222,6 +222,12 @@
 			<version>${wxgroup-sdk.version}</version>
 		</dependency>
 
+		<!--qq发消息接口-->
+		<dependency>
+			<groupId>com.dcg</groupId>
+			<artifactId>CoolQSDK</artifactId>
+			<version>1.0-SNAPSHOT</version>
+		</dependency>
 		<!--ES相关-->
 		<dependency>
 			<groupId>org.springframework.data</groupId>

pcloud-service-book/src/main/java/com/pcloud/book/consumer/wechatgroup/WechatGroupConsr.java

@@ -575,9 +575,24 @@ public class WechatGroupConsr {
         return list;
     }
 
+    @ParamLog("根据qq用户id或昵称模糊查询")
+    public List<String> getByQqUserQuery(String userQuery) {
+        List<String> list = new ArrayList<>();
+        try {
+            list = ResponseHandleUtil.parseListResponse(groupMemberService.getByQqUserQuery(userQuery), String.class);
+
+        } catch (Exception e) {
+            log.error("根据qq用户id或昵称模糊查询.[getByQqUserQuery]失败" + e.getMessage(), e);
+        }
+        return list;
+    }
+
     @ParamLog("批量获取用户信息")
     public Map<String, GroupUserDTO> mapWxUserInfoByWxIdList(List<String> wxUserIds) {
         Map<String, GroupUserDTO> map = new HashMap<>();
+        if(ListUtils.isEmpty(wxUserIds)){
+            return new HashMap<>();
+        }
         try {
             map = ResponseHandleUtil.parseMapResponse(groupMemberService.mapWxUserInfoByWxIdList(wxUserIds), String.class, GroupUserDTO.class);
 
@@ -587,6 +602,21 @@ public class WechatGroupConsr {
         return map;
     }
 
+    @ParamLog("批量获取qq用户信息")
+    public Map<String, GroupUserDTO> mapQqUserInfoByWxIdList(List<String> qqUserIds) {
+        Map<String, GroupUserDTO> map = new HashMap<>();
+        if(ListUtils.isEmpty(qqUserIds)){
+            return new HashMap<>();
+        }
+        try {
+            map = ResponseHandleUtil.parseMapResponse(groupMemberService.mapQqUserInfoByQqIdList(qqUserIds), String.class, GroupUserDTO.class);
+
+        } catch (Exception e) {
+            log.error("批量获取qq用户信息.[mapQqUserInfoByWxIdList]失败" + e.getMessage(), e);
+        }
+        return map;
+    }
+
     @ParamLog("批量获取小号信息")
     public Map<String, GroupUserDTO> mapRobotInfoByIdList(List<String> wxIdList){
         Map<String, GroupUserDTO> map = new HashMap<>();

pcloud-service-book/src/main/java/com/pcloud/book/custom/biz/CustomPlanBiz.java

 package com.pcloud.book.custom.biz;
 
 import com.pcloud.book.custom.entity.CustomPlan;
-import com.pcloud.book.custom.vo.AddBookNameVO;
-import com.pcloud.book.custom.vo.AddCustomPlan4UserVO;
-import com.pcloud.book.custom.vo.AddSuggestionVO;
-import com.pcloud.book.custom.vo.CustomPlanModuleVO;
-import com.pcloud.book.custom.vo.CustomPlanPaperVO;
-import com.pcloud.book.custom.vo.EditCustomPlanModuleVO;
-import com.pcloud.book.custom.vo.ModuleSuggestionVO;
-import com.pcloud.book.custom.vo.SuggestionListVO;
-import com.pcloud.book.custom.vo.UserBookServiceVO;
+import com.pcloud.book.custom.vo.*;
 import com.pcloud.common.page.PageBeanNew;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -39,7 +30,7 @@ public interface CustomPlanBiz {
 
     Map<String, Object> getShortLinkUrl(Long appId, Long productId, String linkUrl);
 
-    PageBeanNew<SuggestionListVO> listSuggestion4Plan(Integer currentPage, Integer numPerPage, String startTime, String endTime, String search, Integer planId);
+    PageBeanNew<SuggestionListVO> listSuggestion4Plan(Integer currentPage, Integer numPerPage, String startTime, String endTime, String search, Integer planId,Integer userType);
 
     List<ModuleSuggestionVO> getSuggestionInfo(Integer batchId, Integer planId);
 

pcloud-service-book/src/main/java/com/pcloud/book/custom/biz/impl/CustomPlanBizImpl.java

 package com.pcloud.book.custom.biz.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.dcg.coolq.sdk.message.MessageBuilder;
+import com.dcg.coolq.sdk.message.vos.send.PrivateMsgSendVO;
 import com.pcloud.appcenter.app.dto.AppDto;
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.consumer.app.AppConsr;
@@ -17,20 +19,11 @@ import com.pcloud.book.custom.enums.PlanUseStateEnum;
 import com.pcloud.book.custom.mapper.CustomPlanMapper;
 import com.pcloud.book.custom.mapper.CustomPlanModuleMapper;
 import com.pcloud.book.custom.mapper.CustomPlanModuleSuggestionMapper;
-import com.pcloud.book.custom.vo.AddBookNameVO;
-import com.pcloud.book.custom.vo.AddCustomPlan4UserVO;
-import com.pcloud.book.custom.vo.AddSuggestionListVO;
-import com.pcloud.book.custom.vo.AddSuggestionVO;
-import com.pcloud.book.custom.vo.CustomPlanModuleVO;
-import com.pcloud.book.custom.vo.CustomPlanPaperVO;
-import com.pcloud.book.custom.vo.EditCustomPlanModuleVO;
-import com.pcloud.book.custom.vo.ModuleSuggestionVO;
-import com.pcloud.book.custom.vo.SuggestionListVO;
-import com.pcloud.book.custom.vo.ToPdfVO;
-import com.pcloud.book.custom.vo.UserBookServiceVO;
+import com.pcloud.book.custom.vo.*;
 import com.pcloud.book.group.biz.WeixinQrcodeBiz;
 import com.pcloud.book.group.tools.Kit;
 import com.pcloud.book.group.tools.SendWeixinRequestTools;
+import com.pcloud.book.pcloudkeyword.enums.PcloudGroupRobotTypeEnum;
 import com.pcloud.book.util.common.ThreadPoolUtils;
 import com.pcloud.channelcenter.wechat.dto.AccountSettingDto;
 import com.pcloud.common.core.aspect.ParamLog;
@@ -47,7 +40,7 @@ import com.pcloud.wechatgroup.group.dto.GroupRobotDTO;
 import com.pcloud.wechatgroup.group.dto.GroupUserDTO;
 import com.sdk.wxgroup.SendMessageTypeEnum;
 import com.sdk.wxgroup.SendTextMessageVO;
-import com.sdk.wxgroup.WxGroupSDK;
+import org.apache.commons.collections.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,6 +55,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.dcg.coolq.sdk.CoolQSDK.sendPrivateMsg;
+
 @Component
 public class CustomPlanBizImpl implements CustomPlanBiz {
 
@@ -297,32 +292,53 @@ public class CustomPlanBizImpl implements CustomPlanBiz {
 
     @Override
     public PageBeanNew<SuggestionListVO> listSuggestion4Plan(Integer currentPage, Integer numPerPage, String startTime,
-                                                             String endTime, String search, Integer planId) {
+                                                             String endTime, String search, Integer planId,Integer userType) {
         List<SuggestionListVO> list = new ArrayList<>();
         List<String> wxIdList = null;
         if (!StringUtil.isEmpty(search)) {
-            wxIdList = wechatGroupConsr.getByUserQuery(search);
+            List wxIds = wechatGroupConsr.getByUserQuery(search);
+            List<String> qqIds = wechatGroupConsr.getByQqUserQuery(search);
+            if (!ListUtils.isEmpty(wxIds) && !ListUtils.isEmpty(qqIds)) {
+                wxIds.addAll(qqIds);
+                wxIdList = wxIds;
+            }
+            if (ListUtils.isEmpty(wxIds) && !ListUtils.isEmpty(qqIds)) {
+                wxIdList = qqIds;
+            }
+            if (!ListUtils.isEmpty(wxIds) && ListUtils.isEmpty(qqIds)) {
+                wxIdList = wxIds;
+            }
             if (ListUtils.isEmpty(wxIdList)) {
                 return new PageBeanNew<>(currentPage, numPerPage, list);
             }
         }
-        Integer count = customPlanModuleSuggestionMapper.getSuggestionCount(startTime, endTime, wxIdList, planId);
+        Integer count = customPlanModuleSuggestionMapper.getSuggestionCount(startTime, endTime, wxIdList, planId,userType);
         if (count <= 0) {
             return new PageBeanNew<>(currentPage, numPerPage, list);
         }
-        list = customPlanModuleSuggestionMapper.listSuggestion4Plan(currentPage * numPerPage, numPerPage, startTime, endTime, wxIdList, planId);
-        List<String> userIds = list.stream().map(SuggestionListVO::getWxId).distinct().collect(Collectors.toList());
-        Map<String, GroupUserDTO> userDTOMap = wechatGroupConsr.mapWxUserInfoByWxIdList(userIds);
-        list.forEach(suggestionListVO -> {
-            //封装用户信息
-            String wxId = suggestionListVO.getWxId();
-            if (userDTOMap != null && userDTOMap.get(wxId) != null) {
-                GroupUserDTO groupUserDTO = userDTOMap.get(wxId);
-                suggestionListVO.setNickName(groupUserDTO.getNickName());
-                suggestionListVO.setHeadUrl(groupUserDTO.getHeadPic());
-                suggestionListVO.setSex(groupUserDTO.getSex());
-            }
-        });
+        list = customPlanModuleSuggestionMapper.listSuggestion4Plan(currentPage * numPerPage, numPerPage, startTime, endTime, wxIdList, planId,userType);
+        List<String> wxUserIds = list.stream().filter(a->a.getUserType()!=null && PcloudGroupRobotTypeEnum.WXROBOT.value.equals(a.getUserType())).map(SuggestionListVO::getWxId).distinct().collect(Collectors.toList());
+        List<String> qqUserIds = list.stream().filter(a->a.getUserType()!=null && PcloudGroupRobotTypeEnum.QQROBOT.value.equals(a.getUserType())).map(SuggestionListVO::getWxId).distinct().collect(Collectors.toList());
+        Map<String, GroupUserDTO> userDTOMap = wechatGroupConsr.mapWxUserInfoByWxIdList(wxUserIds);
+        Map<String, GroupUserDTO> qqUserMap = wechatGroupConsr.mapQqUserInfoByWxIdList(qqUserIds);
+
+            list.forEach(suggestionListVO -> {
+                //封装用户信息
+                String wxId = suggestionListVO.getWxId();
+                if (MapUtils.isNotEmpty(userDTOMap) && userDTOMap.get(wxId) != null) {
+                    GroupUserDTO groupUserDTO = userDTOMap.get(wxId);
+                    suggestionListVO.setNickName(groupUserDTO.getNickName());
+                    suggestionListVO.setHeadUrl(groupUserDTO.getHeadPic());
+                    suggestionListVO.setSex(groupUserDTO.getSex());
+                }
+                if (MapUtils.isNotEmpty(qqUserMap) && qqUserMap.get(wxId) != null) {
+                    GroupUserDTO groupUserDTO = qqUserMap.get(wxId);
+                    suggestionListVO.setNickName(groupUserDTO.getNickName());
+                    suggestionListVO.setHeadUrl(groupUserDTO.getHeadPic());
+                    suggestionListVO.setSex(groupUserDTO.getSex());
+                }
+
+            });
         return new PageBeanNew<>(currentPage, numPerPage, count, list);
     }
 
@@ -334,6 +350,7 @@ public class CustomPlanBizImpl implements CustomPlanBiz {
     @Override
     public Integer addSuggestion4Module(AddSuggestionVO addSuggestionVO) {
         String wxId = addSuggestionVO.getWxId();
+        Integer userType = null!=addSuggestionVO.getUserType()?addSuggestionVO.getUserType():1;
         Integer planId = addSuggestionVO.getPlanId();
         int maxBatchId = customPlanModuleSuggestionMapper.getMaxBatchId();
         List<AddSuggestionListVO> suggestionList = addSuggestionVO.getSuggestionList();
@@ -346,7 +363,7 @@ public class CustomPlanBizImpl implements CustomPlanBiz {
             CustomPlanModuleSuggestion suggestion = CustomPlanModuleSuggestion.builder().wxId(wxId).planId(planId)
                     .suggestionLevel(addSuggestionListVO.getSuggestionLevel()).suggestion(addSuggestionListVO.getSuggestion())
                     .batchId(maxBatchId + 1).moduleId(addSuggestionListVO.getModuleId()).moduleType(addSuggestionListVO.getModuleType())
-                    .openFeedback(addSuggestionListVO.getOpenFeedback()).build();
+                    .openFeedback(addSuggestionListVO.getOpenFeedback()).userType(userType).build();
             list.add(suggestion);
         });
         customPlanModuleSuggestionMapper.batchInsert(list);
@@ -358,17 +375,31 @@ public class CustomPlanBizImpl implements CustomPlanBiz {
             if (!StringUtil.isEmpty(customPlan.getConfirmFeedbackReply()) && addSuggestionVO.getRobotWxId() != null) {
                 //发送return消息
                 String robotWxId = addSuggestionVO.getRobotWxId();
-                GroupRobotDTO groupRobotDTO = wechatGroupConsr.getGroupRobotByWxId(robotWxId);
-                String ip = weixinQrcodeBiz.getRobotIpByGeneration(groupRobotDTO.getVersion());
-                SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
-                sendTextMessageVO.setContent(customPlan.getConfirmFeedbackReply());
-                sendTextMessageVO.setCode(SendMessageTypeEnum.SELF.getCode());
-                sendTextMessageVO.setWxId(robotWxId);
-                sendTextMessageVO.setAltId(robotWxId);
-                sendTextMessageVO.setWxGroupId(wxId);
-                sendTextMessageVO.setIp(ip);
-                // TODO sdk.message
-                wechatGroupConsr.sendMessage(JSON.toJSONString(sendTextMessageVO));
+                if(1==userType) {
+                    //微信发送消息
+                    GroupRobotDTO groupRobotDTO = wechatGroupConsr.getGroupRobotByWxId(robotWxId);
+                    String ip = weixinQrcodeBiz.getRobotIpByGeneration(groupRobotDTO.getVersion());
+                    SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
+                    sendTextMessageVO.setContent(customPlan.getConfirmFeedbackReply());
+                    sendTextMessageVO.setCode(SendMessageTypeEnum.SELF.getCode());
+                    sendTextMessageVO.setWxId(robotWxId);
+                    sendTextMessageVO.setAltId(robotWxId);
+                    sendTextMessageVO.setWxGroupId(wxId);
+                    sendTextMessageVO.setIp(ip);
+                    // TODO sdk.message
+                    wechatGroupConsr.sendMessage(JSON.toJSONString(sendTextMessageVO));
+                }else{
+                    //qq发送消息
+                    PrivateMsgSendVO privateMsgSendVO = new PrivateMsgSendVO();
+                    // 构造一个消息
+                    String message = new MessageBuilder()
+                            .text(customPlan.getConfirmFeedbackReply()) // 文本消息
+                            .toString();
+                    privateMsgSendVO.setMessage(message);
+                    privateMsgSendVO.setSenderQQCode(Long.valueOf(wxId));
+                    privateMsgSendVO.setReceiverQQCode(Long.valueOf(robotWxId));
+                    sendPrivateMsg(privateMsgSendVO);
+                }
             }
         });
         return maxBatchId + 1;

pcloud-service-book/src/main/java/com/pcloud/book/custom/entity/CustomPlanModuleSuggestion.java

@@ -29,4 +29,9 @@ public class CustomPlanModuleSuggestion {
 
     private Integer moduleType;
 
+    /**
+     * 用户类型 1-微信用户  2-qq用户
+     */
+    private Integer userType;
+
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/custom/facade/CustomPlanFacade.java

@@ -143,8 +143,8 @@ public class CustomPlanFacade {
     @ApiOperation(value = "获取方案满意度记录", httpMethod = "GET")
     ResponseDto<?> listSuggestion4Plan(@RequestHeader String token, @RequestParam Integer currentPage, @RequestParam Integer numPerPage,
                                        @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime,
-                                       @RequestParam(value = "search", required = false) String search, @RequestParam Integer planId) {
-        PageBeanNew<SuggestionListVO> page = customPlanBiz.listSuggestion4Plan(currentPage, numPerPage, startTime, endTime, search, planId);
+                                       @RequestParam(value = "search", required = false) String search, @RequestParam Integer planId,@RequestParam(value = "userType", required = false) Integer userType) {
+        PageBeanNew<SuggestionListVO> page = customPlanBiz.listSuggestion4Plan(currentPage, numPerPage, startTime, endTime, search, planId,userType);
         return new ResponseDto<>(page);
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/custom/mapper/CustomPlanModuleSuggestionMapper.java

@@ -16,11 +16,11 @@ import java.util.List;
 public interface CustomPlanModuleSuggestionMapper {
 
     Integer getSuggestionCount(@Param("startTime") String startTime, @Param("endTime") String endTime,
-                               @Param("wxIdList") List<String> wxIdList, @Param("planId") Integer planId);
+                               @Param("wxIdList") List<String> wxIdList, @Param("planId") Integer planId, @Param("userType") Integer userType);
 
     List<SuggestionListVO> listSuggestion4Plan(@Param("pageNum") int pageNum, @Param("numPerPage") int numPerPage,
                                                @Param("startTime") String startTime, @Param("endTime") String endTime,
-                                               @Param("wxIdList") List<String> wxIdList, @Param("planId") Integer planId);
+                                               @Param("wxIdList") List<String> wxIdList, @Param("planId") Integer planId, @Param("userType") Integer userType);
 
     List<ModuleSuggestionVO> getSuggestionInfo(@Param("batchId") Integer batchId, @Param("planId") Integer planId);
 

pcloud-service-book/src/main/java/com/pcloud/book/custom/vo/AddSuggestionVO.java

@@ -15,5 +15,10 @@ public class AddSuggestionVO {
 
     private String robotWxId;
 
+    /**
+     * 用户类型 1-微信用户  2-qq用户
+     */
+    private Integer userType;
+
     private List<AddSuggestionListVO> suggestionList;
 }

pcloud-service-book/src/main/java/com/pcloud/book/custom/vo/SuggestionListVO.java

@@ -29,4 +29,9 @@ public class SuggestionListVO implements Serializable {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
+
+    /**
+     * 用户类型 1-微信用户  2-qq用户
+     */
+    private Integer userType;
 }

pcloud-service-book/src/main/resources/mapper/custom/CustomPlanModuleSuggestionMapper.xml

@@ -10,6 +10,7 @@
     <result column="suggestion_level" jdbcType="INTEGER" property="suggestionLevel" />
     <result column="suggestion" jdbcType="VARCHAR" property="suggestion" />
     <result column="create_time" jdbcType="TIMESTAMP" property="planId" />
+    <result column="user_type" jdbcType="INTEGER" property="userType" />
   </resultMap>
 
   <select id="getSuggestionCount" resultType="int">
@@ -23,6 +24,9 @@
       <if test="startTime != null and endTime != null">
           and a.create_time between #{startTime} and #{endTime}
       </if>
+      <if test="userType!=null">
+         and a.user_type=#{userType}
+      </if>
       <if test="wxIdList != null">
           and wx_id in
           <foreach collection="wxIdList" open="(" close=")" separator="," item="item">
@@ -39,7 +43,8 @@
         SUM(suggestion_level = 1) goodCount,
         SUM(suggestion_level = 2) badCount,
         a.create_time createTime,
-        a.plan_id planId
+        a.plan_id planId,
+        a.user_type userType
     FROM
         custom_plan_module_suggestion a
     LEFT JOIN custom_plan b ON a.plan_id = b.id
@@ -48,6 +53,9 @@
     <if test="startTime != null and endTime != null">
       and a.create_time between #{startTime} and #{endTime}
     </if>
+      <if test="userType!=null">
+        and  a.user_type=#{userType}
+      </if>
     <if test="wxIdList != null">
       and wx_id in
       <foreach collection="wxIdList" open="(" close=")" separator="," item="item">
@@ -78,11 +86,11 @@
 
     <insert id="batchInsert" parameterType="com.pcloud.book.custom.entity.CustomPlanModuleSuggestion">
         insert into custom_plan_module_suggestion(batch_id, wx_id, plan_id, module_Id, suggestion_Level, suggestion, create_time,
-        module_type, open_feedback)
+        module_type, open_feedback,user_type)
         values
         <foreach collection="list" separator="," item="item">
             (#{item.batchId}, #{item.wxId}, #{item.planId}, #{item.moduleId}, #{item.suggestionLevel}, #{item.suggestion}, now(),
-            #{item.moduleType}, #{item.openFeedback})
+            #{item.moduleType}, #{item.openFeedback},#{item.userType})
         </foreach>
     </insert>