From a934e3e3ae90b2bf7b564426387be5b9343bad07 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 02 三月 2022 11:07:08 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 227 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 150 insertions(+), 77 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 dd45bcc..9b7cf9d 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
@@ -10,19 +10,17 @@
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.community.*;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import com.alibaba.fastjson.JSONObject;
@@ -38,33 +36,15 @@
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.ComActActEvaluateVO;
-import com.panzhihua.common.model.vos.community.ComActActPictureVO;
-import com.panzhihua.common.model.vos.community.ComActActRegistVO;
-import com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO;
-import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.CommunityActivitiesVO;
-import com.panzhihua.common.model.vos.community.CommunityGovernanceTrendsVO;
-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.model.vos.user.SysTemplateConfigVO;
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.ComActActEvaluateDAO;
-import com.panzhihua.service_community.dao.ComActActPictureDAO;
-import com.panzhihua.service_community.dao.ComActActRegistDAO;
-import com.panzhihua.service_community.dao.ComActActSignDAO;
-import com.panzhihua.service_community.dao.ComActActivityCodeDao;
-import com.panzhihua.service_community.dao.ComActActivityDAO;
-import com.panzhihua.service_community.dao.ComBpActivityDAO;
+import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.entity.ComActActivityCode;
-import com.panzhihua.service_community.model.dos.ComActActEvaluateDO;
-import com.panzhihua.service_community.model.dos.ComActActPictureDO;
-import com.panzhihua.service_community.model.dos.ComActActRegistDO;
-import com.panzhihua.service_community.model.dos.ComActActSignDO;
-import com.panzhihua.service_community.model.dos.ComActActivityDO;
+import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActActivityCodeService;
import com.panzhihua.service_community.service.ComActActivityService;
import com.panzhihua.service_community.service.ComActIntegralUserTradeService;
@@ -105,6 +85,8 @@
private ComActIntegralUserTradeService comActIntegralUserTradeService;
@Resource
private ComActActivityCodeService comActActivityCodeService;
+ @Resource
+ private ComActDAO comActDAO;
/**
* 新增社区活动
@@ -135,7 +117,9 @@
comActActivityDO.setStatus(3);
}
}
-
+ if(comActActivityVO.getType()==4){
+ comActActivityDO.setIsProject(1);
+ }
boolean save = this.save(comActActivityDO);
if (!save) {
return R.fail();
@@ -156,7 +140,7 @@
ComActActivityCode comActActivityCode = new ComActActivityCode();
comActActivityCode.setActivityId(comActActivityDO.getId().longValue());
comActActivityCode.setCreateTime(new Date());
- comActActivityCode.setType(1);
+ comActActivityCode.setType(comActActivityVO.getType());
comActActivityCode.setStatus(1);
comActActivityCodeService.save(comActActivityCode);
return R.ok(activityId);
@@ -186,7 +170,8 @@
try {
WxXCXTempSend util = new WxXCXTempSend();
String accessToken = util.getAppAccessToken();
-
+ ComActDO comActDO=comActDAO.selectById(comActActivityDO.getCommunityId());
+ R<SysTemplateConfigVO> r=userService.selectTemplate(comActDO.getAreaCode(),1);
activitySignVOS.forEach(activitySignVO1 -> {
// 变更社区活动推送订阅消息给用户
WxUtil.sendSubscribeHDBG(activitySignVO1.getOpenid(), accessToken,
@@ -196,7 +181,7 @@
comActActivityDO.getActivityAddr(),
com.panzhihua.common.utlis.DateUtils.format(comActActivityVO.getBeginAt(),
com.panzhihua.common.utlis.DateUtils.ymdhms_format),
- comActActivityVO.getActivityAddr());
+ comActActivityVO.getActivityAddr(),r.getData().getTemplateId());
});
} catch (Exception e) {
log.error("消息推送失败，失败原因：" + e.getMessage());
@@ -316,6 +301,24 @@
if (!ObjectUtils.isEmpty(comActActSignDO)) {
comActActivityVO.setIsSign(1);
comActActivityVO.setIsVolunteer(comActActSignDO.getIsVolunteer());
+ }
+ List<ComActActRegistDO> regList = comActActRegistDAO.selectList(new QueryWrapper<ComActActRegistDO>().lambda()
+ .eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getActivityId, id));
+ if (!regList.isEmpty()) {
+ List<ComActActRegistDO> collect = regList.stream().sorted(Comparator.comparing(ComActActRegistDO::getId).reversed()).collect(Collectors.toList());
+ comActActivityVO.setTimes(collect.get(0).getTimes());
+ ComActActRegistDO comActActRegistDO=collect.get(0);
+ if(comActActRegistDO.getType()==2){
+ if(comActActRegistDO.getEndTime()==null){
+ comActActivityVO.setSignType(2);
+ }
+ else {
+ comActActivityVO.setSignType(1);
+ }
+ }
+ }
+ else {
+ comActActivityVO.setSignType(1);
}
}
}
@@ -594,10 +597,10 @@
* @return 活动列表
*/
@Override
- public R listActivity(Long userId, Integer status) {
+ public R listActivity(Long userId, Integer status,Integer type) {
List<ActivitySignVO> activitySignVOList = comActActSignDAO.selectList(userId);
if (ObjectUtils.isEmpty(activitySignVOList)) {
- return R.fail();
+ return R.ok();
}
List<Long> longs = activitySignVOList.stream().map(activitySignVO -> activitySignVO.getActivityId())
.collect(Collectors.toList());
@@ -611,6 +614,9 @@
comActActivityDOS = comActActivityDOS.stream()
.filter(activityDO -> activityDO.getStatus().equals(status)).collect(Collectors.toList());
}
+ }
+ if(isNull(type)){
+ comActActivityDOS=comActActivityDOS.stream().filter(comActActivityDO -> comActActivityDO.getType().equals(type)).collect(Collectors.toList());
}
if (!comActActivityDOS.isEmpty()) {
comActActivityDOS.forEach(comActActivityDO -> {
@@ -844,6 +850,8 @@
try {
String accessToken = util.getAppAccessToken();
actActivityList.forEach(actActivity -> {
+ ComActDO comActDO=comActDAO.selectById(actActivity.getCommunityId());
+ R<SysTemplateConfigVO> r=userService.selectTemplate(comActDO.getAreaCode(),9);
// 查询报名活动人员列表
List<ComActActSignDO> actSignList = comActActSignDAO.selectList(new QueryWrapper<ComActActSignDO>()
.lambda().eq(ComActActSignDO::getActivityId, actActivity.getId()));
@@ -851,12 +859,13 @@
// 查询用户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() + "");
+ actActivity.getActivityAddr(), actSignList.size() + "",r.getData().getTemplateId());
}
});
@@ -895,7 +904,6 @@
if (isNull(activityId)) {
return R.fail("签到所属活动id不能为空！");
}
- if(comActActRegistVO.getActivityType()==1){
ComActActivityDO comActActivityDO = comActActivityDAO.selectById(activityId);
if (isNull(comActActivityDO)) {
return R.fail("活动不存在！");
@@ -913,56 +921,84 @@
if (nowDate.before(beginAt) || nowDate.after(endAt)) {
return R.fail("不在活动时间范围内");
}
-
- int signDayCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
- .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getCodeId,comActActRegistVO.getCodeId()));
- int signAllCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
- .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId));
- if (signDayCount > 0) {
- return R.fail("请扫描新的签到码");
- }
- Integer haveIntegralReward = comActActivityDO.getHaveIntegralReward();
- boolean isHave = nonNull(haveIntegralReward) && haveIntegralReward.equals(1);
- if (isHave) {
- int limit = comActActivityDO.getLimit().intValue();
- if(limit != -1 && signAllCount >= limit){
- return R.fail("签到次数上限");
- }
- }
+ Integer haveIntegralReward = comActActivityDO.getHaveIntegralReward();
+ boolean isHave = nonNull(haveIntegralReward) && haveIntegralReward.equals(1);
// String activitySignInKey = String.join(DELIMITER, ACTIVITY_SIGN_IN, userId.toString(), activityId.toString());
// if (stringRedisTemplate.hasKey(activitySignInKey)) {
// return R.fail("你已签到，如要再次签到请三十分钟后尝试！");
// }
ComActActRegistDO comActActRegistDO = new ComActActRegistDO();
- comActActRegistDO.setActivityId(activityId);
- comActActRegistDO.setType(1);
- comActActRegistDO.setUserId(userId);
- comActActRegistDO.setIsVolunteer(comActActSignDO.getIsVolunteer());
- comActActRegistDO.setCreateAt(nowDate);
- comActActRegistDO.setCodeId(comActActRegistVO.getCodeId());
- comActActRegistDO.setAward(isHave ? comActActivityDO.getRewardIntegral() : 0);
- comActActRegistDO.setPosition(comActActRegistVO.getPosition());
- comActActRegistDO.setTimes(signAllCount+1);
- int result = comActActRegistDAO.insert(comActActRegistDO);
- if (result > 0) {
+ if(comActActRegistVO.getType()!=null&&comActActRegistVO.getType()==2){
+ ComActActRegistDO comActActActRegistDO=comActActRegistDAO.selectOne(new QueryWrapper<ComActActRegistDO>()
+ .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getCodeId,comActActRegistVO.getCodeId()));
+ if(comActActActRegistDO==null){
+ return R.fail("未签到无法签退");
+ }
+ if(comActActActRegistDO.getEndTime()!=null){
+ return R.fail("无法重复签退");
+ }
+ comActActRegistDO.setId(comActActRegistVO.getId());
+ comActActRegistDO.setEndTime(new Date());
+ int result=comActActRegistDAO.updateById(comActActRegistDO);
+ if (result > 0) {
+ if (isHave) {
+ AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
+ addComActIntegralUserDTO.setUserId(userId);
+ addComActIntegralUserDTO.setIntegralType(6);
+ addComActIntegralUserDTO.setActivityType(2);
+ addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
+ addComActIntegralUserDTO.setServiceId(activityId);
+ comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
+ return R.ok(comActActivityDO.getRewardIntegral());
+ } else {
+ return R.ok();
+ }
+ }
+ }
+ else {
+ int signDayCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
+ .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getCodeId,comActActRegistVO.getCodeId()));
+ int signAllCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
+ .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId));
+ if (signDayCount > 0) {
+ return R.fail("请扫描新的签到码");
+ }
if (isHave) {
- boolean isVolunteerAct = comActActivityDO.getVolunteerMax() != 0;
- AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
- addComActIntegralUserDTO.setUserId(userId);
- addComActIntegralUserDTO.setIntegralType(isVolunteerAct ? 5 : 4);
- addComActIntegralUserDTO.setActivityType(1);
- addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
- addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
- addComActIntegralUserDTO.setServiceId(activityId);
- comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
- return R.ok(comActActivityDO.getRewardIntegral());
- } else {
- return R.ok();
+ int limit = comActActivityDO.getLimit().intValue();
+ if(limit != -1 && signAllCount >= limit){
+ return R.fail("签到次数上限");
+ }
+ }
+ comActActRegistDO.setActivityId(activityId);
+ comActActRegistDO.setStartTime(new Date());
+ comActActRegistDO.setType(1);
+ comActActRegistDO.setUserId(userId);
+ comActActRegistDO.setIsVolunteer(comActActSignDO.getIsVolunteer());
+ comActActRegistDO.setCreateAt(nowDate);
+ comActActRegistDO.setCodeId(comActActRegistVO.getCodeId());
+ comActActRegistDO.setAward(isHave ? comActActivityDO.getRewardIntegral() : 0);
+ comActActRegistDO.setPosition(comActActRegistVO.getPosition());
+ comActActRegistDO.setTimes(signAllCount+1);
+ int result = comActActRegistDAO.insert(comActActRegistDO);
+ if (result > 0&&comActActRegistDO.getType()==1) {
+ if (isHave) {
+ boolean isVolunteerAct = comActActivityDO.getVolunteerMax() != 0;
+ AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
+ addComActIntegralUserDTO.setUserId(userId);
+ addComActIntegralUserDTO.setIntegralType(isVolunteerAct ? 5 : 4);
+ addComActIntegralUserDTO.setActivityType(1);
+ addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
+ addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
+ addComActIntegralUserDTO.setServiceId(activityId);
+ comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
+ return R.ok(comActActivityDO.getRewardIntegral());
+ } else {
+ return R.ok();
+ }
}
}
return R.fail("网络错误，请重试");
- }
// else {
// ComPbActivityDO comPbActivityDO=comBpActivityDAO.selectById(activityId);
// if (isNull(comPbActivityDO)) {
@@ -1013,8 +1049,6 @@
// }
// return R.fail("网络错误，请重试");
// }
-
- return R.fail("网络错误，请重试");
}
/**
@@ -1083,4 +1117,43 @@
}
return R.ok();
}
+
+ @Override
+ public String getActBelongRegionCode(Long communityId) {
+ return baseMapper.getActBelongRegionCode(communityId);
+ }
+
+ @Override
+ public R partyMemberCount(Long communityId, String year) {
+ PartyActivityStatics partyActivityStatics=this.comActActivityDAO.selectActivityStatics(communityId);
+ List<PartyActivityTypeChart> partyActivityTypeChart=this.comActActivityDAO.selectActivityChart(communityId);
+ if(partyActivityStatics.getActivityCount()!=null&&partyActivityStatics.getActivityCount()>0){
+ if(!CollectionUtils.isEmpty(partyActivityTypeChart)){
+ partyActivityTypeChart.forEach(partyActivityTypeChart1 -> {
+ partyActivityTypeChart1.setPercent(partyActivityTypeChart1.getCount()/partyActivityStatics.getActivityCount());
+ });
+ }
+ }
+ partyActivityStatics.setPartyActivityTypeChartList(partyActivityTypeChart);
+ partyActivityStatics.setPartyActivityLines(getPoints(communityId,year));
+ return R.ok(partyActivityStatics);
+ }
+ public List<PartyActivityLine> getPoints(Long communityId,String year){
+ List<PartyActivityLine> partyActivityLines=new ArrayList<>();
+ for(int i=1;i<=12;i++){
+ String x="";
+ if(i<10){
+ x="0"+i;
+ }
+ else {
+ x=i+"";
+ }
+ PartyActivityLine partyActivityLine=new PartyActivityLine();
+ partyActivityLine.setX(i+"月");
+ Integer y=this.comActActivityDAO.selectActivityLine(communityId,year,x);
+ partyActivityLine.setY(y);
+ partyActivityLines.add(partyActivityLine);
+ }
+ return partyActivityLines;
+ }
}
--
Gitblit v1.7.1