From a376d6024eba813e9a194b9956badab2dae74191 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Tue, 31 Oct 2023 09:16:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E8=83=BD=E8=AF=84?= =?UTF-8?q?=E4=BB=B7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/ItemServiceImpl.java | 64 +++++++++---------- .../src/main/resources/application.yml | 6 +- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 468813ed1..a7660ddb6 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -1016,16 +1016,16 @@ public class ItemServiceImpl extends BaseServiceImpl implem ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(evaluationFormDTO.getDeptId()).getData(); List textList = new ArrayList<>(); textList.add(evaluationFormDTO.getEvaluationContent()); - CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); - if (!isConReview && (contentResult != null && !contentResult.getAllPass())) { - //组装要保存的信息 - SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), - evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, - ModuleName.ITEM_SATISFACTION.getCode(), textList, null, null, contentResult, - null, null, mobile, "0", deptDto); - contentSecurityFeign.insertViolationsRecord(record); - return new Result().error(CheckDataUtils.violations_code, CheckDataUtils.violations_message); - } +// CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); +// if (!isConReview && (contentResult != null && !contentResult.getAllPass())) { +// //组装要保存的信息 +// SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), +// evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, +// ModuleName.ITEM_SATISFACTION.getCode(), textList, null, null, contentResult, +// null, null, mobile, "0", deptDto); +// contentSecurityFeign.insertViolationsRecord(record); +// return new Result().error(CheckDataUtils.violations_code, CheckDataUtils.violations_message); +// } // 诉求评价 ItemEntity itemEntity = new ItemEntity(); @@ -1049,30 +1049,30 @@ public class ItemServiceImpl extends BaseServiceImpl implem } baseDao.updateById(itemEntity); - //内容审核接口异常，保存至待审核信息 - if (contentResult == null && !isConReview) { - SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), - evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList, - null, itemEntity.getId(), null, null, null, mobile, "1", deptDto); - contentSecurityFeign.insertRecords(record); - } +// //内容审核接口异常，保存至待审核信息 +// if (contentResult == null && !isConReview) { +// SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), +// evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList, +// null, itemEntity.getId(), null, null, null, mobile, "1", deptDto); +// contentSecurityFeign.insertRecords(record); +// } //判断是否为待审核 - if (contentResult != null) { - CheckResultMessageDTO twoTypes; - if (isConReview) { - twoTypes = CheckDataUtils.saveTwoTypes(contentResult, null); - } else { - twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null); - } - if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { - //组装要保存的信息 - SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), - evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList, - null, itemEntity.getId(), null, null, twoTypes, mobile, "0", deptDto); - contentSecurityFeign.insertRecords(record); - } - } +// if (contentResult != null) { +// CheckResultMessageDTO twoTypes; +// if (isConReview) { +// twoTypes = CheckDataUtils.saveTwoTypes(contentResult, null); +// } else { +// twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null); +// } +// if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { +// //组装要保存的信息 +// SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), +// evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList, +// null, itemEntity.getId(), null, null, twoTypes, mobile, "0", deptDto); +// contentSecurityFeign.insertRecords(record); +// } +// } // 评论满意的直接结案 todo 暂时注 // ------- diff --git a/renren-cloud-generator/src/main/resources/application.yml b/renren-cloud-generator/src/main/resources/application.yml index 44411bf47..ee5e4935f 100644 --- a/renren-cloud-generator/src/main/resources/application.yml +++ b/renren-cloud-generator/src/main/resources/application.yml @@ -9,9 +9,9 @@ spring: type: com.alibaba.druid.pool.DruidDataSource #MySQL配置 driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/sb_esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: shibei_test - password: Elink@833066 + url: jdbc:mysql://47.104.92.53:3306/one?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + username: root + password: Elink@888 #oracle配置 # driverClassName: oracle.jdbc.OracleDriver # url: jdbc:oracle:thin:@192.168.10.10:1521:helowin