实现层文件夹修改

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

@@ -1,103 +0,0 @@
-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 {
-
-    @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);
-    }
-
-    //查询某一活动的中奖者信息
-    public List<ActivityRecode> whoGetAward(Long activityId){
-        List<ActivityRecode> joinActivities =  activityRecodeDao. findWhoGetAward(activityId);
-        return joinActivities;
-    }
-
-    //查询某一活动的参与人
-    public List<ActivityRecode> joins(Long activityId){
-       return activityRecodeDao.joins(activityId);
-    }
-
-    public List<ActivityRecode> queryOne(Long uuid){
-        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

@@ -1,277 +0,0 @@
-package com.uas.console.donate.impl;
-
-import com.uas.console.donate.dao.ActivityDao;
-import com.uas.console.donate.dao.AwardDao;
-import com.uas.console.donate.dao.ProjectDao;
-import com.uas.console.donate.dao.ProjectQualificationDao;
-import com.uas.console.donate.model.*;
-import com.uas.console.donate.service.ActivityService;
-import com.uas.console.donate.util.CollectionUtils;
-import com.uas.console.donate.util.ObjectUtils;
-import com.uas.platform.core.model.PageInfo;
-import com.uas.platform.core.persistence.criteria.PredicateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-
-@Service
-public class ActivityServiceImpl implements ActivityService{
-
-    private static final SimpleDateFormat codesdf=new SimpleDateFormat("yyyymmddhhmmsssss");
-
-    @Autowired
-    private ActivityDao activityDao;
-
-    @Autowired
-    private AwardDao awardDao;
-
-    @Autowired
-    private ProjectDao projectDao;
-
-    @Autowired
-    private ProjectQualificationDao projectQualificationDao;
-
-
-    /**
-     * 如果活动有草稿状态就取出草稿
-     */
-    public Activity show(){
-        Long userUU = 10000L;
-        if(activityDao.findDraft(userUU)!=null){
-            return activityDao.findDraft(userUU);
-        }else{
-            return null;
-        }
-    }
-    /**
-     * 保存活动
-     * @param activity
-     * @return
-     */
-    public Activity save(Activity activity) {
-        Date date = new Date();
-        //如果是保存过的活动，则不需要重新生成编号
-        if(activity.getId()!=null){
-           // activity.setId(activity.getId());
-            //删除和该活动关联过的所有项目
-            projectQualificationDao.deletByActivityId(activity.getId());
-        }
-        activity.setSubmitTime(date);
-       // activity.setCode();
-        //设置成草稿状态
-        if(activity.getPublish()!=2){
-            activity.setPublish(1);
-        }
-        //设置活动展示优先级
-        activity.setPriority(1);
-
-        //存放不同奖品的list集合
-        List<Award> list=new ArrayList<Award>();
-
-        //设置奖品信息
-        List<Award> awardList = activity.getAwards();
-
-            for (Award award : awardList) {
-                //如果对象里的属性值不是全部为空
-                if(ObjectUtils.isNull(award)){
-                    System.out.print(award+"  ");
-                    award.setActivityId(activity.getId());
-                    list.add(award);
-                }
-            }
-            awardDao.save(list);
-
-        /**
-         * 重新设置该活动关联的项目
-         */
-        //存放多个有资格参与活动的项目的集合
-        List<ProjectQualification> list1=new ArrayList<ProjectQualification>();
-
-        //有资格参与该活动的项目,前台传入的是项目id号
-        List<ProjectQualification> projectQualificationList=activity.getProjectQualificationList();
-            for(ProjectQualification projectQualification:projectQualificationList){
-                //关联项目数
-                int count=0;
-                //由于前台可能传来一个空对象，所以要对对象属性做判空判断
-                if(ObjectUtils.isNull(projectQualification)){
-                    //给项目资格表设置活动id
-                    projectQualification.setActivityId(activity.getId());
-
-                    if(projectQualification.getProId()!=null){
-                        //通过项目id，获取项目名称
-                        Project project=projectDao.findOne(projectQualification.getProId());
-                        //给项目资格表里面设置项目的名称
-                        projectQualification.setName(project.getName());
-                        count++;
-                    }
-
-                    list1.add(projectQualification);
-                }
-                //给活动设置相关项目数
-                activity.setSumconnect(count);
-            }
-            projectQualificationDao.save(list1);
-
-        return  activityDao.saveAndFlush(activity);
-    }
-
-    public Activity submit(Activity activity){
-
-        Date date=new Date();
-        //设置活动发布时间
-        activity.setSubmitTime(date);
-        //设置活动编号
-        activity.setCode(codesdf.format(date));
-
-        //设置成发布状态
-        activity.setPublish(2);
-
-        return activityDao.save(activity);
-    }
-
-    public Activity up(Long id){
-        Integer max=activityDao.findMAxPrioruty();
-        max++;
-        Activity activity=activityDao.findOne(id);
-        activity.setPriority(max);
-        return activityDao.save(activity);
-    }
-
-
-    public Activity findOne(Long id){
-        return activityDao.findOne(id);
-    }
-
-    //搜索出所有已结束的活动
-    public Page<Activity> findEndActivities(Pageable pageable){
-        return activityDao.findEndActivities(pageable);
-    }
-
-    //搜索出所有还未开始的活动
-    public Page<Activity> findNotStart(Pageable pageable){
-        return activityDao.findNotStart(pageable);
-    }
-
-    //搜索出所有正在进行的活动
-    public  Page<Activity> findInprocess(Pageable pageable){
-        return activityDao.findInprocess(pageable);
-    }
-
-    //查找某一活动具体信息
-    public Activity fingById(Long id){
-        return  activityDao.findOne(id);
-    }
-
-    @Override
-    public Page<Activity> getAllActivities(final PageInfo pageInfo, final SearchFilter filter) {
-        return activityDao.findAll(new Specification<Activity>() {
-            @Override
-            public Predicate toPredicate(Root<Activity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
-                if (null != filter) {
-                    String keyword = filter.getKeyword();
-                    if (StringUtils.hasText(keyword)) {
-                        pageInfo.expression(PredicateUtils.or(PredicateUtils.like("name", keyword, false),
-                                PredicateUtils.like("code", keyword, false),
-                                PredicateUtils.like("summary", keyword, false)));
-                    }
-                }
-                query.where(pageInfo.getPredicates(root, query, cb));
-                return null;
-            }
-        }, pageInfo);
-    }
-
-    @Override
-    public Page<Activity> getDoneActivities(PageInfo pageInfo, SearchFilter filter) {
-        Date now = new Date();
-        pageInfo.expression(PredicateUtils.and(PredicateUtils.lte("startTime", now, false),
-                PredicateUtils.gte("endTime", now, false)));
-        pageInfo.expression(PredicateUtils.eq("publish", 2, false));
-        return getAllActivities(pageInfo, filter);
-    }
-
-    @Override
-    public Page<Activity> getTodoActivities(PageInfo pageInfo, SearchFilter filter) {
-        Date now = new Date();
-        pageInfo.expression(PredicateUtils.gt("startTime", now, false));
-        pageInfo.expression(PredicateUtils.eq("publish", 2, false));
-        return getAllActivities(pageInfo, filter);
-    }
-
-    @Override
-    public Page<Activity> getEndActivities(PageInfo pageInfo, SearchFilter filter) {
-        Date now = new Date();
-        pageInfo.expression(PredicateUtils.lt("endTime", now, false));
-        pageInfo.expression(PredicateUtils.eq("publish", 2, false));
-        return getAllActivities(pageInfo, filter);
-    }
-
-    @Override
-    public Page<Activity> getWaitingActivities(PageInfo pageInfo, SearchFilter filter) {
-        pageInfo.expression(PredicateUtils.eq("publish", 1, false));
-        return getAllActivities(pageInfo, filter);
-    }
-
-    @Override
-    public ModelMap getActivitiesNum() {
-        ModelMap map = new ModelMap();
-        Date now = new Date();
-        map.put("doneNum", null != activityDao.findDoneActivitiesNum(now) ? activityDao.findDoneActivitiesNum(now) : 0);
-        map.put("todoNum", null != activityDao.findTodoActivitiesNum(now) ? activityDao.findTodoActivitiesNum(now) : 0);
-        map.put("endNum", null != activityDao.findEndActivitiesNum(now)? activityDao.findEndActivitiesNum(now) : 0);
-        map.put("waitingNum", null != activityDao.findWaitingActivitiesNum() ? activityDao.findWaitingActivitiesNum() : 0);
-        return map;
-    }
-
-    @Override
-    public List<ProjectQualification> getRelatedProject(Long activityId) {
-        return projectQualificationDao.hasConnected(activityId);
-    }
-
-    @Override
-    public Activity openAward(Long activityId) {
-        Activity activity = activityDao.findOne(activityId);
-        activity.setLuckyTime(new Date());
-        return activityDao.save(activity);
-    }
-
-    @Override
-    public List<Project> getActivityRelatedProjects(final String keyword, final List<Long> proIds) {
-        // 默认返回100条
-        final PageInfo pageInfo = new PageInfo(1, 100);
-        return projectDao.findAll(new Specification<Project>() {
-            @Override
-            public Predicate toPredicate(Root<Project> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
-                if (StringUtils.hasText(keyword)) {
-                    pageInfo.expression(PredicateUtils.or(PredicateUtils.like("name", keyword, false),
-                            PredicateUtils.like("code", keyword, false),
-                            PredicateUtils.like("proSummary", keyword, false),
-                            PredicateUtils.like("orgName", keyword, false)));
-                }
-                // 默认全部分类设置值为0
-                if (!CollectionUtils.isEmpty(proIds)) {
-                    for (Long proId : proIds) {
-                        pageInfo.expression(PredicateUtils.ne("id", proId, false));
-                    }
-                }
-                query.where(pageInfo.getPredicates(root, query, cb));
-                return null;
-            }
-        }, pageInfo).getContent();
-    }
-
-}

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

@@ -1,141 +0,0 @@
-package com.uas.console.donate.impl;
-
-import com.uas.console.donate.dao.AttachDao;
-import com.uas.console.donate.model.Attach;
-import com.uas.console.donate.model.FileUpload;
-import com.uas.console.donate.service.AttachService;
-import com.uas.console.donate.util.FileUrl;
-import com.uas.console.donate.util.HttpUtils;
-import com.uas.console.donate.util.PathUtils;
-import com.uas.console.donate.util.SystemSession;
-import com.uas.dfs.service.FileClient;
-import com.uas.platform.core.util.FileUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-
-@Service
-public class AttachServiceImpl implements AttachService {
-
-	@Autowired
-	private AttachDao attachDao;
-
-	@Autowired
-	private FileClient fileClient;
-
-	@Override
-	public Attach getAttach(Long id) {
-		return attachDao.findOne(id);
-	}
-
-	@Override
-	public Attach save(Attach attach) {
-		return attachDao.save(attach);
-	}
-
-	@Override
-	public Attach uploadAndSave(FileUpload uploadItem, String parentDir, String description) {
-		return save(upload(uploadItem, parentDir, description));
-	}
-
-	@Override
-	public Attach upload(FileUpload uploadItem, String parentDir, String description) {
-		return upload(uploadItem, description);
-	}
-
-	public Attach upload(FileUpload uploadItem, String description) {
-		String filename = uploadItem.getFile().getOriginalFilename();
-		long size = uploadItem.getFile().getSize();
-		if(size >  100 * 1024 * 1024) {// 100Mb
-			// 是否限制文件上传大小
-		}
-		String path = null;
-        try {
-            path = HttpUtils.upload(FileUrl.FILE_UPLOAD, uploadItem.getFile(), null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-//		String path = fileClient.upload(uploadItem.getFile().getBytes(), size, FilenameUtils.getExtension(filename), null);
-		Attach attach = new Attach(filename, path, description, size, new Date());
-		return attach;
-	}
-
-	@Override
-	public List<Attach> uploadZipAndSave(FileUpload uploadItem, String parentDir, String description,
-			Map<String, Map<String, Object>> entryParams) {
-		Map<String, String> fileMap = uploadZip(uploadItem, parentDir, description);
-		if (fileMap != null) {
-			List<Attach> attachs = new ArrayList<Attach>();
-			String[] sources = null;
-			for (String entry : fileMap.keySet()) {
-				if (entryParams.containsKey(entry)) {
-					File file = new File(fileMap.get(entry));
-					if (file.exists()) {
-						Map<String, Object> params = entryParams.get(entry);
-						sources = params.get("sourceId").toString().split(",");// multi sources
-						for (String sr : sources) {
-							Attach attach = new Attach(String.valueOf(params.get("name")), fileMap.get(entry), description, file.length(),
-									new Date());
-							attach = attachDao.save(attach);
-							attach.setSourceId(sr);
-							attachs.add(attach);
-						}
-					}
-				}
-			}
-			return attachs;
-		}
-		return null;
-	}
-
-	@Override
-	public Map<String, String> uploadZip(FileUpload uploadItem, String parentDir, String description) {
-		String unzipDir = getDir(parentDir);
-		try {
-			List<String> entries = FileUtils.unzip(uploadItem.getFile().getInputStream(), unzipDir);
-			if (!CollectionUtils.isEmpty(entries)) {
-				Map<String, String> fileMap = new HashMap<String, String>();
-				for (String entry : entries) {
-					fileMap.put(entry, unzipDir + File.separator + entry);
-				}
-				return fileMap;
-			}
-		} catch (IOException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		} catch (Error e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * 文件路径
-	 * 
-	 * @param parentDir
-	 * @return
-	 */
-	private String getDir(String parentDir) {
-		String path = PathUtils.getFilePath() + "postattach";
-		File dir = new File(path);
-		if (!dir.isDirectory())
-			dir.mkdir();
-		path += File.separator + parentDir;
-		dir = new File(path);
-		if (!dir.isDirectory())
-			dir.mkdir();
-		if (SystemSession.getUser() != null) {
-			path += File.separator + SystemSession.getUser().getUserUU();
-			dir = new File(path);
-			if (!dir.isDirectory())
-				dir.mkdir();
-		}
-		return path;
-	}
-
-}

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

@@ -1,26 +0,0 @@
-package com.uas.console.donate.impl;
-
-import com.uas.console.donate.dao.AwardDao;
-import com.uas.console.donate.model.Award;
-import com.uas.console.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 Award save(Award award){
-
-       return awardDao.saveAndFlush(award);
-    }
-
-    public List<Award> findByActivityId(Long activityId){
-        return awardDao.findByActivityId(activityId);
-    }
-
-}

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

@@ -1,42 +0,0 @@
-package com.uas.console.donate.impl;
-
-import com.uas.console.donate.model.FileUpload;
-import com.uas.console.donate.service.FileService;
-import com.uas.dfs.service.FileClient;
-import com.uas.platform.core.exception.IllegalOperatorException;
-import org.apache.commons.io.FilenameUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
-
-@Service
-public class FileServiceImpl implements FileService {
-
-    @Autowired
-    private FileClient fileClient;
-
-    @Override
-    public String save(FileUpload fileUpload) {
-        CommonsMultipartFile file = fileUpload.getFile();
-        try {
-            // 上传到文件系统
-            return fileClient.upload(file.getBytes(), file.getSize(),
-                    FilenameUtils.getExtension(file.getOriginalFilename()), null);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new IllegalOperatorException("附件上传失败");
-        }
-    }
-
-    @Override
-    public String save(String fileName, byte[] fileBytes) {
-        try {
-            String path = fileClient.upload(fileBytes, fileBytes.length, FilenameUtils.getExtension(fileName), null);
-            return path;
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new IllegalOperatorException("附件上传失败");
-        }
-    }
-
-}

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

@@ -1,190 +0,0 @@
-package com.uas.console.donate.impl;
-
-
-import com.uas.console.donate.dao.OrgDao;
-import com.uas.console.donate.model.Org;
-import com.uas.console.donate.model.SearchFilter;
-import com.uas.console.donate.service.OrgService;
-import com.uas.platform.core.model.PageInfo;
-import com.uas.platform.core.persistence.criteria.PredicateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-@Service
-public class OrgServiceImpl implements OrgService {
-
-    private static final SimpleDateFormat codesdf=new SimpleDateFormat("yyyymmddhhmmsssss");
-
-    @Autowired
-    private OrgDao orgDao;
-
-    //取出机构信息
-    public Org show(Long uuid){
-        return orgDao.findOne(uuid);
-    }
-
-    //保存机构
-    public ModelMap save(Org org){
-        ModelMap map = new ModelMap();
-        //如果机构不是发布状态，就设置为草稿状态
-        if(org.getPublish()==null||org.getPublish()==1){
-            org.setPublish(1);
-        }
-        try{
-            org = orgDao.save(org);
-        } catch (Exception e) {
-            map.put("error", "系统错误，请联系管理员！");
-        }
-
-        map.put("id", org.getId());
-        map.put("success", "保存成功");
-        return map;
-    }
-
-    //提交机构申请
-    public ModelMap sumbit(Org org){
-        ModelMap map = new ModelMap();
-        //设置未审核
-        org.setStatus(0);
-        //设置正式提交
-        org.setPublish(2);
-        Date date=new Date();
-        //设置机构提交时间
-        org.setSubmitTime(date);
-        //设置机构编号
-        org.setCode(codesdf.format(date));
-        try{
-            org = orgDao.save(org);
-        } catch (Exception e) {
-            map.put("error", "系统错误，请联系管理员！");
-        }
-
-        map.put("id", org.getId());
-        map.put("success", "保存成功");
-        return map;
-    }
-
-    //查询某一机构具体信息
-    public Org findOne(Long id){
-        return orgDao.findOne(id);
-    }
-
-    public Page<Org> findAll(Pageable pageable){
-
-        return orgDao.findAll(pageable);
-    }
-
-
-
-    //批准某机构
-    public Org approve(Long id){
-        Org org=orgDao.findOne(id);
-        org.setStatus(1);
-        return orgDao.save(org);
-    }
-
-    //驳回某机构
-    public Org unapprove(Long id,String refuse){
-        Org org=orgDao.findOne(id);
-        org.setStatus(2);
-        org.setRefuse(refuse);
-        return orgDao.save(org);
-    }
-
-    //取出某状态下的所有机构
-    public List<Org> findByStatus(Integer status){
-        return orgDao.findByStatus(status);
-    }
-
-    //查询某审核状态下，属于某类别的机构
-    public List<Org> findByType(Integer type,Integer status){
-        return orgDao.findByType(type,status);
-    }
-
-    //查询某审核状态下，属于某领域的机构
-    public List<Org> findByMajorArea(Integer majorArea,Integer status){
-        return orgDao.findByMajorArea(majorArea,status);
-    }
-
-    //查询某审核状态下，属于某类别和领域的机构
-    public List<Org> findByTypeAndMajorArea(Integer type,Integer majorArea,Integer status){
-        return orgDao.findByTypeAndMajorArea(type,majorArea,status);
-    }
-
-    //根据搜索框查询机构信息
-    public List<Org> search(String search){
-        return orgDao.search(search);
-    }
-
-    @Override
-    public Page<Org> getAllOrgs(final PageInfo pageInfo, final SearchFilter filter) {
-        return orgDao.findAll(new Specification<Org>() {
-            @Override
-            public Predicate toPredicate(Root<Org> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
-                if (null != filter) {
-                    String keyword = filter.getKeyword();
-                    if (StringUtils.hasText(keyword)) {
-                        pageInfo.expression(PredicateUtils.or(PredicateUtils.like("name", keyword, false),
-                                PredicateUtils.like("code", keyword, false),
-                                PredicateUtils.like("summary", keyword, false),
-                                PredicateUtils.like("person", keyword, false),
-                                PredicateUtils.like("managerName", keyword, false),
-                                PredicateUtils.like("contactName", keyword, false)));
-                    }
-                    // 默认全部分类设置值为0  因为项目中area为string，所以searchFilter中为string
-                    if (null != filter.getArea() && !"".equals(filter.getArea()) && !"0".equals(filter.getArea())) {
-                        pageInfo.expression(PredicateUtils.eq("area", Integer.valueOf(filter.getArea()), false));
-                    }
-                    // 机构类型 默认为0
-                    if (null != filter.getType() && 0 != filter.getType()) {
-                        pageInfo.expression(PredicateUtils.eq("type", Integer.valueOf(filter.getType()), false));
-                    }
-                }
-                query.where(pageInfo.getPredicates(root, query, cb));
-                return null;
-            }
-        }, pageInfo);
-    }
-
-    @Override
-    public Page<Org> getAuditedOrgs(PageInfo pageInfo, SearchFilter filter) {
-        pageInfo.expression(PredicateUtils.eq("status", 1, false));
-        return getAllOrgs(pageInfo, filter);
-    }
-
-    @Override
-    public Page<Org> getUnauditedOrgs(PageInfo pageInfo, SearchFilter filter) {
-        pageInfo.expression(PredicateUtils.eq("status", 0, false));
-        return getAllOrgs(pageInfo, filter);
-    }
-
-    @Override
-    public Page<Org> getDisagreedOrgs(PageInfo pageInfo, SearchFilter filter) {
-        pageInfo.expression(PredicateUtils.eq("status", 2, false));
-        return getAllOrgs(pageInfo, filter);
-    }
-
-    @Override
-    public ModelMap getOrgsNum() {
-        ModelMap map = new ModelMap();
-        map.put("auditedNum", !CollectionUtils.isEmpty(orgDao.findByStatus(1)) ? orgDao.findByStatus(1).size() : 0);
-        map.put("unauditedNum", !CollectionUtils.isEmpty(orgDao.findByStatus(0)) ? orgDao.findByStatus(0).size() : 0);
-        map.put("disagreedNum", !CollectionUtils.isEmpty(orgDao.findByStatus(2))? orgDao.findByStatus(2).size() : 0);
-        return map;
-    }
-
-}

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

@@ -1,18 +0,0 @@
-package com.uas.console.donate.impl;
-
-import com.uas.console.donate.dao.ProjectConcludeDao;
-import com.uas.console.donate.model.ProjectConclude;
-import com.uas.console.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-console/src/main/java/com/uas/console/donate/impl/ProjectEvolveServiceImpl.java

@@ -1,30 +0,0 @@
-package com.uas.console.donate.impl;
-
-import com.uas.console.donate.dao.ProjectEvolveDao;
-import com.uas.console.donate.model.ProjectEvolve;
-import com.uas.console.donate.service.ProjectEvolveService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class ProjectEvolveServiceImpl implements ProjectEvolveService{
-    @Autowired
-    private ProjectEvolveDao projectEvolveDao;
-
-    @Override
-    public ProjectEvolve save(ProjectEvolve projectEvolve) {
-        return projectEvolveDao.save(projectEvolve);
-    }
-
-    //查找某项目所有的项目进度
-    public List<ProjectEvolve> findAll(Long proId){
-        return projectEvolveDao.findAll(proId);
-    }
-
-    //删除某一条进度
-    public ProjectEvolve deleteById(Long id){
-        return projectEvolveDao.deleteById(id);
-    }
-}

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

@@ -1,41 +0,0 @@
-package com.uas.console.donate.impl;
-
-import com.uas.console.donate.dao.ProjectFinanceDao;
-import com.uas.console.donate.model.ProjectFinance;
-import com.uas.console.donate.service.ProjectFinanceService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.web.servlet.ServletComponentScan;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@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);
-    }
-
-    public List<ProjectFinance> findByProId(Long proId){
-        return projectFinanceDao.findByProId(proId);
-    }
-
-    @Override
-    public Double getTotalCostByProId(Long proId) {
-        return projectFinanceDao.getTotalCostByProId(proId);
-    }
-
-    @Override
-    public Double getExecuteCostByProId(Long proId) {
-        return projectFinanceDao.getExecuteCostByProId(proId);
-    }
-
-    @Override
-    public Double getProjectCostByProId(Long proId) {
-        return projectFinanceDao.getProjectCostByProId(proId);
-    }
-}

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

@@ -1,44 +0,0 @@
-package com.uas.console.donate.impl;
-
-import com.uas.console.donate.dao.ProjectQualificationDao;
-import com.uas.console.donate.model.Project;
-import com.uas.console.donate.model.ProjectQualification;
-import com.uas.console.donate.service.ProjectQualificationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-
-@Service
-public class ProjectQualificationServiceImpl implements ProjectQualificationService{
-
-    @Autowired
-    private ProjectQualificationDao projectQualificationDao;
-
-    public ProjectQualification save(ProjectQualification projectQualification){
-        return projectQualificationDao.save(projectQualification);
-    }
-
-
-    //查询某活动已关联的项目
-    public List<ProjectQualification> hasConnected(Long activityId){
-        return projectQualificationDao.hasConnected(activityId);
-    }
-
-    //查询所有还未被关联活动的项目
-    public List<Project> notConnectList(){
-        return projectQualificationDao.notConnectList();
-    }
-
-
-    //删除该活动所有关联的有资格参与该活动的所有项目
-    @Transactional
-    public void deletByActivityId(Long activityId){
-        projectQualificationDao.deletByActivityId(activityId);
-    }
-
-
-
-}

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

@@ -1,22 +0,0 @@
-package com.uas.console.donate.impl;
-
-import com.uas.console.donate.dao.ProjectRecodeDao;
-import com.uas.console.donate.model.ProjectRecode;
-import com.uas.console.donate.service.ProjectRecodeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class ProjectRecodeServiceImpl implements ProjectRecodeService {
-
-    @Autowired
-    private ProjectRecodeDao projectRecodeDao;
-
-    //展示某项目的所有捐款明细
-    public List<ProjectRecode> findProjectDetail(Long proId){
-
-        return projectRecodeDao.findProjectDetail(proId);
-    }
-}

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

@@ -1,306 +0,0 @@
-package com.uas.console.donate.impl;
-
-
-import com.uas.console.donate.dao.OrgDao;
-import com.uas.console.donate.dao.ProjectDao;
-import com.uas.console.donate.dao.ProjectFinanceDao;
-import com.uas.console.donate.dao.ProjectReportDao;
-import com.uas.console.donate.model.*;
-import com.uas.console.donate.service.ProjectService;
-import com.uas.platform.core.model.PageInfo;
-import com.uas.platform.core.persistence.criteria.PredicateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.Date;
-import java.util.List;
-
-@Service
-public class ProjectServiceImpl implements ProjectService {
-
-    @Autowired
-    private ProjectDao projectDao;
-
-    @Autowired
-    private OrgDao orgDao;
-
-    @Autowired
-    private ProjectFinanceDao projectFinanceDao;
-
-    @Autowired
-    private ProjectReportDao projectReportDao;
-
-    //项目发起，有草稿则取出草稿
-    public Project show(){
-        if(projectDao.getDraft()==null){
-            return null;
-        }else{
-            return projectDao.getDraft();
-        }
-    }
-
-    //保存项目草稿
-    public Project save(Project project){
-        if(project.getOrgId()!=null){
-            Org org= orgDao.findOne(project.getOrgId());
-            //得到机构名
-            String orgName=org.getName();
-            project.setOrgName(orgName);
-        }
-        if(project.getPublish()==null||project.getPublish()==1){
-            project.setPublish(1);
-        }
-        return projectDao.save(project);
-    }
-
-    //提交项目
-    public Project submit(Project project) {
-
-        if(project.getOrgId()!=null){
-            Org org= orgDao.findOne(project.getOrgId());
-            //得到机构名
-            String orgName=org.getName();
-            project.setOrgName(orgName);
-        }
-
-        //正式发布
-        project.setPublish(2);
-        //设置未审核状态
-        project.setStatus(0);
-
-        return projectDao.save(project);
-    }
-
-    //取出某项目的机构信息
-    public Org findOrgInfo(Long id){
-        return projectDao.findOrgInfo(id);
-    }
-
-    //取出某项目的具体信息
-    public Project findOne(Long id){
-        return projectDao.findOne(id);
-    }
-
-
-    //查出所有项目
-    public Page<Project> findAll(Pageable pageable){
-
-        return projectDao.findAll(pageable);
-    }
-
-
-    //批注项目
-    public ModelMap approve(Long id){
-        try{
-            Project project=projectDao.findOne(id);
-            project.setStatus(1);
-            projectDao.save(project);
-            return new ModelMap("success", true);
-        } catch (Exception e) {
-            return new ModelMap("error", true);
-        }
-    }
-
-    //驳回项目
-    public ModelMap unapprove(Long id,String refuse){
-        try{
-            Project project=projectDao.findOne(id);
-            project.setStatus(2);
-            project.setRefuse(refuse);
-            projectDao.save(project);
-            return new ModelMap("success", true);
-        } catch (Exception e) {
-            return new ModelMap("error", true);
-        }
-    }
-
-    public List<Project> getProjects(){
-        return projectDao.getProjects();
-    }
-
-
-    //查询某领域以及某状态下的项目
-    public List<Project> queryProjects(String area,Integer status){
-        return projectDao.queryProjects(area,status);
-    }
-
-    //查询某状态下的所有项目
-    public List<Project> findByStatus(Integer status){
-        return projectDao.findByStatus(status);
-    }
-
-    //项目列表搜索框查询
-    public List<Project> search(String search){
-        return projectDao.search(search);
-    }
-
-    @Override
-    public ModelMap reapply(Long id) {
-       try {
-           Project project = projectDao.findOne(id);
-           project.setStatus(0);
-           projectDao.save(project);
-           return new ModelMap("success", true);
-       } catch (Exception e) {
-           return new ModelMap("error", true);
-       }
-    }
-
-    @Override
-    public Page<Project> getAllProjects(final PageInfo pageInfo, final SearchFilter filter) {
-        return projectDao.findAll(new Specification<Project>() {
-            @Override
-            public Predicate toPredicate(Root<Project> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
-                if (null != filter) {
-                    String keyword = filter.getKeyword();
-                    if (StringUtils.hasText(keyword)) {
-                        pageInfo.expression(PredicateUtils.or(PredicateUtils.like("name", keyword, false),
-                                PredicateUtils.like("code", keyword, false),
-                                PredicateUtils.like("proSummary", keyword, false),
-                                PredicateUtils.like("orgName", keyword, false)));
-                    }
-                    // 默认全部分类设置值为0
-                    if (null != filter.getArea() && !"".equals(filter.getArea()) && !"全部".equals(filter.getArea())) {
-                        pageInfo.expression(PredicateUtils.eq("area", filter.getArea(), false));
-                    }
-                }
-                query.where(pageInfo.getPredicates(root, query, cb));
-                return null;
-            }
-        }, pageInfo);
-    }
-
-    @Override
-    public Page<Project> getAuditedProjects(PageInfo pageInfo, SearchFilter filter) {
-        pageInfo.expression(PredicateUtils.eq("status", 1, false));
-        return getAllProjects(pageInfo, filter);
-    }
-
-    @Override
-    public Page<Project> getUnauditedProjects(PageInfo pageInfo, SearchFilter filter) {
-        pageInfo.expression(PredicateUtils.eq("status", 0, false));
-        return getAllProjects(pageInfo, filter);
-    }
-
-    @Override
-    public Page<Project> getDisagreedProjects(PageInfo pageInfo, SearchFilter filter) {
-        pageInfo.expression(PredicateUtils.eq("status", 2, false));
-        return getAllProjects(pageInfo, filter);
-    }
-
-    @Override
-    public ModelMap saveFinance(ProjectFinance finance, Long proId) {
-        ModelMap map = new ModelMap();
-        try {
-            finance.setProId(proId);
-            finance.setSubmitTime(new Date());
-            finance.setStatus(1);
-            Project project = projectDao.findOne(proId);
-            project.setTotalCost((null != project.getTotalCost() ? project.getTotalCost() : 0) + finance.getAmount());
-            projectDao.save(project);
-            projectFinanceDao.save(finance);
-            map.put("success", true);
-        } catch (Exception e) {
-            e.printStackTrace();
-            map.put("error", true);
-        }
-        return map;
-    }
-
-    @Override
-    public ModelMap saveReport(ProjectReport report, Long proId) {
-        ModelMap map = new ModelMap();
-        try {
-            Date date = new Date();
-            report.setProId(proId);
-            report.setSubmitTime(date);
-            report.setStatus(1);
-            Project project = projectDao.findOne(proId);
-            project.setModifyTime(date);
-            projectDao.save(project);
-            projectReportDao.save(report);
-            map.put("success", true);
-        } catch (Exception e) {
-            e.printStackTrace();
-            map.put("error", true);
-        }
-        return map;
-    }
-
-    /**
-     * 获取项目执行天数
-     *
-     * @param id
-     * @return
-     */
-    @Override
-    public Long getExecuteDaysById(Long id) {
-        Long now = new Date().getTime();
-        Project project = projectDao.findOne(id);
-        if (null != project.getStartTime()) {
-            Long startTime = project.getStartTime().getTime();
-            return (now - startTime) / (1000*3600*24);
-        }
-        return 0L;
-    }
-
-    /**
-     * 获取项目更新次数
-     *
-     * @param id
-     * @return
-     */
-    @Override
-    public Integer getUpdateTimesById(Long id) {
-        return projectReportDao.findByProId(id).size();
-    }
-
-    /**
-     * 保存结项报告
-     *
-     * @param conclude
-     * @param id
-     * @return
-     */
-    @Override
-    public ModelMap saveConclude(ProjectConclude conclude, Long id) {
-        return null;
-    }
-
-    /**
-     * 获取已保存的项目草稿
-     *
-     * @return
-     */
-    @Override
-    public Project getSavedProject() {
-        Long userUU = 10000L;
-        List<Project> projects = projectDao.findByPublishAndUserUU(1, userUU);
-        return !CollectionUtils.isEmpty(projects) ? projects.get(0) : null;
-    }
-
-    /**
-     * 获取各类项目数量
-     *
-     * @return
-     */
-    @Override
-    public ModelMap getProjectsNum() {
-        ModelMap map = new ModelMap();
-        map.put("auditedNum", !CollectionUtils.isEmpty(projectDao.findByStatus(1)) ? projectDao.findByStatus(1).size() : 0);
-        map.put("unauditedNum", !CollectionUtils.isEmpty(projectDao.findByStatus(0)) ? projectDao.findByStatus(0).size() : 0);
-        map.put("disagreedNum", !CollectionUtils.isEmpty(projectDao.findByStatus(2))? projectDao.findByStatus(2).size() : 0);
-        return map;
-    }
-
-}

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

@@ -1,20 +0,0 @@
-package com.uas.console.donate.impl;
-
-import com.uas.console.donate.dao.UserDao;
-import com.uas.console.donate.model.User;
-import com.uas.console.donate.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class UserServiceImpl implements UserService{
-
-    @Autowired
-    private UserDao userDao;
-
-    public List<User> findAll(){
-        return userDao.findAll();
-    }
-}

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

@@ -1,88 +0,0 @@
-package com.uas.service.donate.impl;
-
-import com.uas.service.donate.dao.ActivityRecodeDao;
-import com.uas.service.donate.model.Activity;
-import com.uas.service.donate.model.ActivityRecode;
-import com.uas.service.donate.service.ActivityRecodeService;
-import com.uas.service.donate.service.ActivityService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-@Service
-public class ActivityRecodeServiceImpl implements ActivityRecodeService {
-
-    @Autowired
-    private ActivityRecodeDao activityRecodeDao;
-
-    @Autowired
-    private ActivityService activityService;
-
-    public ActivityRecode save(ActivityRecode joinActivity) {
-
-
-        return activityRecodeDao.save(joinActivity);
-    }
-
-    //参与活动
-    public ActivityRecode join(Long activityId, Long uuid) {
-        ActivityRecode activityRecode = new ActivityRecode();
-        activityRecode.setActivityId(activityId);
-        activityRecode.setUuid(uuid);
-        activityRecode.setStatus(0);
-
-        Activity activity = activityService.fingById(activityId);
-        //更新活动参与人数
-        Long joinAmount = activity.getJoinAmount();
-        if (joinAmount == null) {
-            joinAmount = (long) 0;
-        }
-        joinAmount++;
-        activity.setJoinAmount(joinAmount);
-        activityService.save(activity);
-        activityRecodeDao.save(activityRecode);
-        return activityRecode;
-    }
-
-    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);
-    }
-
-    //计算某人活动参与总次数
-    public Long sumJoin(Long uuid) {
-        return activityRecodeDao.sumJoin(uuid);
-    }
-
-    //领奖
-    public ActivityRecode receive(Long activityId,Long uuid){
-        ActivityRecode activityRecode=activityRecodeDao.findOne(activityId,uuid);
-        //设置领取状态
-        activityRecode.setStatus(2);
-        //设置领取时间
-        activityRecode.setReceiveTime(new Date());
-        //找到领奖的活动
-        Activity activity=activityService.fingById(activityId);
-        //重新设置当前活动领奖总人数
-        Integer receivePerson=activity.getReceivePerson();
-        if(receivePerson==null){
-            receivePerson=(int)0;
-        }
-        receivePerson++;
-        activity.setReceivePerson(receivePerson);
-        //保存活动
-        activityService.save(activity);
-        return activityRecodeDao.save(activityRecode);
-    }
-}

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

