diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/CheckRecordsEntity.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/CheckRecordsEntity.java index 6effb4564..3578e6993 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/CheckRecordsEntity.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/CheckRecordsEntity.java @@ -48,6 +48,11 @@ public class CheckRecordsEntity extends BaseEpdcEntity { */ private String name; + /** + * 手机号 + */ + private String mobile; + /** * 工作类别:1工作2居民 */ diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/ViolationsRecordsEntity.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/ViolationsRecordsEntity.java index 409e2f5e5..6518bf5c1 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/ViolationsRecordsEntity.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/ViolationsRecordsEntity.java @@ -48,6 +48,11 @@ public class ViolationsRecordsEntity extends BaseEpdcEntity { */ private String name; + /** + * 手机号 + */ + private String mobile; + /** * 工作类别:1工作2居民 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java index 2db5c6f53..cf5c89f02 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java @@ -31,6 +31,7 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResult import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.constant.EventsNoticeConstant; +import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.comment.*; import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; import com.elink.esua.epdc.dto.comment.form.SubmitCommentFormDTO; @@ -49,6 +50,7 @@ import com.elink.esua.epdc.modules.comment.service.EventCommentService; import com.elink.esua.epdc.modules.comment.service.EventCommentUserAttitudeService; import com.elink.esua.epdc.modules.events.service.EpdcEventsService; import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient; +import com.elink.esua.epdc.modules.feign.UserFeignClient; import com.elink.esua.epdc.modules.issue.entity.IssueEntity; import com.elink.esua.epdc.modules.issue.service.IssueService; import com.elink.esua.epdc.modules.item.entity.ItemEntity; @@ -95,6 +97,9 @@ public class EventCommentServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -153,13 +158,18 @@ public class EventCommentServiceImpl extends BaseServiceImpl textList = new ArrayList<>(); textList.add(commentFormDTO.getContent()); + String mobile = null; + Result user = userInfoFeignClient.getUserInfoById(commentFormDTO.getUserId()); + if(null != user.getData()){ + mobile = user.getData().getMobile(); + } CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); if (contentResult != null && !contentResult.getAllPass()) { //组装要保存的信息 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(), commentFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one, ModuleName.ISSUE_COMMENT.getCode(), textList,null, null,contentResult, - null,null); + null,null,mobile); contentSecurityFeign.insertViolationsRecord(record); return new Result().error(CheckDataUtils.violations_message); } else { @@ -273,7 +283,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl implem @Autowired private ContentSecurityFeignClient contentSecurityFeign; + @Autowired + private UserFeignClient userInfoFeignClient; + @Override public PageData page(Map params) { @@ -316,6 +320,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem if(null != SecurityUser.getUser()){ userName = SecurityUser.getUser().getUsername(); } + String mobile = null; + Result user = userInfoFeignClient.getUserInfoById(evaluationFormDTO.getUserId()); + if(null != user.getData()){ + mobile = user.getData().getMobile(); + } List textList = new ArrayList<>(); textList.add(evaluationFormDTO.getEvaluationContent()); CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); @@ -324,7 +333,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), userName,CheckDataUtils.cate_two , CheckDataUtils.decision_one, ModuleName.ITEM_SATISFACTION.getCode(), textList,null, null,contentResult, - null,null); + null,null,mobile); contentSecurityFeign.insertViolationsRecord(record); return new Result().error(CheckDataUtils.violations_message); } else { @@ -345,7 +354,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem //组装要保存的信息 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), userName, CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList, - null,itemEntity.getId(), null,null,twoTypes); + null,itemEntity.getId(), null,null,twoTypes,mobile); contentSecurityFeign.insertRecords(record); } }//如果是审核状态是pass,不作任何处理 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java index 6dc1bb21d..96d740db5 100755 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java @@ -30,6 +30,7 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResult import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.comment.*; import com.elink.esua.epdc.dto.constant.TopicNoticeConstant; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; @@ -41,6 +42,7 @@ import com.elink.esua.epdc.modules.comment.dao.TopicCommentDao; import com.elink.esua.epdc.modules.comment.entity.TopicCommentEntity; import com.elink.esua.epdc.modules.comment.service.TopicCommentService; import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient; +import com.elink.esua.epdc.modules.feign.UserFeignClient; import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO; import com.elink.esua.epdc.modules.topic.service.TopicService; import com.elink.esua.epdc.modules.topic.service.impl.TopicServiceImpl; @@ -74,6 +76,9 @@ public class TopicCommentServiceImpl extends BaseServiceImpl textList = new ArrayList<>(); textList.add(commentFormDTO.getContent()); + String mobile = null; + Result user = userInfoFeignClient.getUserInfoById(commentFormDTO.getUserId()); + if(null != user.getData()){ + mobile = user.getData().getMobile(); + } CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); if (contentResult != null && !contentResult.getAllPass()) { //组装要保存的信息 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(), commentFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one, ModuleName.GROUP_TOPIC_COMMENT.getCode(), textList,null, null,contentResult, - null,null); + null,null,mobile); contentSecurityFeign.insertViolationsRecord(record); return new Result().error(CheckDataUtils.violations_message); } else { @@ -215,7 +225,7 @@ public class TopicCommentServiceImpl extends BaseServiceImpl imp //组装要保存的信息 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(), formDto.getNickname(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.GROUP_TOPIC.getCode(), textList, - formDto.getImages(), null,contentResult, imgResult,null); + formDto.getImages(), null,contentResult, imgResult,null,formDto.getMobile()); contentSecurityFeign.insertViolationsRecord(record); return new Result().error(CheckDataUtils.violations_message); } else { @@ -243,7 +243,7 @@ public class TopicServiceImpl extends BaseServiceImpl imp //组装要保存的信息 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(), formDto.getNickname(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC.getCode(), textList, - formDto.getImages(), entity.getId(),null,null, twoTypes); + formDto.getImages(), entity.getId(),null,null, twoTypes,formDto.getMobile()); contentSecurityFeign.insertRecords(record); } } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java index 0dd979770..dabcb17f7 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java @@ -161,7 +161,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl user = userInfoFeignClient.getUserInfoById(appActUserClockLogDTO.getUserId()); + if(null != user.getData()){ + mobile = user.getData().getMobile(); + } List textList = new ArrayList<>(); textList.add(appActUserClockLogDTO.getClockDesc()); CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); @@ -316,7 +321,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl