bugfix

src/main/java/com/caimei/modules/product/dao/KeywordFrequencyDao.java

@@ -29,4 +29,6 @@ public interface KeywordFrequencyDao extends CrudDao<SearchFrequency> {
 
     List<SearchFrequencyVo> getvalueList(@Param("keyword") String keyword);
     SearchFrequency getKeyById(Integer id);
+
+//    List<String> verificationKeword(@Param("keyword")String keyword);
 }

src/main/java/com/caimei/modules/product/entity/SearchFrequency.java

@@ -43,6 +43,10 @@ public class SearchFrequency extends DataEntity<SearchFrequency> {
      *  区分是关键词界面还是关键词库界面 （1关键词；2关键词库）
      */
     private Integer status;
+    /**
+     * 联动搜索次数
+     */
+    private Integer linkageFrequency;
 
     public SearchFrequency() {
         super();

src/main/java/com/caimei/modules/product/service/KeywordFrequencyService.java

@@ -63,7 +63,20 @@ public class KeywordFrequencyService extends CrudService<KeywordFrequencyDao, Se
 //        }
         return "加入关键词库成功";
     }
-
+    /**
+     * 加入关键词库
+     * @param keyword
+     * @return
+     */
+//    @Transactional(readOnly = false)
+//    public boolean verificationKeword(String keyword){
+//        List<String> keyList = keywordFrequencyDao.verificationKeword(keyword);
+//        if(null !=keyList&&keyList.size()>0){
+//            return true;
+//        }else{
+//            return false;
+//        }
+//    }
     /**
      * 删除关键词
      * @param id

src/main/java/com/caimei/modules/product/web/KeywordFrequencyController.java

@@ -116,7 +116,22 @@ public class KeywordFrequencyController extends BaseController {
         addMessage(redirectAttributes, "已加入关键词库");
         return "redirect:"+Global.getAdminPath()+"/product/keywordFrequency/getKeyInfo";
     }
-
+    /**
+     * 验证关键词库是该否存在关键词
+     * @param keyword
+     * @return
+     */
+//    @RequestMapping("/verificationKeword")
+//    public String verificationKeword(String keyword,Model model){
+//        boolean b = keywordFrequencyService.verificationKeword(keyword);
+//        if(b){
+//            model.addAttribute("flag","-1");
+//        }else{
+//            model.addAttribute("flag","0");
+//        }
+//        return "redirect:"+Global.getAdminPath()+"/product/keywordFrequency/getKeyInfo";
+//
+//    }
     /**
      * 删除关键词
      * status 区分是关键词界面还是关键词库界面 （1关键词；2关键词库）

src/main/resources/mappings/modules/product/SearchFrequencyMapper.xml

@@ -10,7 +10,8 @@
                     frequency,
                     searchTime,
                     trueStatus,
-                    delStatus
+                    delStatus,
+                    linkageFrequency
               from cm_user_search_frequency
              where  delStatus=1
              <if test="trueStatus != null">
@@ -48,7 +49,8 @@
             frequency,
             searchTime,
             trueStatus,
-            delStatus
+            delStatus,
+            linkageFrequency
         from cm_user_search_frequency
         where keyword=#{keyword}
         and   fromSearch=#{fromSearch}
@@ -83,16 +85,18 @@
     <update id="delKeyWordById" parameterType="java.lang.Integer">
         update cm_user_search_frequency
         <set>
+            frequency=0,
+            linkageFrequency=0,
             trueStatus=0,
         <if test="delStatus != null">
-            delStatus=#{delStatus}
+            delStatus=0
         </if>
         </set>
         where id =#{id}
     </update>
     <insert id="insert" parameterType="com.caimei.modules.product.entity.SearchFrequency">
-        insert into cm_user_search_frequency(fromSearch,path,keyword,frequency,searchTime,trueStatus)
-        values (#{fromSearch},#{path},#{keyword},#{frequency},#{searchTime},#{trueStatus})
+        insert into cm_user_search_frequency(fromSearch,path,keyword,frequency,searchTime,trueStatus,linkageFrequency)
+        values (#{fromSearch},#{path},#{keyword},#{frequency},#{searchTime},#{trueStatus},0)
     </insert>
     <update id="update">
         update cm_user_search_frequency set keyword=#{keyword},searchTime=#{searchTime} where id=#{id}
@@ -106,7 +110,8 @@
             frequency,
             searchTime,
             trueStatus,
-            delStatus
+            delStatus,
+            linkageFrequency
         from cm_user_search_frequency
         where
            id in
@@ -144,4 +149,12 @@
         and keyword is not null
         and id=#{id}
     </select>
+<!--    <select id="verificationKeword" resultType="java.lang.String">-->
+<!--        select-->
+<!--            keyword-->
+<!--        from cm_user_search_frequency-->
+<!--        where trueStatus=1-->
+<!--          and   delStatus=1-->
+<!--          and keyword =#{keyword}-->
+<!--    </select>-->
 </mapper>

src/main/webapp/WEB-INF/views/modules/product/keywordFrequency.jsp

@@ -139,6 +139,24 @@
            function exportKeyword(ids){
                 window.location.href = "${ctx}/product/keywordFrequency/export?ids=" + ids;
            }
+        <%--function verification(key){--%>
+        <%--    $.ajax({--%>
+        <%--        //几个参数需要注意一下--%>
+        <%--        type: "get",//方法类型--%>
+        <%--        dataType:"json",--%>
+        <%--        url: "${ctx}/product/keywordFrequency/verificationKeword?keyword="+key ,//url--%>
+        <%--        success: function (data) {--%>
+        <%--            if(data=="-1"){--%>
+        <%--                return confirmx("关键词已经存在");--%>
+        <%--            }else{--%>
+        <%--                return true;--%>
+        <%--            }--%>
+        <%--        },--%>
+        <%--        error : function() {--%>
+        <%--            alert("服务异常！");--%>
+        <%--        }--%>
+        <%--    });--%>
+        <%--}--%>
     </script>
 </head>
 <body>
@@ -214,6 +232,8 @@
 <%--                        onclick="updatePwd(${newCmSp.serviceProviderID})"--%>
 <%--                        <a onclick="updateEnabledStatus('${newCmSp.keyId}')">加入关键词库</a>--%>
                         <a href="${ctx}/product/keywordFrequency/addKeyWordList?ids=${newCmSp.keyId}" onclick="return confirmx('确认将关键词加入关键词库吗？', this.href)">加入关键词库</a>
+<%--                         <a href="${ctx}/product/keywordFrequency/addKeyWordList?ids=${newCmSp.keyId}" onclick="verification('${newCmSp.keyword}')">加入关键词库</a>--%>
+
 <%--                        href="${ctx}/new/user/cmSp/cmSpEdit?id=${newCmSp.serviceProviderID}"--%>
                         <a href="${ctx}/product/keywordFrequency/form?keyId=${newCmSp.keyId}&status=1&keyword=${newCmSp.keyword}">编辑</a>
 

src/main/webapp/WEB-INF/views/modules/product/keywordThesaurus.jsp

@@ -193,15 +193,15 @@
     <div class="ul-form">
         <label>关键词：</label>
         <form:input path="keyword" htmlEscape="false" maxlength="20" class="input-medium"/>
-        <label>来源：</label>
-        <form:select path="fromSearch" class="input-medium" id="search">
-            <form:option value="" label="请选择"/>
-            <form:option value="1" label="首页搜索"/>
-            <form:option value="2" label="信息中心搜索"/>
-            <form:option value="3" label="美业资料搜索"/>
-            <form:option value="4" label="采美百科"/>
-            <form:option value="6" label="管理员添加"/>
-        </form:select>
+<%--        <label>来源：</label>--%>
+<%--        <form:select path="fromSearch" class="input-medium" id="search">--%>
+<%--            <form:option value="" label="请选择"/>--%>
+<%--            <form:option value="1" label="首页搜索"/>--%>
+<%--            <form:option value="2" label="信息中心搜索"/>--%>
+<%--            <form:option value="3" label="美业资料搜索"/>--%>
+<%--            <form:option value="4" label="采美百科"/>--%>
+<%--            <form:option value="6" label="管理员添加"/>--%>
+<%--        </form:select>--%>
         &nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
 <%--        &nbsp;&nbsp;<input id="addKeyWord" class="btn btn-primary" type="button" value="加入关键词库" onclick="updateStatus()"/>--%>
         &nbsp;&nbsp;<input id="addKey" class="btn btn-primary" type="button" value="添加关键词" onclick="window.location='${ctx}/product/keywordFrequency/form?status=2'"/>
@@ -247,7 +247,7 @@
 <%--                    管理员添加--%>
 <%--                </c:if>--%>
 <%--            </td>--%>
-            <td>${newCmSp.frequency}</td>
+            <td>${newCmSp.linkageFrequency}</td>
             <td>${newCmSp.serachDate}</td>
             <shiro:hasPermission name="user:newCmClub:edit">
                 <td>