用户行为优化1.0.2

src/main/java/com/caimei365/manager/controller/caimei/keyword/KeyWordApi.java

@@ -1,6 +1,7 @@
 package com.caimei365.manager.controller.caimei.keyword;
 
 import com.alibaba.excel.EasyExcel;
+import com.caimei365.manager.dao.KeyWordDao;
 import com.caimei365.manager.entity.PaginationVo;
 import com.caimei365.manager.entity.ResponseJson;
 import com.caimei365.manager.entity.caimei.CmKeywordInfo;
@@ -35,6 +36,9 @@ public class KeyWordApi {
     @Resource
     private KeywordListener keywordListener;
 
+    @Resource
+    private LabelListener labelListener;
+
     /**
      * 关键词列表
      * keyword 关键词
@@ -169,16 +173,14 @@ public class KeyWordApi {
     /**
      * 动态标签编辑回显
      * @param id
-     * @param pageNum
-     * @param pageSize
      * @return
      */
     @GetMapping("/editKeyword")
-    public ResponseJson<Map<String, Object>> editKeyword(Integer id,
-                                                         @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                         @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
-
-        return keyWordService.editKeyword(id, pageNum, pageSize);
+    public ResponseJson<CmKeywordInfo> editKeyword(Integer id) {
+        if (null == id) {
+            return  ResponseJson.error(-1, "id不能为空", null);
+        }
+        return keyWordService.editKeyword(id);
     }
 
     /**
@@ -239,7 +241,7 @@ public class KeyWordApi {
     public ResponseJson doKeywordImport(MultipartFile keywordFile) {
         try {
             InputStream inputStream = keywordFile.getInputStream();
-            EasyExcel.read(inputStream, CmKeywordInfo.class, new LabelListener()).sheet().doRead();
+            EasyExcel.read(inputStream, CmKeywordInfo.class, labelListener).sheet().doRead();
         } catch (IOException e) {
             e.printStackTrace();
         }

src/main/java/com/caimei365/manager/entity/caimei/CmKeywordSubtag.java

@@ -24,7 +24,7 @@ public class CmKeywordSubtag {
     /**
      * 子标签名
      */
-    private Integer subtag;
+    private String keyword;
     /**
      * 添加时间
      */

src/main/java/com/caimei365/manager/service/caimei/KeyWordService.java

@@ -51,11 +51,9 @@ public interface KeyWordService {
     /**
      * 动态标签编辑回显
      * @param id
-     * @param pageNum
-     * @param pageSize
      * @return
      */
-    ResponseJson<Map<String, Object>> editKeyword(Integer id,  int pageNum, int pageSize);
+    ResponseJson<CmKeywordInfo> editKeyword(Integer id);
 
     /**
      * 选择子标签

src/main/java/com/caimei365/manager/service/caimei/impl/KeyWordServiceImpl.java

@@ -202,29 +202,24 @@ public class KeyWordServiceImpl implements KeyWordService {
      * 动态标签编辑回显
      *
      * @param id
-     * @param pageNum
-     * @param pageSize
      * @return
      */
     @Override
-    public ResponseJson<Map<String, Object>> editKeyword(Integer id, int pageNum, int pageSize) {
-        Map<String, Object> map = new HashMap<>();
+    public ResponseJson<CmKeywordInfo> editKeyword(Integer id) {
         // 标签数据
         CmKeywordInfo cmKeywordInfo = keyWordDao.getkeywordById(id);
         if (null != cmKeywordInfo) {
+            // 前端要求默认 【】
+            cmKeywordInfo.setSubtag(new ArrayList<>());
             // 若为父标签，获取子标签返回
             if (1 == cmKeywordInfo.getParentLabel()) {
-                PageHelper.startPage(pageNum, pageSize);
                 List<CmKeywordSubtag> cmKeywordSubtags = keyWordDao.getkeywordSubtag(id);
-                PaginationVo<CmKeywordSubtag> page = new PaginationVo<>(cmKeywordSubtags);
-                cmKeywordInfo.setSubtag(cmKeywordSubtags);
-                map.put("page", page);
+                cmKeywordInfo.setSubtag(null == cmKeywordSubtags ? new ArrayList<>() : cmKeywordSubtags);
             }
         } else {
             return ResponseJson.error(-1, "标签数据异常", null);
         }
-        map.put("keywordInfo", cmKeywordInfo);
-        return ResponseJson.success(map);
+        return ResponseJson.success(cmKeywordInfo);
     }
 
     /**
@@ -300,7 +295,7 @@ public class KeyWordServiceImpl implements KeyWordService {
                 // 删除有限展示标签
                 keyWordDao.delPriorKeywordById(Integer.parseInt(s));
                 // 删除子标签
-                keyWordDao.updateKeywordSubtag(Integer.parseInt(s), null);
+                keyWordDao.updateKeywordSubtag(Integer.parseInt(s), new ArrayList<>());
             }
         } else {
             // 删除动态/静态标签
@@ -308,7 +303,7 @@ public class KeyWordServiceImpl implements KeyWordService {
             // 删除有限展示标签
             keyWordDao.delPriorKeywordById(Integer.parseInt(id));
             // 删除子标签
-            keyWordDao.updateKeywordSubtag(Integer.parseInt(id), null);
+            keyWordDao.updateKeywordSubtag(Integer.parseInt(id), new ArrayList<>());
         }
         return ResponseJson.success();
     }

src/main/java/com/caimei365/manager/service/caimei/listener/LabelListener.java

@@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSON;
 import com.caimei365.manager.dao.KeyWordDao;
 import com.caimei365.manager.entity.caimei.CmKeywordInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -18,6 +20,7 @@ import java.util.List;
  * @date : 2023/11/28
  */
 @Slf4j
+@Service
 public class LabelListener extends AnalysisEventListener<CmKeywordInfo> {
 
     @Resource
@@ -50,11 +53,9 @@ public class LabelListener extends AnalysisEventListener<CmKeywordInfo> {
         infoList.forEach(info -> {
             Integer keywordId = keyWordDao.getKeywordByName(info.getKeyword());
             if (null == keywordId) {
-                CmKeywordInfo cmKeywordInfo = new CmKeywordInfo();
-                cmKeywordInfo.setKeyword(info.getKeyword());
-                cmKeywordInfo.setDynamicStatus(0);
-                cmKeywordInfo.setParentLabel(0);
-                keyWordDao.insertKeywordInfo(cmKeywordInfo);
+                info.setDynamicStatus(0);
+                info.setParentLabel(0);
+                keyWordDao.insertKeywordInfo(info);
             }
         });
     }

src/main/resources/mapper/KeyWordDao.xml

@@ -199,7 +199,7 @@
     <select id="getkeywordSubtag" resultType="com.caimei365.manager.entity.caimei.CmKeywordSubtag">
         SELECT
             cks.id AS id,
-            cki.keyword AS subtag,
+            cki.keyword AS keyword,
             cks.addTime
         FROM cm_keyword_subtag cks
         left join cm_keyword_info cki on cks.subtagId = cki.id
@@ -227,7 +227,7 @@
 
     <insert id="insertKeywordInfo" keyProperty="id" keyColumn="id" useGeneratedKeys="true">
         insert into cm_keyword_info(fromSearch, keyword, dynamicStatus, parentLabel, addTime, linkageStatus, delFlag)
-        values (1, #{keyword}, #{dynamicStatus}, #{parentLabel}, now(), 0, 1)
+        values (1, #{keyword}, #{dynamicStatus}, #{parentLabel}, now(), 0, 0)
     </insert>
 
     <update id="updateKeyword">