Browse Source

Merge remote-tracking branch 'origin/feature/lc_majorization' into feature/syp_sdsptg

feature/syp_points
songyunpeng 5 years ago
parent
commit
5d2c77044b
  1. 18
      esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/RocketMqConstant.java
  2. 22
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
  3. 8
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckResultServiceImpl.java
  4. 7
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ArchivesDeptDTO.java
  5. 7
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archivesdept/entity/ArchivesDeptEntity.java
  6. 2
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archivesdept/service/impl/ArchivesDeptServiceImpl.java
  7. 9
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/reportissue/service/ReportIssueService.java
  8. 7
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/reportissue/service/impl/ReportIssueServiceImpl.java
  9. 6
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/OrganizationModifyConsumer.java
  10. 48
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/RejectCheckRecordConsumer.java
  11. 27
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/dto/RejectRecordDTO.java
  12. 1
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml
  13. 22
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml
  14. 1
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archivesdept/ArchivesDeptDao.xml
  15. 9
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActApplyInfoService.java
  16. 14
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActApplyInfoServiceImpl.java
  17. 6
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/RejectCheckRecordConsumer.java

18
esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/RocketMqConstant.java

@ -53,6 +53,10 @@ public interface RocketMqConstant {
* 内容安全审核-初心互助-已报名活动-我要打卡-消息tag * 内容安全审核-初心互助-已报名活动-我要打卡-消息tag
*/ */
String MQ_TAG_HEART_SIGNIN_CONTENTSECURITY = "js_heart_signIn_contentSecurityTag"; String MQ_TAG_HEART_SIGNIN_CONTENTSECURITY = "js_heart_signIn_contentSecurityTag";
/**
* 内容安全审核-初心互助-已报名活动-我要打卡-消息tag
*/
String MQ_TAG_HEART_ACT_APPLY= "js_heart_act_apply";
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
/** /**
@ -92,4 +96,18 @@ public interface RocketMqConstant {
*/ */
String MQ_TAG_GROUP_TOPIC_COMMENT_CONTENTSECURITY = "js_group_topic_comment_contentSecurityTag"; String MQ_TAG_GROUP_TOPIC_COMMENT_CONTENTSECURITY = "js_group_topic_comment_contentSecurityTag";
//---------------------------------------------------------------------------
/**
* 内容安全审核-我要举报
*/
String MQ_TOPIC_REPORT_ISSUE = "js_reportIssue_contentSecurityTopic";
/**
* 内容安全审核 我要举报tag
*/
String MQ_TAG_REPORT_ISSUE_CONTENTSECURITY = "js_reportIssue_topic_contentSecurityTag";
} }

