页面修改，轮播图

donate-console/src/main/java/com/uas/console/donate/RestTemplateConfig.java

@@ -0,0 +1,14 @@
+package com.uas.console.donate;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+public class RestTemplateConfig {
+
+    @Bean
+    public RestTemplate restTemplate(){
+        return new RestTemplate();
+    }
+}

donate-console/src/main/java/com/uas/console/donate/controller/CarouselController.java

@@ -0,0 +1,26 @@
+package com.uas.console.donate.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.uas.console.donate.service.CarouselService;
+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.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Controller
+@RequestMapping("/carousels")
+public class CarouselController {
+
+    @Autowired
+    private CarouselService carouselService;
+
+    @ResponseBody
+    @RequestMapping("/getAll")
+    public List<JSONObject> getCarousels(@RequestParam("useFor") String useFor){
+        return carouselService.getCarousels(useFor);
+    }
+}

donate-console/src/main/java/com/uas/console/donate/impl/CarouselServiceImpl.java

@@ -0,0 +1,33 @@
+package com.uas.console.donate.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.uas.console.donate.model.MicroServicesConf;
+import com.uas.console.donate.service.CarouselService;
+import com.uas.console.donate.util.JsonUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.List;
+
+@Service
+public class CarouselServiceImpl implements CarouselService{
+
+    private final MicroServicesConf conf;
+
+    private final RestTemplate restTemplate;
+
+    @Autowired
+    public CarouselServiceImpl(MicroServicesConf conf, RestTemplate restTemplate) {
+        this.conf = conf;
+        this.restTemplate = restTemplate;
+    }
+
+    public List<JSONObject> getCarousels(String useFor){
+        String url=conf.getRequestUrlForCarousel(20030,"/carousels?usedFor="+useFor);
+        String result=restTemplate.getForEntity(url,String.class).getBody();
+        List<JSONObject> r= JsonUtil.parseJsonToObject(result);
+        return r;
+    }
+
+}

donate-console/src/main/java/com/uas/console/donate/model/Carousel.java

@@ -1,5 +1,7 @@
 package com.uas.console.donate.model;
 
+import org.springframework.beans.factory.annotation.Value;
+
 import javax.persistence.*;
 
 /**
@@ -16,6 +18,9 @@ public class Carousel {
     @Column(name = "car_id")
     private Long id;
 
+    @Value("http://10.10.101.23")
+    private String server;
+
     /**
      * 图片名称
      */

donate-console/src/main/java/com/uas/console/donate/service/CarouselService.java

@@ -0,0 +1,13 @@
+package com.uas.console.donate.service;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.uas.console.donate.model.Carousel;
+
+import java.util.List;
+
+public interface CarouselService {
+
+    List<JSONObject> getCarousels(String useFor);
+
+}

donate-console/src/main/java/com/uas/console/donate/util/JsonUtil.java

