console更新

donate-console/pom.xml

@@ -224,7 +224,6 @@
                             <staticDir>/</staticDir>
                             <sourceIncludes>
                                 <sourceInclude>resources/js/**/*.js</sourceInclude>
-                                <sourceInclude>resources/ueditor/**/*.js</sourceInclude>
                                 <sourceInclude>WEB-INF/views/**/*.html</sourceInclude>
                             </sourceIncludes>
                             <!-- http://static.ubtoc.com/css/index.css?_v=1450321871828 -->

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

@@ -32,8 +32,7 @@ import java.util.List;
 
 @Controller
 @RequestMapping("/activity")
-public class
-ActivityController {
+public class ActivityController {
 
     private static final SimpleDateFormat codesdf=new SimpleDateFormat("yyyymmddhhmmsssss");
 
@@ -94,11 +93,6 @@ ActivityController {
     @RequestMapping("/submit")
     public Activity submit(String jsonStr){
         Activity activity = JSONObject.parseObject(jsonStr, Activity.class);
-        Date date=new Date();
-        //设置活动发布时间
-        activity.setSubmitTime(date);
-        //设置活动编号
-        activity.setCode(codesdf.format(date));
 
         return activityService.submit(activity);
     }

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

@@ -80,51 +80,7 @@ public class ActivityRecodeController {
     @RequestMapping("/extract")
     public List<ActivityRecode> extract(Long activityId) {
 
-        //根据活动id查询谁参与了抽奖
-        List<ActivityRecode> activityRecodeList = activityRecodeService.joins(activityId);
-
-        //根据活动id查询活动奖品
-        List<Award> awardList = awardService.findByActivityId(activityId);
-
-        Set<Integer> set = new HashSet<Integer>();
-
-        //抽奖方法
-        for (Award award : awardList) {
-            //奖品的总数量
-            int amount = award.getAmount();
-            //参与活动人数
-            int size = activityRecodeList.size();
-            //中奖数量
-            int list = (amount <= size) ? amount : size;
-            //得到奖品级别
-            String awardLeavel=award.getAwardLevel();
-
-            //设置随机抽奖
-            for (int i = 1; i <= list; i++) {
-                int random = (int) (Math.random() * size);
-                while (set.contains(random)) {
-                    random = (int) (Math.random() * size);
-                }
-                ActivityRecode activityRecode = activityRecodeList.get(random);
-
-                activityRecode.setAwardId(award.getId());
-                activityRecode.setIsGetAward(1);
-                activityRecode.setReceiveTime(new Date());
-                activityRecode.setStatus(0);
-                activityRecode.setAwardLeavel(awardLeavel);
-
-                activityRecodeService.save(activityRecode);
-                set.add(random);
-            }
-            //在活动表里面保存中奖数
-            Activity activity=activityService.findOne(activityId);
-            activity.setReceivePerson(list);
-
-            //计算出这个活动的中奖率，中奖数除以总人数
-            Double chance=(list*100.00)/size;
-
-            activityService.save(activity);
-        }
+        List<ActivityRecode> activityRecodeList=new ArrayList<ActivityRecode>();
         return activityRecodeList;
     }
 

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

@@ -7,10 +7,7 @@ import com.uas.dfs.service.FileClient;
 import org.springframework.beans.factory.annotation.Autowired;
 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;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -36,7 +33,7 @@ public class OrgController {
      * 发起机构，有草稿取出草稿,没有草稿就新增
      */
     @ResponseBody
-    @RequestMapping("/show")
+    @RequestMapping(value = "/show",method = RequestMethod.GET)
     public Org show(Long uuid){
         return orgService.show(uuid);
     }
@@ -92,7 +89,7 @@ public class OrgController {
      *提交机构申请
      */
     @ResponseBody
-    @RequestMapping("/submit")
+    @RequestMapping(value = "/submit",method = RequestMethod.POST)
     public Org submit(@RequestParam(required = false) MultipartFile logo,
                       @RequestParam(required = false) MultipartFile certificate,
                       @RequestParam(required = false) MultipartFile personCertificate,
@@ -142,8 +139,8 @@ public class OrgController {
      * 查询某一机构详情信息
      */
     @ResponseBody
-    @RequestMapping("/detail")
-    public Org detail(Long id){
+    @RequestMapping(value = "/detail/{id}",method = RequestMethod.GET)
+    public Org detail(@PathVariable("id") Long id){
         return orgService.findOne(id);
     }
 
@@ -151,8 +148,8 @@ public class OrgController {
      * 批准机构申请
      */
     @ResponseBody
-    @RequestMapping("/approve")
-    public Org approve(Long id){
+    @RequestMapping(value = "/approve/{id}",method = RequestMethod.POST)
+    public Org approve(@PathVariable("id") Long id){
         return orgService.approve(id);
     }
 
@@ -160,8 +157,8 @@ public class OrgController {
      * 拒绝机构申请
      */
     @ResponseBody
-    @RequestMapping("/unapprove")
-    public Org unapprove(Long id,String refuse){
+    @RequestMapping(value = "/unapprove/{id}",method = RequestMethod.POST)
+    public Org unapprove(@PathVariable("id") Long id,String refuse){
         return orgService.unapprove(id,refuse);
     }
 
@@ -171,7 +168,7 @@ public class OrgController {
     * 默认展示已审核的机构信息
     */
      @ResponseBody
-     @RequestMapping("/showOrgs")
+     @RequestMapping(value = "/showOrgs",method = RequestMethod.GET)
      public List<Org> showOrgs(@RequestParam(defaultValue ="0") Integer type, @RequestParam(defaultValue="0") Integer majorArea, @RequestParam(defaultValue="1")Integer status) {
          if (type == 0 && majorArea != 0) {
              return orgService.findByMajorArea(majorArea,status);
@@ -187,7 +184,7 @@ public class OrgController {
 
     //根据搜索框查询机构信息
     @ResponseBody
-    @RequestMapping("/search")
+    @RequestMapping(value = "/search",method = RequestMethod.GET)
     public List<Org> search(String search){
          return orgService.search(search);
     }

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

@@ -45,7 +45,7 @@ public class ProjectController {
     /**
      * 审核通过项目
      */
-    @RequestMapping("/approve")
+    @RequestMapping(value = "/approve",method = RequestMethod.POST)
     @ResponseBody
     public ModelMap approve(Long id){
         return projectService.approve(id);
@@ -54,7 +54,7 @@ public class ProjectController {
     /**
      * 审核驳回项目
      */
-    @RequestMapping("/unapprove")
+    @RequestMapping(value = "/unapprove",method = RequestMethod.POST)
     @ResponseBody
     public ModelMap unapprove(Long id,String refuse){
         return projectService.unapprove(id,refuse);
@@ -72,7 +72,7 @@ public class ProjectController {
     /**
      * 获取所有未被活动关联到的项目
      */
-    @RequestMapping("/getProjectQualification")
+    @RequestMapping(value = "/getProjectQualification",method = RequestMethod.GET)
     @ResponseBody
     public List<Project> getProjectQualification(){
         return projectService.getProjects();
@@ -84,7 +84,7 @@ public class ProjectController {
      * 默认展示已审核的项目信息
      */
     @ResponseBody
-    @RequestMapping("/showProjects")
+    @RequestMapping(value = "/showProjects",method = RequestMethod.GET)
     public List<Project> showProjects(@RequestParam(defaultValue ="全部") String area,@RequestParam(defaultValue="1")Integer status) {
         if(area=="全部"){
             return projectService.findByStatus(status);
@@ -106,7 +106,7 @@ public class ProjectController {
      * 保存项目草稿
      */
     @ResponseBody
-    @RequestMapping("/save")
+    @RequestMapping(value = "/save",method = RequestMethod.POST)
     public Project save(@RequestParam(required = false) MultipartFile logo,
                         @RequestParam(required = false) MultipartFile pcImg,
                         @RequestParam(required = false) MultipartFile mobileImg,
@@ -150,7 +150,7 @@ public class ProjectController {
      * 正式提交项目
      */
     @ResponseBody
-    @RequestMapping("/submit")
+    @RequestMapping(value = "/submit",method = RequestMethod.POST)
     public Project submit(@RequestParam(required = false) MultipartFile logo,
                           @RequestParam(required = false) MultipartFile pcImg,
                           @RequestParam(required = false) MultipartFile mobileImg,
@@ -188,8 +188,8 @@ public class ProjectController {
      * @return
      */
     @ResponseBody
-    @RequestMapping("/detail")
-    public List<Object> detail(Long id){
+    @RequestMapping("/detail/{id}")
+    public List<Object> detail(@PathVariable("id") Long id){
         Org org=projectService.findOrgInfo(id);
         Project project=projectService.findOne(id);
         //项目进度
@@ -211,7 +211,7 @@ public class ProjectController {
      * @return
      */
     @ResponseBody
-    @RequestMapping("/search")
+    @RequestMapping(value = "/search",method = RequestMethod.GET)
     public List<Project> search(String search){
         return projectService.search(search);
     }

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

@@ -7,10 +7,7 @@ import com.uas.console.donate.service.ProjectEvolveService;
 import com.uas.dfs.service.FileClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -47,7 +44,7 @@ public class ProjectEvolveController {
      */
     @ResponseBody
     @RequestMapping(value = "/upload",method = RequestMethod.POST)
-    public String ueditorUpload(MultipartFile file) throws IOException {
+    public String ueditorUpload(@RequestParam(required = false) MultipartFile file) throws IOException {
         //上传图片
         String path=fileClient.upload(file.getBytes(),file.getSize(),"jpg",null);
 

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

@@ -45,14 +45,6 @@ public class ProjectFinanceController {
         return projectFinanceService.save(projectFinance);
     }
 
-   /* @ResponseBody
-    @RequestMapping("/test")
-    public ProjectFinance test(String name, String age, MultipartFile path, HttpServletRequest request, HttpServletResponse response) throws IOException {
-        System.out.println(path==null);
-        String url = fileClient.upload(path.getBytes(), path.getSize(), "jpg", null);
-        return null;
-    }*/
-
     /**
      * 展示某项目的所有财务信息
      * @param proId

donate-console/src/main/java/com/uas/console/donate/dao/ProjectQualificationDao.java

@@ -26,7 +26,7 @@ public interface ProjectQualificationDao extends JpaRepository<ProjectQualificat
     List<Project> notConnectList();
 
     //查询某活动已关联的项目
-    @Query("from ProjectQualification")
+    @Query("from ProjectQualification where activityId=:activityId")
     List<ProjectQualification> hasConnected(@Param("activityId")Long activityId);
 
 

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

@@ -1,12 +1,20 @@
 package com.uas.console.donate.impl;
 
 import com.uas.console.donate.dao.ActivityRecodeDao;
+import com.uas.console.donate.dao.AwardDao;
+import com.uas.console.donate.model.Activity;
 import com.uas.console.donate.model.ActivityRecode;
+import com.uas.console.donate.model.Award;
 import com.uas.console.donate.service.ActivityRecodeService;
+import com.uas.console.donate.service.ActivityService;
+import com.uas.console.donate.service.AwardService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 @Service
 public class ActivityRecodeServiceImpl implements ActivityRecodeService {
@@ -14,6 +22,15 @@ public class ActivityRecodeServiceImpl implements ActivityRecodeService {
     @Autowired
     private ActivityRecodeDao activityRecodeDao;
 
+    @Autowired
+    private ActivityService activityService;
+
+    @Autowired
+    private AwardService awardService;
+
+    @Autowired
+    private ActivityRecodeService activityRecodeService;
+
     public ActivityRecode save(ActivityRecode joinActivity){
 
         return activityRecodeDao.save(joinActivity);
@@ -34,4 +51,53 @@ public class ActivityRecodeServiceImpl implements ActivityRecodeService {
         return activityRecodeDao.findByUuid(uuid);
     }
 
+    //抽奖方法
+    public List<ActivityRecode> extract(Long activityId){
+        //根据活动id查询谁参与了抽奖
+        List<ActivityRecode> activityRecodeList = activityRecodeService.joins(activityId);
+
+        //根据活动id查询活动奖品
+        List<Award> awardList = awardService.findByActivityId(activityId);
+
+        Set<Integer> set = new HashSet<Integer>();
+
+        //抽奖方法
+        for (Award award : awardList) {
+            //奖品的总数量
+            int amount = award.getAmount();
+            //参与活动人数
+            int size = activityRecodeList.size();
+            //中奖数量
+            int list = (amount <= size) ? amount : size;
+            //得到奖品级别
+            String awardLeavel=award.getAwardLevel();
+
+            //设置随机抽奖
+            for (int i = 1; i <= list; i++) {
+                int random = (int) (Math.random() * size);
+                while (set.contains(random)) {
+                    random = (int) (Math.random() * size);
+                }
+                ActivityRecode activityRecode = activityRecodeList.get(random);
+
+                activityRecode.setAwardId(award.getId());
+                activityRecode.setIsGetAward(1);
+                activityRecode.setReceiveTime(new Date());
+                activityRecode.setStatus(0);
+                activityRecode.setAwardLeavel(awardLeavel);
+
+                activityRecodeService.save(activityRecode);
+                set.add(random);
+            }
+            //在活动表里面保存中奖数
+            Activity activity=activityService.findOne(activityId);
+            activity.setReceivePerson(list);
+
+            //计算出这个活动的中奖率，中奖数除以总人数
+            Double chance=(list*100.00)/size;
+
+            activityService.save(activity);
+        }
+        return activityRecodeList;
+    }
 }

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

@@ -15,6 +15,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -23,6 +24,8 @@ import java.util.List;
 @Service
 public class ActivityServiceImpl implements ActivityService{
 
+    private static final SimpleDateFormat codesdf=new SimpleDateFormat("yyyymmddhhmmsssss");
+
     @Autowired
     private ActivityDao activityDao;
 
@@ -120,6 +123,12 @@ public class ActivityServiceImpl implements ActivityService{
 
     public Activity submit(Activity activity){
 
+        Date date=new Date();
+        //设置活动发布时间
+        activity.setSubmitTime(date);
+        //设置活动编号
+        activity.setCode(codesdf.format(date));
+
         //设置成发布状态
         activity.setPublish(2);
 

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

@@ -19,13 +19,9 @@ public class OrgServiceImpl implements OrgService {
     @Autowired
     private OrgDao orgDao;
 
-    //发起机构进行判断，有草稿取出草稿，没草稿新建机构表单
+    //取出机构信息
     public Org show(Long uuid){
-        if(orgDao.findDraft(uuid)==null){
-            return null;
-        }else{
-            return orgDao.findDraft(uuid);
-        }
+        return orgDao.findOne(uuid);
     }
 
     //保存机构

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

@@ -21,9 +21,6 @@ public class ProjectQualificationServiceImpl implements ProjectQualificationServ
         return projectQualificationDao.save(projectQualification);
     }
 
-    /*public ProjectQualification deleteByProject(Long proId){
-        return projectQualificationDao.deleteByProject(proId);
-    }*/
 
     //查询某活动已关联的项目
     public List<ProjectQualification> hasConnected(Long activityId){

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

@@ -133,6 +133,12 @@ public class Activity implements Serializable{
     @Column(name = "act_img")
     private String actImg;
 
+    @Transient
+    private  List<Award> awards;
+
+    @Transient
+    private List<ProjectQualification> projectQualificationList;
+
     public Long getId() {
         return id;
     }
@@ -292,8 +298,7 @@ public class Activity implements Serializable{
         this.actImg = actImg;
     }
 
-    @Transient
-    private  List<Award> awards;
+
 
     public List<Award> getAwards() {
         return awards;
@@ -303,8 +308,6 @@ public class Activity implements Serializable{
         this.awards = awards;
     }
 
-   @Transient
-    private List<ProjectQualification> projectQualificationList;
 
     public List<ProjectQualification> getProjectQualificationList() {
         return projectQualificationList;

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

@@ -1,8 +1,5 @@
 package com.uas.console.donate.model;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
 import javax.persistence.*;
 import java.util.Date;
 

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

@@ -14,7 +14,9 @@ public interface ActivityRecodeService {
     //查询某一活动的参与人
     List<ActivityRecode> joins(Long activityId);
 
-
+    //查询某用户参与的活动记录
     List<ActivityRecode> queryOne(Long uuid);
 
+    //抽奖方法
+    List<ActivityRecode> extract(Long activityId);
 }