22
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@ -327,7 +327,7 @@ public class AppUserServiceImpl implements AppUserService {
EpdcAppAuthorizationDTO authorization = this.packageEpdcAppAuthorization(tokenDto, newAppUser.getGrid(), AppUserStatesEnum.STATE_REGISTERED.value()); EpdcAppAuthorizationDTO authorization = this.packageEpdcAppAuthorization(tokenDto, newAppUser.getGrid(), AppUserStatesEnum.STATE_REGISTERED.value());
// 网格长加入网格党员群并设置为群主 // 网格长加入网格党员群并设置为群主
this.joinGridPartyGroup(newAppUser, userGridList, NumConstant.ONE_STR); // this.joinGridPartyGroup(newAppUser, userGridList, NumConstant.ONE_STR);
return new Result().ok(authorization); return new Result().ok(authorization);
} }
@ -754,11 +754,11 @@ public class AppUserServiceImpl implements AppUserService {
userResult = registerBindGridResultDto.getData(); userResult = registerBindGridResultDto.getData();
registeredUser = userResult.getUserDTO(); registeredUser = userResult.getUserDTO();
// 用户已认证为党员,绑定网格时加入该网格党员群 // 用户已认证为党员,绑定网格时加入该网格党员群
if (NumConstant.ONE_STR.equals(registeredUser.getPartyFlag())) { /*if (NumConstant.ONE_STR.equals(registeredUser.getPartyFlag())) {
UserGridRelationDTO userGridRelationDto = new UserGridRelationDTO(); UserGridRelationDTO userGridRelationDto = new UserGridRelationDTO();
userGridRelationDto.setGridId(userResult.getGridId()); userGridRelationDto.setGridId(userResult.getGridId());
this.joinGridPartyGroup(registeredUser, Collections.singletonList(userGridRelationDto), NumConstant.ZERO_STR); this.joinGridPartyGroup(registeredUser, Collections.singletonList(userGridRelationDto), NumConstant.ZERO_STR);
} }*/
} }
// 已注册已绑定当前网格 // 已注册已绑定当前网格
@ -863,7 +863,7 @@ public class AppUserServiceImpl implements AppUserService {
EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(tokenDto, userGrid.getGrid(), user.getState()); EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(tokenDto, userGrid.getGrid(), user.getState());
// 更新社群用户党员标识并加入关联的所有网格党员群 // 更新社群用户党员标识并加入关联的所有网格党员群
if (NumConstant.ONE_STR.equals(user.getPartyFlag())) { /*if (NumConstant.ONE_STR.equals(user.getPartyFlag())) {
GroupUserPartyMemberFormDTO formDto = new GroupUserPartyMemberFormDTO(); GroupUserPartyMemberFormDTO formDto = new GroupUserPartyMemberFormDTO();
formDto.setUserId(user.getId()); formDto.setUserId(user.getId());
formDto.setPartyMember(user.getPartyFlag()); formDto.setPartyMember(user.getPartyFlag());
@ -875,7 +875,7 @@ public class AppUserServiceImpl implements AppUserService {
groupFeignClient.updateUserPartyMember(formDto); groupFeignClient.updateUserPartyMember(formDto);
// groupTask.updateUserPartyMember(formDto); // groupTask.updateUserPartyMember(formDto);
} }*/
return new Result().ok(authorizationDto); return new Result().ok(authorizationDto);
} }
@ -1202,9 +1202,9 @@ public class AppUserServiceImpl implements AppUserService {
CachingUserInfoDTO cachingUserInfoDTO = cachingUserResult.getData(); CachingUserInfoDTO cachingUserInfoDTO = cachingUserResult.getData();
EpdcAppAuthorizationDTO authorizationDto = cachingUserInfoForAuthorization(cachingUserInfoDTO, user.getGrid(), user.getState()); EpdcAppAuthorizationDTO authorizationDto = cachingUserInfoForAuthorization(cachingUserInfoDTO, user.getGrid(), user.getState());
if (!partyFlag && newPartyFlag) { /*if (!partyFlag && newPartyFlag) {
initPartyGroupInfo(cachingUserInfoDTO); initPartyGroupInfo(cachingUserInfoDTO);
} }*/
return new Result().ok(authorizationDto); return new Result().ok(authorizationDto);
} }
@ -1429,9 +1429,9 @@ public class AppUserServiceImpl implements AppUserService {
} }
// 更新社群用户党员标识并加入关联的所有网格党员群 // 更新社群用户党员标识并加入关联的所有网格党员群
boolean partyFlag = UserTagUtils.containIdentity(cachingUserInfoDTO.getUserTagInfos(), UserTagEnum.PARTY_MEMBER); boolean partyFlag = UserTagUtils.containIdentity(cachingUserInfoDTO.getUserTagInfos(), UserTagEnum.PARTY_MEMBER);
if (partyFlag) { /*if (partyFlag) {
initPartyGroupInfo(cachingUserInfoDTO); initPartyGroupInfo(cachingUserInfoDTO);
} }*/
//异步更新党群群众信息 //异步更新党群群众信息
PartyUserNewInfoFormDTO formDTO = new PartyUserNewInfoFormDTO(); PartyUserNewInfoFormDTO formDTO = new PartyUserNewInfoFormDTO();
formDTO.setUserId(cachingUserInfoDTO.getUserId()); formDTO.setUserId(cachingUserInfoDTO.getUserId());
@ -1504,9 +1504,9 @@ public class AppUserServiceImpl implements AppUserService {
CachingUserInfoDTO cachingUserInfoDTO = cachingUserResult.getData(); CachingUserInfoDTO cachingUserInfoDTO = cachingUserResult.getData();
EpdcAppAuthorizationDTO authorizationDto = cachingUserInfoForAuthorization(cachingUserInfoDTO, user.getGrid(), user.getState()); EpdcAppAuthorizationDTO authorizationDto = cachingUserInfoForAuthorization(cachingUserInfoDTO, user.getGrid(), user.getState());
if ( newPartyFlag) { /*if ( newPartyFlag) {
initPartyGroupInfo(cachingUserInfoDTO); initPartyGroupInfo(cachingUserInfoDTO);
} }*/
return new Result().ok(authorizationDto); return new Result().ok(authorizationDto);
} }

8
esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckResultServiceImpl.java

@ -180,6 +180,9 @@ public class CheckResultServiceImpl extends BaseServiceImpl<CheckResultDao, Chec
}else if(ModuleName.HELP_SIGNIN.getCode().equals(record.getModule())){ }else if(ModuleName.HELP_SIGNIN.getCode().equals(record.getModule())){
topic = RocketMqConstant.MQ_TOPIC_HEART_CONTENTSECURITY; topic = RocketMqConstant.MQ_TOPIC_HEART_CONTENTSECURITY;
tag = RocketMqConstant.MQ_TAG_HEART_SIGNIN_CONTENTSECURITY; tag = RocketMqConstant.MQ_TAG_HEART_SIGNIN_CONTENTSECURITY;
}else if(ModuleName.ACT_APPLY.getCode().equals(record.getModule())){
topic = RocketMqConstant.MQ_TOPIC_HEART_CONTENTSECURITY;
tag = RocketMqConstant.MQ_TAG_HEART_ACT_APPLY;
} }
//议题项目 //议题项目
else if(ModuleName.ISSUE_SUBMIT.getCode().equals(record.getModule())){ else if(ModuleName.ISSUE_SUBMIT.getCode().equals(record.getModule())){
@ -200,6 +203,11 @@ public class CheckResultServiceImpl extends BaseServiceImpl<CheckResultDao, Chec
topic = RocketMqConstant.MQ_TOPIC_GROUP_CONTENTSECURITY; topic = RocketMqConstant.MQ_TOPIC_GROUP_CONTENTSECURITY;
tag = RocketMqConstant.MQ_TAG_GROUP_TOPIC_COMMENT_CONTENTSECURITY; tag = RocketMqConstant.MQ_TAG_GROUP_TOPIC_COMMENT_CONTENTSECURITY;
} }
//我要举报
else if(ModuleName.REPORT_ISSUE.getCode().equals(record.getModule())){
topic = RocketMqConstant.MQ_TOPIC_REPORT_ISSUE;
tag = RocketMqConstant.MQ_TAG_REPORT_ISSUE_CONTENTSECURITY;
}
RejectRecordDTO body = new RejectRecordDTO(); RejectRecordDTO body = new RejectRecordDTO();
body.setUserId(violationEntity.getUserId()); body.setUserId(violationEntity.getUserId());
body.setRelationId(violationEntity.getRelationId()); body.setRelationId(violationEntity.getRelationId());

