前台代码更新

donate-service/src/main/java/com/uas/service/donate/controller/ActiveCenterController.java

@@ -1,9 +1,11 @@
 package com.uas.service.donate.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.uas.service.donate.model.Activity;
 import com.uas.service.donate.model.Award;
 import com.uas.service.donate.service.ActivityService;
 import com.uas.service.donate.service.AwardService;
+import com.uas.service.donate.service.CarouselService;
 import com.uas.service.donate.service.ProjectRecodeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -30,6 +32,9 @@ public class ActiveCenterController {
     @Autowired
     private AwardService awardService;
 
+    @Autowired
+    private CarouselService carouselService;
+
     /**
      * 返回一元捐活动列表freemarker页面
      * @param modelMap
@@ -44,13 +49,16 @@ public class ActiveCenterController {
                                  @RequestParam(value = "status", defaultValue = "全部") String status,
                                  @RequestParam(value = "search", required = false) String search,
                                  @RequestParam(value = "page", defaultValue = "0") int page,
-                                 @RequestParam(value = "size", defaultValue = "7") int size) {
+                                 @RequestParam(value = "size", defaultValue = "7") int size,
+                                 @RequestParam(value = "useFor",defaultValue ="donate")String useFor) {
         //得到历史参与总人数
         Long historyPerson = projectRecodeService.historyPerson();
         //得到历史参与总捐款额
         Double totality = projectRecodeService.totality();
 
         PageRequest pageable = new PageRequest(page, size);
+        //得到轮播图
+        List<JSONObject> carouselList=carouselService.getCarousels(useFor);
 
         //根据活动状态查询出所有活动
         if ("进行中".equals(status)) {
@@ -80,7 +88,7 @@ public class ActiveCenterController {
                 activity.setAwards(awardList);
             }
         }
-
+        modelMap.put("carouselList",carouselList);
         modelMap.put("historyPerson", historyPerson);
         modelMap.put("totality", totality);
         return "activeCenter";

donate-service/src/main/java/com/uas/service/donate/controller/OrgController.java

@@ -3,6 +3,7 @@ package com.uas.service.donate.controller;
 import com.alibaba.fastjson.JSONObject;
 
 import com.uas.service.donate.model.Org;
+import com.uas.service.donate.model.Project;
 import com.uas.service.donate.service.OrgService;
 import com.uas.service.donate.util.FileUrl;
 import com.uas.service.donate.util.HttpUtils;
@@ -10,11 +11,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 @Controller
@@ -86,4 +89,22 @@ public class OrgController {
 
         return org;
     }
+
+    /**
+     * 计算该机构捐款总人次
+     */
+    @ResponseBody
+    @RequestMapping(value = "/sumJoinPerson", method = RequestMethod.GET)
+    public Long sumJoinPerson(@RequestParam("orgId") Long orgId){
+        return orgService.sumJoinPerson(orgId);
+    }
+
+    /**
+     * 计算该机构捐款总善款
+     */
+    @ResponseBody
+    @RequestMapping(value = "/findProjectsByOrg", method = RequestMethod.GET)
+    public Double sumTotalMoney(@RequestParam("orgId") Long orgId){
+        return orgService.sumTotalMoney(orgId);
+    }
 }

donate-service/src/main/java/com/uas/service/donate/dao/ProjectDao.java

@@ -79,4 +79,16 @@ public interface ProjectDao extends JpaRepository<Project,Long>,JpaSpecification
      */
     @Query("select sum(p.totalAmount) from Project p where p.status = 1 and p.publish = 1")
     Double findAllDonationHistory();
+
+    /**
+     * 查出某机构下的所有项目
+     */
+    @Query("from Project  p where p.orgId=:orgId")
+    List<Project> findProjectsByOrg(@Param("orgId") Long orgId);
+
+    /**
+     * 获取某项目的两个相关项目
+     */
+ /*   @Query("from Project p where p.type")
+    List<Project> findSimilar(@Param("id")Long id)*/
 }

donate-service/src/main/java/com/uas/service/donate/model/Project.java

