From 4ee86eb0f4984bf3ede3196ad8c5fe95e8c5a504 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 15 六月 2022 19:05:02 +0800
Subject: [PATCH] 优化代码
---
service-report/src/main/java/com/java110/report/api/ReportInfoSettingTitleApi.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/api/ReportInfoSettingTitleApi.java b/service-report/src/main/java/com/java110/report/api/ReportInfoSettingTitleApi.java
index 2683521..e34ca8f 100644
--- a/service-report/src/main/java/com/java110/report/api/ReportInfoSettingTitleApi.java
+++ b/service-report/src/main/java/com/java110/report/api/ReportInfoSettingTitleApi.java
@@ -1,6 +1,8 @@
package com.java110.report.api;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.questionAnswerTitle.QuestionAnswerTitleDto;
import com.java110.dto.reportInfoSettingTitle.ReportInfoSettingTitleDto;
import com.java110.po.reportInfoSettingTitle.ReportInfoSettingTitlePo;
import com.java110.report.bmo.reportInfoSettingTitle.IDeleteReportInfoSettingTitleBMO;
@@ -37,26 +39,32 @@
@RequestMapping(value = "/saveReportInfoSettingTitle", method = RequestMethod.POST)
public ResponseEntity<String> saveReportInfoSettingTitle(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "titleId", "璇锋眰鎶ユ枃涓湭鍖呭惈titleId");
Assert.hasKeyAndValue(reqJson, "settingId", "璇锋眰鎶ユ枃涓湭鍖呭惈settingId");
Assert.hasKeyAndValue(reqJson, "title", "璇锋眰鎶ユ枃涓湭鍖呭惈title");
Assert.hasKeyAndValue(reqJson, "titleType", "璇锋眰鎶ユ枃涓湭鍖呭惈titleType");
Assert.hasKeyAndValue(reqJson, "seq", "璇锋眰鎶ユ枃涓湭鍖呭惈seq");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
+ JSONArray titleValues = null;
+ if (!ReportInfoSettingTitleDto.TITLE_TYPE_QUESTIONS.equals(reqJson.getString("titleType"))) {
+ titleValues = reqJson.getJSONArray("titleValues");
+ if (titleValues.size() < 1) {
+ throw new IllegalArgumentException("鏈寘鍚�夐」");
+ }
+ }
ReportInfoSettingTitlePo reportInfoSettingTitlePo = BeanConvertUtil.covertBean(reqJson, ReportInfoSettingTitlePo.class);
- return saveReportInfoSettingTitleBMOImpl.save(reportInfoSettingTitlePo);
+ return saveReportInfoSettingTitleBMOImpl.save(reportInfoSettingTitlePo,titleValues);
}
/**
* 寰俊淇敼娑堟伅妯℃澘
- * @serviceCode /reportInfoSettingTitle/updateReportInfoSettingTitle
+ * @serviceCode /reportInfoSettingTitle/updateSettingTitle
* @path /app/reportInfoSettingTitle/updateReportInfoSettingTitle
* @param reqJson
* @return
*/
- @RequestMapping(value = "/updateReportInfoSettingTitle", method = RequestMethod.POST)
+ @RequestMapping(value = "/updateSettingTitle", method = RequestMethod.POST)
public ResponseEntity<String> updateReportInfoSettingTitle(@RequestBody JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "titleId", "璇锋眰鎶ユ枃涓湭鍖呭惈titleId");
@@ -65,21 +73,29 @@
Assert.hasKeyAndValue(reqJson, "titleType", "璇锋眰鎶ユ枃涓湭鍖呭惈titleType");
Assert.hasKeyAndValue(reqJson, "seq", "璇锋眰鎶ユ枃涓湭鍖呭惈seq");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
- Assert.hasKeyAndValue(reqJson, "titleId", "titleId涓嶈兘涓虹┖");
+ JSONArray titleValues = null;
+ if (!ReportInfoSettingTitleDto.TITLE_TYPE_QUESTIONS.equals(reqJson.getString("titleType"))) {
+ titleValues = reqJson.getJSONArray("titleValues");
+ if (titleValues.size() < 1) {
+ throw new IllegalArgumentException("鏈寘鍚�夐」");
+ }
+ }
ReportInfoSettingTitlePo reportInfoSettingTitlePo = BeanConvertUtil.covertBean(reqJson, ReportInfoSettingTitlePo.class);
- return updateReportInfoSettingTitleBMOImpl.update(reportInfoSettingTitlePo);
+ deleteReportInfoSettingTitleBMOImpl.delete(reportInfoSettingTitlePo);
+
+ return saveReportInfoSettingTitleBMOImpl.save(reportInfoSettingTitlePo,titleValues);
}
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
- * @serviceCode /reportInfoSettingTitle/deleteReportInfoSettingTitle
+ * @serviceCode /reportInfoSettingTitle/deleteSettingTitle
* @path /app/reportInfoSettingTitle/deleteReportInfoSettingTitle
* @param reqJson
* @return
*/
- @RequestMapping(value = "/deleteReportInfoSettingTitle", method = RequestMethod.POST)
+ @RequestMapping(value = "/deleteSettingTitle", method = RequestMethod.POST)
public ResponseEntity<String> deleteReportInfoSettingTitle(@RequestBody JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
@@ -92,18 +108,26 @@
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
- * @serviceCode /reportInfoSettingTitle/queryReportInfoSettingTitle
+ * @serviceCode /reportInfoSettingTitle/querySettingTitle
* @path /app/reportInfoSettingTitle/queryReportInfoSettingTitle
* @param communityId 灏忓尯ID
* @return
*/
- @RequestMapping(value = "/queryReportInfoSettingTitle", method = RequestMethod.GET)
+ @RequestMapping(value = "/querySettingTitle", method = RequestMethod.GET)
public ResponseEntity<String> queryReportInfoSettingTitle(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "titleType",required = false) String titleType,
+ @RequestParam(value = "title",required = false) String title,
+ @RequestParam(value = "titleId",required = false) String titleId,
+ @RequestParam(value = "settingid",required = false) String settingid,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ReportInfoSettingTitleDto reportInfoSettingTitleDto = new ReportInfoSettingTitleDto();
reportInfoSettingTitleDto.setPage(page);
reportInfoSettingTitleDto.setRow(row);
+ reportInfoSettingTitleDto.setTitleType(titleType);
+ reportInfoSettingTitleDto.setTitleLike(title);
+ reportInfoSettingTitleDto.setTitleId(titleId);
+ reportInfoSettingTitleDto.setSettingId(settingid);
reportInfoSettingTitleDto.setCommunityId(communityId);
return getReportInfoSettingTitleBMOImpl.get(reportInfoSettingTitleDto);
}
--
Gitblit v1.8.0