7
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ArchivesDeptDTO.java

@ -17,9 +17,10 @@
package com.elink.esua.epdc.dto; package com.elink.esua.epdc.dto;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
@ -47,6 +48,10 @@ public class ArchivesDeptDTO implements Serializable {
* 排序 * 排序
*/ */
private Integer deptOrder; private Integer deptOrder;
/**
* 是否启用
*/
private String enableFlag;
/** /**
* 归属部门ID * 归属部门ID

7
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archivesdept/entity/ArchivesDeptEntity.java

@ -18,13 +18,10 @@
package com.elink.esua.epdc.modules.archivesdept.entity; package com.elink.esua.epdc.modules.archivesdept.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date;
/** /**
* 档案部门排序表 * 档案部门排序表
* *
@ -53,4 +50,8 @@ public class ArchivesDeptEntity extends BaseEpdcEntity {
*/ */
private Integer deptOrder; private Integer deptOrder;
/**
* 是否启用
*/
private String enableFlag;
} }

2
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archivesdept/service/impl/ArchivesDeptServiceImpl.java

@ -110,6 +110,8 @@ public class ArchivesDeptServiceImpl extends BaseServiceImpl<ArchivesDeptDao, Ar
if(archivesDeptEntity==null){ if(archivesDeptEntity==null){
// 没有新增一条 // 没有新增一条
ArchivesDeptEntity archivesDept =new ArchivesDeptEntity(); ArchivesDeptEntity archivesDept =new ArchivesDeptEntity();
//默认启用
archivesDept.setEnableFlag("1");
archivesDept.setDept(dept); archivesDept.setDept(dept);
archivesDept.setDeptId(deptId); archivesDept.setDeptId(deptId);
return insert(archivesDept); return insert(archivesDept);

9
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/reportissue/service/ReportIssueService.java

@ -27,6 +27,7 @@ import com.elink.esua.epdc.dto.form.ReportIssueSubmitFormDTO;
import com.elink.esua.epdc.dto.result.ReportIssueResultDTO; import com.elink.esua.epdc.dto.result.ReportIssueResultDTO;
import com.elink.esua.epdc.modules.reportissue.entity.ReportIssueEntity; import com.elink.esua.epdc.modules.reportissue.entity.ReportIssueEntity;
import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -146,4 +147,12 @@ public interface ReportIssueService extends BaseService<ReportIssueEntity> {
* @return void * @return void
**/ **/
void modifyOrganizationInfo(OrganizationModifyDTO dto); void modifyOrganizationInfo(OrganizationModifyDTO dto);
/**
* @Description 违规删除
* @Author songyunpeng
* @Date 2020/11/27
* @Param [dto]
* @return void
**/
void rejectActInfo(RejectRecordDTO dto);
} }

7
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/reportissue/service/impl/ReportIssueServiceImpl.java

@ -44,6 +44,7 @@ import com.elink.esua.epdc.modules.reportissue.entity.ReportIssueEntity;
import com.elink.esua.epdc.modules.reportissue.service.CustomImgService; import com.elink.esua.epdc.modules.reportissue.service.CustomImgService;
import com.elink.esua.epdc.modules.reportissue.service.ReportIssueService; import com.elink.esua.epdc.modules.reportissue.service.ReportIssueService;
import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -236,6 +237,12 @@ public class ReportIssueServiceImpl extends BaseServiceImpl<ReportIssueDao, Repo
// 更新网格名称 // 更新网格名称
baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId()); baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId());
} }
@Override
public void rejectActInfo(RejectRecordDTO dto) {
baseDao.deleteById(dto.getRelationId());
}
/** /**
* 组织机构信息处理 * 组织机构信息处理
* *

6
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/OrganizationModifyConsumer.java

@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant; import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant;
import com.elink.esua.epdc.modules.archives.service.ArchivesService; import com.elink.esua.epdc.modules.archives.service.ArchivesService;
import com.elink.esua.epdc.modules.archivesdept.service.ArchivesDeptService; import com.elink.esua.epdc.modules.archivesdept.service.ArchivesDeptService;
import com.elink.esua.epdc.modules.dept.service.DeptInfoService;
import com.elink.esua.epdc.modules.reportissue.service.ReportIssueService; import com.elink.esua.epdc.modules.reportissue.service.ReportIssueService;
import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -33,9 +32,6 @@ public class OrganizationModifyConsumer implements RocketMQListener<MessageExt>
@Autowired @Autowired
private ArchivesDeptService archivesDeptService; private ArchivesDeptService archivesDeptService;
@Autowired
private DeptInfoService deptInfoService;
@Autowired @Autowired
private ReportIssueService reportIssueService; private ReportIssueService reportIssueService;
@ -50,8 +46,6 @@ public class OrganizationModifyConsumer implements RocketMQListener<MessageExt>
archivesService.modifyOrganizationInfo(dto); archivesService.modifyOrganizationInfo(dto);
// 档案部门修改组织机构信息 // 档案部门修改组织机构信息
archivesDeptService.modifyOrganizationInfo(dto); archivesDeptService.modifyOrganizationInfo(dto);
// 部门信息表修改组织机构信息
deptInfoService.modifyOrganizationInfo(dto);
// 我要举报修改组织机构信息 // 我要举报修改组织机构信息
reportIssueService.modifyOrganizationInfo(dto); reportIssueService.modifyOrganizationInfo(dto);
log.info("EPDC-CUSTOM-SERVER消费消息END:{topic:{}, msgId:{}, body:{}}", RocketMqConstant.MQ_TOPIC_ORGANIZATION, messageExt.getMsgId(), body); log.info("EPDC-CUSTOM-SERVER消费消息END:{topic:{}, msgId:{}, body:{}}", RocketMqConstant.MQ_TOPIC_ORGANIZATION, messageExt.getMsgId(), body);

48
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/RejectCheckRecordConsumer.java

@ -0,0 +1,48 @@
package com.elink.esua.epdc.modules.rocketmq.consumer;
import com.alibaba.fastjson.JSONObject;
import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant;
import com.elink.esua.epdc.modules.reportissue.service.ReportIssueService;
import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
import lombok.extern.slf4j.Slf4j;
import org.apache.rocketmq.common.message.MessageExt;
import org.apache.rocketmq.spring.annotation.MessageModel;
import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
import org.apache.rocketmq.spring.core.RocketMQListener;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
*
* 内容审核驳回信息处理-监听MQ消息
*
* @Authorwangtong
* @Date2020/7/14 1:54
*/
@Slf4j
@Component
@RocketMQMessageListener(topic = RocketMqConstant.MQ_TOPIC_REPORT_ISSUE, consumerGroup = "${rocketmq.consumer.contentSecurity-group}", messageModel = MessageModel.BROADCASTING)
public class RejectCheckRecordConsumer implements RocketMQListener<MessageExt> {
@Autowired
private ReportIssueService reportIssueService;
@Override
public void onMessage(MessageExt messageExt) {
log.info("EPDC-CUSTOM-SERVER消费消息START:{topic:{}, msgId:{}}", RocketMqConstant.MQ_TOPIC_REPORT_ISSUE, messageExt.getMsgId());
try {
String charset = "UTF-8";
String body = new String(messageExt.getBody(), charset);
String tag = messageExt.getTags();
RejectRecordDTO dto = JSONObject.parseObject(body, RejectRecordDTO.class);
if(RocketMqConstant.MQ_TAG_REPORT_ISSUE_CONTENTSECURITY.equals(tag)){
//删除发布活动相关信息
reportIssueService.rejectActInfo(dto);
}
log.info("EPDC-CUSTOM-SERVER消费消息END:{topic:{}, msgId:{}, body:{}}", RocketMqConstant.MQ_TOPIC_REPORT_ISSUE, messageExt.getMsgId(), body);
} catch (Exception e) {
log.info("EPDC-CUSTOM-SERVER消费消息失败:msgId:{}", messageExt.getMsgId());
e.printStackTrace();
}
}
}