@@ -0,0 +1,78 @@
+package com.uas.console.donate.util;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import net.sf.json.JSONArray;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Json工具类，利用Jackson完成一些复杂类型的json序列化与反序列化
+ *
+ * @author yangck
+ * @create 2016-11-18 9:21
+ */
+public class JsonUtil {
+
+    private static ObjectMapper mapper = new ObjectMapper();;
+
+    /**
+     * 将Map对象序列化为json字符串
+     * @param map
+     * @return
+     */
+    public static String writeValueAsString(Map<String,? extends Object> map) throws JsonProcessingException {
+        String json = mapper.writeValueAsString(map);
+        return json;
+    }
+
+    /**
+     * 将Map对象序列化为具有良好可读性的json字符串
+     * @param map
+     * @return
+     * @throws JsonProcessingException
+     */
+    public static String writeValueAsPrettyString(Map<String,? extends Object> map) throws JsonProcessingException {
+        String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map);
+        return json;
+    }
+
+    /**
+     * 将json字符串解析为Map对象
+     * @param json
+     * @param <V>
+     * @return
+     */
+    public static <V> Map<String, V> parseJsonToMap(String json) throws IOException {
+        Map<String, V> map = mapper.readValue(json, new TypeReference<HashMap<String, V>>() {});
+
+        return map;
+    }
+
+    /**
+     * json array to JsonArray
+     * @param jsonArray
+     * @return
+     */
+    public static JSONArray parseJsonToArray(String jsonArray) {
+        try {
+            return mapper.readValue(jsonArray, JSONArray.class);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return new JSONArray();
+    }
+
+    public static <T> T parseJsonToObject(String json) {
+        T result = null;
+        try {
+            result = mapper.readValue(json, new TypeReference<T>(){});
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+}

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

@@ -55,12 +55,6 @@ public class ActiveCenterController {
         //根据活动状态查询出所有活动
         if ("进行中".equals(status)) {
             Page<Activity> activities = activityService.findInProcess(pageable);
-            List<Award> awardList=new ArrayList<Award>();
-            for(Activity activity:activities){
-                awardList=awardService.getAwards(activity.getId());
-                modelMap.put("awards",awardList);
-            }
-
             modelMap.put("page", activities);
         } else if ("已结束".equals(status)) {
             Page<Activity> activities = activityService.findEndActivities(pageable);

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

@@ -88,16 +88,15 @@ public class ActivityController {
         return activityService.findEndActivities();
     }
 
-/*
-    *//**
-     * 分页，查询所有进行中和已结束的活动
-     *//*
+
+
     @ResponseBody
+    @RequestMapping("/test")
     public Page<Activity> findAll(@RequestParam(defaultValue = "0")int page,
                                   @RequestParam(defaultValue = "7")int size){
         PageRequest pageRequest=new PageRequest(page,size);
         return activityService.findAll(pageRequest);
-    }*/
+    }
 
     /**
      * 计算与活动相关的项目筹集的总金额

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

@@ -75,7 +75,16 @@ public class ActivityServiceImpl implements ActivityService {
     }
 
     public Page<Activity> findInProcess(Pageable pageable){
-        return activityDao.findInProcess(pageable);
+        Page<Activity> activities=activityDao.findInProcess(pageable);
+        /*List<Activity> activityList=new ArrayList<Activity>();
+        for(Activity activity:activities.getContent()){
+            List<Award> awardList=awardDao.findByActivityId(activity.getId());
+            activity.setAwards(awardList);
+            Activity newactivity=activityDao.save(activity);
+            activityList.add(newactivity);
+            System.out.print(activity);
+        }*/
+        return activities;
     }
 
     //搜索出所有已结束的活动,当前时间大于活动结束时间

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

@@ -147,14 +147,6 @@ public class ProjectRecode {
         this.orgName = orgName;
     }
 
-    public String getWay() {
-        return way;
-    }
-
-    public void setWay(String way) {
-        this.way = way;
-    }
-
     public short getStatus() {
         return status;
     }
@@ -170,4 +162,12 @@ public class ProjectRecode {
     public void setExceptionMsg(String exceptionMsg) {
         this.exceptionMsg = exceptionMsg;
     }
+
+    public String getWay() {
+        return way;
+    }
+
+    public void setWay(String way) {
+        this.way = way;
+    }
 }

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

@@ -446,16 +446,6 @@
                         <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">
@@ -484,7 +474,7 @@
                     <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>
+                            <span class="award"><#list activity.awards as award><span>${award.awardName!''}</span></#list></span>
                         </div>
                     </div>
                     <div><span>参与时间：</span><span>${activity.startTime}至${activity.endTime}</span></div>

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

@@ -26,6 +26,7 @@
         }
         .clearfix {
             clear: both;
+            position:relative;
         }
         /*头部导航*/
         #nav{
@@ -411,12 +412,16 @@
         }
         /*我要捐款弹出窗*/
         .pop{
-            margin: 0 auto;
+            position:absolute;
+            background-color: white;
             width: 480px;
             /*height: 330px;*/
             text-align: center;
             /*border: 1px solid #e1e1e1;*/
             display: none;
+            top:30px;
+            left:400px;
+            z-index:10;
         }
         .pop .header{
             padding: 0 20px;
@@ -559,7 +564,7 @@
 
         #hover-background .x-floating-wrap {
             position: fixed;
-            z-index: 99998;
+            z-index: 5;
             background: #000;
             top: 0;
             left: 0;
@@ -574,7 +579,7 @@
             margin-top: -300px;
             left: 50%;
             margin-left: -600px;
-            z-index: 2000;
+            z-index: 5;
         }
         #hover-background .x-floating{
             vertical-align:middle !important;
@@ -595,7 +600,7 @@
             user-select: none;
         }
         #hover-background .x-floating-wrap{
-            z-index: 1000000 !important;
+            z-index: 5 !important;
         }
         /*切换*/
         .buttons{
@@ -712,6 +717,7 @@
             <#if page?exists>
             <#list page.content as project>
             <div class="list-item clearfix" id="projectList">
+                <div>
                 <div class="project-img fl">
                     <a href="projectDetailsAndProgress"><img src="${project.pcImg!''}" alt=""/></a>
                 </div>
@@ -727,14 +733,14 @@
                     <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"  onclick="donate(this)">我要捐款</a>
-<#--                <input type="button" onclick="donate()" class="fr donation">-->
+                    <a class="fr donation" onclick="donate(this)">我要捐款</a>
+                </div>
                 <!--弹出窗-->
                 <div class="pop">
                     <div class="header clearfix">
-                        <p class="fl">${project.name!''}</p>
-                        <#--<p>${project.id!''}</p>-->
-                        <div class="close fr" id="close">&times;</div>
+                        <p>$
+                            {project.name}</p>
+                        <div class="close fr" class="close">&times;</div>
                     </div>
                     <div class="body">
                         <div class="choose clearfix">
@@ -767,18 +773,18 @@
                         <a href="donationsOver"> <button>确认捐款</button></a>
                     </div>
                 </div>
-                <div id="hover-background" style="display: none">
-                    <div class="x-floating-wrap"></div>
-                    <div class="x-floating">
-                        <div id="item-content">
-                            <div class="x-close-wrap"><a href="javascript:void(0);">&times;</a></div>
-                            <div class="modal"></div>
-                        </div>
-                    </div>
-                </div>
             </div>
             </#list>
             </#if>
+            <div id="hover-background" style="display: none">
+                <div class="x-floating-wrap"></div>
+                <div class="x-floating">
+                    <div id="item-content">
+                        <div class="x-close-wrap"><a href="javascript:void(0);">&times;</a></div>
+                        <div class="modal"></div>
+                    </div>
+                </div>
+            </div>
            <#-- 分页按钮-->
             <div id="kkpager"></div>
         </div>
@@ -786,12 +792,14 @@
 </div>
 
 <script>
-    $('#close').click(function(){
+    $('.close').click(function(){
        $(this).parent().parent().css('display','none');
+       $("#hover-background").css('display','none');
     })
     function donate(e){
         $('.pop').css('display','none');
-        $(e).siblings(".pop").css('display','block');
+        $(e).parent().next().css('display','block');
+        $("#hover-background").css('display','block');
     }
     //    banner
     $('#myCarousel').carousel({