From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-report/src/main/java/com/java110/report/api/ReportInfoSettingApi.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/api/ReportInfoSettingApi.java b/service-report/src/main/java/com/java110/report/api/ReportInfoSettingApi.java
index e3e4f03..2c99953 100644
--- a/service-report/src/main/java/com/java110/report/api/ReportInfoSettingApi.java
+++ b/service-report/src/main/java/com/java110/report/api/ReportInfoSettingApi.java
@@ -37,13 +37,11 @@
@RequestMapping(value = "/saveReportInfoSetting", method = RequestMethod.POST)
public ResponseEntity<String> saveReportInfoSetting(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "settingId", "璇锋眰鎶ユ枃涓湭鍖呭惈settingId");
Assert.hasKeyAndValue(reqJson, "reportType", "璇锋眰鎶ユ枃涓湭鍖呭惈reportType");
Assert.hasKeyAndValue(reqJson, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈startTime");
Assert.hasKeyAndValue(reqJson, "endTime", "璇锋眰鎶ユ枃涓湭鍖呭惈endTime");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
- Assert.hasKeyAndValue(reqJson, "remark", "璇锋眰鎶ユ枃涓湭鍖呭惈remark");
ReportInfoSettingPo reportInfoSettingPo = BeanConvertUtil.covertBean(reqJson, ReportInfoSettingPo.class);
@@ -101,12 +99,16 @@
*/
@RequestMapping(value = "/queryReportInfoSetting", method = RequestMethod.GET)
public ResponseEntity<String> queryReportInfoSetting(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "name",required = false) String name,
+ @RequestParam(value = "settingId",required = false) String settingId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ReportInfoSettingDto reportInfoSettingDto = new ReportInfoSettingDto();
reportInfoSettingDto.setPage(page);
reportInfoSettingDto.setRow(row);
reportInfoSettingDto.setCommunityId(communityId);
+ reportInfoSettingDto.setNameLike(name);
+ reportInfoSettingDto.setSettingId(settingId);
return getReportInfoSettingBMOImpl.get(reportInfoSettingDto);
}
}
--
Gitblit v1.8.0