27
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/dto/RejectRecordDTO.java

@ -0,0 +1,27 @@
package com.elink.esua.epdc.modules.rocketmq.dto;
import lombok.Data;
import java.io.Serializable;
/**
*
* 内容审核驳回信息处理-发送MQ消息DTO
*
* @Author wangtong
* @Date 2020/7/14 14:58
*/
@Data
public class RejectRecordDTO implements Serializable {
private static final long serialVersionUID = 3032661994413974324L;
/**
* 用户ID
*/
private String userId;
/**
* 关联信息ID
*/
private String relationId;
}

1
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml

@ -74,4 +74,5 @@ rocketmq:
name-server: @rocketmq.name.server@ name-server: @rocketmq.name.server@
consumer: consumer:
group: @rocketmq.consumer.group@ group: @rocketmq.consumer.group@
contentSecurity-group: @rocketmq.consumer.contentSecurity.group@

22
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml

@ -79,16 +79,18 @@
<select id="selectListArchiveDeptInfo" resultType="com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO"> <select id="selectListArchiveDeptInfo" resultType="com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO">
SELECT SELECT
DEPT, ead.DEPT,
DEPT_ID ead.DEPT_ID
FROM FROM
epdc_archives_dept epdc_archives_dept ead
WHERE left join epdc_archives ea on ead.DEPT_ID = ea.DEPT_ID and ea.DEL_FLAG='0'
DEL_FLAG = '0' WHERE
ORDER BY ead.DEL_FLAG = '0' and ea.ID is not null and ead.ENABLE_FLAG ='1'
DEPT_ORDER ASC group by ead.DEPT_ID
LIMIT #{pageIndex},#{pageSize} ORDER BY
ead.DEPT_ORDER ASC
LIMIT #{pageIndex},#{pageSize}
</select> </select>
<select id="selectListArchiveInfo" resultType="com.elink.esua.epdc.dto.result.ArchiveResultDTO"> <select id="selectListArchiveInfo" resultType="com.elink.esua.epdc.dto.result.ArchiveResultDTO">

