From 4ad30c634b084f2786efb9e630cf1a4493eab2ab Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 7 Jul 2020 14:29:53 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B7=BB=E5=8A=A0=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E3=80=91-=E3=80=90=E5=85=9A=E7=BE=A4?=
 =?UTF-8?q?=E8=AE=AE=E4=BA=8B-=E8=AE=AE=E9=A2=98=E9=A1=B9=E7=9B=AE-?=
 =?UTF-8?q?=E8=AF=84=E8=AE=BA-=E5=91=BD=E5=90=8D=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/07/07?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/controller/HandleResultController.java  | 6 +++---
 .../elink/esua/epdc/service/ViolationsRecordsService.java   | 6 +++---
 .../epdc/service/impl/ViolationsRecordsServiceImpl.java     | 6 +++---
 .../comment/service/impl/EventCommentServiceImpl.java       | 6 +++---
 .../esua/epdc/modules/feign/ContentSecurityFeignClient.java | 6 +++---
 .../feign/fallback/ContentSecurityFeignClientFallback.java  | 6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/HandleResultController.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/HandleResultController.java
index 6fb0f2596..fea54c21a 100644
--- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/HandleResultController.java
+++ b/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;
 
-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.service.ViolationsRecordsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +30,7 @@ public class HandleResultController{
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
     @PostMapping("insertViolationsRecord")
-    public Result insertViolationsRecord(@RequestBody SaveCheckRecordsFTO formDto) {
+    public Result insertViolationsRecord(@RequestBody SaveCheckRecordsDTO formDto) {
 //        ValidatorUtils.validateEntity(formDto);
         return violationsRecordsService.insertViolationsRecord(formDto);
     }
@@ -43,7 +43,7 @@ public class HandleResultController{
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
     @PostMapping("insertRecords")
-    public Result insertRecords(@RequestBody SaveCheckRecordsFTO formDto) {
+    public Result insertRecords(@RequestBody SaveCheckRecordsDTO formDto) {
 //        ValidatorUtils.validateEntity(formDto);
         return violationsRecordsService.insertRecords(formDto);
     }
diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/ViolationsRecordsService.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/ViolationsRecordsService.java
index 4a6080539..418d14ba0 100644
--- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/ViolationsRecordsService.java
+++ b/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.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.dto.ViolationsRecordsDTO;
 import com.elink.esua.epdc.entity.ViolationsRecordsEntity;
@@ -102,7 +102,7 @@ public interface ViolationsRecordsService extends BaseService<ViolationsRecordsE
     * @param [formDto]
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
-    Result insertViolationsRecord(SaveCheckRecordsFTO formDto);
+    Result insertViolationsRecord(SaveCheckRecordsDTO formDto);
 
     /**
     * @describe: 保存待审核记录
@@ -111,5 +111,5 @@ public interface ViolationsRecordsService extends BaseService<ViolationsRecordsE
     * @param [formDto]
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
-    Result insertRecords(SaveCheckRecordsFTO formDto);
+    Result insertRecords(SaveCheckRecordsDTO formDto);
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/ViolationsRecordsServiceImpl.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/ViolationsRecordsServiceImpl.java
index 6d8788e4f..d24ebed07 100644
--- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/ViolationsRecordsServiceImpl.java
+++ b/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.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 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.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -104,14 +104,14 @@ public class ViolationsRecordsServiceImpl extends BaseServiceImpl<ViolationsReco
     }
 
     @Override
-    public Result insertViolationsRecord(SaveCheckRecordsFTO formDto) {
+    public Result insertViolationsRecord(SaveCheckRecordsDTO formDto) {
         ViolationsRecordsEntity entity = ConvertUtils.sourceToTarget(formDto, ViolationsRecordsEntity.class);
         insert(entity);
         return new Result();
     }
 
     @Override
-    public Result insertRecords(SaveCheckRecordsFTO formDto) {
+    public Result insertRecords(SaveCheckRecordsDTO formDto) {
         ViolationsRecordsEntity entity = ConvertUtils.sourceToTarget(formDto, ViolationsRecordsEntity.class);
         insert(entity);
         return new Result();
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 df37f28f6..cbc7e7d13 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
@@ -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.page.PageData;
 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.utils.ConvertUtils;
 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());
         if(checkResult != null && 200 == checkResult.getDetails().get(0).getCode()){
             if(false == checkResult.getAllPass()){
-                SaveCheckRecordsFTO record = new SaveCheckRecordsFTO();
+                SaveCheckRecordsDTO record = new SaveCheckRecordsDTO();
                 record.setUserId(commentFormDTO.getUserId());
                 record.setName(commentFormDTO.getUserName());
                 record.setCategory("2");//居民
@@ -272,7 +272,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
         if(checkResult != null
                 && 200 == checkResult.getDetails().get(0).getCode()
                 && "review".equals(checkResult.getDetails().get(0).getResults().get(0).getSuggestion())){
-            SaveCheckRecordsFTO record = new SaveCheckRecordsFTO();
+            SaveCheckRecordsDTO record = new SaveCheckRecordsDTO();
             record.setUserId(commentFormDTO.getUserId());
             record.setName(commentFormDTO.getUserName());
             record.setCategory("2");//居民
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/ContentSecurityFeignClient.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/ContentSecurityFeignClient.java
index 3a6e14666..5caad7b1f 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/ContentSecurityFeignClient.java
+++ b/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;
 
 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.modules.feign.fallback.ContentSecurityFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -20,8 +20,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 public interface ContentSecurityFeignClient {
 
     @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)
-    Result insertRecords(@RequestBody SaveCheckRecordsFTO record);
+    Result insertRecords(@RequestBody SaveCheckRecordsDTO record);
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/ContentSecurityFeignClientFallback.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/ContentSecurityFeignClientFallback.java
index 2aeacf44b..a00e5ae7d 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/ContentSecurityFeignClientFallback.java
+++ b/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;
 
 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.Result;
 import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient;
@@ -15,12 +15,12 @@ import org.springframework.stereotype.Component;
 public class ContentSecurityFeignClientFallback implements ContentSecurityFeignClient {
 
     @Override
-    public Result insertViolationsRecord(SaveCheckRecordsFTO record) {
+    public Result insertViolationsRecord(SaveCheckRecordsDTO record) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_CONTENT_SECURITY_SERVER, "insertViolationsRecord", record);
     }
 
     @Override
-    public Result insertRecords(SaveCheckRecordsFTO record) {
+    public Result insertRecords(SaveCheckRecordsDTO record) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_CONTENT_SECURITY_SERVER, "insertRecords", record);
     }