From de90095fb6bd8648395f4cb7d3ede25047c7394f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 20 Jul 2020 18:38:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8E=86=E5=8F=B2=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E8=8D=89=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/work/PublishActInitResultDTO.java | 21 ++++++ .../controller/WorkActDraftController.java | 35 ++++++++++ .../com/epmet/dao/LatestActContentDao.java | 10 ++- .../java/com/epmet/dao/LatestActInfoDao.java | 11 +++- .../service/LatestActContentService.java | 9 +++ .../epmet/service/LatestActInfoService.java | 18 ++++++ .../epmet/service/WorkActDraftService.java | 30 +++++++++ .../impl/LatestActContentServiceImpl.java | 13 ++++ .../impl/LatestActInfoServiceImpl.java | 40 +++++++++++- .../service/impl/WorkActDraftServiceImpl.java | 64 +++++++++++++++++++ .../resources/mapper/LatestActContentDao.xml | 8 ++- .../resources/mapper/LatestActInfoDao.xml | 10 +++ 12 files changed, 265 insertions(+), 4 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInitResultDTO.java create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActDraftService.java create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInitResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInitResultDTO.java new file mode 100644 index 0000000000..94b9e8b7af --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInitResultDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.form.work; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 描述一下 + * + * @author yinzuomei@elink-cn.com + * @date 2020/7/20 17:49 + */ +@Data +public class PublishActInitResultDTO implements Serializable { + private static final long serialVersionUID = 6579531592586604405L; + /** + * true:存在正在编辑的活动 false 不存在 + */ + private Boolean existFlag; + +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java index 2da3a0d56a..9d7b410a47 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java @@ -1,5 +1,10 @@ package com.epmet.controller; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.work.PublishActInitResultDTO; +import com.epmet.service.WorkActDraftService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,4 +17,34 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/work/actdraft") public class WorkActDraftController { + @Autowired + private WorkActDraftService workActDraftService; + + + /** + * @return com.epmet.commons.tools.utils.Result + * @param + * @author yinzuomei + * @description 发布活动初始化 + * @Date 2020/7/20 17:51 + **/ + @PostMapping("publishactinit") + public Result publishActInit(){ + PublishActInitResultDTO initResultDTO=workActDraftService.publishActInit(); + return new Result().ok(initResultDTO); + } + + /** + * @return com.epmet.commons.tools.utils.Result + * @param + * @author yinzuomei + * @description 发布活动-删除历史活动草稿 + * @Date 2020/7/20 18:15 + **/ + @PostMapping("deletedraft") + public Result deleteDraft(){ + workActDraftService.deleteDraft(); + return new Result(); + } + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActContentDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActContentDao.java index 5f1c108a52..fdfc4da871 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActContentDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActContentDao.java @@ -29,5 +29,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface LatestActContentDao extends BaseDao { - + + /** + * @return int + * @param actId + * @author yinzuomei + * @description 根据活动id, 删除活动内容 + * @Date 2020/7/20 18:35 + **/ + int updateToDelByActId(String actId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActInfoDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActInfoDao.java index c6d68bbac5..65cd470efd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActInfoDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActInfoDao.java @@ -29,5 +29,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface LatestActInfoDao extends BaseDao { - + + /** + * @return java.lang.Integer + * @param userId + * @author yinzuomei + * @description 查询当前用户保留的活动记录 + * @Date 2020/7/20 18:06 + **/ + Integer countByUserId(String userId); + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LatestActContentService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LatestActContentService.java index 430e70d859..bf6dbde152 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LatestActContentService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LatestActContentService.java @@ -92,4 +92,13 @@ public interface LatestActContentService extends BaseService { * @date 2020-07-19 */ void delete(String[] ids); + + /** + * @return java.lang.Integer + * @param userId + * @author yinzuomei + * @description 查询当前用户保留的活动记录 + * @Date 2020/7/20 17:58 + **/ + Integer countByUserId(String userId); + + /** + * @return void + * @param userId + * @author yinzuomei + * @description 删除当前用户的活动草稿 + * @Date 2020/7/20 18:17 + **/ + void deleteAllDraft(String userId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActDraftService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActDraftService.java new file mode 100644 index 0000000000..5c8e317e88 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActDraftService.java @@ -0,0 +1,30 @@ +package com.epmet.service; + +import com.epmet.dto.form.work.PublishActInitResultDTO; + +/** + * 工作端活动草稿 + * + * @author yinzuomei@elink-cn.com + * @date 2020/7/20 17:51 + */ +public interface WorkActDraftService { + + /** + * @return com.epmet.dto.form.work.PublishActInitResultDTO + * @param + * @author yinzuomei + * @description 发布活动初始化 + * @Date 2020/7/20 17:54 + **/ + PublishActInitResultDTO publishActInit(); + + /** + * @return void + * @param + * @author yinzuomei + * @description 发布活动-删除历史活动草稿 + * @Date 2020/7/20 18:15 + **/ + void deleteDraft(); +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActContentServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActContentServiceImpl.java index c08afd3689..fca1156449 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActContentServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActContentServiceImpl.java @@ -101,4 +101,17 @@ public class LatestActContentServiceImpl extends BaseServiceImpl page(Map params) { @@ -101,4 +105,38 @@ public class LatestActInfoServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(userId), FieldConstant.CREATED_BY, userId); + List entityList = baseDao.selectList(wrapper); + for(LatestActInfoEntity entity:entityList){ + //删除活动内容 + int num=latestActContentService.deleteByActId(entity.getId()); + //删除活动属性: del_flag="1" + entity.setDelFlag(NumConstant.ONE_STR); + updateById(entity); + } + } + + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java new file mode 100644 index 0000000000..d053b46016 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java @@ -0,0 +1,64 @@ +package com.epmet.service.impl; + +import com.epmet.commons.tools.security.user.LoginUserUtil; +import com.epmet.dto.form.work.PublishActInitResultDTO; +import com.epmet.service.LatestActInfoService; +import com.epmet.service.WorkActDraftService; +import org.apache.commons.lang3.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * 工作端活动草稿 + * + * @author yinzuomei@elink-cn.com + * @date 2020/7/20 17:52 + */ +@Service +public class WorkActDraftServiceImpl implements WorkActDraftService { + private Logger logger = LogManager.getLogger(WorkActDraftServiceImpl.class); + @Autowired + private LoginUserUtil loginUserUtil; + @Autowired + private LatestActInfoService latestActInfoService; + + /** + * @return com.epmet.dto.form.work.PublishActInitResultDTO + * @param + * @author yinzuomei + * @description 发布活动初始化 + * @Date 2020/7/20 17:55 + **/ + @Override + public PublishActInitResultDTO publishActInit() { + PublishActInitResultDTO resultDTO=new PublishActInitResultDTO(); + resultDTO.setExistFlag(false); + String currentUserId=loginUserUtil.getLoginUserId(); + if(StringUtils.isNotBlank(currentUserId)){ + Integer count=latestActInfoService.countByUserId(currentUserId); + if(count>=1){ + logger.info(String.format("userId=%s存在%s条正在编辑的活动",currentUserId,count)); + resultDTO.setExistFlag(true); + } + }else{ + logger.warn("loginUserUtil.getLoginUserId()获取当前用户id为空"); + } + return resultDTO; + } + + /** + * @return void + * @author yinzuomei + * @description 发布活动-删除历史活动草稿 + * @Date 2020/7/20 18:15 + **/ + @Override + public void deleteDraft() { + String currentUserId=loginUserUtil.getLoginUserId(); + if(StringUtils.isNotBlank(currentUserId)){ + latestActInfoService.deleteAllDraft(currentUserId); + } + } +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActContentDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActContentDao.xml index 99c6f3e2c1..d6f4181e6f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActContentDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActContentDao.xml @@ -17,5 +17,11 @@ - + + + UPDATE latest_act_content + SET DEL_FLAG = '1' + WHERE + ACT_ID = #{actId} + \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActInfoDao.xml index 087273256d..cad09d0638 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActInfoDao.xml @@ -41,5 +41,15 @@ + + \ No newline at end of file