From 2b322522e7b801377cdba46c66a1c4ae61f56be0 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 23 六月 2021 14:38:31 +0800
Subject: [PATCH] Merge branch 'test_wangge_two' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 159 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index 68a66d7..669a52e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -1,26 +1,35 @@
package com.panzhihua.service_community.service.impl;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.community.ExcelElderAuthDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
+import com.panzhihua.common.model.vos.IndexDataVO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ActivitySignVO;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
-import com.panzhihua.common.model.vos.community.SignactivityVO;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.ComActActSignDAO;
import com.panzhihua.service_community.dao.ComActActivityDAO;
+import com.panzhihua.service_community.dao.ComActDiscussOptionUserDAO;
import com.panzhihua.service_community.model.dos.ComActActSignDO;
import com.panzhihua.service_community.model.dos.ComActActivityDO;
import com.panzhihua.service_community.service.ComActActivityService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -39,6 +48,9 @@
private ComActActivityDAO comActActivityDAO;
@Resource
private ComActActSignDAO comActActSignDAO;
+ @Resource
+ private UserService userService;
+
/**
* 新增社区活动
* @param comActActivityVO 新增信息
@@ -49,9 +61,21 @@
ComActActivityDO comActActivityDO=new ComActActivityDO();
BeanUtils.copyProperties(comActActivityVO,comActActivityDO);
Integer status = comActActivityVO.getStatus();
+ Date now = new Date();
if (status.intValue()!=1) {
- comActActivityDO.setPublishAt(new Date());//发布时间
+ comActActivityDO.setPublishAt(now);//发布时间
}
+ //如果发布时间大于现在时间状态改为进行中
+ /*if(now.getTime()<comActActivityVO.getBeginAt().getTime()){
+ comActActivityDO.setStatus(3);
+ }*/
+ if(status.intValue()==2) {//点击‘保存并发布’ 按钮
+ //报名结束时间大于当前时间则设置为“进行中”
+ if (comActActivityVO.getSignUpEnd() != null && now.getTime() < comActActivityVO.getSignUpEnd().getTime()) {
+ comActActivityDO.setStatus(4);
+ }
+ }
+
boolean save = this.save(comActActivityDO);
if(!save){
return R.fail();
@@ -71,6 +95,12 @@
public R putActivity(ComActActivityVO comActActivityVO) {
ComActActivityDO comActActivityDO=new ComActActivityDO();
BeanUtils.copyProperties(comActActivityVO,comActActivityDO);
+
+ //结束时间大于当前时间则设置为“进行中”
+ Date now = new Date();
+ if(comActActivityVO.getSignUpEnd()!=null && now.getTime()<comActActivityVO.getSignUpEnd().getTime()){
+ comActActivityDO.setStatus(4);
+ }
boolean b = this.updateById(comActActivityDO);
if (b) {
return R.ok();
@@ -98,6 +128,15 @@
page.setSize(pageSize);
page.setCurrent(pageNum);
IPage<ComActActivityVO> iPage = comActActivityDAO.pageActivity(page, comActActivityVO);
+ List<ComActActivityVO> records = iPage.getRecords();
+ if (!ObjectUtils.isEmpty(records)) {
+ records.forEach(comActActivityVO1 -> {
+ Integer status = comActActivityVO1.getStatus();
+ if (status.intValue()==3) {
+ comActActivityVO1.setStatus(4);
+ }
+ });
+ }
return R.ok(iPage);
}
@@ -208,13 +247,28 @@
Integer type = signactivityVO.getType();
Long userId = signactivityVO.getUserId();
Integer isVolunteer = signactivityVO.getIsVolunteer();
+
int num=0;
if (1==type) {
+ R<LoginUserInfoVO> userInfoR = userService.getUserInfoByUserId(String.valueOf(userId));
+ LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(userInfoR.getData()), LoginUserInfoVO.class);
+ boolean userNotVolunteer = !(loginUserInfoVO.getIsVolunteer()==1);
+ if(isVolunteer == 1 && userNotVolunteer){
+ return R.fail("只有志愿者才能报名");
+ }
+
ComActActSignDO comActActSignDO=new ComActActSignDO();
comActActSignDO.setActivityId(activityId);
comActActSignDO.setUserId(userId);
comActActSignDO.setIsVolunteer(isVolunteer);
- num = comActActSignDAO.insert(comActActSignDO);
+ try {
+ num = comActActSignDAO.insert(comActActSignDO);
+ } catch (Exception e) {
+ if (e.getMessage().contains("unique_activity_id_user_id")) {
+ return R.fail("已经报名过了，请勿重复提交");
+ }
+ log.error(e.getMessage());
+ }
} else {
num = comActActSignDAO.delete(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getUserId, userId).eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, isVolunteer));
}
@@ -250,6 +304,11 @@
}else{
comActActivityVO.setType(2);
}
+ Integer status = comActActivityVO.getStatus();
+ if (status.intValue()==3) {
+ comActActivityVO.setStatus(4);
+ }
+ comActActivityVO.setSingDate(comActActSignDOS.stream().filter(comActActSignDO1 -> comActActSignDO1.getActivityId().equals(comActActivityVO.getId())).collect(Collectors.toList()).get(0).getCreateAt());
comActActivityVOS.add(comActActivityVO);
});
return R.ok(comActActivityVOS);
@@ -318,10 +377,104 @@
// 修改进行状态 变为进行中或者已结束
int num2=comActActivityDAO.updateStatusToBeginActiveOrEnd();
log.info("定时任务--修改社区活动进行状态活动数量【{}】",num2);
+ int num3=comActActivityDAO.updateStatusToBeginAfterSingEnd();
+ log.info("定时任务--报名结束修改社区活动进行状态活动数量【{}】",num3);
return R.ok();
}
+ /**
+ * 社区后台分页查询社区活动
+ *
+ * @param comActActivityVO 查询参数
+ * @return 返回结果
+ */
+ @Override
+ public R pageActivityCommunityBack(ComActActivityVO comActActivityVO) {
+ Page page = new Page<>();
+ Long pageNum = comActActivityVO.getPageNum();
+ Long pageSize = comActActivityVO.getPageSize();
+ if (null==pageNum||0==pageNum) {
+ pageNum = 1l;
+ }
+ if (null==pageSize||0==pageSize) {
+ pageSize = 10l;
+ }
+ page.setSize(pageSize);
+ page.setCurrent(pageNum);
+ IPage<ComActActivityVO> iPage = comActActivityDAO.pageActivityCommunityBack(page, comActActivityVO);
+ return R.ok(iPage);
+ }
+ /**
+ * 首页图表数据汇总
+ *
+ * @param communityId 社区id
+ * @return 图表数据 IndexDataVO
+ */
+ @Override
+ public R indexDataCommunityBackstageEchart(Long communityId) {
+ IndexDataVO indexDataVO=new IndexDataVO();
+ CommunityGovernanceTrendsVO communityGovernanceTrendsVO=new CommunityGovernanceTrendsVO();
+ List<CommunityActivitiesVO> communityActivitiesVOS=new ArrayList<>();
+ List<Date>dates=this.getServenDays();
+ String s=comActActivityDAO.selectCommunityGovernanceTrendsVO(communityId);
+ List<String>y= Arrays.asList(s.split(","));
+ communityGovernanceTrendsVO.setY(y);
+ communityGovernanceTrendsVO.setX(Arrays.asList(new String[]{"一起议","微心愿","随手拍","社区活动"}));
+ dates.forEach(date -> {
+ CommunityActivitiesVO communityActivitiesVO=comActActivityDAO.selectCommunityActivitiesVO(communityId,date);
+ communityActivitiesVO.setDate(date);
+ communityActivitiesVOS.add(communityActivitiesVO);
+ });
+ indexDataVO.setCommunityGovernanceTrendsVO(communityGovernanceTrendsVO);
+ indexDataVO.setCommunityActivitiesVOS(communityActivitiesVOS);
+ return R.ok(indexDataVO);
+ }
+
+ @Override
+ public R getScreenActActivityList(ScreenActActivityListDTO actActivityListDTO){
+ IPage<ActActivityListVO> actActivityListVOIPage = comActActivityDAO.getScreenActActivityList(
+ new Page(actActivityListDTO.getPageNum(),actActivityListDTO.getPageSize()),actActivityListDTO);
+ if(!actActivityListVOIPage.getRecords().isEmpty()){
+ actActivityListVOIPage.getRecords().forEach(actActivityListVO -> {
+ ActActivityListVO activityListVO = comActActivityDAO.getScreenActActivityPeopleCount(actActivityListVO.getId());
+ if(activityListVO != null){
+ actActivityListVO.setParticipantCount(activityListVO.getParticipantCount());
+ actActivityListVO.setVolunteerCount(activityListVO.getVolunteerCount());
+ }
+ });
+ }
+ return R.ok(actActivityListVOIPage);
+ }
+
+ @Override
+ public R getActActivityPeopleList(ScreenActActivityPeopleListDTO activityPeopleListDTO){
+ return R.ok(comActActSignDAO.getActActivityPeopleList(new Page(activityPeopleListDTO.getPageNum(),activityPeopleListDTO.getPageSize()),activityPeopleListDTO));
+ }
+
+ /**
+ * 获取最近七天的时间
+ * @return
+ */
+ private List<Date> getServenDays() {
+ List<Date> dates=new ArrayList<>();
+ Date date=new Date();
+ for(int i=6;i>=0;i--){
+ Date date1= DateUtils.addDays(date,-i);
+ dates.add(date1);
+ }
+ return dates;
+ }
+
+ public static void main(String[] args) {
+ List<Date> dates=new ArrayList<>();
+ Date date=new Date();
+ for(int i=6;i>=0;i--){
+ Date date1= DateUtils.addDays(date,-i);
+ dates.add(date1);
+ }
+ System.out.println(dates);
+ }
}
--
Gitblit v1.7.1