Merge branch 'dev' into 'master'

Dev

See merge request !28

src/main/java/com/weface/component/MenuService.java

@@ -6,17 +6,14 @@ import cn.hutool.core.convert.ConvertException;
 import cn.hutool.core.lang.TypeReference;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.weface.common.utils.SnowIdUtil;
 import com.weface.entity.MenuTagsEntity;
 import com.weface.entity.UserMenusEntity;
 import com.weface.entity.UserTagEntity;
-import com.weface.service.UserMenusService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 
@@ -30,8 +27,8 @@ public class MenuService {
 
     @Autowired
     private GeTuiService geTuiService;
-    @Autowired
-    private UserMenusService userMenusService;
+    /*@Autowired
+    private UserMenusService userMenusService;*/
 
     /**
      * 从map中解析标签并收集关系表数据
@@ -59,10 +56,10 @@ public class MenuService {
                 if (first.isPresent()) {
                     //拿到id
                     String uid = first.get().getUid();
-                    List<UserMenusEntity> entityList = userMenusService.list(new LambdaQueryWrapper<UserMenusEntity>().eq(UserMenusEntity::getUserId, uid).eq(UserMenusEntity::getIsValid, 1));
+                    /*List<UserMenusEntity> entityList = userMenusService.list(new LambdaQueryWrapper<UserMenusEntity>().eq(UserMenusEntity::getUserId, uid).eq(UserMenusEntity::getIsValid, 1));
                     if (!CollectionUtils.isEmpty(entityList)) {
                         continue;
-                    }
+                    }*/
                     //遍历标签id
                     Date date = new Date();
                     for (Long aLong : list) {

src/main/java/com/weface/dao/UserTagDao.java

@@ -37,7 +37,7 @@ public interface UserTagDao extends BaseMapper<UserTagEntity> {
      *
      * @return 用户信息
      */
-    List<UserTagEntity> findUserByIdAfter(Integer id, Integer limit);
+    List<UserTagEntity> findUserByIdAfter(@Param("limit") Integer limit);
 
     /**
      * 查询库中无标签用户

src/main/java/com/weface/serviceimpl/UserTagServiceImpl.java

@@ -39,7 +39,7 @@ public class UserTagServiceImpl extends ServiceImpl<UserTagDao, UserTagEntity> i
 
     @Override
     public List<UserTagEntity> findUserByIdAfter(Integer id, Integer limit) {
-        return this.baseMapper.findUserByIdAfter(id, limit);
+        return this.baseMapper.findUserByIdAfter(limit);
     }
 
     @Override

src/main/java/com/weface/task/UserTagsTask.java

@@ -236,17 +236,18 @@ public class UserTagsTask {
             int max = Integer.parseInt(pushSize);
 
             //存储用户标签信息
-            List<UserMenusEntity> userMenusList = new ArrayList<>();
+            List<UserMenusEntity> userMenusList;
             //获取标签列表
             List<MenuTagsEntity> tags = menuTagsService.list();
             //获取小于起始值,且更新时间为当前时间用户信息
             //List<UserTagEntity> beforeUser = userTagService.findUserByTodayAndIdBefore(id);
             //如果每次更新数据为空则全部设置为新增
             //if (CollUtil.isEmpty(beforeUser)) {
-            List<UserMenusEntity> afterTag = getAfterTag(id, max, tags);
-            if (afterTag != null) {
-                userMenusList.addAll(afterTag);
-            }
+            //List<UserMenusEntity> afterTag = getAfterTag(id, max, tags);
+            userMenusList = getAfterTag(id, max, tags);
+            //if (afterTag != null) {
+               // userMenusList.addAll(afterTag);
+            //}
             /*} else {
                 //过滤用户gid
                 List<String> beforeGid = beforeUser.stream().map(UserTagEntity::getGid).distinct().collect(Collectors.toList());
@@ -291,9 +292,9 @@ public class UserTagsTask {
         //如果当天新增数不为空
         if (CollUtil.isNotEmpty(afterUser)) {
             //获取用户最后一条信息
-            UserTagEntity afterUserInfo = afterUser.get(afterUser.size() - 1);
+            //UserTagEntity afterUserInfo = afterUser.get(afterUser.size() - 1);
             //并覆盖起始值
-            RedisUtil.StringOps.set("user_tag_id", String.valueOf(afterUserInfo.getId()));
+            //RedisUtil.StringOps.set("user_tag_id", String.valueOf(afterUserInfo.getId()));
             //过滤用户gid
             List<String> afterGid = afterUser.stream().map(UserTagEntity::getGid).distinct().collect(Collectors.toList());
             //调用个像接口获取新增用户标签

src/main/resources/mapper/UserTagDao.xml

@@ -51,12 +51,15 @@
     <!--    查询id之后的用户信息-->
     <select id="findUserByIdAfter" resultMap="userTagMap">
         SELECT
-            us.*
+            us.id,
+            us.uid,
+            us.gid
         FROM
-            ( SELECT id, uid, gid FROM t_user_tag WHERE gid IS NOT NULL AND id > #{id} ) us
-                LEFT JOIN ( SELECT * FROM tb_user_menus WHERE is_valid = 1 ) um ON us.uid = um.user_id
-        WHERE
-            um.id IS NULL LIMIT #{limit}
+            t_user_tag us
+        WHERE 
+              us.gid IS NOT NULL
+          AND us.uid NOT IN ( SELECT DISTINCT user_id FROM tb_user_menus)
+            LIMIT #{limit}
     </select>
 
     <!--    查询无标签用户-->