From 600fecdf59571a3152b2e215f0c0f255f1df93cd Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 1 Nov 2023 12:16:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=88=B0=E6=96=B0=E7=9A=84rds=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tduck-api/src/main/resources/application-preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tduck-api/src/main/resources/application-preview.yml b/tduck-api/src/main/resources/application-preview.yml index 9732a8f..cacaa6c 100644 --- a/tduck-api/src/main/resources/application-preview.yml +++ b/tduck-api/src/main/resources/application-preview.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://172.16.0.15:3306/epmet_tduck?useSSL=false&useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&tinyInt1isBit=false + url: jdbc:mysql://172.16.0.8:3306/epmet_tduck?useSSL=false&useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&tinyInt1isBit=false username: epmet password: EpmEt_UsEr@sAAs type: com.zaxxer.hikari.HikariDataSource From 28eb3e672880951fdfb132041158bd8a0e0964a8 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 15 Nov 2023 16:41:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E8=AF=84?= =?UTF-8?q?=E8=B0=83=E6=9F=A5=E9=97=AE=E5=8D=B7=EF=BC=9A=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=AC=AC=E4=B9=9D=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...stionnaireSubmitSatisfactionProcessor.java | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/handler/QuestionnaireSubmitSatisfactionProcessor.java b/tduck-api/src/main/java/com/tduck/cloud/api/handler/QuestionnaireSubmitSatisfactionProcessor.java index 043386b..e36907e 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/handler/QuestionnaireSubmitSatisfactionProcessor.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/handler/QuestionnaireSubmitSatisfactionProcessor.java @@ -63,6 +63,7 @@ public class QuestionnaireSubmitSatisfactionProcessor extends AbstractQuestionna form.setSocialSecurityAspect((String) resultMap.get("field127")); form.setSocialSecurityReason((String) resultMap.get("field128")); form.setBasicEducationReason((String) resultMap.get("field135")); // 基础教育不满意原因文本框 + form.setDissatisfactionReason((String) resultMap.get("field136")); // 对社区不满意的原因是什么 form.setReporterName(reporterName); form.setReporterMobile(reporterMobile); form.setFollowUpStatus(followUpStatus); @@ -76,4 +77,58 @@ public class QuestionnaireSubmitSatisfactionProcessor extends AbstractQuestionna throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "提交失败"); } } + + // @Override + // public void process(UserProjectResultEntity result, String userId, HttpServletRequest request) { + // String projectKey = result.getProjectKey(); + // String agencyId = result.getAgencyId(); + // + // Map resultMap = result.getProcessData(); + // + // String reporterName = (String) resultMap.get("field129");// 姓名 + // String reporterMobile = (String) resultMap.get("field130");// 电话 + // String followUpStatus = (String) resultMap.get("field131");// 是否接受回访 + // String expectFollowUpWay = (String) resultMap.get("field132");// 回访方式 + // String addressDetail = (String) resultMap.get("field134");// 详细地址 + // + // // 将结果通知governance服务，进行持久化 + // SubmitQuestionnaireResultFormDTO form = new SubmitQuestionnaireResultFormDTO(); + // form.setAgencyId(agencyId); + // form.setQuestionnaireProjectKey(projectKey); + // form.setCultureFacilityEva((String) resultMap.get("field101")); + // form.setCultureAspect((String) resultMap.get("field102")); + // form.setCultureReason((String) resultMap.get("field102other")); + // form.setSportsFacilityEva((String) resultMap.get("field104")); + // form.setSportsAspect((String) resultMap.get("field105")); + // form.setSportsReason((String) resultMap.get("field105other")); + // form.setBasicEducationEva( (String) resultMap.get("field107")); + // form.setMedicalEva((String) resultMap.get("field109")); + // form.setMedicalAspect((String) resultMap.get("field114")); + // form.setMedicalReason((String) resultMap.get("field114other")); + // form.setOldPeopleProvideEva((String) resultMap.get("field118")); + // form.setOldPeopleProvideAspect((String) resultMap.get("field117")); + // form.setOldPeopleProvideReason((String) resultMap.get("field117other")); + // form.setSocialAssistanceEva((String) resultMap.get("field120")); + // form.setSocialAssistanceAspect((String) resultMap.get("field121")); + // form.setSocialAssistanceReason((String) resultMap.get("field121other")); + // form.setEcologicalEnvironmenEva((String) resultMap.get("field123")); + // form.setEcologicalEnvironmenAspect((String) resultMap.get("field124")); + // form.setEcologicalEnvironmenReason((String) resultMap.get("field124other")); + // form.setSocialSecurityEva((String) resultMap.get("field126")); + // form.setSocialSecurityAspect((String) resultMap.get("field127")); + // form.setSocialSecurityReason((String) resultMap.get("field127other")); + // // form.setBasicEducationReason((String) resultMap.get("field135")); // 基础教育不满意原因文本框 + // form.setReporterName(reporterName); + // form.setReporterMobile(reporterMobile); + // form.setFollowUpStatus(followUpStatus); + // form.setExpectFollowUpWay(expectFollowUpWay); + // form.setAddressDetail(addressDetail); + // + // Result rst = governanceServiceOpenFeignClient.submitQuestionnaireRst(form); + // if (rst.getCode() > 8000) { + // throw new EpmetException(rst.getCode(), null, rst.getMsg()); + // } else if (rst.getCode() != 0) { + // throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "提交失败"); + // } + // } }