From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 150 insertions(+), 23 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 d4d5f56..53d8f20 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,12 +1,23 @@
package com.panzhihua.service_community.service.impl;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.*;
+import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.WxUtil;
+import com.panzhihua.common.utlis.WxXCXTempSend;
import com.panzhihua.service_community.dao.ComActActSignDAO;
import com.panzhihua.service_community.dao.ComActActivityDAO;
import com.panzhihua.service_community.dao.ComActDiscussOptionUserDAO;
@@ -15,15 +26,13 @@
import com.panzhihua.service_community.service.ComActActivityService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateUtils;
+import org.checkerframework.checker.units.qual.A;
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.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -40,6 +49,8 @@
private ComActActivityDAO comActActivityDAO;
@Resource
private ComActActSignDAO comActActSignDAO;
+ @Resource
+ private UserService userService;
/**
* 新增社区活动
@@ -59,9 +70,11 @@
/*if(now.getTime()<comActActivityVO.getBeginAt().getTime()){
comActActivityDO.setStatus(3);
}*/
- //报名结束时间大于当前时间则设置为“进行中”
- if(comActActivityVO.getSignUpEnd()!=null && now.getTime()<comActActivityVO.getSignUpEnd().getTime()){
- comActActivityDO.setStatus(4);
+ if(status.intValue()==2) {//点击‘保存并发布’ 按钮
+ //报名结束时间大于当前时间则设置为“进行中”
+ if (comActActivityVO.getSignUpEnd() != null && now.getTime() < comActActivityVO.getSignUpEnd().getTime()) {
+ comActActivityDO.setStatus(4);
+ }
}
boolean save = this.save(comActActivityDO);
@@ -81,7 +94,34 @@
*/
@Override
public R putActivity(ComActActivityVO comActActivityVO) {
- ComActActivityDO comActActivityDO=new ComActActivityDO();
+ ComActActivityDO comActActivityDO = this.comActActivityDAO.selectById(comActActivityVO.getId());
+ if(comActActivityDO == null){
+ return R.fail("未找到社区活动");
+ }
+
+ if(!comActActivityDO.getActivityAddr().equals(comActActivityVO.getActivityAddr()) || !comActActivityDO.getBeginAt().equals(comActActivityVO.getBeginAt())){
+ //修改活动开始时间与活动地点需要推送订阅消息给用户
+ ActivitySignVO activitySignVO = new ActivitySignVO();
+ activitySignVO.setActivityId(comActActivityVO.getId());
+ List<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySigns(activitySignVO);
+ if(!activitySignVOS.isEmpty()){
+ try {
+ WxXCXTempSend util = new WxXCXTempSend();
+ String accessToken = util.getAppAccessToken();
+
+ activitySignVOS.forEach(activitySignVO1 -> {
+ //变更社区活动推送订阅消息给用户
+ WxUtil.sendSubscribeHDBG(activitySignVO1.getOpenid(),accessToken,comActActivityVO.getActivityName()
+ , com.panzhihua.common.utlis.DateUtils.format(comActActivityDO.getBeginAt()
+ , com.panzhihua.common.utlis.DateUtils.ymdhms_format),comActActivityDO.getActivityAddr(),
+ com.panzhihua.common.utlis.DateUtils.format(comActActivityVO.getBeginAt()
+ , com.panzhihua.common.utlis.DateUtils.ymdhms_format),comActActivityVO.getActivityAddr());
+ });
+ }catch (Exception e){
+ log.error("消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+ }
BeanUtils.copyProperties(comActActivityVO,comActActivityDO);
//结束时间大于当前时间则设置为“进行中”
@@ -177,12 +217,15 @@
public ComActActivityVO inforActivity(Long id, Long userId) {
ComActActivityVO comActActivityVO=comActActivityDAO.inforActivity(id);
if (!ObjectUtils.isEmpty(comActActivityVO)) {
- ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getActivityId, id).eq(ComActActSignDO::getUserId, userId));
- if (!ObjectUtils.isEmpty(comActActSignDO)) {
- comActActivityVO.setIsSign(1);
- comActActivityVO.setIsVolunteer(comActActSignDO.getIsVolunteer());
- }else {
-
+ if(userId != null){
+ LambdaQueryWrapper<ComActActSignDO> actSignQuery = new LambdaQueryWrapper<>();
+ actSignQuery.eq(ComActActSignDO::getActivityId, id);
+ actSignQuery.eq(ComActActSignDO::getUserId, userId);
+ ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(actSignQuery);
+ if (!ObjectUtils.isEmpty(comActActSignDO)) {
+ comActActivityVO.setIsSign(1);
+ comActActivityVO.setIsVolunteer(comActActSignDO.getIsVolunteer());
+ }
}
}
return comActActivityVO;
@@ -196,7 +239,15 @@
*/
@Override
public R listActivitySign(ActivitySignVO activitySignVO) {
- List<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySign(activitySignVO);
+
+ IPage<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySign(new Page(activitySignVO.getPageNum(),activitySignVO.getPageSize()),activitySignVO);
+// List<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySign(activitySignVO);
+ return R.ok(activitySignVOS);
+ }
+
+ @Override
+ public R listActivitySigns(ActivitySignVO activitySignVO) {
+ List<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySigns(activitySignVO);
return R.ok(activitySignVOS);
}
@@ -235,8 +286,31 @@
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("只有志愿者才能报名");
+ }
+
+ //查询社区活动
+ ComActActivityDO actActivityDO = this.baseMapper.selectById(activityId);
+ if(actActivityDO != null){
+ //查询当前活动下参与志愿者/居民数量
+ Integer count = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getActivityId,activityId)
+ .eq(ComActActSignDO::getIsVolunteer,isVolunteer));
+ if(isVolunteer.equals(1) && actActivityDO.getVolunteerMax() <= count && !actActivityDO.getVolunteerMax().equals(-1)){
+ return R.fail("志愿者报名人数已满");
+ }
+
+ if(isVolunteer.equals(0) && actActivityDO.getParticipantMax() <= count && !actActivityDO.getParticipantMax().equals(-1)){
+ return R.fail("居民报名人数已满");
+ }
+ }
+
ComActActSignDO comActActSignDO=new ComActActSignDO();
comActActSignDO.setActivityId(activityId);
comActActSignDO.setUserId(userId);
@@ -354,12 +428,14 @@
// 修改报名状态 变为报名中
int num1=comActActivityDAO.updateStatusToBeginSign();
log.info("定时任务--修改社区活动报名状态活动数量【{}】",num1);
+ //查询已经结束的活动，需要计算积分
+ List<Long> activityEndIds = comActActivityDAO.getActivityEndIds();
// 修改进行状态 变为进行中或者已结束
int num2=comActActivityDAO.updateStatusToBeginActiveOrEnd();
log.info("定时任务--修改社区活动进行状态活动数量【{}】",num2);
int num3=comActActivityDAO.updateStatusToBeginAfterSingEnd();
log.info("定时任务--报名结束修改社区活动进行状态活动数量【{}】",num3);
- return R.ok();
+ return R.ok(activityEndIds);
}
/**
@@ -412,6 +488,27 @@
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
@@ -426,14 +523,44 @@
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);
+
+ /**
+ * 定时任务检测即将开始的社区活动，并使用订阅消息通知用户
+ */
+ @Override
+ public R timedTaskActivityNotice(){
+ //查询所有即将开始的活动
+ List<ComActActivityDO> actActivityList = comActActivityDAO.selectList(new QueryWrapper<ComActActivityDO>().lambda()
+ .le(ComActActivityDO::getBeginAt, DateUtils.addDays(new Date(),1))
+ .ge(ComActActivityDO::getBeginAt,new Date()));
+ if(!actActivityList.isEmpty()){
+ WxXCXTempSend util = new WxXCXTempSend();
+ try {
+ String accessToken = util.getAppAccessToken();
+ actActivityList.forEach(actActivity -> {
+ //查询报名活动人员列表
+ List<ComActActSignDO> actSignList = comActActSignDAO.selectList(new QueryWrapper<ComActActSignDO>().lambda()
+ .eq(ComActActSignDO::getActivityId,actActivity.getId()));
+ actSignList.forEach(actSign -> {
+ //查询用户openId
+ Map<String,String> map = comActActSignDAO.getUserOpenId(actSign.getUserId());
+ if(map != null){
+ String openid = map.get("openid");
+ //推送消息
+ WxUtil.sendSubscribeHDJJKS(openid,accessToken,actActivity.getActivityName()
+ , com.panzhihua.common.utlis.DateUtils.format(actActivity.getBeginAt()
+ ,com.panzhihua.common.utlis.DateUtils.ymdhms_format),actActivity.getActivityAddr()
+ ,actSignList.size()+"");
+ }
+
+ });
+
+ });
+ }catch (Exception e){
+ log.error("推送失败，错误原因：" + e.getMessage());
+ }
}
- System.out.println(dates);
+ return R.ok();
}
}
--
Gitblit v1.7.1