Merge remote-tracking branch 'origin/master'

src/main/java/com/sooka/module/web/cms/IndexController.java

@@ -1,5 +1,6 @@
 package com.sooka.module.web.cms;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Maps;
 import com.sooka.common.constant.CmsConst;
@@ -164,6 +165,25 @@ public class IndexController {
          return modelAndView;
      }
 
+    @RequestMapping("/appSearchFor")
+    @ResponseBody
+    public String SearchTitleFor(String type, String keyword, String siteId, @RequestParam(value = "number",defaultValue = "1") Integer pageNumber){
+        JSONObject obj = new JSONObject();
+        Map<String,Object>map=new HashMap<>(3);
+        map.put("type",type);
+        map.put("keyword",keyword);
+        PageInfo<TCmsContent> tCmsContentPageInfo = contentService.SearchTitleFor(pageNumber,map);
+        TCmsSite site = new TCmsSite();
+        site.setSiteId(Integer.parseInt(siteId));
+        obj.put("model",tCmsContentPageInfo);
+        obj.put("frontPath",httpProtocol+"://"+ host+":"+port+"/"+siteName+"/"+sitePrefix);
+        obj.put("resPath",httpProtocol+"://"+ host+":"+port+"/"+siteName+"/"+"static"+"/"+"www");
+        obj.put("keyword",keyword);
+        obj.put("siteId",siteId);
+        obj.put("site",site);
+        return JsonUtil.toSuccessResultJSON("查询成功！",obj);
+    }
+
     /**
      * 站点首页
      * @param siteId

src/main/java/com/sooka/module/web/cms/service/impl/ContentServiceImpl.java

@@ -569,7 +569,7 @@ public class ContentServiceImpl implements ContentService {
 
     @Override
     public PageInfo<TCmsContent> SearchTitleFor(int pageNumber, Map<String, Object> map) {
-        PageHelper.startPage(pageNumber, 10);
+        PageHelper.startPage(pageNumber, 999);
         List<TCmsContent> tCmsContents = contentMapper.SearchTitleFor(map);
         PageInfo pageInfo=new PageInfo(tCmsContents);
         return pageInfo;

src/main/resources/static/www/tuiyijunren/images/page.css

@@ -105,16 +105,20 @@ input,textarea{
 	margin: 0 10px 0 0;
 }
 .zixun dl{
-	display: flex;
-	justify-content:space-between;
-	flex-wrap: wrap;
+	overflow: hidden;
 }
-.zixun dl dd{
+.zixun dl a{
+	display: block;
 	width: 26%;
 	background: #fff;
 	padding: 30px;
 	border-radius: 5px;
-	margin: 20px 0 0 0;
+	margin: 20px 11px;
+	float: left;
+	height: 300px;
+}
+.zixun dl dd{
+	width:100%;
 }
 .zixun dl dd .teacher{
 	display: flex;

src/main/resources/templates/www/tuiyijunren/index.html

@@ -292,42 +292,79 @@
         </div>
         <div class="yzgw_list clearfix" id="it">
             <#cms_content_list siteId="${site.siteId}" categoryId="1223" orderBy="2" isHot="0" hasChild="0" isRecommend="0" size="6" titleLen="10" var="bean">
-            <script>
-                renderContent("${bean.title!}","${bean.pay!}","${bean.salary_treatment!}","${bean.address!}",
-                    "${bean.experience_and_education!}","${bean.url}","${bean.tag}","it","IT/互联网服务业");
-            </script>
+            <!--<script>-->
+                <!--renderContent("${bean.title!}","${bean.pay!}","${bean.salary_treatment!}","${bean.address!}",-->
+                    <!--"${bean.experience_and_education!}","${bean.url}","${bean.tag}","it","IT/互联网服务业");-->
+            <!--</script>-->
+            <!--版本2.0开始-->
+            <a class="yzgw_list_div" aos="fade-up" href="${bean.url!}">
+                <h1>
+                    <span style="overflow:hidden !important;
+                                text-overflow: ellipsis !important;
+                                  -webkit-line-clamp: 1 !important;
+                                display: inline !important;
+                                  -webkit-box-orient: vertical !important;">${bean.title!}</span>
+                    <!--<b>5K-8K</b>-->
+                    <b style="overflow:hidden !important;
+                                    text-overflow: ellipsis !important;
+                                      -webkit-line-clamp: 1 !important;
+                                    display: inline !important;
+                                      -webkit-box-orient: vertical !important;">${bean.pay}</b>
+                </h1>
+                <!--<h4><span class="address">长春-南关</span><span>五险一金</span><span>周末双休</span></h4>-->
+                <h4><span class="address" style="height: 40px !important;
+                                    overflow:hidden !important;
+                                    text-overflow: ellipsis !important;
+                                      -webkit-line-clamp: 1 !important;
+                                    display: -webkit-box !important;
+                                      -webkit-box-orient: vertical !important;">${bean.address} ${bean.salary_treatment!}</span></h4>
+                <!--<h4><span class="address">长春-南关 五险一金 周末双休</span></h4>-->
+                <!--<h5>长春动画学院</h5>-->
+                <h5>${bean.company_name}</h5>
+                <!--<h5>e${bean.experience_and_education}</h5>-->
+                <!--<p>民营教育企业&nbsp;&nbsp;|&nbsp;&nbsp;20-99人</p>-->
+                <p style="height: 20px !important;
+                        overflow:hidden !important;
+                        text-overflow: ellipsis !important;
+                        -webkit-line-clamp: 1 !important;
+                        display: -webkit-box !important;
+                        -webkit-box-orient: vertical !important;">公司规模 | ${bean.company_size!}</p>
+            </a>
+            <!--版本2.0结束-->
+            <!--版本1.0开始-->
                 <!--<a class="yzgw_list_div" aos="fade-up" href="${bean.url!}">-->
                     <!--<h1>-->
                         <!--<span style="overflow:hidden !important;-->
                                     <!--text-overflow: ellipsis !important;-->
-                                    <!-- -webkit-line-clamp: 1 !important;-->
+                                      <!-- -webkit-line-clamp: 1 !important;-->
                                     <!--display: inline !important;-->
-                                    <!-- -webkit-box-orient: vertical !important;">${bean.title!}</span>-->
+                                      <!-- -webkit-box-orient: vertical !important;">${bean.title!}</span>-->
                         <!--&lt;!&ndash;<b>5K-8K</b>&ndash;&gt;-->
                         <!--<b style="overflow:hidden !important;-->
                                     <!--text-overflow: ellipsis !important;-->
-                                    <!-- -webkit-line-clamp: 1 !important;-->
+                                      <!-- -webkit-line-clamp: 1 !important;-->
                                     <!--display: inline !important;-->
-                                    <!-- -webkit-box-orient: vertical !important;">${bean.pay}</b>-->
+                                      <!-- -webkit-box-orient: vertical !important;">${bean.pay}</b>-->
                     <!--</h1>-->
                     <!--&lt;!&ndash;<h4><span class="address">长春-南关</span><span>五险一金</span><span>周末双休</span></h4>&ndash;&gt;-->
                     <!--<h4><span class="address" style="height: 40px !important;-->
                                     <!--overflow:hidden !important;-->
                                     <!--text-overflow: ellipsis !important;-->
-                                    <!-- -webkit-line-clamp: 1 !important;-->
+                                      <!-- -webkit-line-clamp: 1 !important;-->
                                     <!--display: -webkit-box !important;-->
-                                    <!-- -webkit-box-orient: vertical !important;">${bean.salary_treatment!}</span></h4>-->
+                                      <!-- -webkit-box-orient: vertical !important;">${bean.salary_treatment!}</span></h4>-->
                     <!--&lt;!&ndash;<h4><span class="address">长春-南关 五险一金 周末双休</span></h4>&ndash;&gt;-->
                     <!--&lt;!&ndash;<h5>长春动画学院</h5>&ndash;&gt;-->
                     <!--<h5>${bean.address} ${bean.experience_and_education}</h5>-->
                     <!--&lt;!&ndash;<p>民营教育企业&nbsp;&nbsp;|&nbsp;&nbsp;20-99人</p>&ndash;&gt;-->
-<!--&lt;!&ndash;                    <p style="height: 20px !important;&ndash;&gt;-->
-<!--&lt;!&ndash;                        overflow:hidden !important;&ndash;&gt;-->
-<!--&lt;!&ndash;                        text-overflow: ellipsis !important;&ndash;&gt;-->
-<!--&lt;!&ndash;                        -webkit-line-clamp: 1 !important;&ndash;&gt;-->
-<!--&lt;!&ndash;                        display: -webkit-box !important;&ndash;&gt;-->
-<!--&lt;!&ndash;                        -webkit-box-orient: vertical !important;">${bean.experience_and_education!}</p>&ndash;&gt;-->
+                    <!--<p style="height: 20px !important;-->
+                        <!--overflow:hidden !important;-->
+                        <!--text-overflow: ellipsis !important;-->
+                        <!-- -webkit-line-clamp: 1 !important;-->
+                        <!--display: -webkit-box !important;-->
+                        <!-- -webkit-box-orient: vertical !important;">${bean.experience_and_education!}</p>-->
                 <!--</a>-->
+            <!--版本1.0结束-->
 
                 <!--<li aos="fade-up" aos-duration="500">-->
                     <!--<img src="${bean.thumb!}" alt="${bean.title!}"/>-->
@@ -573,188 +610,188 @@
 </script>
 </body>
 <style>
-    /*岗位列表*/
-    .yzgw_list_div{
-        width: 28%!important;
-        margin: 1%!important;
-        background: #fcfffc!important;
-        padding: 15px!important;
-        box-shadow: 0px 0px 8px #eee!important;
-        float: left!important;
-        display: block!important;
-        border-radius: 5px!important;
-    }
-    .yzgw_list_div:hover{
-        box-shadow: 0px 0px 8px #609f70!important;
-    }
-    .yzgw_list_div h1{
-        font-size: 20px!important;
-        height: 30px!important;
-        line-height: 30px!important;
-        font-weight: 900!important;
-        margin-bottom: 5px!important;
-    }
-    .yzgw_list_div h1 b{
-        font-size: 20px!important;
-        height: 30px!important;
-        line-height: 30px!important;
-        color: #ffb604!important;
-        float: right!important;
-    }
-    .yzgw_list_div h4 span{
-        font-size: 16px!important;
-        height: 40px!important;
-        line-height: 40px!important;
-        color: #555!important;
-        margin-right: 15px!important;
-    }
-    .yzgw_list_div h4 span.address{
-        padding-left: 16px!important;
-        background: url(twjr_icon8.png) no-repeat left center!important;
-    }
-    .yzgw_list_div h5{
-        border-top:1px solid #d4d4d4!important;
-        height: 40px!important;
-        line-height: 40px!important;
-    }
-    .yzgw_list_div p{
-        font-size: 14px!important;
-        color: #666666!important;
-    }
-    /*优质岗位*/
-    .er_right .yzgw_list{
-        width:967px!important;
-        margin-top: 10px!important;
-    }
-    .zp_nav{
-        width: 967px!important;
-        height: 50px!important;
-        line-height: 50px!important;
-        display: flex!important;
-        flex-direction: row!important;
-        justify-content:space-around!important;
-        background: #e5f5f2!important;
-    }
-    .zp_nav span{
-        font-size: 18px!important;
-        color: #333!important;
-        cursor: pointer!important;
-    }
-    .zp_nav span.on{
-        color: #016303!important;
-        font-weight: 900!important;
-        position: relative!important;
-    }
-    .zp_nav span.on::after{
-        border-left: 9px solid transparent!important;
-        border-top: 9px solid #e5f5f2!important;
-        border-right: 9px solid transparent!important;
-        content: " "!important;
-        display: block!important;
-        height: 0!important;
-        margin-left: -19px!important;
-        width: 0!important;
-        position: absolute!important;
-        /* pointer-events: all; */
-        bottom: -9px!important;
-        left: 60%!important;
-    }
-    .yzgw_list .yzgw_list_div{
-        width: 44%!important;
-        position: relative!important;
-    }
-    .yzgw_list .yzgw_list_div h4 span{
-        font-size: 14px!important;
-        background: #f0f9f7!important;
-        padding: 4px 8px!important;
-        border-radius: 4px!important;
-    }
-    .yzgw_list .yzgw_list_div p{
-        padding: 5px 0px!important;
-    }
-    .yzgw_list .yzgw_list_div p span.address {
-        padding-left: 16px!important;
-        background: url(twjr_icon8.png) no-repeat left center;
-        background-size: 10px!important;
-        margin-right: 4px!important;
-    }
-    .yzgw_list .yzgw_list_div .zp_more {
-        background: #e5f5f2!important;
-        color: #016303!important;
-        border:1px solid #6cb16d!important;
-        border-radius: 4px!important;
-        padding: 4px 8px!important;
-        position: absolute!important;
-        right: 15px!important;
-        bottom:15px!important;
-    }
-    .yzgw_list .yzgw_list_div .zp_more:hover {
-        background: #016303!important;
-        color: #fff!important;
-        border:1px solid #016303!important;
-    }
-    .er_right .yzgw_list{
-        display: none!important;
-    }
-    /*职业技能培训*/
-    .zyjn_list{
-        width: 967px!important;
-    }
-    .zyjn_list .zyjn_list_div{
-        width: 28%!important;
-        margin: 1%!important;
-        float: left!important;
-        background: #fcfffc!important;
-        padding: 1.5%!important;
-        box-shadow: 0px 0px 5px #eee!important;
-        border-radius: 5px!important;
-        cursor: pointer!important;
-        position: relative!important;
-    }
-    .zyjn_list .zyjn_list_div img{
-        width: 285px!important;
-        height: 160px!important;
-        margin-bottom: 5px!important;
-    }
-    .zyjn_list .zyjn_list_div h1{
-        font-size: 20px!important;
-        height: 30px!important;
-        line-height: 30px!important;
-        font-weight: 900!important;
-    }
-    .zyjn_list .zyjn_list_div h4{
-        font-size: 14px!important;
-        color: #666!important;
-        height: 35px!important;
-        line-height: 35px!important;
-        margin-bottom: 2px!important;
-    }
-    .zyjn_list .zyjn_list_div p{
-        font-size: 16px!important;
-        color: #666!important;
-        height: 35px!important;
-        line-height: 35px!important;
-    }
-    .zyjn_list .zyjn_list_div b{
-        font-size: 20px!important;
-        color: #ffb604!important;
-        display: block!important;
-    }
+    /*!*岗位列表*!*/
+    /*.yzgw_list_div{*/
+        /*width: 28%!important;*/
+        /*margin: 1%!important;*/
+        /*background: #fcfffc!important;*/
+        /*padding: 15px!important;*/
+        /*box-shadow: 0px 0px 8px #eee!important;*/
+        /*float: left!important;*/
+        /*display: block!important;*/
+        /*border-radius: 5px!important;*/
+    /*}*/
+    /*.yzgw_list_div:hover{*/
+        /*box-shadow: 0px 0px 8px #609f70!important;*/
+    /*}*/
+    /*.yzgw_list_div h1{*/
+        /*font-size: 20px!important;*/
+        /*height: 30px!important;*/
+        /*line-height: 30px!important;*/
+        /*font-weight: 900!important;*/
+        /*margin-bottom: 5px!important;*/
+    /*}*/
+    /*.yzgw_list_div h1 b{*/
+        /*font-size: 20px!important;*/
+        /*height: 30px!important;*/
+        /*line-height: 30px!important;*/
+        /*color: #ffb604!important;*/
+        /*float: right!important;*/
+    /*}*/
+    /*.yzgw_list_div h4 span{*/
+        /*font-size: 16px!important;*/
+        /*height: 40px!important;*/
+        /*line-height: 40px!important;*/
+        /*color: #555!important;*/
+        /*margin-right: 15px!important;*/
+    /*}*/
+    /*.yzgw_list_div h4 span.address{*/
+        /*padding-left: 16px!important;*/
+        /*background: url(twjr_icon8.png) no-repeat left center!important;*/
+    /*}*/
+    /*.yzgw_list_div h5{*/
+        /*border-top:1px solid #d4d4d4!important;*/
+        /*height: 40px!important;*/
+        /*line-height: 40px!important;*/
+    /*}*/
+    /*.yzgw_list_div p{*/
+        /*font-size: 14px!important;*/
+        /*color: #666666!important;*/
+    /*}*/
+    /*!*优质岗位*!*/
+    /*.er_right .yzgw_list{*/
+        /*width:967px!important;*/
+        /*margin-top: 10px!important;*/
+    /*}*/
+    /*.zp_nav{*/
+        /*width: 967px!important;*/
+        /*height: 50px!important;*/
+        /*line-height: 50px!important;*/
+        /*display: flex!important;*/
+        /*flex-direction: row!important;*/
+        /*justify-content:space-around!important;*/
+        /*background: #e5f5f2!important;*/
+    /*}*/
+    /*.zp_nav span{*/
+        /*font-size: 18px!important;*/
+        /*color: #333!important;*/
+        /*cursor: pointer!important;*/
+    /*}*/
+    /*.zp_nav span.on{*/
+        /*color: #016303!important;*/
+        /*font-weight: 900!important;*/
+        /*position: relative!important;*/
+    /*}*/
+    /*.zp_nav span.on::after{*/
+        /*border-left: 9px solid transparent!important;*/
+        /*border-top: 9px solid #e5f5f2!important;*/
+        /*border-right: 9px solid transparent!important;*/
+        /*content: " "!important;*/
+        /*display: block!important;*/
+        /*height: 0!important;*/
+        /*margin-left: -19px!important;*/
+        /*width: 0!important;*/
+        /*position: absolute!important;*/
+        /*!* pointer-events: all; *!*/
+        /*bottom: -9px!important;*/
+        /*left: 60%!important;*/
+    /*}*/
+    /*.yzgw_list .yzgw_list_div{*/
+        /*width: 44%!important;*/
+        /*position: relative!important;*/
+    /*}*/
+    /*.yzgw_list .yzgw_list_div h4 span{*/
+        /*font-size: 14px!important;*/
+        /*background: #f0f9f7!important;*/
+        /*padding: 4px 8px!important;*/
+        /*border-radius: 4px!important;*/
+    /*}*/
+    /*.yzgw_list .yzgw_list_div p{*/
+        /*padding: 5px 0px!important;*/
+    /*}*/
+    /*.yzgw_list .yzgw_list_div p span.address {*/
+        /*padding-left: 16px!important;*/
+        /*background: url(twjr_icon8.png) no-repeat left center;*/
+        /*background-size: 10px!important;*/
+        /*margin-right: 4px!important;*/
+    /*}*/
+    /*.yzgw_list .yzgw_list_div .zp_more {*/
+        /*background: #e5f5f2!important;*/
+        /*color: #016303!important;*/
+        /*border:1px solid #6cb16d!important;*/
+        /*border-radius: 4px!important;*/
+        /*padding: 4px 8px!important;*/
+        /*position: absolute!important;*/
+        /*right: 15px!important;*/
+        /*bottom:15px!important;*/
+    /*}*/
+    /*.yzgw_list .yzgw_list_div .zp_more:hover {*/
+        /*background: #016303!important;*/
+        /*color: #fff!important;*/
+        /*border:1px solid #016303!important;*/
+    /*}*/
+    /*.er_right .yzgw_list{*/
+        /*display: none!important;*/
+    /*}*/
+    /*!*职业技能培训*!*/
+    /*.zyjn_list{*/
+        /*width: 967px!important;*/
+    /*}*/
+    /*.zyjn_list .zyjn_list_div{*/
+        /*width: 28%!important;*/
+        /*margin: 1%!important;*/
+        /*float: left!important;*/
+        /*background: #fcfffc!important;*/
+        /*padding: 1.5%!important;*/
+        /*box-shadow: 0px 0px 5px #eee!important;*/
+        /*border-radius: 5px!important;*/
+        /*cursor: pointer!important;*/
+        /*position: relative!important;*/
+    /*}*/
+    /*.zyjn_list .zyjn_list_div img{*/
+        /*width: 285px!important;*/
+        /*height: 160px!important;*/
+        /*margin-bottom: 5px!important;*/
+    /*}*/
+    /*.zyjn_list .zyjn_list_div h1{*/
+        /*font-size: 20px!important;*/
+        /*height: 30px!important;*/
+        /*line-height: 30px!important;*/
+        /*font-weight: 900!important;*/
+    /*}*/
+    /*.zyjn_list .zyjn_list_div h4{*/
+        /*font-size: 14px!important;*/
+        /*color: #666!important;*/
+        /*height: 35px!important;*/
+        /*line-height: 35px!important;*/
+        /*margin-bottom: 2px!important;*/
+    /*}*/
+    /*.zyjn_list .zyjn_list_div p{*/
+        /*font-size: 16px!important;*/
+        /*color: #666!important;*/
+        /*height: 35px!important;*/
+        /*line-height: 35px!important;*/
+    /*}*/
+    /*.zyjn_list .zyjn_list_div b{*/
+        /*font-size: 20px!important;*/
+        /*color: #ffb604!important;*/
+        /*display: block!important;*/
+    /*}*/
 
