From ce64e667815b39efdc2f8bd52be0d43d49db8d84 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 17 七月 2022 00:06:29 +0800
Subject: [PATCH] 优化小区位置

---
 service-report/src/main/java/com/java110/report/api/ReportInfoAnswerValueApi.java |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/service-report/src/main/java/com/java110/report/api/ReportInfoAnswerValueApi.java b/service-report/src/main/java/com/java110/report/api/ReportInfoAnswerValueApi.java
index 730b829..f3d280a 100644
--- a/service-report/src/main/java/com/java110/report/api/ReportInfoAnswerValueApi.java
+++ b/service-report/src/main/java/com/java110/report/api/ReportInfoAnswerValueApi.java
@@ -1,5 +1,6 @@
 package com.java110.report.api;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.reportInfoAnswerValue.ReportInfoAnswerValueDto;
 import com.java110.po.reportInfoAnswerValue.ReportInfoAnswerValuePo;
@@ -35,19 +36,24 @@
      * @return
      */
     @RequestMapping(value = "/saveReportInfoAnswerValue", method = RequestMethod.POST)
-    public ResponseEntity<String> saveReportInfoAnswerValue(@RequestBody JSONObject reqJson) {
+    public ResponseEntity<String> saveReportInfoAnswerValue(@RequestHeader(value = "user-id") String userId,@RequestBody JSONObject reqJson) {
 
-        Assert.hasKeyAndValue(reqJson, "anValueId", "璇锋眰鎶ユ枃涓湭鍖呭惈anValueId");
-        Assert.hasKeyAndValue(reqJson, "userAnId", "璇锋眰鎶ユ枃涓湭鍖呭惈userAnId");
+        Assert.hasKeyAndValue(reqJson, "questionAnswerTitles", "璇锋眰鎶ユ枃涓湭鍖呭惈鍥炵瓟椤�");
         Assert.hasKeyAndValue(reqJson, "settingId", "璇锋眰鎶ユ枃涓湭鍖呭惈settingId");
-        Assert.hasKeyAndValue(reqJson, "titleId", "璇锋眰鎶ユ枃涓湭鍖呭惈titleId");
-        Assert.hasKeyAndValue(reqJson, "valueId", "璇锋眰鎶ユ枃涓湭鍖呭惈valueId");
-        Assert.hasKeyAndValue(reqJson, "valueContent", "璇锋眰鎶ユ枃涓湭鍖呭惈valueContent");
         Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
 
+        JSONArray questionAnswerTitles = reqJson.getJSONArray("questionAnswerTitles");
 
-        ReportInfoAnswerValuePo reportInfoAnswerValuePo = BeanConvertUtil.covertBean(reqJson, ReportInfoAnswerValuePo.class);
-        return saveReportInfoAnswerValueBMOImpl.save(reportInfoAnswerValuePo);
+        if (questionAnswerTitles == null || questionAnswerTitles.size() < 1) {
+            throw new IllegalArgumentException("鏈寘鍚鐩強绛旀");
+        }
+        JSONObject titleObj = null;
+        for (int questionAnswerTitleIndex = 0; questionAnswerTitleIndex < questionAnswerTitles.size(); questionAnswerTitleIndex++) {
+            titleObj = questionAnswerTitles.getJSONObject(questionAnswerTitleIndex);
+            Assert.hasKeyAndValue(titleObj, "valueContent", titleObj.getString("title") + ",鏈~鍐欑瓟妗�");
+        }
+
+        return saveReportInfoAnswerValueBMOImpl.save(reqJson,userId);
     }
 
     /**

--
Gitblit v1.8.0