From bd72b193becb5770c2ba7dd0580d46428def7a03 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 29 五月 2023 17:00:57 +0800
Subject: [PATCH] optmize
---
service-report/src/main/java/com/java110/report/api/ReportInfoAnswerValueApi.java | 64 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 26 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..c147d04 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,7 +1,8 @@
package com.java110.report.api;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.reportInfoAnswerValue.ReportInfoAnswerValueDto;
+import com.java110.dto.reportInfoAnswer.ReportInfoAnswerValueDto;
import com.java110.po.reportInfoAnswerValue.ReportInfoAnswerValuePo;
import com.java110.report.bmo.reportInfoAnswerValue.IDeleteReportInfoAnswerValueBMO;
import com.java110.report.bmo.reportInfoAnswerValue.IGetReportInfoAnswerValueBMO;
@@ -19,8 +20,10 @@
@Autowired
private ISaveReportInfoAnswerValueBMO saveReportInfoAnswerValueBMOImpl;
+
@Autowired
private IUpdateReportInfoAnswerValueBMO updateReportInfoAnswerValueBMOImpl;
+
@Autowired
private IDeleteReportInfoAnswerValueBMO deleteReportInfoAnswerValueBMOImpl;
@@ -29,33 +32,40 @@
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
- * @serviceCode /reportInfoAnswerValue/saveReportInfoAnswerValue
- * @path /app/reportInfoAnswerValue/saveReportInfoAnswerValue
+ *
* @param reqJson
* @return
+ * @serviceCode /reportInfoAnswerValue/saveReportInfoAnswerValue
+ * @path /app/reportInfoAnswerValue/saveReportInfoAnswerValue
*/
@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);
}
/**
* 寰俊淇敼娑堟伅妯℃澘
- * @serviceCode /reportInfoAnswerValue/updateReportInfoAnswerValue
- * @path /app/reportInfoAnswerValue/updateReportInfoAnswerValue
+ *
* @param reqJson
* @return
+ * @serviceCode /reportInfoAnswerValue/updateReportInfoAnswerValue
+ * @path /app/reportInfoAnswerValue/updateReportInfoAnswerValue
*/
@RequestMapping(value = "/updateReportInfoAnswerValue", method = RequestMethod.POST)
public ResponseEntity<String> updateReportInfoAnswerValue(@RequestBody JSONObject reqJson) {
@@ -69,24 +79,23 @@
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
Assert.hasKeyAndValue(reqJson, "anValueId", "anValueId涓嶈兘涓虹┖");
-
ReportInfoAnswerValuePo reportInfoAnswerValuePo = BeanConvertUtil.covertBean(reqJson, ReportInfoAnswerValuePo.class);
return updateReportInfoAnswerValueBMOImpl.update(reportInfoAnswerValuePo);
}
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
- * @serviceCode /reportInfoAnswerValue/deleteReportInfoAnswerValue
- * @path /app/reportInfoAnswerValue/deleteReportInfoAnswerValue
+ *
* @param reqJson
* @return
+ * @serviceCode /reportInfoAnswerValue/deleteReportInfoAnswerValue
+ * @path /app/reportInfoAnswerValue/deleteReportInfoAnswerValue
*/
@RequestMapping(value = "/deleteReportInfoAnswerValue", method = RequestMethod.POST)
public ResponseEntity<String> deleteReportInfoAnswerValue(@RequestBody JSONObject reqJson) {
+
Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
-
Assert.hasKeyAndValue(reqJson, "anValueId", "anValueId涓嶈兘涓虹┖");
-
ReportInfoAnswerValuePo reportInfoAnswerValuePo = BeanConvertUtil.covertBean(reqJson, ReportInfoAnswerValuePo.class);
return deleteReportInfoAnswerValueBMOImpl.delete(reportInfoAnswerValuePo);
@@ -94,19 +103,21 @@
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
- * @serviceCode /reportInfoAnswerValue/queryReportInfoAnswerValue
- * @path /app/reportInfoAnswerValue/queryReportInfoAnswerValue
+ *
* @param communityId 灏忓尯ID
* @return
+ * @serviceCode /reportInfoAnswerValue/queryReportInfoAnswerValue
+ * @path /app/reportInfoAnswerValue/queryReportInfoAnswerValue
*/
@RequestMapping(value = "/queryReportInfoAnswerValue", method = RequestMethod.GET)
public ResponseEntity<String> queryReportInfoAnswerValue(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "userName",required = false) String userName,
- @RequestParam(value = "repName",required = false) String repName,
- @RequestParam(value = "repTitle",required = false) String repTitle,
- @RequestParam(value = "valueContent",required = false) String valueContent,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ @RequestParam(value = "userName", required = false) String userName,
+ @RequestParam(value = "repName", required = false) String repName,
+ @RequestParam(value = "repTitle", required = false) String repTitle,
+ @RequestParam(value = "valueContent", required = false) String valueContent,
+ @RequestParam(value = "reportType",required = false) String reportType,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
ReportInfoAnswerValueDto reportInfoAnswerValueDto = new ReportInfoAnswerValueDto();
reportInfoAnswerValueDto.setPage(page);
reportInfoAnswerValueDto.setRow(row);
@@ -115,6 +126,7 @@
reportInfoAnswerValueDto.setRepName(repName);
reportInfoAnswerValueDto.setRepTitle(repTitle);
reportInfoAnswerValueDto.setValueContent(valueContent);
+ reportInfoAnswerValueDto.setReportType(reportType);
return getReportInfoAnswerValueBMOImpl.get(reportInfoAnswerValueDto);
}
}
--
Gitblit v1.8.0