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/ComActMicroWishServiceImpl.java | 75 +++++++++++++++++++++++++++++++------ 1 files changed, 62 insertions(+), 13 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java index 43cba98..a7088ca 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java @@ -1,17 +1,22 @@ package com.panzhihua.service_community.service.impl; +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.bigscreen.work.ScreenMicroListDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActMicroWishVO; import com.panzhihua.common.model.vos.community.TodoEventsVO; +import com.panzhihua.common.model.vos.community.screen.work.MicroListVO; +import com.panzhihua.common.utlis.SensitiveUtil; import com.panzhihua.service_community.dao.ComActMicroWishDAO; import com.panzhihua.service_community.dao.ComActMicroWishUserDAO; import com.panzhihua.service_community.model.dos.ComActMicroWishDO; import com.panzhihua.service_community.model.dos.ComActMicroWishUserDO; import com.panzhihua.service_community.service.ComActMicroWishService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -26,6 +31,7 @@ * @create: 2020-12-07 14:34 **/ @Service +@Slf4j public class ComActMicroWishServiceImpl extends ServiceImpl<ComActMicroWishDAO, ComActMicroWishDO> implements ComActMicroWishService { @Resource private ComActMicroWishDAO comActMicroWishDAO; @@ -53,16 +59,21 @@ page.setSize(pageSize); page.setCurrent(pageNum); IPage<ComActMicroWishVO> iPage = comActMicroWishDAO.pageMicroWish(page, comActMicroWishVO); + List<ComActMicroWishVO> records = iPage.getRecords(); if (!ObjectUtils.isEmpty(records)) { records.forEach(comActMicroWishVO1 -> { - Long id = comActMicroWishVO1.getId(); - ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, id).eq(ComActMicroWishUserDO::getUserId, userId)); - if (ObjectUtils.isEmpty(comActMicroWishUserDO)) { - comActMicroWishVO1.setHaveGiveThumbsUp(0); - } else { - comActMicroWishVO1.setHaveGiveThumbsUp(1); + if(userId != null){ + Long id = comActMicroWishVO1.getId(); + ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, id) + .eq(ComActMicroWishUserDO::getUserId, userId)); + if (ObjectUtils.isEmpty(comActMicroWishUserDO)) { + comActMicroWishVO1.setHaveGiveThumbsUp(0); + } else { + comActMicroWishVO1.setHaveGiveThumbsUp(1); + } } + comActMicroWishVO1.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO1.getSponsorPhone())); }); iPage.setRecords(records); } @@ -79,6 +90,9 @@ @Override public R detailMicroWish(Long id, Long userId) { ComActMicroWishVO comActMicroWishVO = comActMicroWishDAO.detailMicroWish(id); + if (ObjectUtils.isEmpty(comActMicroWishVO)) { + return R.fail("微心愿不存在"); + } Integer starNum = comActMicroWishVO.getStarNum(); if (null==starNum) { comActMicroWishVO.setStarNum(0); @@ -86,12 +100,15 @@ if (ObjectUtils.isEmpty(comActMicroWishVO)) { return R.fail("心愿不存在"); } - ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getUserId, userId).eq(ComActMicroWishUserDO::getMicroWishId, id)); - if (ObjectUtils.isEmpty(comActMicroWishUserDO)) { - comActMicroWishVO.setHaveGiveThumbsUp(0); - }else { - comActMicroWishVO.setHaveGiveThumbsUp(1); + if(userId != null){ + ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getUserId, userId).eq(ComActMicroWishUserDO::getMicroWishId, id)); + if (ObjectUtils.isEmpty(comActMicroWishUserDO)) { + comActMicroWishVO.setHaveGiveThumbsUp(0); + }else { + comActMicroWishVO.setHaveGiveThumbsUp(1); + } } + comActMicroWishVO.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO.getSponsorPhone())); return R.ok(comActMicroWishVO); } @@ -131,11 +148,14 @@ break; case 4: comActMicroWishDO.setDistributionAt(date); - comActMicroWishDO.setResponsibleId(null); - comActMicroWishDO.setStatus(5);//待确认 + comActMicroWishDO.setResponsibleId(responsibleId); + comActMicroWishDO.setStatus(3);//待确认 comActMicroWishDO.setForm(2); break; case 5: + if(comActMicroWishVO.getFeedback().length() > 200){ + return R.fail("反馈字数不得超过200字"); + } comActMicroWishDO.setFeedbackAt(date); comActMicroWishDO.setStatus(5);//待确认 comActMicroWishDO.setFeedback(feedback); @@ -232,5 +252,34 @@ return todoEventsVOS; } + @Override + public R deleteMicroWish(Long id) { + ComActMicroWishDO comActMicroWishDO = comActMicroWishDAO.selectById(id); + if(comActMicroWishDO==null){ + return R.fail("id有误!"); + } + comActMicroWishDAO.deleteById(id); + comActMicroWishUserDAO.delete(new LambdaQueryWrapper<ComActMicroWishUserDO>().eq(ComActMicroWishUserDO::getMicroWishId,id)); + return R.ok(); + } + @Override + public R timedTaskActMicroWishAll() { + int num=comActMicroWishDAO.updateStatusAutoConfirm(); + log.info("定时任务--修改待自动确认微心愿状态数量【{}】",num); + return R.ok(); + } + + @Override + public R getScreenMicroList(ScreenMicroListDTO microListDTO){ + IPage<MicroListVO> microListVOIPage = comActMicroWishDAO.getScreenMicroList(new Page(microListDTO.getPageNum(),microListDTO.getPageSize()),microListDTO); + if(!microListVOIPage.getRecords().isEmpty()){ + microListVOIPage.getRecords().forEach(microListVO -> { + Integer count = comActMicroWishUserDAO.selectCount(new QueryWrapper<ComActMicroWishUserDO>().lambda() + .eq(ComActMicroWishUserDO::getMicroWishId,microListVO.getId())); + microListVO.setStarNum(count); + }); + } + return R.ok(microListVOIPage); + } } -- Gitblit v1.7.1