@@ -1,123 +0,0 @@
-package com.uas.service.donate.impl;
-
-import com.uas.service.donate.dao.ActivityDao;
-import com.uas.service.donate.dao.AwardDao;
-import com.uas.service.donate.model.Activity;
-import com.uas.service.donate.model.Award;
-import com.uas.service.donate.service.ActivityService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class ActivityServiceImpl implements ActivityService {
-
-    @Autowired
-    private ActivityDao activityDao;
-
-    @Autowired
-    private AwardDao awardDao;
-
-    /**
-     * 将活动关联的奖品存进活动字段
-     * @return
-     */
-    private List<Activity> getAwards(List<Activity> activityList){
-
-        List<Activity> list=new ArrayList<>();
-        for(Activity activity:activityList){
-            //通过活动id取到奖品有哪些
-            List<Award> awardList=awardDao.findByActivityId(activity.getId());
-            activity.setAwards(awardList);
-            Activity newActivity=activityDao.save(activity);
-            list.add(newActivity);
-        }
-        return list;
-    }
-
-    //搜索出所有进行中和已结束的活动
-    public List<Activity> findAll(){
-        //取得所有已开始和已结束的活动
-        List<Activity> activityList= activityDao.findAll();
-        //将所有活动所对应的奖品set进活动里
-        List<Activity> list=getAwards(activityList);
-
-        return activityDao.save(list);
-    }
-
-    public Page<Activity> findAll(Pageable pageable){
-        return activityDao.findAll(pageable);
-    }
-
-    public Activity fingById(Long id){
-        //根据活动id找出活动
-        Activity activity=activityDao.findOne(id);
-        //获取活动的奖品
-        List<Award> awardList=awardDao.findByActivityId(id);
-        activity.setAwards(awardList);
-
-
-        return  activityDao.save(activity);
-    }
-
-    //搜索出所有正在进行的活动
-    public List<Activity> findInProcess() {
-
-        List<Activity> activityList= activityDao.findInProcess();
-        //将所有活动所对应的奖品set进活动里
-        List<Activity> list=getAwards(activityList);
-
-        return activityDao.save(list);
-    }
-
-    public Page<Activity> findInProcess(Pageable pageable){
-        Page<Activity> activities=activityDao.findInProcess(pageable);
-        /*List<Activity> activityList=new ArrayList<Activity>();
-        for(Activity activity:activities.getContent()){
-            List<Award> awardList=awardDao.findByActivityId(activity.getId());
-            activity.setAwards(awardList);
-            Activity newactivity=activityDao.save(activity);
-            activityList.add(newactivity);
-            System.out.print(activity);
-        }*/
-        return activities;
-    }
-
-    //搜索出所有已结束的活动,当前时间大于活动结束时间
-    public List<Activity> findEndActivities(){
-
-        List<Activity> activityList= activityDao.findEndActivities();
-        //将所有活动所对应的奖品set进活动里
-        List<Activity> list=getAwards(activityList);
-
-        return activityDao.save(list);
-    }
-
-    public Page<Activity> findEndActivities(Pageable pageable){
-        return activityDao.findEndActivities(pageable);
-    }
-
-    public Activity save(Activity activity){
-        return activityDao.save(activity);
-    }
-
-    //计算与活动相关的项目筹集的总金额
-    public Double sumMoney(Long id){
-        return activityDao.sumMoney(id);
-    }
-
-    //根据活动名关键字，奖品名关键字查询活动
-    public List<Activity> search(String search){
-       return activityDao.search(search);
-    }
-
-
-    public Page<Activity> search(String search,Pageable pageable){
-        return activityDao.search(search,pageable);
-    }
-
-}

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

