elink-star
/
esua-epdc-cloud
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【内容审核】-【保存手机号】-（王童）-2020/07/16

feature/dangjian
Jackwang 5 years ago
parent
05f4d30942
commit
b1854587ea
9 changed files with 58 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/CheckRecordsEntity.java
  2. 5
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/ViolationsRecordsEntity.java
  3. 14
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
  4. 4
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
  5. 13
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  6. 14
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
  7. 4
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
  8. 4
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
  9. 9
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java

5
esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/CheckRecordsEntity.java
View File

@ -48,6 +48,11 @@ public class CheckRecordsEntity extends BaseEpdcEntity {
*/
private String name;
/**
* 手机号
*/
private String mobile;
/**
* 工作类别:1工作2居民
*/

5
esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/ViolationsRecordsEntity.java
View File

@ -48,6 +48,11 @@ public class ViolationsRecordsEntity extends BaseEpdcEntity {
*/
private String name;
/**
* 手机号
*/
private String mobile;
/**
* 工作类别:1工作2居民
*/

14
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
View File

@ -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<EventCommentDao, Ev
@Autowired
private ContentSecurityFeignClient contentSecurityFeign;
@Autowired
private UserFeignClient userInfoFeignClient;
@Override
public PageData<EventCommentDTO> page(Map<String, Object> params) {
IPage<EventCommentEntity> page = baseDao.selectPage(
@ -153,13 +158,18 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
//内容审核
List<String> textList = new ArrayList<>();
textList.add(commentFormDTO.getContent());
String mobile = null;
Result<UserDTO> 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<EventCommentDao, Ev
//组装要保存的信息
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
commentFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ISSUE_COMMENT.getCode(), textList,
null,commentEntity.getId(), null,null,twoTypes);
null,commentEntity.getId(), null,null,twoTypes,mobile);
contentSecurityFeign.insertRecords(record);
}
}//如果是审核状态是pass，不作任何处理

4
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
View File

@ -181,7 +181,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
//组装要保存的信息
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(),
dto.getNickName(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.ISSUE_SUBMIT.getCode(), textList,
dto.getImages(), null,contentResult, imgResult,null);
dto.getImages(), null,contentResult, imgResult,null,dto.getMobile());
contentSecurityFeign.insertViolationsRecord(record);
throw new RenException(CheckDataUtils.violations_message);
// return new Result().error(CheckDataUtils.violations_message);
@ -208,7 +208,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
//组装要保存的信息
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(),
dto.getNickName(), CheckDataUtils.cate_two, null,ModuleName.ISSUE_SUBMIT.getCode(), textList,
dto.getImages(), entity.getId(),null,null, twoTypes);
dto.getImages(), entity.getId(),null,null, twoTypes,dto.getMobile());
contentSecurityFeign.insertRecords(record);
}
}

13
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
View File

@ -75,6 +75,7 @@ import com.elink.esua.epdc.modules.events.service.ImgService;
import com.elink.esua.epdc.modules.feign.AdminFeignClient;
import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient;
import com.elink.esua.epdc.modules.feign.OssFeignClient;
import com.elink.esua.epdc.modules.feign.UserFeignClient;
import com.elink.esua.epdc.modules.interfacelog.entity.InterfaceLogEntity;
import com.elink.esua.epdc.modules.interfacelog.service.InterfaceLogService;
import com.elink.esua.epdc.modules.issue.service.IssueService;
@ -165,6 +166,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
@Autowired
private ContentSecurityFeignClient contentSecurityFeign;
@Autowired
private UserFeignClient userInfoFeignClient;
@Override
public PageData<ItemDTO> page(Map<String, Object> params) {
@ -316,6 +320,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
if(null != SecurityUser.getUser()){
userName = SecurityUser.getUser().getUsername();
}
String mobile = null;
Result<UserDTO> user = userInfoFeignClient.getUserInfoById(evaluationFormDTO.getUserId());
if(null != user.getData()){
mobile = user.getData().getMobile();
}
List<String> textList = new ArrayList<>();
textList.add(evaluationFormDTO.getEvaluationContent());
CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
@ -324,7 +333,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> 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，不作任何处理

14
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
View File

@ -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<TopicCommentDao, To
@Autowired
private ContentSecurityFeignClient contentSecurityFeign;
@Autowired
private UserFeignClient userInfoFeignClient;
private static final Logger logger = LoggerFactory.getLogger(TopicServiceImpl.class);
@ -134,13 +139,18 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
//内容审核
List<String> textList = new ArrayList<>();
textList.add(commentFormDTO.getContent());
String mobile = null;
Result<UserDTO> 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<TopicCommentDao, To
//组装要保存的信息
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
commentFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.GROUP_TOPIC_COMMENT.getCode(), textList,
null,commentEntity.getId(), null,null,twoTypes);
null,commentEntity.getId(), null,null,twoTypes,mobile);
contentSecurityFeign.insertRecords(record);
}
}//如果是审核状态是pass，不作任何处理

4
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
View File

@ -206,7 +206,7 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> 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<TopicDao, TopicEntity> 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);
}
}

4
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
View File

@ -161,7 +161,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
//组装要保存的信息
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
userName, CheckDataUtils.cate_one, CheckDataUtils.decision_one, ModuleName.HELP_ACTIVITY.getCode(), textList,
imgList, null,contentResult, imgResult,null);
imgList, null,contentResult, imgResult,null,dto.getTel());
contentSecurityFeign.insertViolationsRecord(record);
return new Result().error(CheckDataUtils.violations_message);
} else {
@ -185,7 +185,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
//组装要保存的信息
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
userName, CheckDataUtils.cate_two, null,ModuleName.HELP_ACTIVITY.getCode(), textList,
imgList, entity.getId(),null,null, twoTypes);
imgList, entity.getId(),null,null, twoTypes,dto.getTel());
contentSecurityFeign.insertRecords(record);
}
}

9
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
View File

@ -308,6 +308,11 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
if(null != SecurityUser.getUser()){
userName = SecurityUser.getUser().getUsername();
}
String mobile = null;
Result<UserDTO> user = userInfoFeignClient.getUserInfoById(appActUserClockLogDTO.getUserId());
if(null != user.getData()){
mobile = user.getData().getMobile();
}
List<String> textList = new ArrayList<>();
textList.add(appActUserClockLogDTO.getClockDesc());
CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
@ -316,7 +321,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
//组装要保存的信息
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
userName, CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.HELP_SIGNIN.getCode(), textList,
appActUserClockLogDTO.getImages(), null,contentResult, imgResult,null);
appActUserClockLogDTO.getImages(), null,contentResult, imgResult,null,mobile);
contentSecurityFeign.insertViolationsRecord(record);
return new Result().error(CheckDataUtils.violations_message);
} else {
@ -363,7 +368,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
//组装要保存的信息
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
userName, CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,
appActUserClockLogDTO.getImages(), entity.getId(),null,null, twoTypes);
appActUserClockLogDTO.getImages(), entity.getId(),null,null, twoTypes,mobile);
contentSecurityFeign.insertRecords(record);
}
}

Write Preview
Loading…
Cancel
Save