bugfix

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

@@ -13,7 +13,7 @@ public interface KeywordFrequencyDao extends CrudDao<SearchFrequency> {
 
     List<SearchFrequency> findList(SearchFrequency searchFrequency);
 
-    List<String> getSearchFrom(Integer trueStatus);
+    List<SearchFrequency> getSearchFrom(Integer trueStatus);
     void addKeyWordList(@Param("idList") int[] idList);
 
     List<SearchFrequency> getvalueListByIds(@Param("idList") int[] idList);

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

@@ -37,8 +37,8 @@ public class KeywordFrequencyService extends CrudService<KeywordFrequencyDao, Se
      * 查询未加入关键词库的关键词来源
      * @return
      */
-    public List<String> getSearchFrom(Integer trueStatus){
-        List<String> seacherFrom = keywordFrequencyDao.getSearchFrom(trueStatus);
+    public List<SearchFrequency> getSearchFrom(Integer trueStatus){
+        List<SearchFrequency> seacherFrom = keywordFrequencyDao.getSearchFrom(trueStatus);
         return seacherFrom;
     }
 

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

@@ -59,8 +59,10 @@ public class KeywordFrequencyController extends BaseController {
         public String getKeyInfo(SearchFrequency searchFrequency, HttpServletRequest request, HttpServletResponse response,  Model model){//@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
             searchFrequency.setTrueStatus(0);
             Page<SearchFrequency> keyInfo = keywordFrequencyService.findPage(new Page<SearchFrequency>(request,response),searchFrequency);
+            List<SearchFrequency> seacherFrom = keywordFrequencyService.getSearchFrom(1);
             model.addAttribute("keyInfo",keyInfo);
             model.addAttribute("searchFrequency",searchFrequency);
+            model.addAttribute("seacherFrom",seacherFrom);
             return "modules/product/keywordFrequency";
         }
     /**
@@ -85,8 +87,10 @@ public class KeywordFrequencyController extends BaseController {
             }
         }
         keyInfo.setList(list);
+        List<SearchFrequency> seacherFrom = keywordFrequencyService.getSearchFrom(2);
         model.addAttribute("keyInfo",keyInfo);
         model.addAttribute("searchFrequency",searchFrequency);
+        model.addAttribute("seacherFrom",seacherFrom);
         return "modules/product/keywordThesaurus";
     }
 
@@ -97,8 +101,8 @@ public class KeywordFrequencyController extends BaseController {
         @ResponseBody
         @RequestMapping("/getSeacherFrom")
         public List<String> getSearchFrom(Integer trueStatus){
-            List<String> seacherFrom = keywordFrequencyService.getSearchFrom(trueStatus);
-            return seacherFrom;
+//            List<String> seacherFrom = keywordFrequencyService.getSearchFrom(trueStatus);
+            return null;
         }
 
     /**

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

@@ -30,7 +30,7 @@
              </if>
          </select>
 
-    <select id="getSearchFrom" resultType="java.lang.String">
+    <select id="getSearchFrom" resultType="com.caimei.modules.product.entity.SearchFrequency">
             select
             fromSearch
         from cm_user_search_frequency

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

@@ -27,35 +27,35 @@
             return false;
         }
         window.onload = function () {
-            $.ajax({
-                //几个参数需要注意一下
-                type: "get",//方法类型
-                dataType:"json",
-                url: "${ctx}/product/keywordFrequency/getSeacherFrom?trueStatus=1" ,//url
-                success: function (data) {
-                    $('#search').get(0).options.length = 0;
-                    $('#search').append('<option value="" aria-selected="true">请选择</option>');
-                    $.each(data, function(i, obj) {
-                        var option = $('<option />');
-                        option.val(obj);
-                        if(obj==1){
-                            option.text("首页搜索");
-                        }else if(obj==2){
-                            option.text("信息中心搜索");
-                        }else if(obj==3){
-                            option.text("美业资料搜索");
-                        }else if(obj==4){
-                            option.text("采美百科搜索");
-                        }else if(obj==6){
-                            option.text("管理员添加");
-                        }
-                        $('#search').append(option);
-                    });
-                },
-                error : function() {
-                    alert("服务异常！");
-                }
-            });
+            <%--$.ajax({--%>
+            <%--    //几个参数需要注意一下--%>
+            <%--    type: "get",//方法类型--%>
+            <%--    dataType:"json",--%>
+            <%--    url: "${ctx}/product/keywordFrequency/getSeacherFrom?trueStatus=1" ,//url--%>
+            <%--    success: function (data) {--%>
+            <%--        $('#search').get(0).options.length = 0;--%>
+            <%--        $('#search').append('<option value="" aria-selected="true">请选择</option>');--%>
+            <%--        $.each(data, function(i, obj) {--%>
+            <%--            var option = $('<option />');--%>
+            <%--            option.val(obj);--%>
+            <%--            if(obj==1){--%>
+            <%--                option.text("首页搜索");--%>
+            <%--            }else if(obj==2){--%>
+            <%--                option.text("信息中心搜索");--%>
+            <%--            }else if(obj==3){--%>
+            <%--                option.text("美业资料搜索");--%>
+            <%--            }else if(obj==4){--%>
+            <%--                option.text("采美百科搜索");--%>
+            <%--            }else if(obj==6){--%>
+            <%--                option.text("管理员添加");--%>
+            <%--            }--%>
+            <%--            $('#search').append(option);--%>
+            <%--        });--%>
+            <%--    },--%>
+            <%--    error : function() {--%>
+            <%--        alert("服务异常！");--%>
+            <%--    }--%>
+            <%--});--%>
         }
         //选中所有
         function allCkbfun(ckb){
@@ -157,6 +157,14 @@
         <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:options items="${seacherFrom}" itemLabel="fromSearch" itemValue="id"--%>
+<%--                          htmlEscape="false"/>--%>
         </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()"/>

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

@@ -53,35 +53,35 @@
             return false;
         }
         window.onload = function () {
-            $.ajax({
-                //几个参数需要注意一下
-                type: "get",//方法类型
-                dataType:"json",
-                url: "${ctx}/product/keywordFrequency/getSeacherFrom?trueStatus=1" ,//url
-                success: function (data) {
-                    $('#search').get(0).options.length = 0;
-                    $('#search').append('<option value="" aria-selected="true">请选择</option>');
-                    $.each(data, function(i, obj) {
-                        var option = $('<option />');
-                        option.val(obj);
-                        if(obj==1){
-                            option.text("首页搜索");
-                        }else if(obj==2){
-                            option.text("信息中心搜索");
-                        }else if(obj==3){
-                            option.text("美业资料搜索");
-                        }else if(obj==4){
-                            option.text("采美百科搜索");
-                        }else if(obj==6){
-                            option.text("管理员添加");
-                        }
-                        $('#search').append(option);
-                    });
-                },
-                error : function() {
-                    alert("服务异常！");
-                }
-            });
+            <%--$.ajax({--%>
+            <%--    //几个参数需要注意一下--%>
+            <%--    type: "get",//方法类型--%>
+            <%--    dataType:"json",--%>
+            <%--    url: "${ctx}/product/keywordFrequency/getSeacherFrom?trueStatus=1" ,//url--%>
+            <%--    success: function (data) {--%>
+            <%--        $('#search').get(0).options.length = 0;--%>
+            <%--        $('#search').append('<option value="" aria-selected="true">请选择</option>');--%>
+            <%--        $.each(data, function(i, obj) {--%>
+            <%--            var option = $('<option />');--%>
+            <%--            option.val(obj);--%>
+            <%--            if(obj==1){--%>
+            <%--                option.text("首页搜索");--%>
+            <%--            }else if(obj==2){--%>
+            <%--                option.text("信息中心搜索");--%>
+            <%--            }else if(obj==3){--%>
+            <%--                option.text("美业资料搜索");--%>
+            <%--            }else if(obj==4){--%>
+            <%--                option.text("采美百科搜索");--%>
+            <%--            }else if(obj==6){--%>
+            <%--                option.text("管理员添加");--%>
+            <%--            }--%>
+            <%--            $('#search').append(option);--%>
+            <%--        });--%>
+            <%--    },--%>
+            <%--    error : function() {--%>
+            <%--        alert("服务异常！");--%>
+            <%--    }--%>
+            <%--});--%>
         }
         //选中所有
         function allCkbfun(ckb){
@@ -195,6 +195,12 @@
         <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>
         &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()"/>--%>
@@ -211,8 +217,8 @@
         <th style="width:20px;"><input class="check-all" type="checkbox" onclick="allCkbfun(this);"/></th>
         <th>序号</th>
         <th>关键词</th>
-        <th>搜索来源</th>
-        <th>搜索次数</th>
+<%--        <th>搜索来源</th>--%>
+        <th>联动词搜索次数</th>
         <th>添加时间</th>
         <shiro:hasPermission name="user:newCmClub:edit"><th>操作</th></shiro:hasPermission>
     </tr>
@@ -224,23 +230,23 @@
             <td>${status.index+1}</td>
                 <%--<td>${newCmSp.name}</td>--%>
             <td>${newCmSp.keyword}</td>
-            <td>
-                <c:if test="${newCmSp.fromSearch eq 1}">
-                    首页搜索
-                </c:if>
-                <c:if test="${newCmSp.fromSearch eq 2}">
-                    信息中心搜索
-                </c:if>
-                <c:if test="${newCmSp.fromSearch eq 3}">
-                    美业资料搜索
-                </c:if>
-                <c:if test="${newCmSp.fromSearch eq 4}">
-                    采美百科搜索
-                </c:if>
-                <c:if test="${newCmSp.fromSearch eq 6}">
-                    管理员添加
-                </c:if>
-            </td>
+<%--            <td>--%>
+<%--                <c:if test="${newCmSp.fromSearch eq 1}">--%>
+<%--                    首页搜索--%>
+<%--                </c:if>--%>
+<%--                <c:if test="${newCmSp.fromSearch eq 2}">--%>
+<%--                    信息中心搜索--%>
+<%--                </c:if>--%>
+<%--                <c:if test="${newCmSp.fromSearch eq 3}">--%>
+<%--                    美业资料搜索--%>
+<%--                </c:if>--%>
+<%--                <c:if test="${newCmSp.fromSearch eq 4}">--%>
+<%--                    采美百科搜索--%>
+<%--                </c:if>--%>
+<%--                <c:if test="${newCmSp.fromSearch eq 6}">--%>
+<%--                    管理员添加--%>
+<%--                </c:if>--%>
+<%--            </td>--%>
             <td>${newCmSp.frequency}</td>
             <td>${newCmSp.serachDate}</td>
             <shiro:hasPermission name="user:newCmClub:edit">