标签

fs-admin/src/test/java/com/fs/task/StoreTaskTest.java

@@ -1,12 +1,18 @@
 package com.fs.task;
 
 
+import com.alibaba.fastjson.JSON;
 import com.fs.FSAdminApplication;
+import com.fs.common.core.page.TableDataInfo;
 import com.fs.company.service.ICompanyService;
+import com.fs.company.service.ICompanyTagService;
 import com.fs.company.vo.RedPacketMoneyVO;
 import com.fs.course.mapper.FsCourseRedPacketLogMapper;
 import com.fs.course.service.IFsCourseWatchLogService;
 import com.fs.statis.service.FsStatisSalerWatchService;
+import com.fs.store.param.h5.FsUserPageListParam;
+import com.fs.store.service.IFsUserService;
+import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +22,7 @@ import java.util.List;
 
 @RunWith(value = org.springframework.test.context.junit4.SpringRunner.class)
 @SpringBootTest(classes = FSAdminApplication.class)
+@Slf4j
 public class StoreTaskTest {
     @Autowired
     private IFsCourseWatchLogService fsCourseWatchLogService;
@@ -29,6 +36,11 @@ public class StoreTaskTest {
 
     @Autowired
     private ICompanyService companyService;
+    @Autowired
+    private ICompanyTagService companyTagService;
+
+    @Autowired
+    private IFsUserService fsUserService;
     @Test
     public void addQwWatchLog() {
         fsCourseWatchLogService.addCourseWatchLogDayNew();
@@ -43,6 +55,17 @@ public class StoreTaskTest {
         fsStatisSalerWatchService.writeData();
     }
 
+    @Test
+    public void tag(){
+//        log.info("tag: {}",companyTagService.queryAllTagMap());
+        FsUserPageListParam param = new FsUserPageListParam();
+        param.setPageNum(1);
+        param.setPageSize(10);
+
+        TableDataInfo tableDataInfo = fsUserService.selectFsUserPageListNew(param);
+        log.info("数据：{}", JSON.toJSONString(tableDataInfo));
+    }
+
     @Test
     public void redPacketSubMoney() throws Exception
     {

fs-service-system/src/main/java/com/fs/company/domain/CompanyTag.java

@@ -2,6 +2,8 @@ package com.fs.company.domain;
 
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -11,6 +13,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author fs
  * @date 2025-04-02
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class CompanyTag extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -26,41 +30,4 @@ public class CompanyTag extends BaseEntity
     @Excel(name = "标签")
     private String tag;
 
-    public void setTagId(Long tagId)
-    {
-        this.tagId = tagId;
-    }
-
-    public Long getTagId()
-    {
-        return tagId;
-    }
-    public void setCompanyId(Long companyId)
-    {
-        this.companyId = companyId;
-    }
-
-    public Long getCompanyId()
-    {
-        return companyId;
-    }
-    public void setTag(String tag)
-    {
-        this.tag = tag;
-    }
-
-    public String getTag()
-    {
-        return tag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("tagId", getTagId())
-            .append("companyId", getCompanyId())
-            .append("tag", getTag())
-            .append("createTime", getCreateTime())
-            .toString();
-    }
 }

fs-service-system/src/main/java/com/fs/company/mapper/CompanyTagMapper.java

@@ -79,6 +79,6 @@ public interface CompanyTagMapper
     List<CompanyTag> selectCompanyTagListByUserId(@Param("userId") Long userId);
 
     String findUserTagByUserId(@Param("userId") Long userId);
-    @MapKey("tag_id")
+    @MapKey("tagId")
     Map<Long,CompanyTag> queryAllTagMap();
 }

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -529,7 +529,7 @@ public class FsUserServiceImpl implements IFsUserService
                     Map<Long, CompanyTag> tagMap = companyTagCacheService.queryAllTagMap();
                     Set<String> tagNames = new HashSet<>();
                     for (String tag : split) {
-                        if(tag != null) {
+                        if(StringUtils.isNotBlank(tag)) {
                             Long tagL = Long.parseLong(tag);
                             CompanyTag companyTag = tagMap.get(tagL);
                             if(companyTag != null) {
@@ -542,10 +542,10 @@ public class FsUserServiceImpl implements IFsUserService
                 }
 
                 // 是否宠粉
-                Integer isRepeat = qwExternalContactCacheService.selectQwIsRepeat(item.getUserId());
-                if(isRepeat != null) {
-                    item.setIsRepeat(isRepeat);
-                }
+//                Integer isRepeat = qwExternalContactCacheService.selectQwIsRepeat(item.getUserId());
+//                if(isRepeat != null) {
+//                    item.setIsRepeat(isRepeat);
+//                }
             }
         }
 

fs-service-system/src/main/resources/mapper/company/CompanyTagMapper.xml

@@ -56,7 +56,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="findUserTagByUserId" resultType="java.lang.String">
         select tag_ids from company_tag_user where user_id = ${userId} limit 1
     </select>
-    <select id="queryAllTagMap" resultType="java.util.Map">
+    <resultMap id="companyTagMap" type="com.fs.company.domain.CompanyTag">
+        <id column="tag_id" property="tagId" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <id column="tag" property="tag" jdbcType="VARCHAR" javaType="java.lang.String"/>
+    </resultMap>
+    <select id="queryAllTagMap" resultMap="companyTagMap">
         select tag_id,tag from company_tag
     </select>