@@ -1,19 +0,0 @@
-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/CarouselServiceImpl.java

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

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

@@ -1,68 +0,0 @@
-package com.uas.service.donate.impl;
-
-import com.uas.message.mail.service.MailService;
-import com.uas.platform.core.util.HttpUtil;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
-import com.uas.service.donate.MessageConfiguration;
-import com.uas.service.donate.model.SmsMessage;
-import com.uas.service.donate.service.MessageService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 发送消息提醒实现方法
- *
- */
-@Service
-public class MessageServiceImpl implements MessageService {
-
-    @Autowired
-    private MailService mailService;
-
-    @Autowired
-    private MessageConfiguration messageConfiguration;
-
-    @Override
-    public ResponseEntity<String> sendMail(String receivedEmail, Map<String, Object> model) {
-        try {
-            if (null != messageConfiguration.getTplInvitationForB2B()) {
-                model.put("vendorusername", "");
-                model.put("vendorname", "");
-                model.put("custname", "");
-                model.put("inviteuid", "");
-                model.put("inviteUserCode", "");
-                mailService.send(messageConfiguration.getTplInvitationForB2B(), receivedEmail, model);
-            }
-            return new ResponseEntity<String>(HttpStatus.OK);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @Override
-    public ResponseEntity<String> sendMessage(String receiverTel, List<Object> obj) {
-        try {
-            if (null != messageConfiguration.getMsgInvitationForB2B()) {
-                SmsMessage sms = new SmsMessage();
-//            obj.add(record.getVendusername());
-//            obj.add(record.getVendname());
-//            obj.add(SystemSession.getUser().getUserName() + "("
-//                    + SystemSession.getUser().getEnterprise().getEnName() + ")");
-                sms.setParams(obj);
-                sms.setReceiver(receiverTel);
-                sms.setTemplateId(messageConfiguration.getMsgInvitationForB2B());
-                HttpUtil.sendPost(messageConfiguration.getMessageSendUrl(), FlexJsonUtils.toJsonDeep(sms));
-            }
-            return new ResponseEntity<String>(HttpStatus.OK);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-}

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

@@ -1,23 +0,0 @@
-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);
-    }
-
-    public Org findOne(Long id){
-        return orgDao.findOne(id);
-    }
-}

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

@@ -1,24 +0,0 @@
-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;
-
-import java.util.List;
-
-@Service
-public class ProjectConcludeServiceImpl implements ProjectConcludeService {
-    @Autowired
-    private ProjectConcludeDao projectConcludeDao;
-
-    public ProjectConclude save(ProjectConclude projectConclude){
-        return projectConcludeDao.save(projectConclude);
-    }
-
-    public List<ProjectConclude> findAll(Long proId){
-        return projectConcludeDao.findAll(proId);
-    }
-
-}

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

@@ -1,25 +0,0 @@
-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;
-
-import java.util.List;
-
-@Service
-public class ProjectEvolveServiceImpl implements ProjectEvolveService {
-    @Autowired
-    private ProjectEvolveDao projectEvolveDao;
-
-    @Override
-    public ProjectEvolve save(ProjectEvolve projectEvolve) {
-        return projectEvolveDao.save(projectEvolve);
-    }
-
-    //查找某项目所有的项目进度
-    public List<ProjectEvolve> findAll(Long proId){
-        return projectEvolveDao.findAll(proId);
-    }
-}

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

@@ -1,29 +0,0 @@
-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;
-
-import java.util.List;
-
-@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);
-    }
-
-    //查找某项目所有的财务情况
-    public List<ProjectFinance> findAll(Long proId){
-        return projectFinanceDao.findAll(proId);
-    }
-
-}

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