-    .zyjn_more{
-        background: #e5f5f2!important;
-        color: #016303!important;
-        border:1px solid #6cb16d!important;
-        border-radius: 4px!important;
-        padding: 4px 8px!important;
-        position: absolute!important;
-        right: 15px!important;
-        bottom:15px!important;
-    }
-    .zyjn_more:hover{
-        background: #016303!important;
-        color: #fff!important;
-        border:1px solid #016303!important;
-    }
+    /*.zyjn_more{*/
+        /*background: #e5f5f2!important;*/
+        /*color: #016303!important;*/
+        /*border:1px solid #6cb16d!important;*/
+        /*border-radius: 4px!important;*/
+        /*padding: 4px 8px!important;*/
+        /*position: absolute!important;*/
+        /*right: 15px!important;*/
+        /*bottom:15px!important;*/
+    /*}*/
+    /*.zyjn_more:hover{*/
+        /*background: #016303!important;*/
+        /*color: #fff!important;*/
+        /*border:1px solid #016303!important;*/
+    /*}*/
 </style>
 </html>

src/main/resources/templates/www/tuiyijunren/list-seek.html

@@ -14,7 +14,7 @@
 		@}
 		<dl>
 			<#cms_pagination siteId="${site.siteId}" categoryId="${categoryId}" page="${page}" moreNum="6" var="page">
