标签库增加联动搜索V1.2

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

@@ -53,8 +53,8 @@ public class KeyWordApi {
      * @return
      */
     @GetMapping("/findLinkageStatus")
-    public ResponseJson findLinkageStatus(String id) {
-        return keyWordService.findLinkageStatus(id);
+    public ResponseJson findLinkageStatus(String id, Integer linkageStatus) {
+        return keyWordService.findLinkageStatus(id, linkageStatus);
     }
 
     /**

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

@@ -12,7 +12,7 @@ import java.util.List;
 public interface KeyWordService {
     ResponseJson<PaginationVo<KeyWord>> getKeyWordList(String keyWord, Integer searchTimeCode, Integer fromSearch, String beginTime, String endTime, Integer labelStatus, int pageNum, int pageSize);
 
-    ResponseJson findLinkageStatus(String id);
+    ResponseJson findLinkageStatus(String id, Integer linkageStatus);
 
     ResponseJson joinLabel(String id);
 

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

@@ -48,30 +48,35 @@ public class KeyWordServiceImpl implements KeyWordService {
     }
 
     @Override
-    public ResponseJson findLinkageStatus(String id) {
-        Map<String, String> linkageMap = keyWordDao.findLinkageStatus(id);
+    public ResponseJson findLinkageStatus(String id, Integer linkageStatus) {
         String linkageText = "";
-        if (null == linkageMap || null == linkageMap.get("product")) {
-            linkageText += ",商品";
-        }
-        if (null == linkageMap || null == linkageMap.get("cm_product_archive")) {
-            linkageText += ",美业资料";
-        }
-        if (null == linkageMap || null == linkageMap.get("info")) {
-            linkageText += ",信息平台";
-        }
-        if (null == linkageMap || null == linkageMap.get("cm_baike_product")) {
-            linkageText += ",采美百科";
+        if(linkageStatus==1){
+            Map<String, String> linkageMap = keyWordDao.findLinkageStatus(id);
+            if (null == linkageMap || null == linkageMap.get("product")) {
+                linkageText += ",商品";
+            }
+            if (null == linkageMap || null == linkageMap.get("cm_product_archive")) {
+                linkageText += ",美业资料";
+            }
+            if (null == linkageMap || null == linkageMap.get("info")) {
+                linkageText += ",信息平台";
+            }
+            if (null == linkageMap || null == linkageMap.get("cm_baike_product")) {
+                linkageText += ",采美百科";
+            }
         }
-        int linkageStatus = "".equals(linkageText) ? 1 : 0;
         keyWordDao.updateCmUserSearchFrequency(new KeyWord()
                 .setId(Integer.valueOf(id))
                 .setLinkageStatus(linkageStatus));
 
-        if ("".equals(linkageText)) {
-            linkageText = "关联成功";
-        } else {
-            linkageText = "该标签需关联上" + linkageText.substring(1) + "后才可开启";
+        if(linkageStatus==1){
+            if ("".equals(linkageText)) {
+                linkageText = "关联成功";
+            } else {
+                linkageText = "该标签需关联上" + linkageText.substring(1) + "后才可开启";
+            }
+        }else {
+            linkageText = "取消关联成功";
         }
         return ResponseJson.success(linkageText, linkageStatus);