Browse Source

【添加内容审核】-【党群议事-议题项目-评论-命名调整】-(王童)-2020/07/07

feature/dangjian
Jackwang 5 years ago
parent
commit
4ad30c634b
  1. 6
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/HandleResultController.java
  2. 6
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/ViolationsRecordsService.java
  3. 6
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/ViolationsRecordsServiceImpl.java
  4. 6
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
  5. 6
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/ContentSecurityFeignClient.java
  6. 6
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/ContentSecurityFeignClientFallback.java

6
esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/HandleResultController.java

@ -1,6 +1,6 @@
package com.elink.esua.epdc.controller; package com.elink.esua.epdc.controller;
import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsFTO; import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.service.ViolationsRecordsService; import com.elink.esua.epdc.service.ViolationsRecordsService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -30,7 +30,7 @@ public class HandleResultController{
* @return com.elink.esua.epdc.commons.tools.utils.Result * @return com.elink.esua.epdc.commons.tools.utils.Result
*/ */
@PostMapping("insertViolationsRecord") @PostMapping("insertViolationsRecord")
public Result insertViolationsRecord(@RequestBody SaveCheckRecordsFTO formDto) { public Result insertViolationsRecord(@RequestBody SaveCheckRecordsDTO formDto) {
// ValidatorUtils.validateEntity(formDto); // ValidatorUtils.validateEntity(formDto);
return violationsRecordsService.insertViolationsRecord(formDto); return violationsRecordsService.insertViolationsRecord(formDto);
} }
@ -43,7 +43,7 @@ public class HandleResultController{
* @return com.elink.esua.epdc.commons.tools.utils.Result * @return com.elink.esua.epdc.commons.tools.utils.Result
*/ */
@PostMapping("insertRecords") @PostMapping("insertRecords")
public Result insertRecords(@RequestBody SaveCheckRecordsFTO formDto) { public Result insertRecords(@RequestBody SaveCheckRecordsDTO formDto) {
// ValidatorUtils.validateEntity(formDto); // ValidatorUtils.validateEntity(formDto);
return violationsRecordsService.insertRecords(formDto); return violationsRecordsService.insertRecords(formDto);
} }

6
esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/ViolationsRecordsService.java

@ -19,7 +19,7 @@ package com.elink.esua.epdc.service;
import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsFTO; import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.ViolationsRecordsDTO; import com.elink.esua.epdc.dto.ViolationsRecordsDTO;
import com.elink.esua.epdc.entity.ViolationsRecordsEntity; import com.elink.esua.epdc.entity.ViolationsRecordsEntity;
@ -102,7 +102,7 @@ public interface ViolationsRecordsService extends BaseService<ViolationsRecordsE
* @param [formDto] * @param [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result * @return com.elink.esua.epdc.commons.tools.utils.Result
*/ */
Result insertViolationsRecord(SaveCheckRecordsFTO formDto); Result insertViolationsRecord(SaveCheckRecordsDTO formDto);
/** /**
* @describe: 保存待审核记录 * @describe: 保存待审核记录
@ -111,5 +111,5 @@ public interface ViolationsRecordsService extends BaseService<ViolationsRecordsE
* @param [formDto] * @param [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result * @return com.elink.esua.epdc.commons.tools.utils.Result
*/ */
Result insertRecords(SaveCheckRecordsFTO formDto); Result insertRecords(SaveCheckRecordsDTO formDto);
} }

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

@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsFTO; import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.Result;
@ -104,14 +104,14 @@ public class ViolationsRecordsServiceImpl extends BaseServiceImpl<ViolationsReco
} }
@Override @Override
public Result insertViolationsRecord(SaveCheckRecordsFTO formDto) { public Result insertViolationsRecord(SaveCheckRecordsDTO formDto) {
ViolationsRecordsEntity entity = ConvertUtils.sourceToTarget(formDto, ViolationsRecordsEntity.class); ViolationsRecordsEntity entity = ConvertUtils.sourceToTarget(formDto, ViolationsRecordsEntity.class);
insert(entity); insert(entity);
return new Result(); return new Result();
} }
@Override @Override
public Result insertRecords(SaveCheckRecordsFTO formDto) { public Result insertRecords(SaveCheckRecordsDTO formDto) {
ViolationsRecordsEntity entity = ConvertUtils.sourceToTarget(formDto, ViolationsRecordsEntity.class); ViolationsRecordsEntity entity = ConvertUtils.sourceToTarget(formDto, ViolationsRecordsEntity.class);
insert(entity); insert(entity);
return new Result(); return new Result();

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

@ -24,7 +24,7 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils; import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils;
import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsFTO; import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.Result;
@ -151,7 +151,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
CheckResultDTO checkResult = CheckDataUtils.checkContent(null,commentFormDTO.getContent()); CheckResultDTO checkResult = CheckDataUtils.checkContent(null,commentFormDTO.getContent());
if(checkResult != null && 200 == checkResult.getDetails().get(0).getCode()){ if(checkResult != null && 200 == checkResult.getDetails().get(0).getCode()){
if(false == checkResult.getAllPass()){ if(false == checkResult.getAllPass()){
SaveCheckRecordsFTO record = new SaveCheckRecordsFTO(); SaveCheckRecordsDTO record = new SaveCheckRecordsDTO();
record.setUserId(commentFormDTO.getUserId()); record.setUserId(commentFormDTO.getUserId());
record.setName(commentFormDTO.getUserName()); record.setName(commentFormDTO.getUserName());
record.setCategory("2");//居民 record.setCategory("2");//居民
@ -272,7 +272,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
if(checkResult != null if(checkResult != null
&& 200 == checkResult.getDetails().get(0).getCode() && 200 == checkResult.getDetails().get(0).getCode()
&& "review".equals(checkResult.getDetails().get(0).getResults().get(0).getSuggestion())){ && "review".equals(checkResult.getDetails().get(0).getResults().get(0).getSuggestion())){
SaveCheckRecordsFTO record = new SaveCheckRecordsFTO(); SaveCheckRecordsDTO record = new SaveCheckRecordsDTO();
record.setUserId(commentFormDTO.getUserId()); record.setUserId(commentFormDTO.getUserId());
record.setName(commentFormDTO.getUserName()); record.setName(commentFormDTO.getUserName());
record.setCategory("2");//居民 record.setCategory("2");//居民

6
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/ContentSecurityFeignClient.java

@ -1,7 +1,7 @@
package com.elink.esua.epdc.modules.feign; package com.elink.esua.epdc.modules.feign;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsFTO; import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.modules.feign.fallback.ContentSecurityFeignClientFallback; import com.elink.esua.epdc.modules.feign.fallback.ContentSecurityFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
@ -20,8 +20,8 @@ import org.springframework.web.bind.annotation.RequestBody;
public interface ContentSecurityFeignClient { public interface ContentSecurityFeignClient {
@PostMapping(value = "content-sercurity/handleResult/insertViolationsRecord", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) @PostMapping(value = "content-sercurity/handleResult/insertViolationsRecord", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result insertViolationsRecord(@RequestBody SaveCheckRecordsFTO record); Result insertViolationsRecord(@RequestBody SaveCheckRecordsDTO record);
@PostMapping(value = "content-sercurity/handleResult/insertRecords", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) @PostMapping(value = "content-sercurity/handleResult/insertRecords", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result insertRecords(@RequestBody SaveCheckRecordsFTO record); Result insertRecords(@RequestBody SaveCheckRecordsDTO record);
} }

6
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/ContentSecurityFeignClientFallback.java

@ -1,7 +1,7 @@
package com.elink.esua.epdc.modules.feign.fallback; package com.elink.esua.epdc.modules.feign.fallback;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsFTO; import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient; import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient;
@ -15,12 +15,12 @@ import org.springframework.stereotype.Component;
public class ContentSecurityFeignClientFallback implements ContentSecurityFeignClient { public class ContentSecurityFeignClientFallback implements ContentSecurityFeignClient {
@Override @Override
public Result insertViolationsRecord(SaveCheckRecordsFTO record) { public Result insertViolationsRecord(SaveCheckRecordsDTO record) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CONTENT_SECURITY_SERVER, "insertViolationsRecord", record); return ModuleUtils.feignConError(ServiceConstant.EPDC_CONTENT_SECURITY_SERVER, "insertViolationsRecord", record);
} }
@Override @Override
public Result insertRecords(SaveCheckRecordsFTO record) { public Result insertRecords(SaveCheckRecordsDTO record) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CONTENT_SECURITY_SERVER, "insertRecords", record); return ModuleUtils.feignConError(ServiceConstant.EPDC_CONTENT_SECURITY_SERVER, "insertRecords", record);
} }

Loading…
Cancel
Save