-				<#cms_content_list siteId="${site.siteId}" categoryId="${categoryId}" orderBy="3" isHot="0" hasChild="0" isRecommend="0" size="12" titleLen="22" var="bean" pageNumber="${page.current}">
+				<#cms_content_list siteId="${site.siteId}" categoryId="${categoryId}" orderBy="3" isHot="0" hasChild="0" isRecommend="0" size="9" titleLen="22" var="bean" pageNumber="${page.current}">
 					<a href="${bean.url!}">
 						<dd>
 							<div class="teacher">
@@ -26,7 +26,7 @@
 								</div>
 							</div>
 							<div class="ls-cont">
-								<p>${bean.description!}</p>
+								<p>${isNotEmpty(bean.description)&&strutil.length(bean.description)>100?strutil.subStringTo(bean.description,0,100)+"...":bean.description}</p>
 							</div>
 						</dd>
 					</a>

src/main/resources/templates/www/tuiyijunren/list-zx.html

@@ -19,7 +19,7 @@
 							</div>
 						</div>
 						<div class="ls-cont">
-							<p>${bean.description!}</p>
+							<p>${isNotEmpty(bean.description)&&strutil.length(bean.description)>100?strutil.subStringTo(bean.description,0,100)+"...":bean.description}</p>
 						</div>
 					</dd>
 				</a>
@@ -41,7 +41,7 @@
 							</div>
 						</div>
 						<div class="ls-cont">
-							<p>${bean.description!}</p>
+							<p>${isNotEmpty(bean.description)&&strutil.length(bean.description)>100?strutil.subStringTo(bean.description,0,100)+"...":bean.description}</p>
 						</div>
 					</dd>
 				</a>
@@ -63,7 +63,7 @@
 							</div>
 						</div>
 						<div class="ls-cont">
-							<p>${bean.description!}</p>
+							<p>${isNotEmpty(bean.description)&&strutil.length(bean.description)>100?strutil.subStringTo(bean.description,0,100)+"...":bean.description}</p>
 						</div>
 					</dd>
 				</a>