Procházet zdrojové kódy

Merge branch 'test' of ssh://anderx@git.jishutao.com:55555/jishutao/jitao-server.git into test

anderx před 7 roky
rodič
revize
4fbd7e3aa2

+ 39 - 4
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -396,7 +396,12 @@ public class WebpageController extends BaseController {
 		// 咨询师
 		List<UserIdentityBo> userIdentityBos = userIdentityService.getExperts(8);
 		// List<consultantListBo>userIdentityBos=userIdentityService.getConsultantList(8);
-		modelview.addObject("consultants", userIdentityBos);
+		modelview.addObject("consultants", userIdentityBos);
+		//获得轮播图数据
+		List<Banners> blist = bannersService.findBannersList("serviceIndex", 0, 3, 1);
+		if(null != blist){
+			modelview.addObject("sbannerlist", blist);
+		}
 		return modelview;
 	}
 
@@ -709,6 +714,12 @@ public class WebpageController extends BaseController {
 				&& subscriptions.get(0).getSourceUrl().contains(".")) {
 			modelview.addObject("videoUrl", subscriptions.get(0).getSourceUrl());
 		}
+		
+		//获得轮播图数据
+		List<Banners> blist = bannersService.findBannersList("index", 0, 3, 1);
+		if(null != blist){
+			modelview.addObject("bannerlist", blist);
+		}
 		// List<AchievementObject>
 		// achievementObjects=achievementService.getHotAchievements(9, url,
 		// "web_index");
@@ -843,7 +854,13 @@ public class WebpageController extends BaseController {
 				demandListBo.setPictureUrl(demandListBo.getPictureUrl().split(",")[0]);
 		}
 		LimitLengthUtil.limiteDemandLength(sixMaxPersonnelDemand, 7, 30);
-		modelview.addObject("personnelDemandList", sixMaxPersonnelDemand);
+		modelview.addObject("personnelDemandList", sixMaxPersonnelDemand);
+		
+		//获得轮播图数据
+		List<Banners> blist = bannersService.findBannersList("demand", 0, 3, 1);
+		if(null != blist){
+			modelview.addObject("dbannerlist", blist);
+		}
 		return modelview;
 	}
 
@@ -909,7 +926,14 @@ public class WebpageController extends BaseController {
 		// List<PolicyEntity>intellectualPropertyPolicyList=achievementService.getIntellectualProperty(5);
 		List<PolicyResult> policies = (List<PolicyResult>) policyService
 				.searchPolicy("", 2, null, null, "web_index", 1, 5, null).getList();
-		modelview.addObject("policyList", policies);
+		modelview.addObject("policyList", policies);
+		
+		//获得轮播图数据
+		List<Banners> blist = bannersService.findBannersList("achievement", 0, 3, 1);
+		if(null != blist){
+			modelview.addObject("abannerlist", blist);
+		}
+		
 		return modelview;
 	}
 
@@ -995,6 +1019,11 @@ public class WebpageController extends BaseController {
 			}
 		}
 		modelAndView.addObject("jtNews", news);
+		//获得轮播图数据
+		List<Banners> blist = bannersService.findBannersList("patent", 0, 3, 1);
+		if(null != blist){
+			modelAndView.addObject("pbannerlist", blist);
+		}
 		return modelAndView;
 	}
 
@@ -1033,7 +1062,13 @@ public class WebpageController extends BaseController {
 
 		// 专家
 		List<UserIdentityBo> userIdentityBos = userIdentityService.getExperts(3);
-		modelAndView.addObject("expert", userIdentityBos);
+		modelAndView.addObject("expert", userIdentityBos);
+		
+		//获得轮播图数据
+		List<Banners> blist = bannersService.findBannersList("tradingIndex", 0, 3, 1);
+		if(null != blist){
+			modelAndView.addObject("tbannerlist", blist);
+		}
 
 		return modelAndView;
 	}

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/index.html


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/patent.html


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html


+ 33 - 2
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

@@ -70,9 +70,40 @@
         </div>
     </div>
     <!-- banner -->
-  <div id="myCarousel" class="carousel slide">
+    <!-- <div id="myCarousel" class="carousel slide">
         <img th:src="${portalHost+'/img/technology_trading_banner01.jpg'}" alt="First slide">