@@ -1,104 +0,0 @@
-package com.uas.service.donate.impl;
-
-import com.uas.service.donate.dao.ProjectRecodeDao;
-import com.uas.service.donate.model.Org;
-import com.uas.service.donate.model.Project;
-import com.uas.service.donate.model.ProjectRecode;
-import com.uas.service.donate.service.OrgService;
-import com.uas.service.donate.service.ProjectRecodeService;
-import com.uas.service.donate.service.ProjectService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class ProjectRecordServiceImpl implements ProjectRecodeService {
-
-    @Autowired
-    private ProjectRecodeDao projectRecodeDao;
-
-    @Autowired
-    private ProjectService projectService;
-
-    @Autowired
-    private OrgService orgService;
-
-    public List<ProjectRecode> findByuuid(Long uuid) {
-        return projectRecodeDao.findByuuid(uuid);
-    }
-
-    //计算某人参与项目的次数
-    public Long sumJoin(Long uuid) {
-        return projectRecodeDao.sumJoin(uuid);
-    }
-
-    //计算某人捐赠的总善款
-    public Long sumMoney(Long uuid) {
-        return projectRecodeDao.sumMoney(uuid);
-    }
-
-    public ProjectRecode join(ProjectRecode projectRecode) {
-        //得到此次捐款额
-        Double amount = projectRecode.getAmount();
-        //通过项目参与表的项目id，找到项目
-        Project project = projectService.findOne(projectRecode.getProId());
-        //通过项目id找到机构
-        Org org = orgService.findOne(project.getOrgId());
-
-        Double totalAmount = project.getTotalAmount();
-        if (totalAmount == null) {
-            totalAmount = (double) 0;
-        }
-        totalAmount += amount;
-        //重新设置该项目已筹集金额
-        project.setTotalAmount(totalAmount);
-        //得到该项目的参与人数
-        Long joinAmount = project.getJoinAmount();
-        if (joinAmount == null) {
-            joinAmount = (long) 0;
-        }
-        joinAmount++;
-        //重新设置该项目的参与人数
-        project.setJoinAmount(joinAmount);
-        //保存项目
-        projectService.save(project);
-        //设置项目待支付状态
-        projectRecode.setStatus((short) 1);
-        //设置项目名
-        projectRecode.setProjectName(project.getName());
-        //设置机构名
-        projectRecode.setOrgName(org.getName());
-        return projectRecodeDao.save(projectRecode);
-    }
-
-    public void update(ProjectRecode projectRecode) {
-        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);
-    }
-
-    //根据捐款单号找到该条捐款单据
-    public ProjectRecode findOne(Long id) {
-        return projectRecodeDao.findOne(id);
-    }
-
-}

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

