donate-service

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

@@ -1,20 +1,17 @@
 package com.uas.service.donate;
 
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+        import org.springframework.boot.SpringApplication;
+        import org.springframework.boot.autoconfigure.SpringBootApplication;
+        import org.springframework.context.annotation.ImportResource;
+        import org.springframework.web.bind.annotation.RestController;
 
 @SpringBootApplication
 @RestController
+@ImportResource("classpath:spring/*.xml")
 public class Application {
 
-//    @RequestMapping("/")
-//    public String greeting() {
-//        return "Index Page Of donate-service!";
-//    }
-
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
+    public static void main(String[] args){
+        SpringApplication application=new SpringApplication(Application.class);
+        application.run(args);
     }
 }

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

@@ -0,0 +1,35 @@
+package com.uas.service.donate.Impl;
+
+import com.uas.service.donate.dao.ActivityRecodeDao;
+import com.uas.service.donate.model.ActivityRecode;
+import com.uas.service.donate.service.ActivityRecodeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ActivityRecodeServiceImpl implements ActivityRecodeService {
+
+    @Autowired
+    private ActivityRecodeDao activityRecodeDao;
+
+    public ActivityRecode save(ActivityRecode joinActivity){
+
+        return activityRecodeDao.save(joinActivity);
+    }
+    public List<ActivityRecode> joins(Long activityId){
+        List<ActivityRecode> joinActivities =  activityRecodeDao. findByActivityId(activityId);
+        return joinActivities;
+    }
+
+    public List<ActivityRecode> queryOne(Long uuid){
+        return activityRecodeDao.findByUuid(uuid);
+    }
+
+
+    public ActivityRecode findOne(Long activityId,Long uuid){
+        return activityRecodeDao.findOne(activityId,uuid);
+    }
+
+}

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

@@ -0,0 +1,25 @@
+package com.uas.service.donate.Impl;
+
+import com.uas.service.donate.dao.ActivityDao;
+import com.uas.service.donate.model.Activity;
+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;
+
+@Service
+public class ActivityServiceImpl implements ActivityService {
+    @Autowired
+    private ActivityDao activityDao;
+
+
+    public Page<Activity> findAll(Pageable pageable){
+
+        return activityDao.findAll(pageable);
+    }
+
+    public Activity fingById(Long id){
+        return  activityDao.findById(id);
+    }
+}

donate-service/src/main/java/com/uas/service/donate/Impl/AwardServiceImpl.java

