Browse Source

删除历史活动草稿

master
yinzuomei 5 years ago
parent
commit
de90095fb6
  1. 21
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInitResultDTO.java
  2. 35
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java
  3. 8
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActContentDao.java
  4. 9
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActInfoDao.java
  5. 9
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LatestActContentService.java
  6. 18
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LatestActInfoService.java
  7. 30
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActDraftService.java
  8. 13
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActContentServiceImpl.java
  9. 40
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActInfoServiceImpl.java
  10. 64
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java
  11. 8
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActContentDao.xml
  12. 10
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActInfoDao.xml

21
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;
}

35
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<com.epmet.dto.form.work.PublishActInitResultDTO>
* @param
* @author yinzuomei
* @description 发布活动初始化
* @Date 2020/7/20 17:51
**/
@PostMapping("publishactinit")
public Result<PublishActInitResultDTO> publishActInit(){
PublishActInitResultDTO initResultDTO=workActDraftService.publishActInit();
return new Result<PublishActInitResultDTO>().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();
}
}

8
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActContentDao.java

@ -30,4 +30,12 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface LatestActContentDao extends BaseDao<LatestActContentEntity> {
/**
* @return int
* @param actId
* @author yinzuomei
* @description 根据活动id, 删除活动内容
* @Date 2020/7/20 18:35
**/
int updateToDelByActId(String actId);
}

9
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActInfoDao.java

@ -30,4 +30,13 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface LatestActInfoDao extends BaseDao<LatestActInfoEntity> {
/**
* @return java.lang.Integer
* @param userId
* @author yinzuomei
* @description 查询当前用户保留的活动记录
* @Date 2020/7/20 18:06
**/
Integer countByUserId(String userId);
}

9
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LatestActContentService.java

@ -92,4 +92,13 @@ public interface LatestActContentService extends BaseService<LatestActContentEnt
* @date 2020-07-19
*/
void delete(String[] ids);
/**
* @return int
* @param actId
* @author yinzuomei
* @description 根据活动id,删除活动内容
* @Date 2020/7/20 18:34
**/
int deleteByActId(String actId);
}

18
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LatestActInfoService.java

@ -92,4 +92,22 @@ public interface LatestActInfoService extends BaseService<LatestActInfoEntity> {
* @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);
}

30
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();
}

13
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<LatestActConten
baseDao.deleteBatchIds(Arrays.asList(ids));
}
/**
* @param actId
* @return int
* @author yinzuomei
* @description 根据活动id, 删除活动内容
* @Date 2020/7/20 18:34
**/
@Override
public int deleteByActId(String actId) {
int updateNum=baseDao.updateToDelByActId(actId);
return updateNum;
}
}

40
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActInfoServiceImpl.java

@ -20,13 +20,15 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.dao.LatestActInfoDao;
import com.epmet.dto.LatestActInfoDTO;
import com.epmet.entity.LatestActInfoEntity;
import com.epmet.redis.LatestActInfoRedis;
import com.epmet.service.LatestActContentService;
import com.epmet.service.LatestActInfoService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -48,6 +50,8 @@ public class LatestActInfoServiceImpl extends BaseServiceImpl<LatestActInfoDao,
@Autowired
private LatestActInfoRedis latestActInfoRedis;
@Autowired
private LatestActContentService latestActContentService;
@Override
public PageData<LatestActInfoDTO> page(Map<String, Object> params) {
@ -101,4 +105,38 @@ public class LatestActInfoServiceImpl extends BaseServiceImpl<LatestActInfoDao,
baseDao.deleteBatchIds(Arrays.asList(ids));
}
/**
* @return java.lang.Integer
* @param userId
* @author yinzuomei
* @description 查询当前用户保留的活动记录
* @Date 2020/7/20 18:04
**/
@Override
public Integer countByUserId(String userId) {
return baseDao.countByUserId(userId);
}
/**
* @param userId
* @return void
* @author yinzuomei
* @description 删除当前用户的活动草稿
* @Date 2020/7/20 18:17
**/
@Override
public void deleteAllDraft(String userId) {
QueryWrapper<LatestActInfoEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(userId), FieldConstant.CREATED_BY, userId);
List<LatestActInfoEntity> entityList = baseDao.selectList(wrapper);
for(LatestActInfoEntity entity:entityList){
//删除活动内容
int num=latestActContentService.deleteByActId(entity.getId());
//删除活动属性: del_flag="1"
entity.setDelFlag(NumConstant.ONE_STR);
updateById(entity);
}
}
}

64
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);
}
}
}

8
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActContentDao.xml

@ -17,5 +17,11 @@
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<!-- 根据活动id, 删除活动内容 -->
<update id="updateToDelByActId" parameterType="java.lang.String">
UPDATE latest_act_content
SET DEL_FLAG = '1'
WHERE
ACT_ID = #{actId}
</update>
</mapper>

10
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActInfoDao.xml

@ -41,5 +41,15 @@
<result property="delFlag" column="DEL_FLAG"/>
</resultMap>
<!-- 查询当前用户保留的活动记录 -->
<select id="countByUserId" parameterType="java.lang.String" resultType="java.lang.Integer">
SELECT
count( 1 ) as totalNum
FROM
latest_act_info lai
WHERE
lai.DEL_FLAG = '0'
AND lai.CREATED_BY = #{userId}
</select>
</mapper>
Loading…
Cancel
Save