From 78d1c9ee9b0c49f77c29d0535cb93c6d62c42f3a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 11 十一月 2021 13:58:25 +0800
Subject: [PATCH] 1111修改提交
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 369 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 307 insertions(+), 62 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 b91f7cd..e3eb9f9 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,24 @@
package com.panzhihua.service_community.service.impl;
-import java.util.*;
+import static java.util.Objects.isNull;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.Resource;
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.ObjectUtils;
@@ -21,13 +33,27 @@
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.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.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.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.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.ComActActivityDAO;
+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.service.ComActActivityService;
@@ -44,12 +70,22 @@
@Service
public class ComActActivityServiceImpl extends ServiceImpl<ComActActivityDAO, ComActActivityDO>
implements ComActActivityService {
+ private static final String DELIMITER = ":";
+ private static final String ACTIVITY_SIGN_IN = "ACTIVITY:SIGN:IN";
@Resource
private ComActActivityDAO comActActivityDAO;
@Resource
private ComActActSignDAO comActActSignDAO;
@Resource
private UserService userService;
+ @Resource
+ private ComActActEvaluateDAO comActActEvaluateDAO;
+ @Resource
+ private ComActActRegistDAO comActActRegistDAO;
+ @Resource
+ private StringRedisTemplate stringRedisTemplate;
+ @Resource
+ private ComActActPictureDAO comActActPictureDAO;
/**
* 新增社区活动
@@ -74,7 +110,7 @@
if (status.intValue() == 2) {// 点击‘保存并发布’ 按钮
// 报名结束时间大于当前时间则设置为“进行中”
if (comActActivityVO.getSignUpEnd() != null && now.getTime() < comActActivityVO.getSignUpEnd().getTime()) {
- comActActivityDO.setStatus(4);
+ comActActivityDO.setStatus(3);
}
}
@@ -86,6 +122,14 @@
.eq(ComActActivityDO::getActivityName, comActActivityDO.getActivityName())
.orderByDesc(ComActActivityDO::getCreateAt).last(" limit 1 "));
Long activityId = one.getId();
+
+ //保存上传照片
+ ComActActPictureDO comActActPictureDO = new ComActActPictureDO();
+ comActActPictureDO.setActivityId(activityId);
+ comActActPictureDO.setUserId(comActActivityVO.getUserId());
+ comActActPictureDO.setUploadPicture(comActActivityVO.getCover());
+ comActActPictureDO.setSysFlag(0);
+ comActActPictureDAO.insert(comActActPictureDO);
return R.ok(activityId);
}
@@ -135,7 +179,7 @@
// 结束时间大于当前时间则设置为“进行中”
Date now = new Date();
if (comActActivityVO.getSignUpEnd() != null && now.getTime() < comActActivityVO.getSignUpEnd().getTime()) {
- comActActivityDO.setStatus(4);
+ comActActivityDO.setStatus(3);
}
boolean b = this.updateById(comActActivityDO);
if (b) {
@@ -165,15 +209,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);
- }
- });
- }
+// 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);
}
@@ -186,10 +230,12 @@
*/
@Override
public R releaseActivity(ComActActivityVO comActActivityVO) {
- ComActActivityDO comActActivityDO = new ComActActivityDO();
- comActActivityDO.setId(comActActivityVO.getId());
+ ComActActivityDO comActActivityDO = comActActivityDAO.selectById(comActActivityVO.getId());
comActActivityDO.setPublishAt(comActActivityVO.getPublishAt());
- comActActivityDO.setStatus(comActActivityVO.getStatus());
+ comActActivityDO.setStatus(3);
+ if (comActActivityVO.getPublishAt().after(comActActivityDO.getSignUpEnd())) {
+ comActActivityVO.setStatus(4);
+ }
int update = comActActivityDAO.updateById(comActActivityDO);
if (update > 0) {
return R.ok();
@@ -265,6 +311,88 @@
return R.ok(activitySignVOS);
}
+ @Override
+ public R getSignLists(ActivitySignVO activitySignVO) {
+ return R.ok(comActActSignDAO.getSignLists(activitySignVO));
+ }
+
+ @Override
+ public R pageActivityEvaluates(ComActActEvaluateVO comActActEvaluateVO) {
+ IPage<ComActActEvaluateVO> comActActEvaluateVOIPage = comActActEvaluateDAO
+ .pageActivityEvaluates(new Page(comActActEvaluateVO.getPageNum(), comActActEvaluateVO.getPageSize()), comActActEvaluateVO);
+ return R.ok(comActActEvaluateVOIPage);
+ }
+
+ @Override
+ public R getEvaluateLists(ComActActEvaluateVO comActActEvaluateVO) {
+ return R.ok(comActActEvaluateDAO.getEvaluateLists(comActActEvaluateVO));
+ }
+
+ @Override
+ public R pageActivityRegists(ComActActRegistVO comActActRegistVO) {
+ IPage<ComActActRegistVO> comActActRegistVOIPage = comActActRegistDAO.pageActivityRegists(new Page(comActActRegistVO.getPageNum(), comActActRegistVO.getPageSize()), comActActRegistVO);
+ return R.ok(comActActRegistVOIPage);
+ }
+
+ @Override
+ public R getRegistLists(ComActActRegistVO comActActRegistVO) {
+ return R.ok(comActActRegistDAO.getRegistLists(comActActRegistVO));
+ }
+
+ @Override
+ public R getNoRegistLists(ComActActRegistVO comActActRegistVO) {
+ return R.ok(comActActRegistDAO.getNoRegistLists(comActActRegistVO));
+ }
+
+ @Override
+ public R activityStatistics(Long activityId) {
+ ComActActivityStatisticsVO comActActivityStatisticsVO = comActActivityDAO.activityStatistics(activityId);
+ if (comActActivityStatisticsVO != null) {
+ if (comActActivityStatisticsVO.getSignTotal().equals(0)){
+ comActActivityStatisticsVO.setSignTotalStr("不限");
+ comActActivityStatisticsVO.setNoSignTotalStr("");
+ comActActivityStatisticsVO.setSignPersent("");
+ }else {
+ comActActivityStatisticsVO.setSignTotalStr(String.valueOf(comActActivityStatisticsVO.getSignTotal()));
+ comActActivityStatisticsVO.setNoSignTotalStr(String.valueOf(Integer.valueOf(comActActivityStatisticsVO.getSignTotalStr()) - comActActivityStatisticsVO.getReallySignTotal()));
+ comActActivityStatisticsVO.setSignPersent(getPersent(comActActivityStatisticsVO.getReallySignTotal(),comActActivityStatisticsVO.getSignTotal()));
+ }
+ comActActivityStatisticsVO.setRegistPersent(getPersent(comActActivityStatisticsVO.getReallyRegistTotal(),comActActivityStatisticsVO.getRegistTotal()));
+ comActActivityStatisticsVO.setEvaluatePersent(getPersent(comActActivityStatisticsVO.getReallyEvaluateTotal(),comActActivityStatisticsVO.getEvaluateTotal()));
+ }
+ return R.ok(comActActivityStatisticsVO);
+ }
+
+ @Override
+ public R getPictureList(Long userId) {
+ List<ComActActPictureVO> comActActPictureVOS = new ArrayList<>();
+ List<ComActActPictureDO> comActActPictureDOS = comActActPictureDAO.selectList(new QueryWrapper<ComActActPictureDO>().lambda().
+ eq(ComActActPictureDO::getUserId, userId));
+ if (comActActPictureDOS != null && comActActPictureDOS.size() != 0) {
+ comActActPictureDOS.forEach(comActActPictureDO -> {
+ ComActActPictureVO comActActPictureVO = new ComActActPictureVO();
+ BeanUtils.copyProperties(comActActPictureDO, comActActPictureVO);
+ comActActPictureVOS.add(comActActPictureVO);
+ });
+ }
+ return R.ok(comActActPictureVOS);
+ }
+
+ @Override
+ public R getSysPictureList(Integer type) {
+ List<ComActActPictureVO> comActActPictureVOS = new ArrayList<>();
+ List<ComActActPictureDO> comActActPictureDOS = comActActPictureDAO.selectList(new QueryWrapper<ComActActPictureDO>().lambda().
+ eq(ComActActPictureDO::getSysFlag, 1).eq(ComActActPictureDO :: getType, type));
+ if (comActActPictureDOS != null && comActActPictureDOS.size() != 0) {
+ comActActPictureDOS.forEach(comActActPictureDO -> {
+ ComActActPictureVO comActActPictureVO = new ComActActPictureVO();
+ BeanUtils.copyProperties(comActActPictureDO, comActActPictureVO);
+ comActActPictureVOS.add(comActActPictureVO);
+ });
+ }
+ return R.ok(comActActPictureVOS);
+ }
+
/**
* 分页展示我的所有活动 时间倒序排列
*
@@ -302,7 +430,11 @@
Integer type = signactivityVO.getType();
Long userId = signactivityVO.getUserId();
Integer isVolunteer = signactivityVO.getIsVolunteer();
-
+ // 查询社区活动
+ ComActActivityDO actActivityDO = this.baseMapper.selectById(activityId);
+ if (isNull(actActivityDO)) {
+ return R.fail("活动不存在");
+ }
int num = 0;
if (1 == type) {
R<LoginUserInfoVO> userInfoR = userService.getUserInfoByUserId(String.valueOf(userId));
@@ -313,21 +445,33 @@
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("志愿者报名人数已满");
- }
+ // 查询当前活动下参与志愿者/居民数量
+ 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("居民报名人数已满");
+ //审查用户是否有该活动报名权限（是否活动指定参与人群）
+ String currentUserTags = loginUserInfoVO.getTags();
+ String attendPeople = actActivityDO.getAattendPeople();
+ if (isVolunteer.intValue() == 0 && isNotBlank(attendPeople)) {
+ if (isBlank(currentUserTags)) {
+ currentUserTags = "全部居民";
+ } else {
+ currentUserTags = currentUserTags.concat(",全部居民");
}
+ List<String> currentUserTagList = Arrays.asList(currentUserTags.split(","));
+ boolean checkResult = currentUserTagList.stream().anyMatch(currentUserTag -> attendPeople.contains(currentUserTag));
+ if (!checkResult) {
+ return R.fail("您不是指定参与人群！");
+ }
+ }
+
+ if (isVolunteer.equals(0) && actActivityDO.getParticipantMax() <= count
+ && !actActivityDO.getParticipantMax().equals(-1)) {
+ return R.fail("居民报名人数已满");
}
ComActActSignDO comActActSignDO = new ComActActSignDO();
@@ -416,33 +560,34 @@
*/
@Override
public R timedTaskActActivity() {
- List<Long> longs = comActActivityDAO.selectTimedTaskActActivity();
- if (ObjectUtils.isEmpty(longs)) {
- return R.fail("没有需要取消的社区活动");
- }
- List<ComActActivityDO> comActActivityDOS = comActActivityDAO.selectBatchIds(longs);
- List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
- if (!ObjectUtils.isEmpty(comActActivityDOS)) {
- comActActivityDOS.forEach(comActActivityDO -> {
- ComActActivityVO comActActivityVO = new ComActActivityVO();
- BeanUtils.copyProperties(comActActivityDO, comActActivityVO);
- List<ComActActSignDO> comActActSignDOS = comActActSignDAO.selectList(new QueryWrapper<ComActActSignDO>()
- .lambda().eq(ComActActSignDO::getActivityId, comActActivityDO.getId()));
- if (!ObjectUtils.isEmpty(comActActSignDOS)) {
- List<ActivitySignVO> activitySignVOList = new ArrayList<>();
- comActActSignDOS.forEach(comActActSignDO -> {
- ActivitySignVO activitySignVO = new ActivitySignVO();
- BeanUtils.copyProperties(comActActSignDO, activitySignVO);
- activitySignVOList.add(activitySignVO);
- comActActivityVO.setActivitySignVOList(activitySignVOList);
- });
- }
- comActActivityVOS.add(comActActivityVO);
- });
- int num = comActActivityDAO.updateIdBatch(longs);
- log.info("定时任务--一共取消社区活动数量【{}】", num);
- }
- return R.ok(comActActivityVOS);
+// List<Long> longs = comActActivityDAO.selectTimedTaskActActivity();
+// if (ObjectUtils.isEmpty(longs)) {
+// return R.fail("没有需要取消的社区活动");
+// }
+// List<ComActActivityDO> comActActivityDOS = comActActivityDAO.selectBatchIds(longs);
+// List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
+// if (!ObjectUtils.isEmpty(comActActivityDOS)) {
+// comActActivityDOS.forEach(comActActivityDO -> {
+// ComActActivityVO comActActivityVO = new ComActActivityVO();
+// BeanUtils.copyProperties(comActActivityDO, comActActivityVO);
+// List<ComActActSignDO> comActActSignDOS = comActActSignDAO.selectList(new QueryWrapper<ComActActSignDO>()
+// .lambda().eq(ComActActSignDO::getActivityId, comActActivityDO.getId()));
+// if (!ObjectUtils.isEmpty(comActActSignDOS)) {
+// List<ActivitySignVO> activitySignVOList = new ArrayList<>();
+// comActActSignDOS.forEach(comActActSignDO -> {
+// ActivitySignVO activitySignVO = new ActivitySignVO();
+// BeanUtils.copyProperties(comActActSignDO, activitySignVO);
+// activitySignVOList.add(activitySignVO);
+// comActActivityVO.setActivitySignVOList(activitySignVOList);
+// });
+// }
+// comActActivityVOS.add(comActActivityVO);
+// });
+// int num = comActActivityDAO.updateIdBatch(longs);
+// log.info("定时任务--一共取消社区活动数量【{}】", num);
+// }
+// return R.ok(comActActivityVOS);
+ return R.ok();
}
/**
@@ -456,15 +601,15 @@
int num = comActActivityDAO.updateStatusToNotBegin();
log.info("定时任务--修改社区活动发布状态活动数量【{}】", num);
// 修改报名状态 变为报名中
- int num1 = comActActivityDAO.updateStatusToBeginSign();
- log.info("定时任务--修改社区活动报名状态活动数量【{}】", num1);
+// int num1 = comActActivityDAO.updateStatusToBeginSign();
+// log.info("定时任务--修改社区活动报名状态活动数量【{}】", num1);
+ int num3 = comActActivityDAO.updateStatusToBeginAfterSingEnd();
+ log.info("定时任务--报名结束修改社区活动进行状态活动数量【{}】", num3);
// 查询已经结束的活动，需要计算积分
List<Long> activityEndIds = comActActivityDAO.getActivityEndIds();
// 修改进行状态 变为进行中或者已结束
int num2 = comActActivityDAO.updateStatusToBeginActiveOrEnd();
log.info("定时任务--修改社区活动进行状态活动数量【{}】", num2);
- int num3 = comActActivityDAO.updateStatusToBeginAfterSingEnd();
- log.info("定时任务--报名结束修改社区活动进行状态活动数量【{}】", num3);
return R.ok(activityEndIds);
}
@@ -489,6 +634,25 @@
page.setSize(pageSize);
page.setCurrent(pageNum);
IPage<ComActActivityVO> iPage = comActActivityDAO.pageActivityCommunityBack(page, comActActivityVO);
+ iPage.getRecords().forEach(vo ->{
+ List<ComActActEvaluateDO> comActActEvaluateDOList = comActActEvaluateDAO
+ .selectList(new QueryWrapper<ComActActEvaluateDO>().lambda().eq(ComActActEvaluateDO::getActivityId, vo.getId()));
+ if (comActActEvaluateDOList != null && comActActEvaluateDOList.size() > 0) {
+ BigDecimal starNum = BigDecimal.ZERO;
+ //总星级
+ for (ComActActEvaluateDO evaluateDO:comActActEvaluateDOList) {
+ starNum = starNum.add(BigDecimal.valueOf(evaluateDO.getStarLevel()==null?0:evaluateDO.getStarLevel()));
+ }
+ //评分星级(如果无评分默认5分)=总星级/总评价人数
+ if(starNum.compareTo(BigDecimal.ZERO) == 0){
+ vo.setEvaluateLevel(BigDecimal.valueOf(5));
+ }else{
+ vo.setEvaluateLevel(starNum.divide(BigDecimal.valueOf(comActActEvaluateDOList.size()),2, RoundingMode.HALF_UP));
+ }
+ }else{
+ vo.setEvaluateLevel(BigDecimal.valueOf(5));
+ }
+ });
return R.ok(iPage);
}
@@ -567,7 +731,7 @@
// 查询所有即将开始的活动
List<ComActActivityDO> actActivityList = comActActivityDAO.selectList(new QueryWrapper<ComActActivityDO>()
.lambda().le(ComActActivityDO::getBeginAt, DateUtils.addDays(new Date(), 1))
- .ge(ComActActivityDO::getBeginAt, new Date()));
+ .ge(ComActActivityDO::getBeginAt, new Date()).notIn(ComActActivityDO::getStatus,5,6));
if (!actActivityList.isEmpty()) {
WxXCXTempSend util = new WxXCXTempSend();
try {
@@ -598,4 +762,85 @@
return R.ok();
}
+ private String getPersent(int x, int y){
+ if (y == 0) {
+ return "";
+ }
+ if (x == 0) {
+ return "0.00%";
+ }
+ double d1 = x * 1.0;
+ double d2 = y * 1.0;
+ DecimalFormat decimalFormat = new DecimalFormat("##.00%");
+ return decimalFormat.format(d1 / d2);
+ }
+
+ /**
+ * 用户签到
+ *
+ * @param comActActRegistVO 签到参数
+ * @return 签到结果
+ */
+ @Override
+ public R activitySignIn(ComActActRegistVO comActActRegistVO) {
+ Long activityId = comActActRegistVO.getActivityId();
+ Long userId = comActActRegistVO.getUserId();
+ if (isNull(activityId)) {
+ return R.fail("签到所属活动id不能为空！");
+ }
+ ComActActivityDO comActActivityDO = comActActivityDAO.selectById(activityId);
+ if (isNull(comActActivityDO)) {
+ return R.fail("活动不存在！");
+ }
+
+ Date beginAt = comActActivityDO.getBeginAt();
+ Date endAt = comActActivityDO.getEndAt();
+ Date nowDate = new Date();
+ if (nowDate.before(beginAt) || nowDate.after(endAt)) {
+ return R.fail("不在活动时间范围内");
+ }
+
+ int signCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
+ .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId));
+
+ if (signCount > 0) {
+ return R.fail("请勿重复签到");
+ }
+
+// 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.setUserId(userId);
+ comActActRegistDO.setIsVolunteer(comActActRegistVO.getIsVolunteer());
+ comActActRegistDO.setCreateAt(nowDate);
+ int result = comActActRegistDAO.insert(comActActRegistDO);
+ if (result > 0) {
+// ValueOperations<String, String> opsForValue = stringRedisTemplate.opsForValue();
+// opsForValue.set(activitySignInKey, "", 1800L, TimeUnit.SECONDS);
+ return R.ok();
+ }
+ return R.fail("网络错误，请重试");
+ }
+
+ /**
+ *用户签到记录列表
+ *
+ * @param userId 用id
+ * @return 用户签到列表
+ */
+ @Override
+ public R listSignInActivity(Long userId) {
+ List<ComActActRegistDO> comActActRegistDOS = comActActRegistDAO.selectList(new QueryWrapper<ComActActRegistDO>()
+ .lambda().eq(ComActActRegistDO::getUserId, userId));
+ ArrayList<ComActActRegistVO> comActActRegistVOS = new ArrayList<>();
+ comActActRegistDOS.forEach(comActActRegistDO -> {
+ ComActActRegistVO comActActRegistVO = new ComActActRegistVO();
+ BeanUtils.copyProperties(comActActRegistDO, comActActRegistVO);
+ comActActRegistVOS.add(comActActRegistVO);
+ });
+ return R.ok(comActActRegistVOS);
+ }
}
--
Gitblit v1.7.1