@@ -0,0 +1,19 @@
+package com.uas.service.donate.Impl;
+
+import com.uas.service.donate.dao.AwardDao;
+import com.uas.service.donate.model.Award;
+import com.uas.service.donate.service.AwardService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class AwardServiceImpl implements AwardService{
+    @Autowired
+    private AwardDao awardDao;
+
+    public List<Award> getAwards(Long id){
+        return awardDao.findByActivityId(id);
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.uas.service.donate.Impl;
+
+import com.uas.service.donate.dao.OrgDao;
+import com.uas.service.donate.model.*;
+import com.uas.service.donate.service.OrgService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class OrgServiceImpl implements OrgService{
+
+    @Autowired
+    private OrgDao orgDao;
+
+    public Org save(Org org){
+        return orgDao.saveAndFlush(org);
+    }
+
+}

donate-service/src/main/java/com/uas/service/donate/Impl/ProjectConcludeServiceImpl.java

@@ -0,0 +1,17 @@
+package com.uas.service.donate.Impl;
+
+import com.uas.service.donate.dao.ProjectConcludeDao;
+import com.uas.service.donate.model.ProjectConclude;
+import com.uas.service.donate.service.ProjectConcludeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ProjectConcludeServiceImpl implements ProjectConcludeService {
+    @Autowired
+    private ProjectConcludeDao projectConcludeDao;
+
+    public ProjectConclude save(ProjectConclude projectConclude){
+        return projectConcludeDao.save(projectConclude);
+    }
+}

donate-service/src/main/java/com/uas/service/donate/Impl/ProjectEvolveServiceImpl.java

@@ -0,0 +1,18 @@
+package com.uas.service.donate.Impl;
+
+import com.uas.service.donate.dao.ProjectEvolveDao;
+import com.uas.service.donate.model.ProjectEvolve;
+import com.uas.service.donate.service.ProjectEvolveService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ProjectEvolveServiceImpl implements ProjectEvolveService {
+    @Autowired
+    private ProjectEvolveDao projectEvolveDao;
+
+    @Override
+    public ProjectEvolve save(ProjectEvolve projectEvolve) {
+        return projectEvolveDao.save(projectEvolve);
+    }
+}

donate-service/src/main/java/com/uas/service/donate/Impl/ProjectFinanceServiceImpl.java

@@ -0,0 +1,22 @@
+package com.uas.service.donate.Impl;
+
+
+import com.uas.service.donate.dao.ProjectFinanceDao;
+import com.uas.service.donate.model.ProjectFinance;
+import com.uas.service.donate.service.ProjectFinanceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.stereotype.Service;
+
+@Service
+@ServletComponentScan(basePackages = {"com.uas.dfs.service"})
+public class ProjectFinanceServiceImpl implements ProjectFinanceService {
+
+    @Autowired
+    private ProjectFinanceDao projectFinanceDao;
+
+    public ProjectFinance save(ProjectFinance projectFinance) {
+        return projectFinanceDao.save(projectFinance);
+    }
+
+}

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

@@ -0,0 +1,45 @@
+package com.uas.service.donate.Impl;
+
+import com.uas.service.donate.dao.ProjectRecodeDao;
+import com.uas.service.donate.model.ProjectRecode;
+import com.uas.service.donate.service.ProjectRecodeService;
+import com.uas.service.donate.service.ProjectReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ProjectRecordServiceImpl implements ProjectRecodeService {
+
+    @Autowired
+    ProjectRecodeDao projectRecodeDao;
+
+    public List<ProjectRecode> findByuuid(Long uuid){
+        return projectRecodeDao.findByuuid(uuid);
+    }
+
+    @Override
+    public ProjectRecode join(Long uuid, Double amount) {
+        ProjectRecode projectRecode=new ProjectRecode();
+        projectRecode.setUuid(uuid);
+        projectRecode.setAmount(amount);
+        return projectRecodeDao.save(projectRecode);
+    }
+
+    public Double totality(){
+        return projectRecodeDao.totality();
+    }
+
+    public Long historyPerson(){
+        return projectRecodeDao.historyPerson();
+    }
+    public Long sumPerson(Long proId){
+        return projectRecodeDao.sumPerson(proId);
+    }
+
+    public Double sumamount(Long proId){
+        return projectRecodeDao.sumamount(proId);
+    }
+
+}

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

@@ -0,0 +1,18 @@
+package com.uas.service.donate.Impl;
+
+import com.uas.service.donate.dao.ProjectReportDao;
+import com.uas.service.donate.model.ProjectReport;
+import com.uas.service.donate.service.ProjectReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ProjectReportServiceImpl implements ProjectReportService {
+
+    @Autowired
+    private ProjectReportDao projectReportDao;
+
+    public ProjectReport save(ProjectReport projectReport){
+            return projectReportDao.save(projectReport);
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.uas.service.donate.Impl;
+
+
+import com.uas.service.donate.dao.ProjectDao;
+import com.uas.service.donate.model.Project;
+import com.uas.service.donate.service.ProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class ProjectServiceImpl implements ProjectService {
+
+    @Autowired
+    private ProjectDao projectDao;
+
+    public Page<Project> findAll(Pageable pageable){
+
+        return projectDao.findAll(pageable);
+    }
+
+    public Project save(Project project){
+
+        return projectDao.save(project);
+    }
+
+    public Project findOne(Long id){
+        return projectDao.findOne(id);
+    }
+}

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

@@ -0,0 +1,56 @@
+package com.uas.service.donate.controller;
+
+import com.uas.service.donate.model.Activity;
+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.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+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 java.util.ArrayList;
+import java.util.List;
+
+
+@Controller
+@RequestMapping("/activity")
+public class ActivityController {
+    @Autowired
+    private ActivityService activityService;
+
+    /**
+     * 展示所有活动列表
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/getActivities")
+    public Page<Activity> getActivities(@RequestParam(value = "page",defaultValue = "0")Integer page,
+                                        @RequestParam(value = "size",defaultValue = "10")Integer size){
+        Pageable pageable=pageSort(page,size);
+        return activityService.findAll(pageable);
+    }
+
+    /*优先级倒序，时间倒序排序的方式*/
+    private Pageable pageSort(Integer page,Integer size){
+        Sort.Order prioritySort=new Sort.Order(Sort.Direction.DESC,"priority");
+        Sort.Order timeSort=new Sort.Order(Sort.Direction.DESC,"submitTime");
+        List<Sort.Order> list=new ArrayList<Sort.Order>();
+        list.add(prioritySort);
+        list.add(timeSort);
+        Sort sort = new Sort(list);
+        Pageable pageable=new PageRequest(page,size,sort);
+        return pageable;
+    }
+    /**
+     * 展示某具体活动
+     */
+    @ResponseBody
+    @RequestMapping("/detail")
+    public Activity findById(Long id){
+        return activityService.fingById(id);
+    }
+}

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

@@ -0,0 +1,68 @@
+package com.uas.service.donate.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.uas.service.donate.model.ActivityRecode;
+import com.uas.service.donate.service.ActivityRecodeService;
+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.ResponseBody;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Controller
+@RequestMapping("/activityRecode")
+public class ActivityRecodeController {
+
+    @Autowired
+    private ActivityRecodeService activityRecodeService;
+
+    /**
+     * 参与活动
+     */
+    @ResponseBody
+    @RequestMapping("/join")
+    public ActivityRecode join(Long activityId,Long uuid){
+        ActivityRecode activityRecode=new ActivityRecode();
+        activityRecode.setActivityId(activityId);
+        activityRecode.setUuid(uuid);
+        activityRecode.setStatus(0);
+        ActivityRecode activity=activityRecodeService.save(activityRecode);
+        return activity;
+    }
+
+    /**
+     *查询某一用户参加过的活动
+     */
+    @ResponseBody
+    @RequestMapping("/queryOne")
+    public List<ActivityRecode> queryOne(Long uuid){
+        return activityRecodeService.queryOne(uuid);
+    }
+    /**
+     * 查询某一活动参与者
+     * @param activityId
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/joins")
+    public List<ActivityRecode> joins(Long activityId){
+
+        return activityRecodeService.joins(activityId);
+    }
+
+    /**
+     * 领奖  1.未领取 2.已领取
+     */
+    @ResponseBody
+    @RequestMapping("/receive")
+    public ActivityRecode receive(Long activityId,Long uuid){
+        ActivityRecode activityRecode=activityRecodeService.findOne(activityId,uuid);
+        activityRecode.setStatus(2);
+        activityRecode.setReceiveTime(new Date());
+        return activityRecode;
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package com.uas.service.donate.controller;
+
+import com.uas.service.donate.model.Award;
+import com.uas.service.donate.service.AwardService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.stereotype.Repository;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+@Controller
+@RequestMapping("/award")
+public class AwardController {
+    @Autowired
+    private AwardService awardService;
+
+    @ResponseBody
+    @RequestMapping("/getAwards")
+    public List<Award> getAwards(Long id){
+        return awardService.getAwards(id);
+    }
+}

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

@@ -0,0 +1,81 @@
+package com.uas.service.donate.controller;
+
+import com.alibaba.fastjson.JSONObject;
+
+import com.uas.service.donate.dao.OrgDao;
+import com.uas.service.donate.model.Org;
+import com.uas.service.donate.service.OrgService;
+import com.uas.service.donate.util.FileUrl;
+import com.uas.service.donate.util.HttpUtils;
+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.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/org")
+public class OrgController {
+
+    @Autowired
+    private OrgService orgService;
+
+    @ResponseBody
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    public Org save(String jsonStr,Map<String,String> orgAttaches) throws Exception{
+        Org org=saveform(jsonStr,orgAttaches);
+        org.setStatus(3);
+
+        return orgService.save(org);
+    }
+
+    @ResponseBody
+    @RequestMapping("/submit")
+    public Org submit(String jsonStr, Map<String,String> orgAttaches)throws Exception{
+        Org org=saveform(jsonStr,orgAttaches);
+        org.setStatus(4);
+        return orgService.save(org);
+    }
+
+    public Org saveform(String jsonStr, Map<String,String> orgAttaches) throws Exception{
+        Org org = JSONObject.parseObject(jsonStr, Org.class);
+
+        for(Map.Entry<String,String> orgAttach:orgAttaches.entrySet()){
+            String fileName=orgAttach.getKey();
+            String fileValue=orgAttach.getValue();
+
+            HttpUtils.Response response = HttpUtils.upload(FileUrl.FILE_UPLOAD,fileValue,null);
+            if(200 == response.getStatusCode()) {
+                JSONObject object = JSONObject.parseObject(response.getResponseText());
+                if(null != object) {
+                    String path = (String) object.get("path");
+                    switch(fileName){
+                        case "logo": org.setLogo(path);
+                            break;
+                        case "certificate":org.setCertificate(path);
+                            break;
+                        case "personCertificate":org.setPersonCertificate(path);
+                            break;
+                        case "donateCertificate":org.setDonateCertificate(path);
+                            break;
+                        case "legalIdCard":org.setLegalIdCard(path);
+                            break;
+                        case "material":org.setMaterial(path);
+                            break;
+                        case "certify":org.setCertify(path);
+                            break;
+                    }
+                }
+            }
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+        org.setCode(sdf.format(new Date()));
+        org.setSubmitTime(new Date());
+
+        return org;
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.uas.service.donate.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.uas.service.donate.model.ProjectConclude;
+import com.uas.service.donate.service.ProjectConcludeService;
+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.ResponseBody;
+
+import java.util.Date;
+
+@Controller
+@RequestMapping("/projectconclude")
+public class ProjectConcludeController {
+
+    @Autowired
+    private ProjectConcludeService projectConcludeService;
+
+    @ResponseBody
+    @RequestMapping("/save")
+    public ProjectConclude save(String jsonStr){
+        ProjectConclude projectConclude= JSONObject.parseObject(jsonStr,ProjectConclude.class);
+        //状态.1:保存2:提交
+        projectConclude.setStatus(1);
+        projectConclude.setSubmitTime(new Date());
+        return projectConcludeService.save(projectConclude);
+    }
+    @ResponseBody
+    @RequestMapping("/submit")
+    public ProjectConclude submit(String jsonStr){
+        ProjectConclude projectConclude= JSONObject.parseObject(jsonStr,ProjectConclude.class);
+        projectConclude.setStatus(2);
+        projectConclude.setSubmitTime(new Date());
+        return projectConcludeService.save(projectConclude);
+    }
+
+}

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

@@ -0,0 +1,106 @@
+package com.uas.service.donate.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.uas.service.donate.model.Project;
+import com.uas.service.donate.service.ProjectService;
+import com.uas.service.donate.util.FileUrl;
+import com.uas.service.donate.util.HttpUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+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.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/project")
+public class ProjectController {
+
+    @Autowired
+    private ProjectService projectService ;
+
+    /**
+     * 获取所有捐款项目
+     * @param page
+     * @param size
+     * @return
+     */
+    @RequestMapping("/getProjects")
+    @ResponseBody
+    public Page<Project> findAll(@RequestParam(value = "page",defaultValue = "0")Integer page,
+                                 @RequestParam(value = "size",defaultValue = "5")Integer size){
+        Pageable pageable=pageSort(page,size);
+        return projectService.findAll(pageable);
+    }
+    /*审核状态正序，时间倒序排序的方式*/
+    private Pageable pageSort(Integer page,Integer size){
+        Sort.Order timeSort=new Sort.Order(Sort.Direction.DESC,"submitTime");
+        List<Sort.Order> list=new ArrayList<Sort.Order>();
+        list.add(timeSort);
+        Sort sort = new Sort(list);
+        Pageable pageable=new PageRequest(page,size,sort);
+        return pageable;
+    }
+
+    @ResponseBody
+    @RequestMapping("/save")
+    public Project save(String jsonStr, Map<String,String> projectAttaches) throws Exception{
+        Project project = JSONObject.parseObject(jsonStr, Project.class);
+        project.setStatus(3);
+       return projectService.save(project);
+    }
+
+    @ResponseBody
+    @RequestMapping("/submit")
+    public Project submit(String jsonStr, Map<String,String> orgAttaches)throws Exception{
+        Project project=saveform(jsonStr,orgAttaches);
+        project.setStatus(4);
+        return projectService.save(project);
+    }
+
+    public Project saveform(String jsonStr, Map<String,String> projectAttaches) throws Exception{
+        Project project = JSONObject.parseObject(jsonStr, Project.class);
+        for(Map.Entry<String,String> projectAttach:projectAttaches.entrySet()){
+            String fileName=projectAttach.getKey();
+            String fileValue=projectAttach.getValue();
+
+            HttpUtils.Response response = HttpUtils.upload(FileUrl.FILE_UPLOAD,fileValue,null);
+            if(200 == response.getStatusCode()) {
+                JSONObject object = JSONObject.parseObject(response.getResponseText());
+                if(null != object) {
+                    String path = (String) object.get("path");
+                    switch(fileName){
+                        case "pcImg":project.setPcImg(path);
+                            break;
+                        case "mobileImg":project.setMobileImg(path);
+                            break;
+                        case "listImg":project.setListImg(path);
+                            break;
+                        case "logo":project.setLogo(path);
+                            break;
+                    }
+                }
+            }
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+
+        project.setSubmitTime(new Date());
+
+        return project;
+    }
+    @ResponseBody
+    @RequestMapping("/detail")
+    public Project showDetail(Long id) {
+        return projectService.findOne(id);
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.uas.service.donate.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.uas.service.donate.model.ProjectEvolve;
+import com.uas.service.donate.service.ProjectEvolveService;
+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.ResponseBody;
+
+import java.util.Date;
+
+@Controller
+@RequestMapping("/projectevolve")
+public class ProjectEvolveController {
+    @Autowired
+    private ProjectEvolveService projectEvolveService;
+
+    @ResponseBody
+    @RequestMapping("/save")
+    public ProjectEvolve save(String jsonStr){
+        ProjectEvolve projectEvolve= JSONObject.parseObject(jsonStr,ProjectEvolve.class);
+        //状态.1:保存2:提交
+        projectEvolve.setStatus(1);
+        projectEvolve.setSubmitTime(new Date());
+        return projectEvolveService.save(projectEvolve);
+    }
+
+    @ResponseBody
+    @RequestMapping("/submit")
+    public ProjectEvolve submit(String jsonStr){
+        ProjectEvolve projectEvolve= JSONObject.parseObject(jsonStr,ProjectEvolve.class);
+        projectEvolve.setStatus(2);
+        projectEvolve.setSubmitTime(new Date());
+        return projectEvolveService.save(projectEvolve);
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.uas.service.donate.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.uas.service.donate.model.ProjectFinance;
+import com.uas.service.donate.service.ProjectFinanceService;
+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.ResponseBody;
+
+import java.util.Date;
+
+@Controller
+@RequestMapping("/projectfinance")
+public class ProjectFinanceController {
+    @Autowired
+    private ProjectFinanceService projectFinanceService;
+
+    @ResponseBody
+    @RequestMapping("/save")
+    public ProjectFinance save(String jsonStr){
+        ProjectFinance projectFinance= JSONObject.parseObject(jsonStr,ProjectFinance.class);
+        //状态.1:保存2:提交
+        projectFinance.setStatus(1);
+        projectFinance.setSubmitTime(new Date());
+        return projectFinanceService.save(projectFinance);
+    }
+
+    @ResponseBody
+    @RequestMapping("/submit")
+    public ProjectFinance submit(String jsonStr){
+        ProjectFinance projectFinance= JSONObject.parseObject(jsonStr,ProjectFinance.class);
+        projectFinance.setStatus(2);
+        projectFinance.setSubmitTime(new Date());
+        return projectFinanceService.save(projectFinance);
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.uas.service.donate.controller;
+
+import com.uas.service.donate.model.ProjectRecode;
+import com.uas.service.donate.service.ProjectRecodeService;
+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.ResponseBody;
+
+import java.util.List;
+
+@Controller
+@RequestMapping("/projectrecode")
+public class ProjectRecodeController {
+
+    @Autowired
+    private ProjectRecodeService projectRecodeService;
+
+    @ResponseBody
+    @RequestMapping("/joins")
+    public List<ProjectRecode> joins(Long uuid){
+        return projectRecodeService.findByuuid(uuid);
+    }
+
+    @ResponseBody
+    @RequestMapping("/join")
+    public ProjectRecode join(Long uuid,Double amount){
+
+        return projectRecodeService.join(uuid,amount);
+    }
+
+    /**
+     * 计算历史捐款总额
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/totality")
+    public Double totality(){
+        return projectRecodeService.totality();
+    }
+
+
+    /**
+     * 计算历史参与总人数
+     */
+    @ResponseBody
+    @RequestMapping("/historyperson")
+    public Long historyPerson(){
+        return projectRecodeService.historyPerson();
+    }
+
+    /**
+     * 记录某项目已参与人数
+     */
+    @ResponseBody
+    @RequestMapping("/sumperson")
+    public Long sumPerson(Long proId){
+        return projectRecodeService.sumPerson(proId);
+    }
+
+    /**
+     * 记录某项目已筹款额
+     */
+    @ResponseBody
+    @RequestMapping("/sumamount")
+    public Double sumamount(Long proId){
+        return projectRecodeService.sumamount(proId);
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.uas.service.donate.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.uas.service.donate.model.ProjectReport;
+import com.uas.service.donate.service.ProjectReportService;
+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.ResponseBody;
+
+import java.util.Date;
+
+@Controller
+@RequestMapping("/projectreport")
+public class ProjectReportController {
+    @Autowired
+    private ProjectReportService projectReportService;
+
+    @ResponseBody
+    @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);
+    }
+
+    @ResponseBody
+    @RequestMapping("/submit")
+    public ProjectReport submit(String jsonStr){
+        ProjectReport projectReport= JSONObject.parseObject(jsonStr,ProjectReport.class);
+        projectReport.setStatus(2);
+        projectReport.setSubmitTime(new Date());
+        return projectReportService.save(projectReport);
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.uas.service.donate.dao;
+
+import com.uas.service.donate.model.Activity;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ActivityDao extends JpaRepository<Activity,Long>,JpaSpecificationExecutor<Activity>,PagingAndSortingRepository<Activity, Long> {
+
+    @Query(value = "from Activity a  where a.id=:id ")
+    Activity findById(@Param("id") Long id);
+
+    @Query("from Activity a where  a.status=2 ")
+    Page<Activity> findAll(Pageable pageable);
+
+}

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

@@ -0,0 +1,22 @@
+package com.uas.service.donate.dao;
+
+import com.uas.service.donate.model.ActivityRecode;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ActivityRecodeDao extends JpaRepository<ActivityRecode,Long>,JpaSpecificationExecutor<ActivityRecode> {
+
+    List<ActivityRecode> findByActivityId(@Param(value = "activityId") Long activityId);
+
+    List<ActivityRecode> findByUuid(@Param(value = "uuid") Long uuid);
+
+    @Query("from ActivityRecode where activityId=:activityId and uuid=:uuid")
+    ActivityRecode findOne(@Param(value = "activityId") Long activityId,@Param(value = "uuid") Long uuid);
+
+}

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

@@ -0,0 +1,17 @@
+package com.uas.service.donate.dao;
+
+import com.uas.service.donate.model.Award;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface AwardDao extends JpaRepository<Award,Long>{
+
+    @Query("from Award where activityId=:activityId")
+    List<Award> findByActivityId(@Param("activityId") Long activityId);
+
+}

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

@@ -0,0 +1,11 @@
+package com.uas.service.donate.dao;
+
+import com.uas.service.donate.model.Org;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+//@Repository
+public interface OrgDao extends JpaRepository<Org,Long>,JpaSpecificationExecutor<Org> {
+
+}

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

@@ -0,0 +1,11 @@
+package com.uas.service.donate.dao;
+
+
+import com.uas.service.donate.model.ProjectConclude;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ProjectConcludeDao extends JpaRepository<ProjectConclude,Long>,JpaSpecificationExecutor<ProjectConclude> {
+}

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

@@ -0,0 +1,18 @@
+package com.uas.service.donate.dao;
+
+
+import com.uas.service.donate.model.Project;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ProjectDao extends JpaRepository<Project,Long>,JpaSpecificationExecutor<Project>,PagingAndSortingRepository<Project, Long> {
+    Page<Project> findAll(Pageable pageable);
+
+}

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

@@ -0,0 +1,8 @@
+package com.uas.service.donate.dao;
+
+import com.uas.service.donate.model.ProjectEvolve;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface ProjectEvolveDao extends JpaRepository<ProjectEvolve,Long>,JpaSpecificationExecutor<ProjectEvolve> {
+}

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

@@ -0,0 +1,11 @@
+package com.uas.service.donate.dao;
+
+import com.uas.service.donate.model.ProjectFinance;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ProjectFinanceDao extends JpaRepository<ProjectFinance,Long>,JpaSpecificationExecutor<ProjectFinance> {
+
+}

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

@@ -0,0 +1,30 @@
+package com.uas.service.donate.dao;
+
+import com.uas.service.donate.model.ProjectRecode;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ProjectRecodeDao extends JpaRepository<ProjectRecode,Long>,JpaSpecificationExecutor<ProjectRecode>{
+
+    @Query("from ProjectRecode where uuid=:uuid")
+    List<ProjectRecode> findByuuid(@Param("uuid") Long uuid);
+
+
+    @Query("select  sum(amount) from ProjectRecode ")
+    Double totality();
+
+    @Query("select count(*) from ProjectRecode")
+    Long historyPerson();
+
+    @Query("select count(*) from ProjectRecode where proId=:proId")
+    Long sumPerson(@Param("proId")Long proId);
+
+    @Query("select sum(amount) from ProjectRecode where proId=:proId")
+    Double sumamount(@Param("proId")Long proId);
+}

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

@@ -0,0 +1,11 @@
+package com.uas.service.donate.dao;
+
+import com.uas.service.donate.model.ProjectReport;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ProjectReportDao extends JpaRepository<ProjectReport,Long>,JpaSpecificationExecutor<ProjectReport>{
+
+}

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

@@ -0,0 +1,196 @@
+package com.uas.service.donate.model;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Entity
+@Table(name="donate$activity")
+public class Activity implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+    private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name="act_id")
+    private  Long id;
+
+    /**
+     * 活动编号
+     */
+    @Column(name = "act_code")
+    private String code;
+
+    /**
+     * 活动名
+     */
+    @Column(name="act_name")
+    private  String name;
+
+    /**
+     * 活动简介
+     */
+    @Column(name="act_summary")
+    private  String summary;
+
+    /**
+     * 开始时间
+     */
+    @Column(name="act_start_time")
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    @Column(name="act_end_time")
+    private  String endTime;
+
+    /**
+     * 开奖日期
+     */
+    @Column(name="act_lucky_time")
+    private  String luckyTime;
+
+    /**
+     * 活动提交人
+     * @return
+     */
+    @Column(name="act_person")
+    private  String person;
+
+    /**
+     * 活动提交时间
+     * @return
+     */
+    @Column(name = "act_submit")
+    private Date submitTime;
+
+    /**
+     * stutus   1:已保存 2：已提交
+     */
+    @Column(name="act_status")
+    private Integer status;
+
+    @Column(name="act_priority")
+    private Integer priority;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSummary() {
+        return summary;
+    }
+
+    public void setSummary(String summary) {
+        this.summary = summary;
+    }
+
+    public String getLuckyTime() {
+        return luckyTime;
+    }
+
+    public void setLuckyTime(String luckyTime) {
+        this.luckyTime = luckyTime;
+    }
+
+    public String getPerson() {
+        return person;
+    }
+
+    public void setPerson(String person) {
+        this.person = person;
+    }
+
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+       return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getSubmitTime() {
+        Date date = this.submitTime;
+        return date != null ? sdf.format(this.submitTime) : null;
+    }
+
+    public void setSubmitTime(Date submitTime) {
+        this.submitTime = submitTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    @Override
+    public String toString() {
+        return "Activity{" +
+                "id=" + id +
+                ", code='" + code + '\'' +
+                ", name='" + name + '\'' +
+                ", summary='" + summary + '\'' +
+                ", startTime='" + startTime + '\'' +
+                ", endTime='" + endTime + '\'' +
+                ", luckyTime='" + luckyTime + '\'' +
+                ", person='" + person + '\'' +
+                ", submitTime=" + submitTime +
+                '}';
+    }
+    @Transient
+    private  List<Award> awards;
+
+    public List<Award> getAwards() {
+        return awards;
+    }
+
+    public void setAwards(List<Award> awards) {
+        this.awards = awards;
+    }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Integer priority) {
+        this.priority = priority;
+    }
+}

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

@@ -0,0 +1,110 @@
+package com.uas.service.donate.model;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Entity
+@Table(name="donate$activityrecode")
+public class ActivityRecode {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name="ar_id")
+    private  Long id;
+
+    /**
+     * 活动编号
+     */
+    @Column(name="ar_act_id")
+    private Long activityId;
+
+    /**
+     * 活动
+     */
+    @OneToOne(cascade = { CascadeType.REFRESH, CascadeType.MERGE })
+    @JoinColumn(name = "ar_act_id", insertable = false, updatable = false)
+    private Activity activity;
+
+    /**
+     * 优软云账号
+     */
+    @Column(name="ar_uuid")
+    private Long uuid;
+
+    /**
+     * 获奖的奖品编号
+     */
+    @Column(name="ar_aw_id")
+    private Long awardId;
+
+    /**
+     * 领取状态   0：初始状态 1：未领取 2：已领取 3：奖品失效
+     */
+    @Column(name="ar_aw_status")
+    private Integer status;
+
+
+    /**
+     * 用户领奖时间
+     */
+    @Column(name="ar_receive_time")
+    private Date receiveTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Long activityId) {
+        this.activityId = activityId;
+    }
+
+    public Long getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(Long uuid) {
+        this.uuid = uuid;
+    }
+
+    public Long getAwardId() {
+        return awardId;
+    }
+
+    public void setAwardId(Long awardId) {
+        this.awardId = awardId;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getReceiveTime() {
+        return receiveTime;
+    }
+
+    public void setReceiveTime(Date receiveTime) {
+        this.receiveTime = receiveTime;
+    }
+
+    public Activity getActivity() {
+        return activity;
+    }
+
+    public void setActivity(Activity activity) {
+        this.activity = activity;
+    }
+}

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

@@ -0,0 +1,125 @@
+package com.uas.service.donate.model;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name="donate$award")
+public class Award implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name="aw_id")
+    private  Long id;
+
+    /**
+     * 活动编号
+     */
+    @Column(name="aw_act_id")
+    private Long activityId;
+
+    /**
+     * 奖品级别
+     */
+    @Column(name="aw_level")
+    private String awardLevel;
+
+    /**
+     * 奖品名
+     */
+    @Column(name="aw_name")
+    private String awardName;
+
+    /**
+     * 奖品简介
+     */
+    @Column(name="aw_summary")
+    private String awardSummary;
+
+    /**
+     * 奖品数量
+     * @return
+     */
+    @Column(name = "aw_amount")
+    private Long amount;
+
+    /**
+     * 奖品领取开始时间
+     */
+    @Column(name="aw_start_time")
+    private Date startTime;
+
+    /**
+     * 奖品领取结束时间
+     */
+    @Column(name="aw_end_time")
+    private Date endTime;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Long activityId) {
+        this.activityId = activityId;
+    }
+
+    public String getAwardLevel() {
+        return awardLevel;
+    }
+
+    public void setAwardLevel(String awardLevel) {
+        this.awardLevel = awardLevel;
+    }
+
+    public String getAwardName() {
+        return awardName;
+    }
+
+    public void setAwardName(String awardName) {
+        this.awardName = awardName;
+    }
+
+    public String getAwardSummary() {
+        return awardSummary;
+    }
+
+    public void setAwardSummary(String awardSummary) {
+        this.awardSummary = awardSummary;
+    }
+
+    public Long getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Long amount) {
+        this.amount = amount;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+}

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

@@ -0,0 +1,602 @@
+package com.uas.service.donate.model;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name="donate$organization")
+public class Org implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name = "org_id")
+    private Long id;
+
+    /**
+     * 注册编号
+     */
+    @Column(name="org_code")
+    private String code;
+
+
+    /**
+     *优软云账号
+     */
+    @Column(name="org_uuid")
+    private Long uuid;
+
+    /**
+     * 提交人姓名
+     */
+    @Column(name="org_person")
+    private String person;
+
+
+    /**
+     * 提交人时间
+     */
+    @Column(name = "org_submit")
+    private Date submitTime;
+
+
+    /**
+     * 审核状态（0:待审核1：批准2：驳回）
+     */
+    @Column(name="org_status")
+    private Integer status;
+
+    /**
+     * 驳回理由
+     */
+    @Column(name="org_refuse")
+    private String refuse;
+
+    /**
+     *机构类别（1:公募 2：非公募)
+     */
+    @Column(name = "org_type")
+    private Integer type;
+
+    /**
+     * 机构全称
+     */
+    @Column(name="org_name")
+    private String name;
+
+    /**
+     * 机构电话
+     */
+    @Column(name="org_tel")
+    private String telphone;
+
+    /**
+     * 所属省
+     */
+    @Column(name = "org_province")
+    private String province;
+
+    /**
+     * 所属市
+     */
+    @Column(name="org_city")
+    private String city;
+
+    /**
+     * 详细地址
+     */
+    @Column(name="org_address")
+    private String address;
+
+    /**
+     * 机构登记性质
+     */
+    @Column(name = "org_reg_type")
+    private String regType;
+
+    /**
+     * 主要领域：
+     1.疾病援助2.扶贫救灾
+     3.教育助学 4.环境，动物保护
+     5.其他
+     */
+    @Column(name = "org_major")
+    private Integer majorArea;
+
+    /**
+     * 年募捐额
+     */
+    @Column(name="org_year_donations")
+    private Long yearDonationAmount;
+
+    /**
+     * 全职人数
+     */
+    @Column(name="org_full_times")
+    private Long fullTimePopulation;
+
+    /**
+     * 兼职人数
+     */
+    @Column(name="org_part_times")
+    private Long partTimePopulation;
+
+    /**
+     * 志愿者人数
+     */
+    @Column(name="org_voluntaries")
+    private Long voluntaryPopulation;
+
+    /**
+     * 成立日期
+     */
+    @Column(name="org_create_time")
+    private Date createTime;
+
+    /**
+     * 官网地址
+     */
+    @Column(name="org_website")
+    private String website;
+
+    /**
+     * 机构简介
+     */
+    @Column(name="org_summary")
+    private String summary;
+
+    /**
+     * 负责人姓名
+     */
+    @Column(name="org_manager_name")
+    private String managerName;
+
+    /**
+     * 负责人身份证号
+     */
+    @Column(name="org_manager_idcard")
+    private String managerIdcard;
+
+    /**
+     * 负责人办公电话
+     */
+    @Column(name="org_manager_oph")
+    private String managerOph;
+
+    /**
+     * 负责人个人手机
+     */
+    @Column(name="org_manager_mobile")
+    private Long managerMobile;
+
+    /**
+     * 联系人姓名
+     */
+    @Column(name="org_contact_name")
+    private String contactName;
+
+    /**
+     * 联系人身份证号
+     */
+    @Column(name="org_contact_idcard")
+    private String contactIdcard;
+
+    /**
+     * 联系人电话
+     */
+    @Column(name="org_contact_tel")
+    private Long contactTel;
+
+
+    /**
+     * 联系人电子邮箱
+     */
+    @Column(name ="org_contact_email")
+    private String contactEmail;
+
+    /**
+     * 银行卡开户名称
+     */
+    @Column(name="org_bank_card_name")
+    private String bankCardName;
+
+
+    /**
+     * 开户银行
+     */
+    @Column(name="org_card_of_bank")
+    private String cardOfBank;
+
+    /**
+     * 银行卡支行信息
+     */
+    @Column(name="org_branch_message")
+    private String branchMessage;
+
+    /**
+     * 银行卡账号
+     */
+    @Column(name="org_bank_account")
+    private Long account;
+
+    /**
+     * 机构logo
+     */
+    @Column(name = "org_logo")
+    private String logo;
+
+    /**
+     * 机构证书
+     */
+    @Column(name = "org_certificate")
+    private String certificate;
+
+
+    /**
+     *慈善组织法人登记证书
+     */
+    @Column(name = "org_person_certificate")
+    private String personCertificate;
+
+
+    /**
+     *慈善组织公开募捐资格证书
+     */
+    @Column(name = "org_donate_certificate")
+    private String donateCertificate;
+
+
+    /**
+     * 法人身份证
+     */
+    @Column(name="org_legal_idcard")
+    private String legalIdCard;
+
+
+    /**
+     * 合作商户资料
+     */
+    @Column(name = "org_partner_material")
+    private String material;
+
+
+    /**
+     * 结算银行账号证明
+     */
+    @Column(name = "org_bank_certify")
+    private String certify;
+
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Long getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(Long uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getPerson() {
+        return person;
+    }
+
+    public void setPerson(String person) {
+        this.person = person;
+    }
+
+    public Date getSubmitTime() {
+        return submitTime;
+    }
+
+    public void setSubmitTime(Date submitTime) {
+        this.submitTime = submitTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getRefuse() {
+        return refuse;
+    }
+
+    public void setRefuse(String refuse) {
+        this.refuse = refuse;
+    }
+
+    public String getPersonCertificate() {
+        return personCertificate;
+    }
+
+    public void setPersonCertificate(String personCertificate) {
+        this.personCertificate = personCertificate;
+    }
+
+    public String getDonateCertificate() {
+        return donateCertificate;
+    }
+
+    public void setDonateCertificate(String donateCertificate) {
+        this.donateCertificate = donateCertificate;
+    }
+
+    public String getLegalIdCard() {
+        return legalIdCard;
+    }
+
+    public void setLegalIdCard(String legalIdCard) {
+        this.legalIdCard = legalIdCard;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTelphone() {
+        return telphone;
+    }
+
+    public void setTelphone(String telphone) {
+        this.telphone = telphone;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getRegType() {
+        return regType;
+    }
+
+    public void setRegType(String regType) {
+        this.regType = regType;
+    }
+
+    public Integer getMajorArea() {
+        return majorArea;
+    }
+
+    public void setMajorArea(Integer majorArea) {
+        this.majorArea = majorArea;
+    }
+
+    public Long getYearDonationAmount() {
+        return yearDonationAmount;
+    }
+
+    public void setYearDonationAmount(Long yearDonationAmount) {
+        this.yearDonationAmount = yearDonationAmount;
+    }
+
+    public Long getFullTimePopulation() {
+        return fullTimePopulation;
+    }
+
+    public void setFullTimePopulation(Long fullTimePopulation) {
+        this.fullTimePopulation = fullTimePopulation;
+    }
+
+    public Long getPartTimePopulation() {
+        return partTimePopulation;
+    }
+
+    public void setPartTimePopulation(Long partTimePopulation) {
+        this.partTimePopulation = partTimePopulation;
+    }
+
+    public Long getVoluntaryPopulation() {
+        return voluntaryPopulation;
+    }
+
+    public void setVoluntaryPopulation(Long voluntaryPopulation) {
+        this.voluntaryPopulation = voluntaryPopulation;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getWebsite() {
+        return website;
+    }
+
+    public void setWebsite(String website) {
+        this.website = website;
+    }
+
+    public String getSummary() {
+        return summary;
+    }
+
+    public void setSummary(String summary) {
+        this.summary = summary;
+    }
+
+    public String getManagerName() {
+        return managerName;
+    }
+
+    public void setManagerName(String managerName) {
+        this.managerName = managerName;
+    }
+
+    public String getManagerIdcard() {
+        return managerIdcard;
+    }
+
+    public void setManagerIdcard(String managerIdcard) {
+        this.managerIdcard = managerIdcard;
+    }
+
+    public String getManagerOph() {
+        return managerOph;
+    }
+
+    public void setManagerOph(String managerOph) {
+        this.managerOph = managerOph;
+    }
+
+    public Long getManagerMobile() {
+        return managerMobile;
+    }
+
+    public void setManagerMobile(Long managerMobile) {
+        this.managerMobile = managerMobile;
+    }
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
+
+    public String getContactIdcard() {
+        return contactIdcard;
+    }
+
+    public void setContactIdcard(String contactIdcard) {
+        this.contactIdcard = contactIdcard;
+    }
+
+    public Long getContactTel() {
+        return contactTel;
+    }
+
+    public void setContactTel(Long contactTel) {
+        this.contactTel = contactTel;
+    }
+
+    public String getContactEmail() {
+        return contactEmail;
+    }
+
+    public void setContactEmail(String contactEmail) {
+        this.contactEmail = contactEmail;
+    }
+
+    public String getBankCardName() {
+        return bankCardName;
+    }
+
+    public void setBankCardName(String bankCardName) {
+        this.bankCardName = bankCardName;
+    }
+
+    public String getCardOfBank() {
+        return cardOfBank;
+    }
+
+    public void setCardOfBank(String cardOfBank) {
+        this.cardOfBank = cardOfBank;
+    }
+
+    public String getBranchMessage() {
+        return branchMessage;
+    }
+
+    public void setBranchMessage(String branchMessage) {
+        this.branchMessage = branchMessage;
+    }
+
+    public Long getAccount() {
+        return account;
+    }
+
+    public void setAccount(Long account) {
+        this.account = account;
+    }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
+
+    public String getCertificate() {
+        return certificate;
+    }
+
+    public void setCertificate(String certificate) {
+        this.certificate = certificate;
+    }
+
+    public String getMaterial() {
+        return material;
+    }
+
+    public void setMaterial(String material) {
+        this.material = material;
+    }
+
+    public String getCertify() {
+        return certify;
+    }
+
+    public void setCertify(String certify) {
+        this.certify = certify;
+    }
+}
+

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

@@ -0,0 +1,366 @@
+package com.uas.service.donate.model;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Entity
+@Table(name="donate$project")
+public class Project implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+    private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+
+
+    /**
+     * 项目编号
+     */
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name = "pro_id")
+    private Long id;
+
+
+    /**
+     * 注册编号
+     */
+    @Column(name="pro_code")
+    private String code;
+
+    /**
+     * 项目名称
+     */
+    @Column(name = "pro_name")
+    private String name;
+
+    /**
+     * 捐助领域
+     */
+    @Column(name = "pro_area")
+    private String area;
+
+    /**
+     * 项目所在省
+     */
+    @Column(name = "pro_province")
+    private String province;
+
+    /**
+     * 项目所在市
+     */
+    @Column(name = "pro_city")
+    private String city;
+
+
+    /**
+     *筹款目标
+     */
+    @Column(name = "pro_target")
+    private Long target;
+
+    /**
+     * 发起缘由
+     */
+    @Column(name = "pro_reason")
+    private String reason;
+
+
+    /**
+     *PC端主图
+     */
+    @Column(name = "pro_pc_img")
+    private String pcImg;
+
+    /**
+     * 手机端主图
+     */
+    @Column(name = "pro_mobile_img")
+    private String mobileImg;
+
+    /**
+     *手机列表图
+     */
+    @Column(name = "pro_mobile_list_img")
+    private String listImg;
+
+    /**
+     * 发起人姓名
+     */
+    @Column(name = "pro_person_name")
+    private String personName;
+
+    /**
+     * 发起人头像
+     */
+    @Column(name="pro_person_logo")
+    private String logo;
+
+
+    /**
+     * 发起人工作单位
+     */
+    @Column(name = "pro_person_workunit")
+    private String workunit;
+
+    /**
+     * 发起人简介
+     */
+    @Column(name = "pro_person_summary")
+    private String summary;
+
+    /**
+     * 项目简介
+     */
+    @Column(name = "pro_summary")
+    private String proSummary;
+
+    /**
+     * 项目介绍
+     */
+    @Column(name = "pro_introduction")
+    private String introduction;
+
+    /**
+     * 项目详情
+     */
+    @Column(name="pro_detail")
+    private String detail;
+
+    /**
+     * 核状态（0:待审核 1：批准 2：驳回）
+     */
+    @Column(name = "pro_status")
+    private Integer status;
+
+
+    /**
+     * 所属机构
+     */
+    @Column(name = "pro_org_id")
+    private Long orgId;
+
+    /**
+     * 开始时间
+     */
+    @Column(name = "pro_start_time")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @Column(name = "pro_end_time")
+    private Date endTime;
+
+    /**
+     * 提交时间
+     */
+    @Column(name="pro_submit_time")
+    private Date submitTime;
+
+    /**
+     * 驳回理由
+     */
+    @Column(name="org_refuse")
+    private String refuse;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public Long getTarget() {
+        return target;
+    }
+
+    public void setTarget(Long target) {
+        this.target = target;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public String getPcImg() {
+        return pcImg;
+    }
+
+    public void setPcImg(String pcImg) {
+        this.pcImg = pcImg;
+    }
+
+    public String getMobileImg() {
+        return mobileImg;
+    }
+
+    public void setMobileImg(String mobileImg) {
+        this.mobileImg = mobileImg;
+    }
+
+    public String getListImg() {
+        return listImg;
+    }
+
+    public void setListImg(String listImg) {
+        this.listImg = listImg;
+    }
+
+    public String getPersonName() {
+        return personName;
+    }
+
+    public void setPersonName(String personName) {
+        this.personName = personName;
+    }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
+
+    public String getWorkunit() {
+        return workunit;
+    }
+
+    public void setWorkunit(String workunit) {
+        this.workunit = workunit;
+    }
+
+    public String getSummary() {
+        return summary;
+    }
+
+    public void setSummary(String summary) {
+        this.summary = summary;
+    }
+
+    public String getProSummary() {
+        return proSummary;
+    }
+
+    public void setProSummary(String proSummary) {
+        this.proSummary = proSummary;
+    }
+
+    public String getIntroduction() {
+        return introduction;
+    }
+
+    public void setIntroduction(String introduction) {
+        this.introduction = introduction;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
+    public String getStartTime() {
+        Date date=this.startTime;
+       return date!=null?sdf.format(this.startTime):null;
+    }
+
+    public void setAtartTime(Date atartTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        Date date=this.endTime;
+        return date!=null?sdf.format(date):null;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getSubmitTime() {
+
+        Date date=this.submitTime;
+        return date!=null?sdf.format(date):null;
+    }
+
+    public void setSubmitTime(Date submitTime) {
+        this.submitTime = submitTime;
+    }
+
+    public String getRefuse() {
+        return refuse;
+    }
+
+    public void setRefuse(String refuse) {
+        this.refuse = refuse;
+    }
+}

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

@@ -0,0 +1,86 @@
+package com.uas.service.donate.model;
+
+import javax.persistence.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Entity
+@Table(name="donate$projectconclude")
+public class ProjectConclude {
+    private static final long serialVersionUID = 1L;
+    private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+
+    /**
+     * 编号
+     */
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    /**
+     * 项目编号
+     */
+    @Column(name="pro_id")
+    private Long proId;
+
+
+    /**
+     * 项目结项管理描述
+     */
+    @Column(name="conclude_description")
+    private String description;
+
+    /**
+     *表单提交状态
+     */
+    @Column(name="status")
+    private Integer status;
+
+    /**
+     * 提交时间
+     */
+    @Column(name="submittime")
+    private Date submitTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getProId() {
+        return proId;
+    }
+
+    public void setProId(Long proId) {
+        this.proId = proId;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getSubmitTime() {
+        Date date = this.submitTime;
+        return date != null ? sdf.format(this.submitTime) : null;
+    }
+
+    public void setSubmitTime(Date submitTime) {
+        this.submitTime = submitTime;
+    }
+}

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

@@ -0,0 +1,86 @@
+package com.uas.service.donate.model;
+
+import javax.persistence.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Entity
+@Table(name = "donate$projectevolve")
+public class ProjectEvolve {
+    private static final long serialVersionUID = 1L;
+    private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+
+    /**
+     * 编号
+     */
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    /**
+     * 项目编号
+     */
+    @Column(name="pro_id")
+    private Long proId;
+
+
+    /**
+     * 项目报告描述
+     */
+    @Column(name="evolve_description")
+    private String description;
+
+    /**
+     *表单提交状态
+     */
+    @Column(name="status")
+    private Integer status;
+
+    /**
+     * 提交时间
+     */
+    @Column(name="submittime")
+    private Date submitTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getProId() {
+        return proId;
+    }
+
+    public void setProId(Long proId) {
+        this.proId = proId;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getSubmitTime() {
+        Date date = this.submitTime;
+        return date != null ? sdf.format(this.submitTime) : null;
+    }
+
+    public void setSubmitTime(Date submitTime) {
+        this.submitTime = submitTime;
+    }
+}

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

@@ -0,0 +1,87 @@
+package com.uas.service.donate.model;
+
+import javax.persistence.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Entity
+@Table(name = "donate$projectfinance")
+public class ProjectFinance {
+    private static final long serialVersionUID = 1L;
+    private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+
+    /**
+     * 编号
+     */
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    /**
+     * 项目编号
+     */
+    @Column(name="pro_id")
+    private Long proId;
+
+
+    /**
+     * 项目报告描述
+     */
+    @Column(name="finance_description")
+    private String description;
+
+    /**
+     *表单提交状态
+     */
+    @Column(name="status")
+    private Integer status;
+
+    /**
+     * 提交时间
+     */
+    @Column(name="submittime")
+    private Date submitTime;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getProId() {
+        return proId;
+    }
+
+    public void setProId(Long proId) {
+        this.proId = proId;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getSubmitTime() {
+        Date date = this.submitTime;
+        return date != null ? sdf.format(this.submitTime) : null;
+    }
+
+    public void setSubmitTime(Date submitTime) {
+        this.submitTime = submitTime;
+    }
+}

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

@@ -0,0 +1,81 @@
+package com.uas.service.donate.model;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name="donate$projectrecode")
+public class ProjectRecode {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name="pr_id")
+    private  Long id;
+
+    /**
+     * 项目编号
+     */
+    @Column(name="pr_pro_id")
+    private Long proId;
+
+    /**
+     * 项目
+     */
+    @OneToOne(cascade = { CascadeType.REFRESH, CascadeType.MERGE })
+    @JoinColumn(name = "pr_pro_id", insertable = false, updatable = false)
+    private Project project;
+
+    /**
+     * 优软云账号
+     */
+    @Column(name="pr_uuid")
+    private Long uuid;
+
+
+    /**
+     * 捐款额
+     * @return
+     */
+    @Column(name = "pr_amount")
+    private Double amount;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getProId() {
+        return proId;
+    }
+
+    public void setProId(Long proId) {
+        this.proId = proId;
+    }
+
+    public Project getProject() {
+        return project;
+    }
+
+    public void setProject(Project project) {
+        this.project = project;
+    }
+
+    public Long getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(Long uuid) {
+        this.uuid = uuid;
+    }
+
+    public Double getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Double amount) {
+        this.amount = amount;
+    }
+}

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

@@ -0,0 +1,87 @@
+package com.uas.service.donate.model;
+
+import javax.persistence.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Entity
+@Table(name = "donate$projectreport")
+public class ProjectReport {
+    private static final long serialVersionUID = 1L;
+    private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+
+    /**
+     * 编号
+     */
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    /**
+     * 项目编号
+     */
+    @Column(name="pro_id")
+    private Long proId;
+
+
+    /**
+     * 项目报告描述
+     */
+    @Column(name="report_description")
+    private String description;
+
+    /**
+     *表单提交状态
+     */
+    @Column(name="status")
+    private Integer status;
+
+
+    /**
+     * 提交时间
+     */
+    @Column(name="submittime")
+    private Date submitTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getProId() {
+        return proId;
+    }
+
+    public void setProId(Long proId) {
+        this.proId = proId;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getSubmitTime() {
+        Date date = this.submitTime;
+        return date != null ? sdf.format(this.submitTime) : null;
+    }
+
+    public void setSubmitTime(Date submitTime) {
+        this.submitTime = submitTime;
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.uas.service.donate.service;
+
+
+import com.uas.service.donate.model.ActivityRecode;
+
+import java.util.List;
+
+public interface ActivityRecodeService {
+
+    ActivityRecode save(ActivityRecode joinActivity);
+
+    List<ActivityRecode> joins(Long activityId);
+
+    List<ActivityRecode> queryOne(Long uuid);
+
+    ActivityRecode findOne(Long activityId,Long uuid);
+}

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

@@ -0,0 +1,15 @@
+package com.uas.service.donate.service;
+
+import com.uas.service.donate.model.Activity;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+
+public interface ActivityService {
+//    List<Activity> findAll();
+
+    Page<Activity> findAll(Pageable pageable);
+
+    Activity fingById(Long id);
+}

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

@@ -0,0 +1,9 @@
+package com.uas.service.donate.service;
+
+import com.uas.service.donate.model.Award;
+
+import java.util.List;
+
+public interface AwardService {
+    List<Award> getAwards(Long id);
+}

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

@@ -0,0 +1,9 @@
+package com.uas.service.donate.service;
+
+import com.uas.service.donate.model.Org;
+
+public interface OrgService {
+
+    //提交机构申请表单
+    Org save(Org org);
+}

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

@@ -0,0 +1,9 @@
+package com.uas.service.donate.service;
+
+
+import com.uas.service.donate.model.ProjectConclude;
+
+public interface ProjectConcludeService {
+
+    ProjectConclude save(ProjectConclude projectConclude);
+}

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

@@ -0,0 +1,8 @@
+package com.uas.service.donate.service;
+
+
+import com.uas.service.donate.model.ProjectEvolve;
+
+public interface ProjectEvolveService {
+    ProjectEvolve save(ProjectEvolve projectEvolve);
+}

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

@@ -0,0 +1,9 @@
+package com.uas.service.donate.service;
+
+
+import com.uas.service.donate.model.ProjectFinance;
+
+public interface ProjectFinanceService {
+
+    ProjectFinance save(ProjectFinance projectFinance);
+}

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

@@ -0,0 +1,20 @@
+package com.uas.service.donate.service;
+
+import com.uas.service.donate.model.ProjectRecode;
+
+import java.util.List;
+
+public interface ProjectRecodeService {
+
+    List<ProjectRecode> findByuuid(Long uuid);
+
+    ProjectRecode join(Long uuid,Double amount);
+
+    Double totality();
+
+    Long historyPerson();
+
+    Long sumPerson(Long proId);
+
+    Double sumamount(Long proId);
+}

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

@@ -0,0 +1,10 @@
+package com.uas.service.donate.service;
+
+
+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

@@ -0,0 +1,15 @@
+package com.uas.service.donate.service;
+
+
+import com.uas.service.donate.model.Project;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+public interface ProjectService {
+
+    Page<Project> findAll(Pageable pageable);
+
+    Project save(Project project);
+
+    Project findOne(Long id);
+}

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

@@ -1,8 +0,0 @@
-package com.uas.service.donate.service;
-
-/**
- * Created by dongbw
- * 17/09/27 16:25.
- */
-public class TestService {
-}

donate-service/src/main/java/com/uas/service/donate/util/FileUrl.java

@@ -0,0 +1,35 @@
+package com.uas.service.donate.util;
+
+/**
+ * 文件服务器的基本链接
+ *
+ * @author yuj 2017-10-12 14:53
+ */
+public class FileUrl {
+
+    /**
+     * 文件上传
+     */
+    public final static String FILE_UPLOAD = "http://10.10.100.200:9999/file/upload";
+
+
+    /**
+     * 文件下载
+     */
+    public final static String FILE_DOWNLOAD = "http://10.10.100.200:9999/file/download";
+
+    /**
+     * 文件删除
+     */
+    public final static String FILE_DELETE = "http://10.10.100.200:9999/file/delete";
+
+    /**
+     * 文件信息
+     */
+    public final static String FILE_INFO = "http://10.10.100.200:9999/file/info";
+
+    /**
+     * 文件额外属性
+     */
+    public final static String FILE_METADATA = "http://10.10.100.200:9999/file/metadata";
+}

donate-service/src/main/java/com/uas/service/donate/util/HttpUtils.java

@@ -0,0 +1,299 @@
+package com.uas.service.donate.util;
+
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.Consts;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.FileBody;
+import org.apache.http.entity.mime.content.InputStreamBody;
+import org.apache.http.entity.mime.content.StringBody;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.*;
+import java.util.Map.Entry;
+
+public class HttpUtils {
+
+	/**
+	 * 发起POST、PUT请求
+	 * 
+	 * @param params
+	 * @return
+	 * @throws Exception
+	 */
+	public static Response get(String url, Map<String, Object> params) throws Exception {
+		CloseableHttpClient httpClient = HttpClients.createDefault();
+		HttpEntityEnclosingRequestBase request = null;
+		CloseableHttpResponse response = null;
+		try {
+			StringBuilder buf = new StringBuilder(url);
+			if (params != null && !params.isEmpty()) {
+				if (url.indexOf("?") == -1)
+					buf.append("?");
+				else if (!url.endsWith("&"))
+					buf.append("&");
+				Set<Entry<String, Object>> entrys = params.entrySet();
+				for (Entry<String, Object> entry : entrys) {
+					buf.append(entry.getKey()).append("=").append(URLEncoder.encode(String.valueOf(entry.getValue()), "UTF-8")).append("&");
+				}
+			}
+			request = new HttpPost(buf.toString());
+			response = httpClient.execute(request);
+			return Response.getResponse(response);
+		} finally {
+			request.releaseConnection();
+			try {
+				httpClient.close();
+			} catch (IOException e) {
+			}
+			if (response != null) {
+				try {
+					response.close();
+				} catch (IOException e) {
+				}
+			}
+		}
+	}
+
+	/**
+	 * 发起POST、PUT请求
+	 *
+	 * @param datas
+	 * @return
+	 * @throws Exception
+	 */
+	public static Response post(String url, Collection<?> datas) throws Exception {
+		CloseableHttpClient httpClient = HttpClients.createDefault();
+		HttpEntityEnclosingRequestBase request = new HttpPost(url);
+		CloseableHttpResponse response = null;
+		try {
+			if (datas != null && !datas.isEmpty()) {
+				request.setEntity(new StringEntity(FlexJsonUtils.toJson(datas), ContentType.create("text/plain", Consts.UTF_8)));
+			}
+			response = httpClient.execute(request);
+			return Response.getResponse(response);
+		} finally {
+			request.releaseConnection();
+			try {
+				httpClient.close();
+			} catch (IOException e) {
+			}
+			if (response != null) {
+				try {
+					response.close();
+				} catch (IOException e) {
+				}
+			}
+		}
+	}
+
+	/**
+	 * 发起POST、PUT请求
+	 *
+	 * @param params
+	 * @return
+	 * @throws Exception
+	 */
+	public static Response post(String url, Map<String, String> params) throws Exception {
+		CloseableHttpClient httpClient = HttpClients.createDefault();
+		HttpEntityEnclosingRequestBase request = new HttpPost(url);
+		CloseableHttpResponse response = null;
+		try {
+			List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+			if (params != null && !params.isEmpty()) {
+				Set<Entry<String, String>> entrys = params.entrySet();
+				for (Entry<String, String> entry : entrys) {
+					nvps.add(new BasicNameValuePair(entry.getKey(), URLEncoder.encode(entry.getValue(), "UTF-8")));
+				}
+			}
+			request.setEntity(new UrlEncodedFormEntity(nvps));
+			response = httpClient.execute(request);
+			return Response.getResponse(response);
+		} finally {
+			request.releaseConnection();
+			try {
+				httpClient.close();
+			} catch (IOException e) {
+			}
+			if (response != null) {
+				try {
+					response.close();
+				} catch (IOException e) {
+				}
+			}
+		}
+	}
+
+	/**
+	 * http上传文件
+	 * 
+	 * @param url
+	 *            请求地址
+	 * @param filePath
+	 *            附件路径
+	 * @param params
+	 *            参数
+	 * @return
+	 * @throws Exception
+	 * @throws IOException
+	 * @throws IllegalStateException
+	 */
+	public static Response upload(String url, String filePath, Map<String, String> params) throws IllegalStateException, IOException,
+			Exception {
+		CloseableHttpClient httpClient = null;
+		CloseableHttpResponse response = null;
+		try {
+			httpClient = HttpClients.createDefault();
+			HttpPost httpPost = new HttpPost(url);
+			FileBody fileBody = new FileBody(new File(filePath));
+			MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+			builder.addPart("file", fileBody);
+			if (params != null) {
+				for (String paramKey : params.keySet()) {
+					StringBody body = new StringBody(params.get(paramKey), ContentType.create("text/plain", Consts.UTF_8));
+					builder.addPart(paramKey, body);
+				}
+			}
+			HttpEntity reqEntity = builder.build();
+			httpPost.setEntity(reqEntity);
+			response = httpClient.execute(httpPost);
+			return Response.getResponse(response);
+		} finally {
+			try {
+				if (response != null) {
+					response.close();
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+			try {
+				if (httpClient != null) {
+					httpClient.close();
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * http上传文件
+	 *
+	 * @param url
+	 *            请求地址
+	 * @param multipartFile
+	 *            附件路径
+	 * @param params
+	 *            参数
+	 * @return
+	 * @throws Exception
+	 * @throws IOException
+	 * @throws IllegalStateException
+	 */
+	public static Response upload(String url, MultipartFile multipartFile, Map<String, String> params) throws IllegalStateException, IOException,
+			Exception {
+		CloseableHttpClient httpClient = null;
+		CloseableHttpResponse response = null;
+		try {
+			httpClient = HttpClients.createDefault();
+			HttpPost httpPost = new HttpPost(url);
+			InputStreamBody streamBody = new InputStreamBody(multipartFile.getInputStream(),
+				multipartFile.getOriginalFilename());
+			MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+			builder.addPart("file", streamBody);
+			if (params != null) {
+				for (String paramKey : params.keySet()) {
+					StringBody body = new StringBody(params.get(paramKey), ContentType.create("text/plain", Consts.UTF_8));
+					builder.addPart(paramKey, body);
+				}
+			}
+			HttpEntity reqEntity = builder.build();
+			httpPost.setEntity(reqEntity);
+			response = httpClient.execute(httpPost);
+			return Response.getResponse(response);
+		} finally {
+			try {
+				if (response != null) {
+					response.close();
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+			try {
+				if (httpClient != null) {
+					httpClient.close();
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * 下载
+	 * 
+	 * @param url
+	 * @return
+	 * @throws ClientProtocolException
+	 * @throws IOException
+	 */
+	public static InputStream download(String url) throws ClientProtocolException, IOException {
+		CloseableHttpClient httpClient = HttpClients.createDefault();
+		HttpGet httpGet = new HttpGet(url);
+		CloseableHttpResponse response = httpClient.execute(httpGet);
+		return response.getEntity().getContent();
+	}
+
+	public static class Response {
+		private int statusCode;
+		private String responseText;
+
+		public int getStatusCode() {
+			return statusCode;
+		}
+
+		public void setStatusCode(int statusCode) {
+			this.statusCode = statusCode;
+		}
+
+		public String getResponseText() {
+			return responseText;
+		}
+
+		public void setResponseText(String responseText) {
+			this.responseText = responseText;
+		}
+
+		public Response() {
+		}
+
+		public Response(HttpResponse response) throws IllegalStateException, IOException, Exception {
+			this.statusCode = response.getStatusLine().getStatusCode();
+			this.responseText = IOUtils.toString(response.getEntity().getContent());
+		}
+
+		public static Response getResponse(HttpResponse response) throws IllegalStateException, IOException, Exception {
+			if (response != null)
+				return new Response(response);
+			return null;
+		}
+	}
+}