添加计粉代码

admin/src/main/java/com/baiye/modules/distribute/controller/WeChatController.java

@@ -92,4 +92,12 @@ public class WeChatController {
     }
 
 
+    @GetMapping("/query/user/statistics")
+    @Operation(summary = "总统计用户数量")
+    public R<AddFriendVo> getDateBy(List<Long> userIdList) {
+        return R.ok(wechatFriendService.statisticsFriendByUserId(userIdList));
+    }
+
+
+
 }

admin/src/main/java/com/baiye/modules/distribute/mapper/LoginEquipmentMapper.java

@@ -46,8 +46,9 @@ public interface LoginEquipmentMapper extends ExtendMapper<LoginEquipment> {
      * 天数查询数据
      *
      * @param dayNum
+     * @param currentUserId
      * @param wxId
      * @return
      */
-    List<WeChatAddFriendVo> queryByDate(@Param("dayNum") Integer dayNum, @Param("wxId") String wxId);
+    List<WeChatAddFriendVo> queryByDate(@Param("dayNum") Integer dayNum,@Param("userId") Long currentUserId, @Param("wxId") String wxId);
 }

admin/src/main/java/com/baiye/modules/distribute/mapper/WeChatFriendMapper.java

@@ -3,7 +3,9 @@ package com.baiye.modules.distribute.mapper;
 import cn.hutool.core.date.DateTime;
 import com.baiye.extend.mybatis.plus.mapper.ExtendMapper;
 import com.baiye.modules.distribute.entity.WeChatFriedRecord;
+import com.baiye.modules.distribute.vo.AddFriendVo;
 import com.baiye.modules.distribute.vo.StatisticsFriendVO;
+import com.baiye.modules.distribute.vo.WeChatAddFriendVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,4 +27,11 @@ public interface WeChatFriendMapper extends ExtendMapper<WeChatFriedRecord> {
      * @return
      */
     List<StatisticsFriendVO> queryByDate(@Param("startTime") DateTime beginOfDay, @Param("endTime") DateTime now, @Param("userId") Long currentUserId);
+
+    /**
+     * 用户数据查询
+     * @param userIdList
+     * @return
+     */
+    List<WeChatAddFriendVo> queryByUserList(@Param("userIdList") List<Long> userIdList);
 }

admin/src/main/java/com/baiye/modules/distribute/service/LoginEquipmentService.java

@@ -5,7 +5,6 @@ import com.baiye.domain.PageResult;
 import com.baiye.extend.mybatis.plus.service.ExtendService;
 import com.baiye.modules.distribute.entity.LoginEquipment;
 import com.baiye.modules.distribute.qo.AccountQo;
-import com.baiye.modules.distribute.vo.AddFriendVo;
 import com.baiye.modules.distribute.vo.WeChatAccountVO;
 import com.baiye.modules.distribute.vo.WeChatAddFriendVo;
 
@@ -36,11 +35,13 @@ public interface LoginEquipmentService extends ExtendService<LoginEquipment> {
 
     /**
      * 时间查询数据
+     *
      * @param dayNum
+     * @param currentUserId
      * @param wxId
      * @return
      */
-    List<WeChatAddFriendVo> queryByDate(Integer dayNum, String wxId);
+    List<WeChatAddFriendVo> queryByDate(Integer dayNum, Long currentUserId, String wxId);
 
     /**
      * 机器人查询

admin/src/main/java/com/baiye/modules/distribute/service/WechatFriendService.java

@@ -3,7 +3,9 @@ package com.baiye.modules.distribute.service;
 import com.baiye.extend.mybatis.plus.service.ExtendService;
 import com.baiye.modules.distribute.dto.WeChatFriendDTO;
 import com.baiye.modules.distribute.entity.WeChatFriedRecord;
+import com.baiye.modules.distribute.vo.AddFriendVo;
 import com.baiye.modules.distribute.vo.StatisticsFriendVO;
+import com.baiye.modules.distribute.vo.WeChatAddFriendVo;
 
 import java.util.List;
 
@@ -27,4 +29,11 @@ public interface WechatFriendService extends ExtendService<WeChatFriedRecord> {
      * @return
      */
     List<StatisticsFriendVO> statisticsFriendByType(Integer queryType);
+
+    /**
+     * 统计数据
+     * @param userIdList
+     * @return
+     */
+    AddFriendVo statisticsFriendByUserId(List<Long> userIdList);
 }