@@ -1,23 +0,0 @@
-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;
-
-import java.util.Date;
-
-@Service
-public class ProjectReportServiceImpl implements ProjectReportService {
-
-    @Autowired
-    private ProjectReportDao projectReportDao;
-
-    public ProjectReport save(ProjectReport projectReport){
-        projectReport.setStatus(1);
-        projectReport.setSubmitTime(new Date());
-        return projectReportDao.save(projectReport);
-    }
-
-}

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

@@ -1,174 +0,0 @@
-package com.uas.service.donate.impl;
-
-
-import com.uas.platform.core.model.PageInfo;
-import com.uas.platform.core.persistence.criteria.PredicateUtils;
-import com.uas.service.donate.dao.ProjectDao;
-import com.uas.service.donate.dao.ProjectRecodeDao;
-import com.uas.service.donate.model.Project;
-import com.uas.service.donate.model.ProjectRecode;
-import com.uas.service.donate.model.SearchFilter;
-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.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.Date;
-import java.util.List;
-
-
-@Service
-public class ProjectServiceImpl implements ProjectService {
-
-    @Autowired
-    private ProjectDao projectDao;
-
-    @Autowired
-    private ProjectRecodeDao projectRecodeDao;
-
-    //获取所有审核通过，进行中或者已结束的捐款项目
-    public Page<Project> findAll(Pageable pageable){
-
-        return projectDao.findAll(pageable);
-    }
-
-
-    public Project findOne(Long id){
-        return projectDao.findOne(id);
-    }
-
-
-    public Project save(Project project){
-        return projectDao.save(project);
-    }
-
-    //查询所有筹备中项目
-    public Page<Project> findInProcess(Pageable pageable){
-        return projectDao.findInProcess(pageable);
-    }
-
-    //查询所有已结束的项目
-    public Page<Project> findEndProject(Pageable pageable){
-
-        return projectDao.findEndProject(pageable);
-    }
-
-    //查询特定领域的项目
-    public List<Project> findArea(String area){
-
-        return  projectDao.findArea(area);
-    }
-
-    /**
-     * 获取所有项目历史数据
-     *
-     * @return
-     */
-    @Override
-    public ModelMap getTotalDonation() {
-        ModelMap map = new ModelMap();
-        Integer joinedPersonHistory = projectDao.findAllJoinedHistory();
-        Double totalDonationsHistory = projectDao.findAllDonationHistory();
-        map.put("joinedPersonHistory", joinedPersonHistory);
-        map.put("totalDonationsHistory", totalDonationsHistory);
-        return map;
-    }
-
-    @Override
-    public Page<Project> getAllProjects(final PageInfo pageInfo, final SearchFilter filter) {
-//        if (StringUtils.hasText(filter.getKeyword())) {
-//            String keyword = filter.getKeyword();
-//            // name code proSummary orgName
-//            pageInfo.expression(PredicateUtils.like("name", keyword, false));
-//            pageInfo.expression(PredicateUtils.like("code", keyword, false));
-//            pageInfo.expression(PredicateUtils.like("proSummary", keyword, false));
-//            pageInfo.expression(PredicateUtils.like("orgName", keyword, false));
-//        }
-        return projectDao.findAll(new Specification<Project>() {
-            public Predicate toPredicate(Root<Project> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-                if (null != filter) {
-                    String keyword = filter.getKeyword();
-                    if (StringUtils.hasText(keyword)) {
-                        pageInfo.expression(PredicateUtils.or(PredicateUtils.like("name", keyword, false),
-                                PredicateUtils.like("code", keyword, false),
-                                PredicateUtils.like("proSummary", keyword, false),
-                                PredicateUtils.like("orgName", keyword, false)));
-                    }
-                    // 默认全部分类设置值为0
-                    if (null != filter.getArea() && !"".equals(filter.getArea()) && !"全部".equals(filter.getArea())) {
-                        pageInfo.expression(PredicateUtils.eq("area", filter.getArea(), false));
-                    }
-                }
-                query.where(pageInfo.getPredicates(root, query, builder));
-                return null;
-            }
-        }, pageInfo);
-    }
-
-    @Override
-    public Page<Project> getEndProjects(final PageInfo pageInfo, final SearchFilter filter) {
-        pageInfo.expression(PredicateUtils.lt("endTime", new Date(), false));
-        return getAllProjects(pageInfo, filter);
-    }
-
-    @Override
-    public Page<Project> getTodoProjects(final PageInfo pageInfo, final SearchFilter filter) {
-        pageInfo.expression(PredicateUtils.lte("startTime", new Date(), false));
-        pageInfo.expression(PredicateUtils.gte("endTime", new Date(), false));
-        return getAllProjects(pageInfo, filter);
-    }
-
-    @Override
-    public Page<Project> getWaitingProjects(PageInfo pageInfo, SearchFilter filter) {
-        pageInfo.expression(PredicateUtils.gt("startTime", new Date(), false));
-        return getAllProjects(pageInfo, filter);
-    }
-
-    @Override
-    public ModelMap getThisDonation(Long proId) {
-        List<ProjectRecode> recodes = projectRecodeDao.findByProId(proId);
-        return new ModelMap("joinedPersonHistory", recodes.size());
-    }
-
-    public Page<Project> findPageArea(String area,Pageable pageable){
-        return projectDao.findPageArea(area,pageable);
-    }
-
-    //根据area查询所有执行中的项目
-    public Page<Project> findInProcessArea(Pageable pageable,String area){
-        return projectDao.findInProcessArea(pageable,area);
-    }
-
-    //根据area查询所有已结束项目
-    public Page<Project> findEndProjectArea(Pageable pageable,String area){
-        return projectDao.findEndProjectArea(pageable,area);
-    }
-
-
-    public List<Project> findProjects(){
-        return projectDao.findProjects();
-    }
-
-    public List<Project> search(String search){
-        return projectDao.search(search);
-    }
-
-    public Page<Project> searchPage(Pageable pageable,String search){
-        return projectDao.searchPage(pageable,search);
-    }
-
-    //查询项目中所有领域分类
-    public List<String> allArea(){
-        return projectDao.allArea();
-    }
-
-
-}

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

@@ -1,19 +0,0 @@
-package com.uas.service.donate.impl;
-
-import com.uas.service.donate.dao.UserDao;
-import com.uas.service.donate.model.User;
-import com.uas.service.donate.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class UserServiceImpl implements UserService{
-
-    @Autowired
-    private UserDao userDao;
-
-    //返回某人个人信息
-    public User findOne(Long id){
-        return userDao.findOne(id);
-    }
-}