ソースを参照

首页数据问题修改

Signed-off-by: anderx <312518615@qq.com>
anderx 6 年 前
コミット
0af850af0b

+ 3 - 8
src/main/java/com/kede/common/controller/WebpageController.java

@@ -121,15 +121,11 @@ public class WebpageController extends BaseController {
 		InputBannerDetails ibd=new InputBannerDetails(1,0);
 		modelview.addObject("banners",bannersService.listBannersDetails(ibd, 5, 1).getList());
 		//获取服务客户20个
-		InputCustomerCase ic=new InputCustomerCase();
-		ic.setReleaseStatus(1);
-		ic.setStatus(1);
+		InputCustomerCase ic=new InputCustomerCase(1,1);
 		modelview.addObject("clist1",customerCaseService.listCustomerCase(ic, 10, 1).getList());
 		modelview.addObject("clist2",customerCaseService.listCustomerCase(ic, 10, 2).getList());
 		//获取公司新闻1个与3个,获取行业新闻3个
-		InputNews in=new InputNews();
-		in.setType(0);
-		in.setStatus(1);
+		InputNews in=new InputNews(0,1);
 		List<OutNews>list=(List<OutNews>) newsService.listnewsDetails(in, 4, 1).getList();
 		OutNews gs1=new OutNews();
 		List<OutNews> gs2=new ArrayList<>();
@@ -152,8 +148,7 @@ public class WebpageController extends BaseController {
 		}
 		modelview.addObject("hy", hy);
 		//获取战略合作16个
-		InputOrganization ir=new InputOrganization();
-		ir.setReleaseStatus(1);
+		InputOrganization ir=new InputOrganization(1,1);
 		modelview.addObject("orgList1", organizationService.listOrganization(ir, 8, 1).getList());
 		modelview.addObject("orgList2", organizationService.listOrganization(ir, 8, 2).getList());
 		return modelview;

+ 168 - 0
src/main/java/com/kede/common/controller/publicApiController.java

@@ -0,0 +1,168 @@
+package com.kede.common.controller;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.view.RedirectView;
+
+import com.kede.banners.bo.InputBannerDetails;
+import com.kede.banners.bo.OutBannerDetails;
+import com.kede.banners.service.BannersService;
+import com.kede.common.constant.AFTConstants;
+import com.kede.common.utils.DateUtils;
+import com.kede.customerCase.bo.InputCustomerCase;
+import com.kede.customerCase.service.CustomerCaseService;
+import com.kede.news.bo.InputNews;
+import com.kede.news.bo.OutNews;
+import com.kede.news.service.NewsService;
+import com.kede.organization.bo.InputOrganization;
+import com.kede.organization.service.OrganizationService;
+
+
+@Controller
+public class publicApiController extends BaseController {
+	
+	@Resource
+	private BannersService	bannersService;
+	@Resource
+	private NewsService newsService;
+	@Resource
+	private CustomerCaseService customerCaseService; 
+	@Resource
+	private OrganizationService	organizationService;
+
+	@RequestMapping(value = "/admin/login", method = RequestMethod.GET)
+	public ModelAndView adminLogin(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/admin/login");
+		return modelview;
+	}
+	
+	@RequestMapping(value = "/admin/index", method = RequestMethod.GET)
+	public ModelAndView adminHome(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/admin/index");
+		return modelview;
+	}
+	
+	/**
+	 * 关于科德
+	 * @param request
+	 * @param modelview
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	@RequestMapping(value = "/portal/aboutKede", method = RequestMethod.GET)
+	public ModelAndView portalAboutKede(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/aboutKede");
+		InputBannerDetails ibd=new InputBannerDetails(1,5);
+		OutBannerDetails o=new OutBannerDetails();
+		List<OutBannerDetails> list=(List<OutBannerDetails>) bannersService.listBannersDetails(ibd, 1, 1).getList();
+		o=list.size()>0?list.get(0):null;
+		modelview.addObject("banners",o);
+		return modelview;
+	}
+	
+	/**
+	 * 联系我们
+	 * @param request
+	 * @param modelview
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	@RequestMapping(value = "/portal/contactUs", method = RequestMethod.GET)
+	public ModelAndView portalContactUs(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/contactUs");
+		InputBannerDetails ibd=new InputBannerDetails(1,6);
+		OutBannerDetails o=new OutBannerDetails();
+		List<OutBannerDetails> list=(List<OutBannerDetails>) bannersService.listBannersDetails(ibd, 1, 1).getList();
+		o=list.size()>0?list.get(0):null;
+		modelview.addObject("banners",o);
+		return modelview;
+	}
+	/**
+	 * 新闻详情
+	 * @param request
+	 * @param modelview
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	@RequestMapping(value = "/portal/newsDetails", method = RequestMethod.GET)
+	public ModelAndView portalNewsDetails(HttpServletRequest request, ModelAndView modelview,Integer id) {
+		modelview.setViewName("/portal/news/newsDetails");
+		InputBannerDetails ibd=new InputBannerDetails(1,4);
+		OutBannerDetails o=new OutBannerDetails();
+		List<OutBannerDetails> list=(List<OutBannerDetails>) bannersService.listBannersDetails(ibd, 1, 1).getList();
+		o=list.size()>0?list.get(0):null;
+		modelview.addObject("banners",o);
+		modelview.addObject("news",newsService.selectNews(new InputNews(id)));
+		return modelview;
+	}
+	
+	@RequestMapping(value = "/", method = RequestMethod.GET)
+	public ModelAndView home(HttpServletRequest request, ModelAndView modelview) {
+		RedirectView rv = new RedirectView();
+		modelview.setViewName("/portal/index");
+		rv.setExposeModelAttributes(false);
+		modelview.setView(rv);
+		return modelview;
+	}
+	@SuppressWarnings("unchecked")
+	@RequestMapping(value = "/portal/index", method = RequestMethod.GET)
+	public ModelAndView protalIndex(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/index");
+		//获取轮播图
+		InputBannerDetails ibd=new InputBannerDetails(1,0);
+		modelview.addObject("banners",bannersService.listBannersDetails(ibd, 5, 1).getList());
+		//获取服务客户20个
+		InputCustomerCase ic=new InputCustomerCase();
+		ic.setReleaseStatus(1);
+		ic.setStatus(1);
+		modelview.addObject("clist1",customerCaseService.listCustomerCase(ic, 10, 1).getList());
+		modelview.addObject("clist2",customerCaseService.listCustomerCase(ic, 10, 2).getList());
+		//获取公司新闻1个与3个,获取行业新闻3个
+		InputNews in=new InputNews();
+		in.setType(0);
+		in.setStatus(1);
+		List<OutNews>list=(List<OutNews>) newsService.listnewsDetails(in, 4, 1).getList();
+		OutNews gs1=new OutNews();
+		List<OutNews> gs2=new ArrayList<>();
+		for (int i = 0; i < list.size(); i++) {
+			list.get(i).setReleaseTimeConvert(DateUtils.formatDate(list.get(i).getReleaseTime(), AFTConstants.MMDD));
+			list.get(i).setContent(displayRestriction(list.get(i).getContent()));
+			if (i==1) {
+				gs1=list.get(i);
+			}else {
+				gs2.add(list.get(i));
+			}
+		}
+		in.setType(1);
+		modelview.addObject("gs1", gs1);
+		modelview.addObject("gs2", gs2);
+		List<OutNews>hy=(List<OutNews>) newsService.listnewsDetails(in, 3, 1).getList();
+		for (OutNews o : hy) {
+			o.setReleaseTimeConvert(DateUtils.formatDate(o.getReleaseTime(), AFTConstants.MMDD));
+			o.setContent(displayRestriction(o.getContent()));
+		}
+		modelview.addObject("hy", hy);
+		//获取战略合作16个
+		InputOrganization ir=new InputOrganization();
+		ir.setReleaseStatus(1);
+		modelview.addObject("orgList1", organizationService.listOrganization(ir, 8, 1).getList());
+		modelview.addObject("orgList2", organizationService.listOrganization(ir, 8, 2).getList());
+		return modelview;
+	}
+
+
+	public String displayRestriction(String str) {
+		if(str.length()>24)str=str.substring(0, 24)+"...";
+		return str;
+	}
+	
+}

+ 12 - 0
src/main/java/com/kede/common/mapper/CustomerCaseMapper.xml

@@ -382,6 +382,12 @@
     <if test="c.name!=null">
     and name = #{c.name}
     </if>
+    <if test="c.releaseStatus!=null">
+    and release_status = #{c.releaseStatus}
+    </if>
+    <if test="c.status!=null">
+    and status = #{c.status}
+    </if>
     <if test="c.province!=null">
     and province = #{c.province}
     </if>
@@ -402,6 +408,12 @@
     <if test="c.name!=null">
     and name = #{c.name}
     </if>
+    <if test="c.releaseStatus!=null">
+    and release_status = #{c.releaseStatus}
+    </if>
+    <if test="c.status!=null">
+    and status = #{c.status}
+    </if>
     <if test="c.province!=null">
     and province = #{c.province}
     </if>

+ 7 - 1
src/main/java/com/kede/common/mapper/OrganizationMapper.xml

@@ -347,6 +347,9 @@
     <if test="o.releaseStatus != null">
     and release_status = #{o.releaseStatus}
     </if>
+    <if test="o.status != null">
+    and status = #{o.status}
+    </if>
     <if test="o.name != null">
    and name like concat('%',#{o.name},'%')
     </if>
@@ -358,12 +361,15 @@
   <select id="findOrganizationCount" resultType="java.lang.Integer">
     select count(*) 
     from organization where 1=1
-    <if test="o.id != null">
+   <if test="o.id != null">
     and id = #{o.id}
     </if>
     <if test="o.releaseStatus != null">
     and release_status = #{o.releaseStatus}
     </if>
+    <if test="o.status != null">
+    and status = #{o.status}
+    </if>
     <if test="o.name != null">
    and name like concat('%',#{o.name},'%')
     </if>

+ 7 - 0
src/main/java/com/kede/customerCase/bo/InputCustomerCase.java

@@ -4,6 +4,13 @@ import com.kede.common.model.CustomerCase;
 
 public class InputCustomerCase extends CustomerCase {
 	private String releaseTimes;
+	public InputCustomerCase() {
+		
+	}
+	public InputCustomerCase(Integer releaseStatus, Integer status) {
+		this.setReleaseStatus(releaseStatus);
+		this.setStatus(status);
+	}
 
 	public String getReleaseTimes() {
 		return releaseTimes;

+ 4 - 0
src/main/java/com/kede/news/bo/InputNews.java

@@ -11,6 +11,10 @@ public class InputNews extends News{
 		this.setId(id);
 	}
 
+	public InputNews(Integer type, Integer status) {
+		this.setType(type);
+		this.setStatus(status);
+	}
 	public String getReleaseTimes() {
 		return releaseTimes;
 	}

+ 6 - 0
src/main/java/com/kede/organization/bo/InputOrganization.java

@@ -5,6 +5,12 @@ import com.kede.common.model.Organization;
 public class InputOrganization extends Organization{
 	private String releaseTimes;
 
+	public InputOrganization() {
+	}
+	public InputOrganization(Integer releaseStatus, Integer status) {
+	this.setReleaseStatus(1);
+	this.setStatus(1);
+	}
 	public String getReleaseTimes() {
 		return releaseTimes;
 	}

+ 2 - 2
src/main/webapp/WEB-INF/views/portal/index.html

@@ -23,8 +23,8 @@
         <div class="banner-index">
             <!-- 轮播图 -->
             <div class="swiper-container" id="swiper1">
-                <div class="swiper-wrapper" th:each="b,bStatus:${banners}">
-                    <div th:if="${b.bannerUrl}!=null and ${b.bannerUrl}!=''" class="swiper-slide">
+                <div class="swiper-wrapper" >
+                    <div  th:each="b,bStatus:${banners}" class="swiper-slide">
                         <img th:src="|${avatarUploadHost}${b.bannerUrl}" />
                     </div>
                    <!--  <div class="swiper-slide">