admin/src/main/java/com/baiye/modules/distribute/service/impl/LoginEquipmentServiceImpl.java

@@ -44,8 +44,8 @@ public class LoginEquipmentServiceImpl extends ExtendServiceImpl<LoginEquipmentM
     }
 
     @Override
-    public List<WeChatAddFriendVo> queryByDate(Integer dayNum, String wxId) {
-        return baseMapper.queryByDate(dayNum, wxId);
+    public List<WeChatAddFriendVo> queryByDate(Integer dayNum, Long currentUserId, String wxId) {
+        return baseMapper.queryByDate(dayNum, currentUserId, wxId);
     }
 
     @Override

admin/src/main/java/com/baiye/modules/distribute/service/impl/WeChatServiceImpl.java

@@ -180,7 +180,7 @@ public class WeChatServiceImpl extends ExtendServiceImpl<WeChatAccountMapper, We
             BeanUtil.copyProperties(vo, addFriendVo);
             // 查询数据天数据
             List<WeChatAddFriendVo> weChatAddFriendVos =
-                    loginEquipmentService.queryByDate(DefaultNumberConstants.MINUS_FIFTEEN_NUMBER, vo.getWxId());
+                    loginEquipmentService.queryByDate(DefaultNumberConstants.MINUS_FIFTEEN_NUMBER, SecurityUtils.getCurrentUserId(), vo.getWxId());
             // 转为map
             Map<String, List<WeChatAddFriendVo>> map = weChatAddFriendVos.stream().collect
                     (Collectors.groupingBy(WeChatAddFriendVo::getDayStr));

admin/src/main/java/com/baiye/modules/distribute/service/impl/WechatFriendServiceImpl.java

@@ -12,7 +12,9 @@ import com.baiye.modules.distribute.dto.WeChatFriendDTO;
 import com.baiye.modules.distribute.entity.WeChatFriedRecord;
 import com.baiye.modules.distribute.mapper.WeChatFriendMapper;
 import com.baiye.modules.distribute.service.WechatFriendService;
+import com.baiye.modules.distribute.vo.AddFriendVo;
 import com.baiye.modules.distribute.vo.StatisticsFriendVO;
+import com.baiye.modules.distribute.vo.WeChatAddFriendVo;
 import com.baiye.security.util.SecurityUtils;
 import com.google.common.collect.Lists;
 import lombok.RequiredArgsConstructor;
@@ -57,4 +59,10 @@ public class WechatFriendServiceImpl extends ExtendServiceImpl
         return Lists.newArrayList();
     }
 
+    @Override
+    public AddFriendVo statisticsFriendByUserId(List<Long> userIdList) {
+        List<WeChatAddFriendVo> weChatAddFriendVos = baseMapper.queryByUserList(userIdList);
+        return new AddFriendVo();
+    }
+
 }

admin/src/main/resources/mapper/LoginEquipmentMapper.xml

@@ -45,7 +45,7 @@
              , count(1) as                          num
              , add_friend_type
         FROM tb_wechat_friend
-        WHERE DATE_SUB(CURDATE(), INTERVAL #{dayNum} DAY) <= date (create_time) and robot_wx_id = #{wxId}
+        WHERE DATE_SUB(CURDATE(), INTERVAL #{dayNum} DAY) <= date (create_time) and robot_wx_id = #{wxId} and user_id = #{userId}
         GROUP BY dayStr, add_friend_type
         ORDER BY dayStr
     </select>

admin/src/main/resources/mapper/WeChatFriendMapper.xml

@@ -14,4 +14,21 @@
         GROUP BY
         add_friend_type
     </select>
+
+    <select id="queryByUserList" resultType="com.baiye.modules.distribute.vo.WeChatAddFriendVo">
+
+        SELECT DATE_FORMAT(create_time, '%m-%d') dayStr
+        , count(1) as                          num
+        , add_friend_type
+        FROM tb_wechat_friend
+        WHERE DATE_SUB(CURDATE(), INTERVAL #{dayNum} DAY) &lt;= date (create_time) and robot_wx_id = #{wxId} and user_id = #{userId}
+        GROUP BY dayStr, add_friend_type
+        ORDER BY dayStr
+        <if test="userIdList != null and userIdList.size() > 0">
+            user_id in
+            <foreach collection="userIdList" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 </mapper>