service更新代码

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

@@ -13,6 +13,7 @@ import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewResolverRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
+import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver;
 
 import java.nio.charset.Charset;
 import java.util.Arrays;
@@ -47,7 +48,6 @@ public class WebAppConfiguration extends WebMvcConfigurerAdapter {
 
 	@Override
 	public void addViewControllers(ViewControllerRegistry registry) {
-		registry.addViewController("/").setViewName("project");
 		registry.addViewController("/index").setViewName("index");
 		registry.addViewController("/console").setViewName("console");
 		registry.addViewController("/login/proxy").setViewName("proxyLogin");

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

@@ -0,0 +1,61 @@
+package com.uas.service.donate.controller;
+
+import com.uas.service.donate.model.Activity;
+import com.uas.service.donate.service.ActivityService;
+import com.uas.service.donate.service.ProjectRecodeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+
+@Controller
+public class ActiveCenterController {
+
+    @Autowired
+    private ProjectRecodeService projectRecodeService;
+
+    @Autowired
+    private ActivityService activityService;
+
+    @RequestMapping(value = "/activeCenter",method = RequestMethod.GET)
+    public String returnActivity(ModelMap modelMap,
+                                 @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){
+        //得到历史参与总人数
+        Long historyPerson = projectRecodeService.historyPerson();
+        //得到历史参与总捐款额
+        Double totality = projectRecodeService.totality();
+
+        PageRequest pageable=new PageRequest(page,size);
+
+        //根据活动状态查询出所有活动
+        if("进行中".equals(status)){
+             Page<Activity> activities=activityService.findInProcess(pageable);
+             modelMap.put("page",activities);
+        }else if("已结束".equals(status)){
+            Page<Activity> activities=activityService.findEndActivities(pageable);
+            modelMap.put("page",activities);
+        }else if("全部".equals(status)){
+            Page<Activity> activities=activityService.findAll(pageable);
+            modelMap.put("page",activities);
+        }
+
+        if(search!=null){
+            Page<Activity> activities=activityService.search(search,pageable);
+            modelMap.put("page",activities);
+        }
+
+        modelMap.put("historyPerson",historyPerson);
+        modelMap.put("totality",totality);
+
+        return "activeCenter";
+    }
+
+}

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

@@ -9,6 +9,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;
@@ -31,6 +32,7 @@ public class ActivityController {
     @Autowired
     private AwardService awardService;
 
+
     /**
      * 展示进行中和已结束的活动列表
      * @return
@@ -39,9 +41,9 @@ public class ActivityController {
     @RequestMapping("/getActivities")
     public List<Activity> getActivities(String status){
         List<Activity> activityList=new ArrayList<Activity>();
-        if(status=="进行中"){
+        if("进行中".equals(status)){
             return activityService.findInProcess();
-        }else if(status=="已结束"){
+        }else if("已结束".equals(status)){
             return activityService.findEndActivities();
         }
         return activityList;
@@ -65,6 +67,19 @@ public class ActivityController {
         return activityService.findInProcess();
     }
 
+    /**
+     * 分页，所有正在进行中的活动
+     * @param page
+     * @param size
+     * @return
+     */
+    @ResponseBody
+    public Page<Activity> findInProcess(@RequestParam(defaultValue = "0")int page,
+                                        @RequestParam(defaultValue = "7")int size){
+        PageRequest pageRequest=new PageRequest(page,size);
+        return  activityService.findInProcess(pageRequest);
+    }
+
     /**
      * 搜索出所有已结束的活动,当前时间大于活动结束时间
      * @return
@@ -75,6 +90,16 @@ public class ActivityController {
         return activityService.findEndActivities();
     }
 
+
+    /**
+     * 分页，查询所有进行中和已结束的活动
+     */
+    @ResponseBody
+    public Page<Activity> findAll(@RequestParam(defaultValue = "0")int page,
+                                  @RequestParam(defaultValue = "7")int size){
+        PageRequest pageRequest=new PageRequest(page,size);
+        return activityService.findAll(pageRequest);
+    }
     /**
      * 计算与活动相关的项目筹集的总金额
      * @param id
@@ -83,8 +108,7 @@ public class ActivityController {
     @ResponseBody
     @RequestMapping("/sumMoney/{id}")
     public ModelMap sumMoney(@PathVariable("id") Long id) {
-
         return new ModelMap("sum",activityService.sumMoney(id));
-
     }
+
 }

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

@@ -0,0 +1,148 @@
+package com.uas.service.donate.controller;
+
+import com.uas.service.donate.model.*;
+import com.uas.service.donate.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Controller
+public class AppController {
+
+    @Autowired
+    private ProjectRecodeService projectRecodeService;
+
+    @Autowired
+    private CarouselService carouselService;
+
+    @Autowired
+    private ProjectService projectService;
+
+    @Autowired
+    private ActivityController activityController;
+
+    @Autowired
+    private ActivityService activityService;
+
+    @Autowired
+    private ActivityRecodeService activityRecodeService;
+
+    @Autowired
+    private UserService userService;
+
+    /**
+     * 返回移动端首页轮播图
+     */
+    @ResponseBody
+    @RequestMapping("/appIndex")
+    public ModelMap returnapp(){
+        ModelMap modelMap=new ModelMap();
+        Double totality=projectRecodeService.totality();
+        //存入捐款总数
+        modelMap.put("totality",totality);
+        List<Carousel> carouselList=carouselService.findAll();
+        //存入首页轮播图
+        modelMap.put("carouselList",carouselList);
+        //查询项目中所有领域分类
+        List<String> allArea=projectService.allArea();
+        modelMap.put("allArea",allArea);
+        return modelMap;
+    }
+    /**
+     * 返回首页项目列表
+     */
+    @ResponseBody
+    @RequestMapping("/projects")
+    public ModelMap returnProjects(@RequestParam(value="area",defaultValue = "0")String area,
+                                   @RequestParam(value = "search",required = false)String search){
+        ModelMap modelMap=new ModelMap();
+        if(search!=null){
+            List<Project> projectList=projectService.search(search);
+            modelMap.put("projectList",projectList);
+        }
+        if(area!=null){
+            List<Project> projectList=projectService.findArea(area);
+            modelMap.put("projectList",projectList);
+        }
+        return modelMap;
+    }
+
+    /**
+     * 获取活动列表
+     */
+    @ResponseBody
+    @RequestMapping("/activities")
+    public ModelMap returnActivities(@RequestParam(value="status",defaultValue = "全部")String status,
+                                     @RequestParam(value = "search",required = false)String search){
+        ModelMap modelMap=new ModelMap();
+        if(status!=null){
+            List<Activity> activityList=activityController.getActivities(status);
+            modelMap.put("activityList",activityList);
+        }
+        if(search!=null){
+            List<Activity> activityList=activityService.search(search);
+            modelMap.put("activityList",activityList);
+        }
+        return modelMap;
+    }
+
+    /**
+     * 获取当前用户的捐款信息
+     * 传入用户UUID
+     */
+    @ResponseBody
+    @RequestMapping("/donateDetail/{uuid}")
+    public ModelMap projectRecodeList(@PathVariable("uuid") Long uuid){
+        ModelMap modelMap=new ModelMap();
+        List<ProjectRecode> projectRecodeList=projectRecodeService.findByuuid(uuid);
+        modelMap.put("projectRecodeList",projectRecodeList);
+        //计算参与的项目总数
+        Long sumJoin=projectRecodeService.sumJoin(uuid);
+        modelMap.put("sumJoin",sumJoin);
+        //捐赠的善款总数
+        Long sumMoney=projectRecodeService.sumMoney(uuid);
+        modelMap.put("sumMoney",sumMoney);
+        return modelMap;
+    }
+
+    /**
+     * 查询某一用户参与的活动
+     */
+    @ResponseBody
+    @RequestMapping("/joinActivity/{uuid}")
+    public ModelMap queryOne(@PathVariable("uuid")Long uuid){
+        ModelMap modelMap=new ModelMap();
+        List<ActivityRecode> activityRecodeList=activityRecodeService.queryOne(uuid);
+        modelMap.put("activityRecodeList",activityRecodeList);
+        //计算某人参与的活动总数
+        Long sumJoin=activityRecodeService.sumJoin(uuid);
+        modelMap.put("sumJoin",sumJoin);
+        return modelMap;
+    }
+
+    /**
+     * 个人中心列表
+     */
+    @ResponseBody
+    @RequestMapping("/center")
+    public ModelMap center(Long uuid){
+        ModelMap modelMap=new ModelMap();
+        //获取个人账户信息
+        User user=userService.findOne(uuid);
+        modelMap.put("user",user);
+        //捐赠的善款总数
+        Long sumMoney=projectRecodeService.sumMoney(uuid);
+        modelMap.put("sumMoney",sumMoney);
+        //计算某人参与的活动总数
+        Long sumActJoin=activityRecodeService.sumJoin(uuid);
+        modelMap.put("sumActJoin",sumActJoin);
+        //计算参与的项目总数
+        Long sumProJoin=projectRecodeService.sumJoin(uuid);
+        modelMap.put("sumProJoin",sumProJoin);
+        return modelMap;
+
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.uas.service.donate.controller;
+
+
+import com.uas.service.donate.model.SystemSession;
+import com.uas.service.donate.model.UserInfo;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+
+@RestController
+@RequestMapping("/authentication")
+public class AuthenticationController {
+
+    @RequestMapping(method = RequestMethod.GET, headers = "Accept=application/json")
+    @ResponseBody
+    @ResponseStatus(value = HttpStatus.OK)
+    public UserInfo getAuthentication(HttpSession session) {
+        if (SystemSession.getUser() == null) {
+            return null;
+        }
+        return new UserInfo(SystemSession.getUser());
+    }
+
+}

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

@@ -174,7 +174,9 @@ public class ProjectController {
      */
     @ResponseBody
     @RequestMapping("/pageArea")
-    public Page<Project> findPageArea(String area,int page,int size){
+    public Page<Project> findPageArea(@RequestParam(value = "page",defaultValue = "0")int page,
+                                      @RequestParam(value = "size",defaultValue = "7")int size,
+                                      String area){
         Pageable pageable=new PageRequest(page,size);
         return projectService.findPageArea(area,pageable);
     }
@@ -196,10 +198,22 @@ public class ProjectController {
      */
     @ResponseBody
     @RequestMapping("/search")
-    public List<Project> search(@RequestParam("search")String search){
+    public List<Project> search(String search){
         return projectService.search(search);
     }
 
+
+    /**
+     * 根据搜索框查找相应项目
+     */
+    @ResponseBody
+    @RequestMapping("/searchPage")
+    public Page<Project> searchPage(@RequestParam("search")String search,int page,int size){
+        Pageable pageable=new PageRequest(page,size);
+        return projectService.searchPage(pageable,search);
+    }
+
+
     /**
      * 保存项目
      * @param jsonStr

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

@@ -9,6 +9,7 @@ import com.uas.service.donate.service.ProjectService;
 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.ResponseBody;
 
 import java.util.List;
@@ -40,10 +41,10 @@ public class ProjectRecodeController {
      * @return
      */
     @ResponseBody
-    @RequestMapping("/join")
+    @RequestMapping(value = "/join")
     public ProjectRecode join(String jsonStr){
-        ProjectRecode projectRecode= JSONObject.parseObject(jsonStr,ProjectRecode.class);
 
+        ProjectRecode projectRecode= JSONObject.parseObject(jsonStr,ProjectRecode.class);
 
         return projectRecodeService.join(projectRecode);
     }

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

@@ -21,8 +21,6 @@ public class ProjectReportController {
     @RequestMapping("/save")
     public ProjectReport save(String jsonStr) {
         ProjectReport projectReport= JSONObject.parseObject(jsonStr,ProjectReport.class);
-        projectReport.setStatus(1);
-        projectReport.setSubmitTime(new Date());
         return projectReportService.save(projectReport);
     }
 

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

@@ -4,43 +4,25 @@ import com.uas.service.donate.model.*;
 import com.uas.service.donate.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
-
 @Controller
 public class indexController {
 
-    @Autowired
-    private ProjectRecodeController projectRecodeController;
-
     @Autowired
     private ProjectRecodeService projectRecodeService;
 
-    @Autowired
-    private CarouselService carouselService;
-
-    @Autowired
-    private ProjectController projectController;
-
     @Autowired
     private ProjectService projectService;
 
-    @Autowired
-    private ActivityController activityController;
-
-    @Autowired
-    private ActivityService activityService;
-
-    @Autowired
-    private ActivityRecodeService activityRecodeService;
 
-    @Autowired
-    private UserService userService;
+    @RequestMapping(value = "/",method = RequestMethod.GET)
+    public String returnaDefault(){
+        return "forward:/index";
+    }
 
     /**
      * 返回首页index.ftl的页面
@@ -49,146 +31,51 @@ public class indexController {
     public String returnIndex(Model model, @RequestParam(value = "page", defaultValue = "0") int page,
                               @RequestParam(value = "size", defaultValue = "7") int size,
                               @RequestParam(value = "area", defaultValue = "全部") String area,
-                              @RequestParam(value = "status", defaultValue = "全部") String status) {
+                              @RequestParam(value = "status", defaultValue = "全部") String status,
+                              @RequestParam(value = "search",required = false)String search) {
+
+        PageRequest pageable=new PageRequest(page,size);
+
         //得到历史参与总人数
         Long historyPerson = projectRecodeService.historyPerson();
         //得到历史参与总捐款额
         Double totality = projectRecodeService.totality();
 
-        //Pageable pageable=new PageRequest(page,size);
-
-        //领域是全部,那么只搜索状态
+        //展示不同的状态列表
         if (!"全部".equals(status) &&  "全部".equals(area)) {
-            Page<Project> projects = projectController.findStatus(status, page, size);
-            model.addAttribute("page", projects);
+            if("进行中".equals(status)){
+                Page<Project> projects=projectService.findInProcess(pageable);
+                model.addAttribute("page", projects);
+            }
+            if("已结束".equals(status)){
+                Page<Project> projects= projectService.findEndProject(pageable);
+                model.addAttribute("page", projects);
+            }
         } else if ("全部".equals(status) &&  !"全部".equals(area)) {
-            Page<Project> projects = projectController.findPageArea(area, page, size);
+            Page<Project> projects = projectService.findPageArea(area,pageable);
             model.addAttribute("page", projects);
         } else if ("全部".equals(status) &&  "全部".equals(area)) {
-            Page<Project> projects = projectController.findAll(page, size);
+            Page<Project> projects = projectService.findAll(pageable);
             model.addAttribute("page", projects);
         } else {
-            Page<Project> projects=projectController.searchAreaAndStatus(area,status,page,size);
+            if("进行中".equals(status)){
+                Page<Project> projects= projectService.findInProcessArea(pageable,area);
+                model.addAttribute("page",projects);
+            }else if("已结束".equals(status)){
+                Page<Project> projects= projectService.findEndProjectArea(pageable,area);
+                model.addAttribute("page",projects);
+            }
+        }
+
+        if(search!=null){
+            Page<Project> projects=projectService.searchPage(pageable,search);
             model.addAttribute("page",projects);
         }
 
-        List<Project> projectList = projectService.findProjects();
-        model.addAttribute("projects", projectList);
         model.addAttribute("historyPerson", historyPerson);
         model.addAttribute("totality", totality);
         return "index";
     }
 
-    /**
-     * 返回移动端首页轮播图
-     */
-    @ResponseBody
-    @RequestMapping("/appIndex")
-    public ModelMap returnapp(){
-        ModelMap modelMap=new ModelMap();
-        Double totality=projectRecodeService.totality();
-        //存入捐款总数
-        modelMap.put("totality",totality);
-        List<Carousel> carouselList=carouselService.findAll();
-        //存入首页轮播图
-        modelMap.put("carouselList",carouselList);
-        //查询项目中所有领域分类
-        List<String> allArea=projectService.allArea();
-        modelMap.put("allArea",allArea);
-        return modelMap;
-    }
-    /**
-     * 返回首页项目列表
-     */
-    @ResponseBody
-    @RequestMapping("/projects")
-    public ModelMap returnProjects(@RequestParam(value="area",defaultValue = "0")String area,
-                                   @RequestParam(value = "search",required = false)String search){
-        ModelMap modelMap=new ModelMap();
-        if(search!=null){
-            List<Project> projectList=projectService.search(search);
-            modelMap.put("projectList",projectList);
-        }
-        if(area!=null){
-            List<Project> projectList=projectService.findArea(area);
-            modelMap.put("projectList",projectList);
-        }
-        return modelMap;
-    }
-
-    /**
-     * 获取活动列表
-     */
-    @ResponseBody
-    @RequestMapping("/activities")
-    public ModelMap returnActivities(@RequestParam(value="status",defaultValue = "全部")String status,
-                                           @RequestParam(value = "search",required = false)String search){
-        ModelMap modelMap=new ModelMap();
-        if(status!=null){
-            List<Activity> activityList=activityController.getActivities(status);
-            modelMap.put("activityList",activityList);
-        }
-        if(search!=null){
-            List<Activity> activityList=activityService.search(search);
-            modelMap.put("activityList",activityList);
-        }
-        return modelMap;
-    }
 
-    /**
-     * 获取当前用户的捐款信息
-     * 传入用户UUID
-     */
-    @ResponseBody
-    @RequestMapping("/donateDetail/{uuid}")
-    public ModelMap projectRecodeList(@PathVariable("uuid") Long uuid){
-        ModelMap modelMap=new ModelMap();
-        List<ProjectRecode> projectRecodeList=projectRecodeService.findByuuid(uuid);
-        modelMap.put("projectRecodeList",projectRecodeList);
-        //计算参与的项目总数
-        Long sumJoin=projectRecodeService.sumJoin(uuid);
-        modelMap.put("sumJoin",sumJoin);
-        //捐赠的善款总数
-        Long sumMoney=projectRecodeService.sumMoney(uuid);
-        modelMap.put("sumMoney",sumMoney);
-        return modelMap;
-    }
-
-    /**
-     * 查询某一用户参与的活动
-     */
-    @ResponseBody
-    @RequestMapping("/joinActivity/{uuid}")
-    public ModelMap queryOne(@PathVariable("uuid")Long uuid){
-        ModelMap modelMap=new ModelMap();
-        List<ActivityRecode> activityRecodeList=activityRecodeService.queryOne(uuid);
-        modelMap.put("activityRecodeList",activityRecodeList);
-        //计算某人参与的活动总数
-        Long sumJoin=activityRecodeService.sumJoin(uuid);
-        modelMap.put("sumJoin",sumJoin);
-        return modelMap;
-    }
-
-    /**
-     * 个人中心列表
-     */
-    @ResponseBody
-    @RequestMapping("/center")
-    public ModelMap center(Long uuid){
-        ModelMap modelMap=new ModelMap();
-        //获取个人账户信息
-        User user=userService.findOne(uuid);
-        modelMap.put("user",user);
-        //捐赠的善款总数
-        Long sumMoney=projectRecodeService.sumMoney(uuid);
-        modelMap.put("sumMoney",sumMoney);
-        //计算某人参与的活动总数
-        Long sumActJoin=activityRecodeService.sumJoin(uuid);
-        modelMap.put("sumActJoin",sumActJoin);
-        //计算参与的项目总数
-        Long sumProJoin=projectRecodeService.sumJoin(uuid);
-        modelMap.put("sumProJoin",sumProJoin);
-        return modelMap;
-
-    }
 }

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

@@ -19,6 +19,9 @@ public interface ActivityDao extends JpaRepository<Activity,Long>,JpaSpecificati
     @Query("from Activity a where  a.publish=2 and NOW()>a.startTime")
     List<Activity> findAll();
 
+    @Query("from Activity a where  a.publish=2 and NOW()>a.startTime")
+    Page<Activity> findAll(Pageable pageable);
+
     //搜索出所有还未开始的活动,活动开始时间小于当前时间
     @Query("from Activity a where now()<a.startTime and publish=2")
     List<Activity> findNotStart();
@@ -27,10 +30,16 @@ public interface ActivityDao extends JpaRepository<Activity,Long>,JpaSpecificati
     @Query("from Activity a where now()>=a.startTime and now()<=a.endTime and publish=2")
     List<Activity> findInProcess();
 
+    @Query("from Activity a where now()>=a.startTime and now()<=a.endTime and publish=2")
+    Page<Activity> findInProcess(Pageable pageable);
+
     //搜索出所有已结束的活动,当前时间大于活动结束时间
     @Query("from Activity a where NOW()>a.endTime and publish=2")
     List<Activity> findEndActivities();
 
+    @Query("from Activity a where NOW()>a.endTime and publish=2")
+    Page<Activity> findEndActivities(Pageable pageable);
+
     //计算与活动相关的项目筹集的总金额
     @Query("select sum(p.totalAmount) from Project p where p.id in (select pq.proId from ProjectQualification pq where pq.activityId=:activityId)")
     Double sumMoney(@Param("activityId")Long activityId);
@@ -39,5 +48,8 @@ public interface ActivityDao extends JpaRepository<Activity,Long>,JpaSpecificati
     @Query("from Activity a where a.name like %:search% or a.id in (select aw.activityId from Award aw where aw.awardName like %:search%)")
     List<Activity> search(@Param("search")String search);
 
+    @Query("from Activity a where a.name like %:search% or a.id in (select aw.activityId from Award aw where aw.awardName like %:search%)")
+    Page<Activity> search(@Param("search")String search,Pageable pageable);
+
 }
 

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

@@ -54,6 +54,12 @@ public interface ProjectDao extends JpaRepository<Project,Long>,JpaSpecification
     @Query("from Project p where p.name like %:search% or p.orgName like %:search% and p.status=1 and p.publish=2 order by p.startTime desc")
     List<Project> search(@Param("search")String search);
 
+    /**
+     * 项目列表搜索出分页项目
+     */
+    @Query("from Project p where p.name like %:search% or p.orgName like %:search% and p.status=1 and p.publish=2 order by p.startTime desc")
+    Page<Project> searchPage(Pageable pageable,@Param("search")String search);
+
     /**
      * 查询出所有的项目分类
      */

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

@@ -16,6 +16,7 @@ public class ActivityRecodeServiceImpl implements ActivityRecodeService {
 
     public ActivityRecode save(ActivityRecode joinActivity){
 
+
         return activityRecodeDao.save(joinActivity);
     }
     public List<ActivityRecode> joins(Long activityId){

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

@@ -6,6 +6,8 @@ import com.uas.service.donate.model.Activity;
 import com.uas.service.donate.model.Award;
 import com.uas.service.donate.service.ActivityService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -47,6 +49,10 @@ public class ActivityServiceImpl implements ActivityService {
         return activityDao.save(list);
     }
 
+    public Page<Activity> findAll(Pageable pageable){
+        return activityDao.findAll(pageable);
+    }
+
     public Activity fingById(Long id){
         //根据活动id找出活动
         Activity activity=activityDao.findOne(id);
@@ -68,6 +74,10 @@ public class ActivityServiceImpl implements ActivityService {
         return activityDao.save(list);
     }
 
+    public Page<Activity> findInProcess(Pageable pageable){
+        return activityDao.findInProcess(pageable);
+    }
+
     //搜索出所有已结束的活动,当前时间大于活动结束时间
     public List<Activity> findEndActivities(){
 
@@ -78,6 +88,10 @@ public class ActivityServiceImpl implements ActivityService {
         return activityDao.save(list);
     }
 
+    public Page<Activity> findEndActivities(Pageable pageable){
+        return activityDao.findEndActivities(pageable);
+    }
+
     public Activity save(Activity activity){
         return activityDao.save(activity);
     }
@@ -92,4 +106,9 @@ public class ActivityServiceImpl implements ActivityService {
        return activityDao.search(search);
     }
 
+
+    public Page<Activity> search(String search,Pageable pageable){
+        return activityDao.search(search,pageable);
+    }
+
 }

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

@@ -17,4 +17,7 @@ public class OrgServiceImpl implements OrgService{
         return orgDao.saveAndFlush(org);
     }
 
+    public Org findOne(Long id){
+        return orgDao.findOne(id);
+    }
 }

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

@@ -1,8 +1,11 @@
 package com.uas.service.donate.impl;
 
+import com.uas.service.donate.dao.ProjectDao;
 import com.uas.service.donate.dao.ProjectRecodeDao;
+import com.uas.service.donate.model.Org;
 import com.uas.service.donate.model.Project;
 import com.uas.service.donate.model.ProjectRecode;
+import com.uas.service.donate.service.OrgService;
 import com.uas.service.donate.service.ProjectRecodeService;
 import com.uas.service.donate.service.ProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,33 +22,42 @@ public class ProjectRecordServiceImpl implements ProjectRecodeService {
     @Autowired
     private ProjectService projectService;
 
-    public List<ProjectRecode> findByuuid(Long uuid){
+    @Autowired
+    private OrgService orgService;
+
+    public List<ProjectRecode> findByuuid(Long uuid) {
         return projectRecodeDao.findByuuid(uuid);
     }
 
     //计算某人参与项目的次数
-    public Long sumJoin(Long uuid){
+    public Long sumJoin(Long uuid) {
         return projectRecodeDao.sumJoin(uuid);
     }
 
     //计算某人捐赠的总善款
-    public Long sumMoney(Long uuid){
+    public Long sumMoney(Long uuid) {
         return projectRecodeDao.sumMoney(uuid);
     }
 
     public ProjectRecode join(ProjectRecode projectRecode) {
         //得到此次捐款额
-        Double amount=projectRecode.getAmount();
+        Double amount = projectRecode.getAmount();
         //通过项目参与表的项目id，找到项目
-        Project project=projectService.findOne(projectRecode.getProId());
-        Double totalAmount=project.getTotalAmount();
-        totalAmount+=amount;
+        Project project = projectService.findOne(projectRecode.getProId());
+        //通过项目id找到机构
+        Org org = orgService.findOne(project.getOrgId());
+
+        Double totalAmount = project.getTotalAmount();
+        if (totalAmount == null) {
+            totalAmount = (double) 0;
+        }
+        totalAmount += amount;
         //重新设置该项目已筹集金额
         project.setTotalAmount(totalAmount);
         //得到该项目的参与人数
         Long joinAmount = project.getJoinAmount();
         if (joinAmount == null) {
-            joinAmount = (long)0;
+            joinAmount = (long) 0;
         }
         joinAmount++;
         //重新设置该项目的参与人数
@@ -53,34 +65,37 @@ public class ProjectRecordServiceImpl implements ProjectRecodeService {
         //保存项目
         projectService.save(project);
         //设置项目待支付状态
-        projectRecode.setStatus((short)1);
-       return projectRecodeDao.save(projectRecode);
+        projectRecode.setStatus((short) 1);
+        //设置项目名
+        projectRecode.setProjectName(project.getName());
+        //设置机构名
+        projectRecode.setOrgName(org.getName());
+        return projectRecodeDao.save(projectRecode);
     }
 
     //查询所有项目已筹集金额
-    public Double totality(){
+    public Double totality() {
         return projectRecodeDao.totality();
     }
 
     //查询所有的项目历史总参与人数
-    public Long historyPerson(){
+    public Long historyPerson() {
         return projectRecodeDao.historyPerson();
     }
 
     //查询某项目参与总人数
-    public Long sumPerson(Long proId){
+    public Long sumPerson(Long proId) {
         return projectRecodeDao.sumPerson(proId);
     }
 
     //查询某项目已筹集金额
-    public Double sumamount(Long proId){
+    public Double sumamount(Long proId) {
         return projectRecodeDao.sumamount(proId);
     }
 
     //根据捐款单号找到该条捐款单据
-    public ProjectRecode findOne(Long id){
+    public ProjectRecode findOne(Long id) {
         return projectRecodeDao.findOne(id);
     }
 
-
 }

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

@@ -6,6 +6,8 @@ import com.uas.service.donate.service.ProjectReportService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 @Service
 public class ProjectReportServiceImpl implements ProjectReportService {
 
@@ -13,7 +15,9 @@ public class ProjectReportServiceImpl implements ProjectReportService {
     private ProjectReportDao projectReportDao;
 
     public ProjectReport save(ProjectReport projectReport){
-            return projectReportDao.save(projectReport);
+        projectReport.setStatus(1);
+        projectReport.setSubmitTime(new Date());
+        return projectReportDao.save(projectReport);
     }
 
 }

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

@@ -161,6 +161,10 @@ public class ProjectServiceImpl implements ProjectService {
         return projectDao.search(search);
     }
 
+    public Page<Project> searchPage(Pageable pageable,String search){
+        return projectDao.searchPage(pageable,search);
+    }
+
     //查询项目中所有领域分类
     public List<String> allArea(){
         return projectDao.allArea();

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

@@ -1,6 +1,8 @@
 package com.uas.service.donate.model;
 
 
+import org.hibernate.engine.internal.Cascade;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
@@ -84,7 +86,7 @@ public class Activity implements Serializable{
     private Date submitTime;
 
     /**
-     * status   1:已保存 2：已提交
+     * publish   1:已保存 2：已提交
      */
     @Column(name="act_publish")
     private Integer publish;
@@ -147,10 +149,11 @@ public class Activity implements Serializable{
     @Column(name = "act_joinAmount")
     private Long joinAmount;
 
-    @Transient
+
+    @OneToMany(cascade = CascadeType.REFRESH)
     private  List<Award> awards;
 
-    @Transient
+    @OneToMany(cascade = CascadeType.REFRESH)
     private List<ProjectQualification> projectQualificationList;
 
     public Long getId() {

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

@@ -58,13 +58,6 @@ public class Award implements Serializable{
     @Column(name="aw_end_time")
     private Date endTime;
 
-//    /**
-//     * 活动编号
-//     */
-//    @ManyToOne(cascade = {CascadeType.MERGE, CascadeType.REFRESH})
-//    @JoinColumn(name = "act_id", nullable = false)
-//    private Activity activity;
-
 
     public Long getId() {
         return id;

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

@@ -178,7 +178,7 @@ public class Org implements Serializable{
      * 负责人个人手机
      */
     @Column(name="org_manager_mobile")
-    private Long managerMobile;
+    private String managerMobile;
 
     /**
      * 联系人姓名
@@ -196,7 +196,7 @@ public class Org implements Serializable{
      * 联系人电话
      */
     @Column(name="org_contact_tel")
-    private Long contactTel;
+    private String contactTel;
 
 
     /**
@@ -510,11 +510,11 @@ public class Org implements Serializable{
         this.managerOph = managerOph;
     }
 
-    public Long getManagerMobile() {
+    public String getManagerMobile() {
         return managerMobile;
     }
 
-    public void setManagerMobile(Long managerMobile) {
+    public void setManagerMobile(String managerMobile) {
         this.managerMobile = managerMobile;
     }
 
@@ -534,11 +534,11 @@ public class Org implements Serializable{
         this.contactIdcard = contactIdcard;
     }
 
-    public Long getContactTel() {
+    public String getContactTel() {
         return contactTel;
     }
 
-    public void setContactTel(Long contactTel) {
+    public void setContactTel(String contactTel) {
         this.contactTel = contactTel;
     }
 

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

@@ -14,33 +14,50 @@ public class User implements Serializable{
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 用户uu号
+     */
     @Id
     @GeneratedValue(strategy= GenerationType.IDENTITY)
-    @Column(name="user_id")
-    private  Long id;
+    @Column(name = "user_uu")
+    private Long userUU;
 
+    /**
+     * 用户名
+     */
     @Column(name = "user_name")
     private String name;
 
+    /**
+     * 用户密码
+     */
+    @Column(name = "user_pwd")
+    private String pwd;
+
+    /**
+     * 用户手机号
+     */
     @Column(name = "user_tel")
     private Long tel;
 
     @Column(name = "user_identity")
     private Integer identity;
 
-    @Column(name = "user_uu")
-    private Long userUU;
-
+    /**
+     * 用户在的公司
+     */
     @Column(name = "user_company")
     private String company;
 
-    public Long getId() {
-        return id;
-    }
+    @Column(name = "user_imid")
+    private Long userIMId;
+
+    /**
+     *用户所属类型
+     */
+    @Column(name = "user_type")
+    private String type;
 
-    public void setId(Long id) {
-        this.id = id;
-    }
 
     public String getName() {
         return name;
@@ -81,4 +98,28 @@ public class User implements Serializable{
     public void setCompany(String company) {
         this.company = company;
     }
+
+    public String getPwd() {
+        return pwd;
+    }
+
+    public void setPwd(String pwd) {
+        this.pwd = pwd;
+    }
+
+    public Long getUserIMId() {
+        return userIMId;
+    }
+
+    public void setUserIMId(Long userIMId) {
+        this.userIMId = userIMId;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 }

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

@@ -0,0 +1,8 @@
+package com.uas.service.donate.model;
+
+public class UserInfo {
+
+    public UserInfo(User user){
+
+    }
+}

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

@@ -11,15 +11,21 @@ public interface ActivityService {
     //搜索出所有进行中和已结束的活动
     List<Activity> findAll();
 
+    Page<Activity> findAll(Pageable pageable);
+
     //通过活动id，找到某一活动
     Activity fingById(Long id);
 
     //搜索出所有正在进行的活动
     List<Activity> findInProcess();
 
+    Page<Activity> findInProcess(Pageable pageable);
+
     //搜索出所有已结束的活动,当前时间大于活动结束时间
     List<Activity> findEndActivities();
 
+    Page<Activity> findEndActivities(Pageable pageable);
+
     Activity save(Activity activity);
 
     //计算与活动相关的项目筹集的总金额
@@ -27,4 +33,6 @@ public interface ActivityService {
 
     //根据活动名关键字，奖品名关键字查询活动
     List<Activity> search(String search);
+
+    Page<Activity> search(String search,Pageable pageable);
 }

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

@@ -6,4 +6,6 @@ public interface OrgService {
 
     //提交机构申请表单
     Org save(Org org);
+
+    Org findOne(Long id);
 }

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

@@ -6,5 +6,4 @@ import com.uas.service.donate.model.ProjectReport;
 
 public interface ProjectReportService {
     ProjectReport save(ProjectReport projectReport);
-
 }

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

@@ -50,6 +50,8 @@ public interface ProjectService {
     //查询项目方法
     List<Project> search(String search);
 
+    Page<Project> searchPage(Pageable pageable,String search);
+
     //查询项目中所有领域分类
     List<String> allArea();
 

donate-service/src/main/webapp/WEB-INF/views/activeCenter.html → donate-service/src/main/resources/templates/activeCenter.ftl

@@ -12,6 +12,8 @@
     <link href="static/images/icon/u.png" rel="icon" type="image/x-icon" />
     <link rel="stylesheet" href="static/css/bootstrap.min.css">
     <link rel="stylesheet" href="static/css/base.css">
+    <link rel="stylesheet" type="text/css" href="static/css/kkpager_blue.css" />
+    <script type="text/javascript" src="static/lib/kkpager/kkpager.js"></script>
     <style>
         body{
             font-family: "Microsoft Yahei", "微软雅黑";
@@ -433,14 +435,15 @@
                     <a href="/index"><span>项目中心</span></a><span class="active">活动中心</span>
                 </div>
                 <!--切换-->
+                <!--切换&ndash;&gt;-->
                 <div class="buttons show">
                     <div class="bottom-item">
                         <div class="title"><span>历史参加人数</span></div>
-                        <div class="count"><span class="historyperson"></span><span>人次</span></div>
+                        <div class="count"><span class="historyperson">${historyPerson!''}</span><span>人次</span></div>
                     </div>
                     <div class="bottom-item">
                         <div class="title"><span>历史捐款总额</span></div>
-                        <div class="count" style="margin-left: -10px;"><span class="totality"></span><span>元</span></div>
+                        <div class="count" style="margin-left: -10px;"><span class="totality">${totality!''}</span><span>元</span></div>
                     </div>
                 </div>
                 <div class="buttons">
@@ -459,125 +462,143 @@
             <div class="status">
                 <div class="form-group">
                     <label for="">活动状态：</label>
-                    <select name="" id="">
-                        <option value="">全部</option>
+                    <select name="" id="chooseStatus">
+                        <option>全部</option>
+                        <option>进行中</option>
+                        <option>已结束</option>
                     </select>
                 </div>
                 <div class="form-group form-groups">
-                    <input type="text" class="form-control" placeholder="请输入关键词"/>
+                    <input type="text" class="form-control" placeholder="请输入关键词" id="search"/>
                     <img src="static/images/index/search.png" alt=""/>
                 </div>
             </div>
+            <#if page?exists>
+            <#list page.content as activity>
             <div class="list-item clearfix">
                 <div class="project-img fl">
                     <a href="activeDetail"><img src="static/images/activeCenter/reward.png" alt=""/></a>
                 </div>
                 <div class="project-detail fl">
-                    <p><a href="activeDetail">优软一元捐感恩回馈活动一</a></p>
-                    <div class="clearfix">
-                        <span class="fl">活动奖品：</span>
-                        <div class="fl">
-                            <span class="award">一等奖：XXXXX(1份)</span><span class="award">二等奖：CCCCCCCC(5份)</span><span class="award">参与奖：QQQQ(50份)</span>
-                        </div>
-                    </div>
-                    <div><span>参与时间：</span><span>2017-08-20至2017-09-10</span></div>
-                </div>
-                <div class="project-progress fr">
-                    <span>进行中</span>
-                </div>
-            </div>
-            <div class="list-item clearfix">
-                <div class="project-img fl">
-                    <a href="activeDetail"><img src="static/images/activeCenter/reward.png" alt=""/></a>
-                </div>
-                <div class="project-detail fl">
-                    <p><a href="activeDetail">优软一元捐感恩回馈活动三</a></p>
-                    <div class="clearfix">
-                        <span class="fl">活动奖品：</span>
-                        <div class="fl">
-                            <span class="award">一等奖：XXXXX(1份)</span><span class="award">二等奖：CCCCCCCC(5份)</span><span class="award">参与奖：QQQQ(50份)</span>
-                        </div>
-                    </div>
-                    <div><span>参与时间：</span><span>2017-08-20至2017-09-10</span></div>
-                </div>
-                <div class="project-progress fr">
-                    <span>兑奖截止日期</span>
-                    <p>2017-09-30</p>
-                </div>
-            </div>
-            <div class="list-item clearfix">
-                <div class="project-img fl">
-                    <a href="activeDetail"><img src="static/images/activeCenter/reward.png" alt=""/></a>
-                </div>
-                <div class="project-detail fl">
-                    <p><a href="activeDetail">优软一元捐感恩回馈活动一</a></p>
-                    <div class="clearfix">
-                        <span class="fl">活动奖品：</span>
-                        <div class="fl">
-                            <span class="award">一等奖：XXXXX(1份)</span><span class="award">二等奖：CCCCCCCC(5份)</span><span class="award">参与奖：QQQQ(50份)</span>
-                        </div>
-                    </div>
-                    <div><span>参与时间：</span><span>2017-08-20至2017-09-10</span></div>
-                </div>
-                <div class="project-progress fr">
-                    <span class="await">待开奖</span>
-                </div>
-            </div>
-            <div class="list-item clearfix">
-                <div class="project-img fl">
-                    <a href="activeDetail"><img src="static/images/activeCenter/reward.png" alt=""/></a>
-                </div>
-                <div class="project-detail fl">
-                    <p><a href="activeDetail">优软一元捐感恩回馈活动一</a></p>
+                    <p><a href="activeDetail">${activity.name!''}</a></p>
                     <div class="clearfix">
                         <span class="fl">活动奖品：</span>
                         <div class="fl">
                             <span class="award">一等奖：XXXXX(1份)</span><span class="award">二等奖：CCCCCCCC(5份)</span><span class="award">参与奖：QQQQ(50份)</span>
                         </div>
                     </div>
-                    <div><span>参与时间：</span><span>2017-08-20至2017-09-10</span></div>
+                    <div><span>参与时间：</span><span>${activity.startTime}至${activity.endTime}</span></div>
                 </div>
                 <div class="project-progress fr">
-                    <span>进行中</span>
+                    <span>${activity.stage}</span>
                 </div>
             </div>
+            </#list>
+            </#if>
+            <#-- 分页按钮-->
+            <div id="kkpager"></div>
+
         </div>
     </div>
 </div>
 <!--js begin-->
 <script type="text/javascript" src="static/js/jquery-1.9.1.min.js"></script>
 <script type="text/javascript" src="static/js/bootstrap.min.js"></script>
-<!--<script type="text/javascript" src="static/lib/require.js"
-        data-main="static/js/activity/main.js"></script>-->
+
 <script>
-//    banner
+    //    banner
     $('#myCarousel').carousel({
         interval: 5000
     })
-//    点击切换
+    //    点击切换
     $('.button').on('click', 'span', function () {
         var index = $(this).index();
         $(this).addClass('active').siblings().removeClass('active');
         $('.buttons').eq(index).addClass('show').siblings().removeClass('show');
     });
-$(document).ready(function(){
-    $.ajax({
-        url:"/projectrecode/historyperson",
-        type:"GET",
-        dataType:"JSON",
-        success:function(data){
-            $(".historyperson").text(data);
-        }
+
+    //随着状态跳转到不同的路径
+    $("#chooseStatus").change(function(){
+        //得到被选中的状态下拉框文本值
+        var status=$("#chooseStatus").find("option:selected").text();
+        window.location.href="http://localhost:8084/activeCenter?status="+status;
     })
-    $.ajax({
-        url:"/projectrecode/totality",
-        type:"GET",
-        dataType:"JSON",
-        success:function(data){
-            $(".totality").text(data);
+
+    //获取浏览器地址参数值
+    function getUrlParam(key){
+        //获取地址栏参数
+        var url=window.location.search;
+
+        var reg=new RegExp("(^|&)"+ key +"=([^&]*)(&|$)");
+        //匹配目标参数
+        var result=url.substr(1).match(reg);
+        //返回参数值
+        return result?decodeURIComponent(result[2]) : null;
+    }
+    //得到地址栏上状态的参数值
+    var status=getUrlParam('status');
+    var search=getUrlParam('search');
+    var pno=getUrlParam('page');
+
+    //状态下拉框赋值
+    $("#chooseStatus").val(status);
+    //对搜索框赋值
+    $("#search").val(search);
+
+    //搜索框的回车事件
+   $("#search").keydown(function(){
+        if(event.keyCode==13){
+            var search=$("#search").val();
+            window.location.href="http://localhost:8084/activeCenter?search="+search;
         }
-    })
-});
+   })
+
+    //生成分页代码
+    kkpager.generPageHtml({
+        pno : pno+1,//当前页,pno是0开始，而分页页码是1开始
+        mode : 'click', //设置为click模式
+        //总页码
+        total : '${page.totalPages!''}',
+        //总数据条数
+        totalRecords : '${page.totalElements!''}',
+        //点击页码、页码输入框跳转、以及首页、下一页等按钮都会调用click
+        //适用于不刷新页面，比如ajax
+        click : function(pno){
+            this.selectPage(pno);
+            searchpage(pno);
+        }
+        ,lang				: {
+            firstPageText			: '首页',
+            firstPageTipText		: '首页',
+            lastPageText			: '尾页',
+            lastPageTipText			: '尾页',
+            prePageText				: '上一页',
+            prePageTipText			: '上一页',
+            nextPageText			: '下一页',
+            nextPageTipText			: '下一页',
+            totalPageBeforeText		: '共',
+            totalPageAfterText		: '页',
+            currPageBeforeText		: '当前第',
+            currPageAfterText		: '页',
+            totalInfoSplitStr		: '/',
+            totalRecordsBeforeText	: '共',
+            totalRecordsAfterText	: '条数据',
+            gopageBeforeText		: ' 转到',
+            gopageButtonOkText		: '确定',
+            gopageAfterText			: '页',
+            buttonTipBeforeText		: '第',
+            buttonTipAfterText		: '页'
+        }
+
+    });
+    /*选择页码，页面跳转，这里的pno是只点击的页码值*/
+    function searchpage(pno) {
+        //得到被选中的领域下拉框的文本值
+        var area=$("#chooseArea").find("option:selected").text();
+        //得到被选中的状态下拉框文本值
+        var status=$("#chooseStatus").find("option:selected").text();
+        window.location.href="http://localhost:8084/activeCenter?status="+status+"&&page="+(pno-1);
+    }
 </script>
 </body>
 </html>

donate-service/src/main/resources/templates/index.ftl

@@ -583,8 +583,8 @@
 <div class="container clearfix">
     <div class="fl"><a href=""><img src="static/images/uas.png" alt=""/></a><span>一元捐</span></div>
     <div class="fr">
-        <a ng-if = "!user" ng-click="signinModal()" href="javascript:void(0)">登录</a>
-        <a ng-if = "!user" ng-click="registerModal()" href="javascript:void(0)">注册</a>
+        <a href="https://account.ubtob.com/sso/login">登录</a>
+        <a href="javascript:void(0)">注册</a>
         <a href="http://www.ubtob.com/" target="_blank">进入优软云</a>
     </div>
 </div>
@@ -651,23 +651,13 @@
                         <div class="count" style="margin-left: -10px;"><span class="totality">${totality!''}</span><span>元</span></div>
                     </div>
                 </div>
-                <div class="buttons">
-                    <div class="bottom-item">
-                        <div class="title"><span>历史参加人数</span></div>
-                        <div class="count"><span class="historyperson"></span><span>人次</span></div>
-                    </div>
-                    <div class="bottom-item">
-                        <div class="title"><span>历史捐款总额</span></div>
-                        <div class="count" style="margin-left: -10px;"><span class="totality"></span><span>元</span></div>
-                    </div>
-                </div>
             </div>
         </div>
         <div class="section section2">
             <div class="status">
                 <div class="form-group">
                     <label for="">项目状态：</label>
-                    <select name="" id="chooseStatus">
+                    <select id="chooseStatus">
                         <option>全部</option>
                         <option>进行中</option>
                         <option>已结束</option>
@@ -675,7 +665,7 @@
                 </div>
                 <div class="form-group">
                     <label for="">项目领域：</label>
-                    <select name="" id="chooseArea">
+                    <select id="chooseArea">
                         <option>全部</option>
                         <option>环保/保护动物</option>
                         <option>疾病救助</option>
@@ -684,7 +674,7 @@
                     </select>
                 </div>
                 <div class="form-group form-groups">
-                    <input type="text" class="form-control" placeholder="请输入关键词"/>
+                    <input type="text" class="form-control" placeholder="请输入关键词" id="search"/>
                     <img src="static/images/index/search.png" alt=""/>
                 </div>
             </div>
@@ -703,27 +693,14 @@
                 </div>
                 <div class="project-progress fr">
                     <div><span>项目状态：<em>${project.overdue!''}</em></span></div>
-                    <div><span>已参与：<em>${project.joinAmount!''}</em>人</span></div>
-                    <div><span>已筹款：<em>${project.totalAmount!''}</em>元<#if project.target??>（${project.totalAmount/project.target*100!''}%）</#if></span></div>
+                    <div><span>已参与：<em>${project.joinAmount!'0'}</em>人</span></div>
+                    <div><span>已筹款：<em>${project.totalAmount!'0'}</em>元<#if project.target?exists><#if project.totalAmount?exists>(${project.totalAmount/project.target*100!''}%)</#if></#if>></span></div>
                 </div>
                 <a class="fr donation" data-toggle="modal" data-target="#layer">我要捐款</a>
             </div>
             </#list>
             </#if>
-            <div class="page">
-                <ul>
-                    <li>总页数${page.totalPages }</li>
-                    <li>总数据${page.totalElements}</li>
-                    <li class="list active"><a href="">1</a></li>
-                    <li class="list"><a href="">2</a></li>
-                    <li class="list"><a href="">3</a></li>
-                    <li class="list"><a href="">4</a></li>
-                    <li class="list"><a href="">5</a></li>
-                    <li class="omit"><a href="">...</a></li>
-                    <li class="list"><a href="">20</a></li>
-                    <li class="list next"><a href="">下一页</a></li>
-                </ul>
-            </div>
+           <#-- 分页按钮-->
             <div id="kkpager"></div>
         </div>
     </div>
@@ -780,9 +757,26 @@
         $(this).addClass('active').siblings().removeClass('active');
         $('.buttons').eq(index).addClass('show').siblings().removeClass('show');
     })
+    //获取地址栏参数值
+    function getUrlParam(key){
+        // 获取参数
+        var url = window.location.search;
+        // 正则筛选地址栏
+        var reg = new RegExp("(^|&)"+ key +"=([^&]*)(&|$)");
+        // 匹配目标参数
+        var result = url.substr(1).match(reg);
+        //返回参数值
+        return result ? decodeURIComponent(result[2]) : null;
+    }
+    var area=getUrlParam('area');
+    var status=getUrlParam('status');
+    var pno=getUrlParam('page');
+    var search=getUrlParam('search');
+
+
     //生成分页代码
     kkpager.generPageHtml({
-        pno : ${page.number},
+        pno : pno+1,//当前页
         mode : 'click', //设置为click模式
         //总页码
         total : '${page.totalPages!''}',
@@ -790,63 +784,50 @@
         totalRecords : '${page.totalElements!''}',
         //点击页码、页码输入框跳转、以及首页、下一页等按钮都会调用click
         //适用于不刷新页面，比如ajax
-        click : function(n){
-            this.selectPage(n);
-            search(n);
-            alert(n);
+        click : function(pno){
+            this.selectPage(pno);
+            searchpage(pno);
         }
         ,lang				: {
-        firstPageText			: '首页',
-                firstPageTipText		: '首页',
-                lastPageText			: '尾页',
-                lastPageTipText			: '尾页',
-                prePageText				: '上一页',
-                prePageTipText			: '上一页',
-                nextPageText			: '下一页',
-                nextPageTipText			: '下一页',
-                totalPageBeforeText		: '共',
-                totalPageAfterText		: '页',
-                currPageBeforeText		: '当前第',
-                currPageAfterText		: '页',
-                totalInfoSplitStr		: '/',
-                totalRecordsBeforeText	: '共',
-                totalRecordsAfterText	: '条数据',
-                gopageBeforeText		: ' 转到',
-                gopageButtonOkText		: '确定',
-                gopageAfterText			: '页',
-                buttonTipBeforeText		: '第',
-                buttonTipAfterText		: '页'
-    }
+            firstPageText			: '首页',
+            firstPageTipText		: '首页',
+            lastPageText			: '尾页',
+            lastPageTipText			: '尾页',
+            prePageText				: '上一页',
+            prePageTipText			: '上一页',
+            nextPageText			: '下一页',
+            nextPageTipText			: '下一页',
+            totalPageBeforeText		: '共',
+            totalPageAfterText		: '页',
+            currPageBeforeText		: '当前第',
+            currPageAfterText		: '页',
+            totalInfoSplitStr		: '/',
+            totalRecordsBeforeText	: '共',
+            totalRecordsAfterText	: '条数据',
+            gopageBeforeText		: ' 转到',
+            gopageButtonOkText		: '确定',
+            gopageAfterText			: '页',
+            buttonTipBeforeText		: '第',
+            buttonTipAfterText		: '页'
+        }
 
     });
     /*页面跳转*/
-    function search(n) {
+    function searchpage(pno) {
         //得到被选中的领域下拉框的文本值
         var area=$("#chooseArea").find("option:selected").text();
         //得到被选中的状态下拉框文本值
         var status=$("#chooseStatus").find("option:selected").text();
-        window.location.href="http://localhost:8084/index?area="+area+"&&status="+status+"&&page="+(n-1);
+        window.location.href="http://localhost:8084/index?area="+area+"&&status="+status+"&&page="+(pno-1);
     }
 
-    //获取地址栏参数值
-    function getUrlParam(key){
-        // 获取参数
-        var url = window.location.search;
-        // 正则筛选地址栏
-        var reg = new RegExp("(^|&)"+ key +"=([^&]*)(&|$)");
-        // 匹配目标参数
-        var result = url.substr(1).match(reg);
-        //返回参数值
-        return result ? decodeURIComponent(result[2]) : null;
-    }
-    var area=getUrlParam('area');
-    var status=getUrlParam('status');
-
     $('#chooseArea').val(area);
 
     $('#chooseStatus').val(status);
 
-    //项目领域下拉框
+    $('#search').val(search);
+
+    //项目领域下拉框查询项目
         $("#chooseArea").change(function(){
             //得到被选中的领域下拉框的文本值
             var area=$("#chooseArea").find("option:selected").text();
@@ -855,7 +836,7 @@
             window.location.href="http://localhost:8084/index?area="+area+"&&status="+status;
         })
 
-    //项目状态下拉框
+    //项目状态下拉框查询项目
     $("#chooseStatus").change(function () {
         //得到被选中的领域下拉框的文本值
         var area=$("#chooseArea").find("option:selected").text();
@@ -863,6 +844,14 @@
         var status=$("#chooseStatus").find("option:selected").text();
         window.location.href="http://localhost:8084/index?area="+area+"&&status="+status;
     })
+
+    //input搜索框查询项目
+    $("#search").keydown(function(event){
+      if(event.keyCode==13){
+          var search=$("#search").val();
+          window.location.href="http://localhost:8084/index?search="+search;
+      }
+    })
 </script>
 </body>
 </html>

donate-service/src/main/resources/templates/test.ftl

@@ -1,5 +0,0 @@
-<html>
-<body>
-hello world
-</body>
-</html>