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/ReportInfoSettingTitleValueApi.java |   38 +++++++++++++++++++++++++++++---------
 1 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/service-report/src/main/java/com/java110/report/api/ReportInfoSettingTitleValueApi.java b/service-report/src/main/java/com/java110/report/api/ReportInfoSettingTitleValueApi.java
index a7eb205..6e84a4a 100644
--- a/service-report/src/main/java/com/java110/report/api/ReportInfoSettingTitleValueApi.java
+++ b/service-report/src/main/java/com/java110/report/api/ReportInfoSettingTitleValueApi.java
@@ -29,16 +29,15 @@
 
     /**
      * 寰俊淇濆瓨娑堟伅妯℃澘
-     * @serviceCode /reportInfoSettingTitleValue/saveReportInfoSettingTitleValue
+     * @serviceCode /reportInfoSettingTitleValue/saveSettingTitleValue
      * @path /app/reportInfoSettingTitleValue/saveReportInfoSettingTitleValue
      * @param reqJson
      * @return
      */
-    @RequestMapping(value = "/saveReportInfoSettingTitleValue", method = RequestMethod.POST)
+    @RequestMapping(value = "/saveSettingTitleValue", method = RequestMethod.POST)
     public ResponseEntity<String> saveReportInfoSettingTitleValue(@RequestBody JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "valueId", "璇锋眰鎶ユ枃涓湭鍖呭惈valueId");
-        Assert.hasKeyAndValue(reqJson, "titleId", "璇锋眰鎶ユ枃涓湭鍖呭惈titleId");
         Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
         Assert.hasKeyAndValue(reqJson, "qaValue", "璇锋眰鎶ユ枃涓湭鍖呭惈qaValue");
         Assert.hasKeyAndValue(reqJson, "seq", "璇锋眰鎶ユ枃涓湭鍖呭惈seq");
@@ -50,12 +49,12 @@
 
     /**
      * 寰俊淇敼娑堟伅妯℃澘
-     * @serviceCode /reportInfoSettingTitleValue/updateReportInfoSettingTitleValue
+     * @serviceCode /reportInfoSettingTitleValue/updateTitleValue
      * @path /app/reportInfoSettingTitleValue/updateReportInfoSettingTitleValue
      * @param reqJson
      * @return
      */
-    @RequestMapping(value = "/updateReportInfoSettingTitleValue", method = RequestMethod.POST)
+    @RequestMapping(value = "/updateTitleValue", method = RequestMethod.POST)
     public ResponseEntity<String> updateReportInfoSettingTitleValue(@RequestBody JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "valueId", "璇锋眰鎶ユ枃涓湭鍖呭惈valueId");
@@ -72,12 +71,12 @@
 
     /**
      * 寰俊鍒犻櫎娑堟伅妯℃澘
-     * @serviceCode /reportInfoSettingTitleValue/deleteReportInfoSettingTitleValue
+     * @serviceCode /reportInfoSettingTitleValue/deleteTitleValue
      * @path /app/reportInfoSettingTitleValue/deleteReportInfoSettingTitleValue
      * @param reqJson
      * @return
      */
-    @RequestMapping(value = "/deleteReportInfoSettingTitleValue", method = RequestMethod.POST)
+    @RequestMapping(value = "/deleteTitleValue", method = RequestMethod.POST)
     public ResponseEntity<String> deleteReportInfoSettingTitleValue(@RequestBody JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
 
@@ -90,19 +89,40 @@
 
     /**
      * 寰俊鍒犻櫎娑堟伅妯℃澘
-     * @serviceCode /reportInfoSettingTitleValue/queryReportInfoSettingTitleValue
+     * @serviceCode /reportInfoSettingTitleValue/queryTitleValue
      * @path /app/reportInfoSettingTitleValue/queryReportInfoSettingTitleValue
      * @param communityId 灏忓尯ID
      * @return
      */
-    @RequestMapping(value = "/queryReportInfoSettingTitleValue", method = RequestMethod.GET)
+    @RequestMapping(value = "/queryTitleValue", method = RequestMethod.GET)
     public ResponseEntity<String> queryReportInfoSettingTitleValue(@RequestParam(value = "communityId") String communityId,
+                                                                   @RequestParam(value = "titleId") String titleId,
                                                       @RequestParam(value = "page") int page,
                                                       @RequestParam(value = "row") int row) {
         ReportInfoSettingTitleValueDto reportInfoSettingTitleValueDto = new ReportInfoSettingTitleValueDto();
         reportInfoSettingTitleValueDto.setPage(page);
         reportInfoSettingTitleValueDto.setRow(row);
+        reportInfoSettingTitleValueDto.setTitleId(titleId);
         reportInfoSettingTitleValueDto.setCommunityId(communityId);
         return getReportInfoSettingTitleValueBMOImpl.get(reportInfoSettingTitleValueDto);
     }
+    /**
+     * 寰俊鍒犻櫎娑堟伅妯℃澘
+     * @serviceCode /reportInfoSettingTitleValue/queryTitleValueResult
+     * @path /app/reportInfoSettingTitleValue/queryReportInfoSettingTitleValue
+     * @param communityId 灏忓尯ID
+     * @return
+     */
+    @RequestMapping(value = "/queryTitleValueResult", method = RequestMethod.GET)
+    public ResponseEntity<String> getReportInfoSettingTitleValueInfoResult(@RequestParam(value = "communityId") String communityId,
+                                                                   @RequestParam(value = "titleId") String titleId,
+                                                      @RequestParam(value = "page") int page,
+                                                      @RequestParam(value = "row") int row) {
+        ReportInfoSettingTitleValueDto reportInfoSettingTitleValueDto = new ReportInfoSettingTitleValueDto();
+        reportInfoSettingTitleValueDto.setPage(page);
+        reportInfoSettingTitleValueDto.setRow(row);
+        reportInfoSettingTitleValueDto.setTitleId(titleId);
+        reportInfoSettingTitleValueDto.setCommunityId(communityId);
+        return getReportInfoSettingTitleValueBMOImpl.getReportInfoSettingTitleValueInfoResult(reportInfoSettingTitleValueDto);
+    }
 }

--
Gitblit v1.8.0