保存疫情问卷

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,7 +36,7 @@ public class ReportInfoAnswerValueApi {
      * @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");
@@ -44,10 +45,21 @@ public class ReportInfoAnswerValueApi {
         Assert.hasKeyAndValue(reqJson, "valueId", "请求报文中未包含valueId");
         Assert.hasKeyAndValue(reqJson, "valueContent", "请求报文中未包含valueContent");
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
-
+        Assert.hasKey(reqJson, "questionAnswerTitles", "未包含回答项");
+        JSONArray questionAnswerTitles = reqJson.getJSONArray("questionAnswerTitles");
+
+        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("qaTitle") + ",未填写答案");
+        }
 
         ReportInfoAnswerValuePo reportInfoAnswerValuePo = BeanConvertUtil.covertBean(reqJson, ReportInfoAnswerValuePo.class);
-        return saveReportInfoAnswerValueBMOImpl.save(reportInfoAnswerValuePo);
+
+        return saveReportInfoAnswerValueBMOImpl.save(reportInfoAnswerValuePo,questionAnswerTitles);
     }
 
     /**

service-report/src/main/java/com/java110/report/bmo/reportInfoAnswerValue/ISaveReportInfoAnswerValueBMO.java

@@ -1,5 +1,6 @@
 package com.java110.report.bmo.reportInfoAnswerValue;
 
+import com.alibaba.fastjson.JSONArray;
 import com.java110.po.reportInfoAnswerValue.ReportInfoAnswerValuePo;
 import org.springframework.http.ResponseEntity;
 public interface ISaveReportInfoAnswerValueBMO {
@@ -11,7 +12,7 @@ public interface ISaveReportInfoAnswerValueBMO {
      * @param reportInfoAnswerValuePo
      * @return
      */
-    ResponseEntity<String> save(ReportInfoAnswerValuePo reportInfoAnswerValuePo);
+    ResponseEntity<String> save(ReportInfoAnswerValuePo reportInfoAnswerValuePo, JSONArray questionAnswerTitles);
 
 
 }

service-report/src/main/java/com/java110/report/bmo/reportInfoAnswerValue/impl/SaveReportInfoAnswerValueBMOImpl.java

@@ -1,5 +1,6 @@
 package com.java110.report.bmo.reportInfoAnswerValue.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.report.IReportInfoAnswerValueInnerServiceSMO;
@@ -23,7 +24,8 @@ public class SaveReportInfoAnswerValueBMOImpl implements ISaveReportInfoAnswerVa
      * @return 订单服务能够接受的报文
      */
     @Java110Transactional
-    public ResponseEntity<String> save(ReportInfoAnswerValuePo reportInfoAnswerValuePo) {
+    public ResponseEntity<String> save(ReportInfoAnswerValuePo reportInfoAnswerValuePo, JSONArray questionAnswerTitles) {
+
 
         reportInfoAnswerValuePo.setAnValueId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_anValueId));
         int flag = reportInfoAnswerValueInnerServiceSMOImpl.saveReportInfoAnswerValue(reportInfoAnswerValuePo);