-    </div>
+    </div> -->
+    <div id="myCarousel" class="carousel" th:if="${#lists.size(abannerlist) eq 1}">
+		<!-- 轮播(Carousel)项目 -->
+		<div class="carousel-inner" th:each="banner,bStatus:${abannerlist}">
+			<div class="item active">
+				<a th:if="${banner.forwardUrl}!=null and ${banner.forwardUrl}!=''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
+				<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
+			</div>
+		</div>
+	</div>
+	<div id="myCarousel" class="carousel slide" th:if="${#lists.size(abannerlist) > 1}">
+		<!-- 轮播(Carousel)指标 -->
+		<ol class="carousel-indicators"><!-- 循环圆点 -->
+			<li data-target="#myCarousel" data-slide-to="${bStatus.index}" class="active" th:each="banner,bStatus:${abannerlist}" th:if="${bStatus.first}"></li>
+			<li data-target="#myCarousel" data-slide-to="${bStatus.index}" th:each="banner,bStatus:${abannerlist}" th:unless="${bStatus.first}"></li>
+		</ol>
+		<!-- 轮播(Carousel)项目 -->
+		<div class="carousel-inner" >
+			<div class="item active" th:each="banner,bStatus:${abannerlist}" th:if="${bStatus.first}">
+			<!-- /portal/continueHigh  /portal/militaryProject   /portal/practicalPatent -->
+				<a th:if="${banner.forwardUrl}!=null and ${banner.forwardUrl}!=''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
+				<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
+			</div>
+			<div class="item" th:each="banner,bStatus:${abannerlist}" th:unless="${bStatus.first}">
+				<a th:if="${banner.forwardUrl}!=null and ${banner.forwardUrl}!=''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
+				<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
+			</div>
+		</div>
+		<!-- 轮播(Carousel)导航 -->
+		<a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>
+		<a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
+	</div>
     <!-- 主体内容区域 -->
     <div class="container">
         <div class="demand-marq">

+ 33 - 2
src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html

@@ -68,9 +68,40 @@
 	</div>
 	<!-- banner -->
 
-	<div id="myCarousel" class="carousel slide">
+	<!-- <div id="myCarousel" class="carousel slide">
         <img th:src="${portalHost+'/img/technology_trading_banner01.jpg'}" alt="First slide">
-    </div>
+    </div> -->
+    <div id="myCarousel" class="carousel" th:if="${#lists.size(dbannerlist) eq 1}">
+		<!-- 轮播(Carousel)项目 -->
+		<div class="carousel-inner" th:each="banner,bStatus:${dbannerlist}">
+			<div class="item active">
+				<a th:if="${banner.forwardUrl}!=null and ${banner.forwardUrl}!=''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
+				<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
+			</div>
+		</div>
+	</div>
+	<div id="myCarousel" class="carousel slide" th:if="${#lists.size(dbannerlist) > 1}">
+		<!-- 轮播(Carousel)指标 -->
+		<ol class="carousel-indicators"><!-- 循环圆点 -->
+			<li data-target="#myCarousel" data-slide-to="${bStatus.index}" class="active" th:each="banner,bStatus:${dbannerlist}" th:if="${bStatus.first}"></li>
+			<li data-target="#myCarousel" data-slide-to="${bStatus.index}" th:each="banner,bStatus:${dbannerlist}" th:unless="${bStatus.first}"></li>
+		</ol>
+		<!-- 轮播(Carousel)项目 -->
+		<div class="carousel-inner" >
+			<div class="item active" th:each="banner,bStatus:${dbannerlist}" th:if="${bStatus.first}">
+			<!-- /portal/continueHigh  /portal/militaryProject   /portal/practicalPatent -->
+				<a th:if="${banner.forwardUrl}!=null and ${banner.forwardUrl}!=''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
+				<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
+			</div>
+			<div class="item" th:each="banner,bStatus:${dbannerlist}" th:unless="${bStatus.first}">
+				<a th:if="${banner.forwardUrl}!=null and ${banner.forwardUrl}!=''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
+				<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
+			</div>
+		</div>
+		<!-- 轮播(Carousel)导航 -->
+		<a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>
+		<a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
+	</div>
 	<!-- 主体内容区域 -->
 	<div class="container">
 		<div class="demand-marq">

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html