1
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archivesdept/ArchivesDeptDao.xml

@ -7,6 +7,7 @@
<result property="id" column="ID"/> <result property="id" column="ID"/>
<result property="dept" column="DEPT"/> <result property="dept" column="DEPT"/>
<result property="deptOrder" column="DEPT_ORDER"/> <result property="deptOrder" column="DEPT_ORDER"/>
<result property="enableFlag" column="ENABLE_FLAG"/>
<result property="deptId" column="DEPT_ID"/> <result property="deptId" column="DEPT_ID"/>
<result property="delFlag" column="DEL_FLAG"/> <result property="delFlag" column="DEL_FLAG"/>
<result property="revision" column="REVISION"/> <result property="revision" column="REVISION"/>

9
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActApplyInfoService.java

@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.modules.activity.entity.ActApplyInfoEntity; import com.elink.esua.epdc.modules.activity.entity.ActApplyInfoEntity;
import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -129,4 +130,12 @@ public interface ActApplyInfoService extends BaseService<ActApplyInfoEntity> {
* @return void * @return void
**/ **/
void modifyOrganizationInfo(OrganizationModifyDTO dto); void modifyOrganizationInfo(OrganizationModifyDTO dto);
/**
* @Description 删除我要申请
* @Author songyunpeng
* @Date 2020/11/27
* @Param [dto]
* @return void
**/
void rejectActClockInfo(RejectRecordDTO dto);
} }

