修复不能评价bug

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<ItemDao, ItemEntity> implem
             ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(evaluationFormDTO.getDeptId()).getData();
             List<String> 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<ItemDao, ItemEntity> 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 暂时注
             // -------

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