@@ -15,7 +15,7 @@ import java.util.Date;
 public class Project implements Serializable{
 
     private static final long serialVersionUID = 1L;
-    private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+    private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
     /**
      * 项目编号

donate-service/src/main/java/com/uas/service/donate/service/OrgService.java

@@ -8,4 +8,10 @@ public interface OrgService {
     Org save(Org org);
 
     Org findOne(Long id);
+
+    //计算该机构的捐款总人次
+    Long sumJoinPerson(Long orgId);
+
+    //计算该机构的捐款总数
+    Double sumTotalMoney(Long orgId);
 }

donate-service/src/main/java/com/uas/service/donate/service/ProjectService.java

@@ -61,4 +61,7 @@ public interface ProjectService {
     //根据area查询所有已结束项目
     Page<Project> findEndProjectArea(Pageable pageable,String area);
 
+    //找出某机构下面的所有项目
+    List<Project> findProjectsByOrg(Long orgId);
+
 }

donate-service/src/main/java/com/uas/service/donate/service/impl/OrgServiceImpl.java

@@ -3,9 +3,12 @@ package com.uas.service.donate.service.impl;
 import com.uas.service.donate.dao.OrgDao;
 import com.uas.service.donate.model.*;
 import com.uas.service.donate.service.OrgService;
+import com.uas.service.donate.service.ProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 @Service
 public class OrgServiceImpl implements OrgService{
@@ -13,6 +16,9 @@ public class OrgServiceImpl implements OrgService{
     @Autowired
     private OrgDao orgDao;
 
+    @Autowired
+    private ProjectService projectService;
+
     public Org save(Org org){
         return orgDao.saveAndFlush(org);
     }
@@ -20,4 +26,30 @@ public class OrgServiceImpl implements OrgService{
     public Org findOne(Long id){
         return orgDao.findOne(id);
     }
+
+    //计算该机构的捐款总人次
+    public Long sumJoinPerson(Long orgId){
+        Long sumJoinPerson=0L;
+        List<Project>projects=projectService.findProjectsByOrg(orgId);
+        for(Project project:projects){
+            Long joinAmount=project.getJoinAmount();
+             if(joinAmount!=null){
+                 sumJoinPerson+=joinAmount;
+             }
+        }
+        return sumJoinPerson;
+    }
+
+    //计算该机构的捐款总数
+    public Double sumTotalMoney(Long orgId){
+        Double sumTotalMoney=0.0;
+        List<Project> projects=projectService.findProjectsByOrg(orgId);
+        for(Project project:projects){
+            Double totalAmount=project.getTotalAmount();
+            if(totalAmount!=null){
+                sumTotalMoney+=totalAmount;
+            }
+        }
+        return sumTotalMoney;
+    }
 }

donate-service/src/main/java/com/uas/service/donate/service/impl/ProjectServiceImpl.java

@@ -171,4 +171,10 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
 
+    //找出某机构下面的所有项目
+    public List<Project> findProjectsByOrg(Long orgId){
+        return projectDao.findProjectsByOrg(orgId);
+    }
+
+
 }

donate-service/src/main/webapp/resources/css/kkpager_orange.css

@@ -0,0 +1,114 @@
+#kkpager{
+	clear:both;
+	color:#999;
+	padding:5px 0px 5px 0px;
+	font-size:13px;
+}
+#kkpager a{
+	float: left;
+	border: 1px solid #ccc;
+	display: inline;
+	padding: 3px 10px 3px 10px;
+	margin-right: 5px;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	cursor: pointer;
+	background: #fff;
+	text-decoration:none;
+	color:#999;
+}
+
+#kkpager span.disabled{
+	float: left;
+	display: inline;
+	padding: 3px 10px 3px 10px;
+	margin-right: 5px;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border:1px solid #DFDFDF;
+	background-color:#FFF;
+	color:#DFDFDF;
+}
+#kkpager span.curr{
+	float: left;
+	border: 1px solid #FF6600;
+	display: inline;
+	padding: 3px 10px 3px 10px;
+	margin-right: 5px;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	background: #FFEEE5;
+	color: #FF6600;
+}
+#kkpager a:hover{
+	border:1px solid #FF6600; 
+	background-color:#FF6600; 
+	color:#fff;
+}
+#kkpager span.normalsize{
+}
+#kkpager_gopage_wrap{
+	position:relative;
+	left:0px;
+	top:0px;
+}
+#kkpager_btn_go {
+	width:44px;
+	height:18px;
+	border:0px;
+	overflow:hidden;
+	line-height:140%;
+	padding:0px;
+	margin:0px;
+	text-align:center;
+	cursor:pointer;
+	background-color:#FF6600;
+	color:#FFF;
+	position:absolute;
+	left:0px;
+	top:-2px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	display:none;
+}
+#kkpager_btn_go_input{
+	width:36px;
+	height:14px;
+	color:#999;
+	text-align:center;
+	margin-left:1px;
+	margin-right:1px;
+	border:1px solid #DFDFDF;
+	position:relative;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	left:0px;
+	top:0px;
+	outline:none;
+}
+
+#kkpager_btn_go_input.focus{
+	border-color:#FF6600;
+}
+
+#kkpager .pageBtnWrap{
+	float:left;
+}
+#kkpager .infoTextAndGoPageBtnWrap{
+	float:right;
+}
+#kkpager .spanDot{
+	float:left;
+	margin-right:5px;
+}
+
+#kkpager .currPageNum{
+	color:#FD7F4D;
+}
+
+#kkpager .infoTextAndGoPageBtnWrap{
+	padding-top:5px;
+}