14
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActApplyInfoServiceImpl.java

@ -42,6 +42,7 @@ import com.elink.esua.epdc.modules.activity.service.ActApplyInfoService;
import com.elink.esua.epdc.modules.feign.AdminFeignClient; import com.elink.esua.epdc.modules.feign.AdminFeignClient;
import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient; import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient;
import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -82,9 +83,14 @@ public class ActApplyInfoServiceImpl extends BaseServiceImpl<ActApplyInfoDao, Ac
private QueryWrapper<ActApplyInfoEntity> getWrapper(Map<String, Object> params){ private QueryWrapper<ActApplyInfoEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP); String id = (String)params.get(FieldConstant.ID_HUMP);
String actTitle = (String) params.get("actTitle");
String actContacts = (String) params.get("actContacts");
String actTel = (String) params.get("actTel");
QueryWrapper<ActApplyInfoEntity> wrapper = new QueryWrapper<>(); QueryWrapper<ActApplyInfoEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
wrapper.like(StringUtils.isNotBlank(actTitle),"ACT_TITLE",actTitle);
wrapper.like(StringUtils.isNotBlank(actContacts),"ACT_CONTACTS",actContacts);
wrapper.like(StringUtils.isNotBlank(actTel),"ACT_TEL",actTel);
return wrapper; return wrapper;
} }
@ -209,6 +215,12 @@ public class ActApplyInfoServiceImpl extends BaseServiceImpl<ActApplyInfoDao, Ac
// 更新网格名称 // 更新网格名称
baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId()); baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId());
} }
@Override
public void rejectActClockInfo(RejectRecordDTO dto) {
baseDao.deleteById(dto.getRelationId());
}
/** /**
* *
* 组织机构信息处理 * 组织机构信息处理

6
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/RejectCheckRecordConsumer.java

@ -2,6 +2,7 @@ package com.elink.esua.epdc.modules.rocketmq.consumer;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant; import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant;
import com.elink.esua.epdc.modules.activity.service.ActApplyInfoService;
import com.elink.esua.epdc.modules.activity.service.ActInfoService; import com.elink.esua.epdc.modules.activity.service.ActInfoService;
import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO; import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -26,6 +27,8 @@ public class RejectCheckRecordConsumer implements RocketMQListener<MessageExt> {
@Autowired @Autowired
private ActInfoService actInfoService; private ActInfoService actInfoService;
@Autowired
private ActApplyInfoService actApplyInfoService;
@Override @Override
public void onMessage(MessageExt messageExt) { public void onMessage(MessageExt messageExt) {
@ -41,6 +44,9 @@ public class RejectCheckRecordConsumer implements RocketMQListener<MessageExt> {
}else if(RocketMqConstant.MQ_TAG_HEART_SIGNIN_CONTENTSECURITY.equals(tag)){ }else if(RocketMqConstant.MQ_TAG_HEART_SIGNIN_CONTENTSECURITY.equals(tag)){
//删除已报名活动-我要打卡相关信息 //删除已报名活动-我要打卡相关信息
actInfoService.rejectActClockInfo(dto); actInfoService.rejectActClockInfo(dto);
}else if(RocketMqConstant.MQ_TAG_HEART_ACT_APPLY.equals(tag)){
//删除我要申请
actApplyInfoService.rejectActClockInfo(dto);
} }
log.info("EPDC-HEART-SERVER消费消息END:{topic:{}, msgId:{}, body:{}}", RocketMqConstant.MQ_TOPIC_HEART_CONTENTSECURITY, messageExt.getMsgId(), body); log.info("EPDC-HEART-SERVER消费消息END:{topic:{}, msgId:{}, body:{}}", RocketMqConstant.MQ_TOPIC_HEART_CONTENTSECURITY, messageExt.getMsgId(), body);

Loading…
Cancel
Save