From fe667a39c8a4e713b86c5d8b5d57ab42421190e6 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 01:23:01 +0800
Subject: [PATCH] 优化后端代理

---
 service-report/src/main/java/com/java110/report/api/ReportInfoBackCityApi.java |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/service-report/src/main/java/com/java110/report/api/ReportInfoBackCityApi.java b/service-report/src/main/java/com/java110/report/api/ReportInfoBackCityApi.java
index ad638be..60bd513 100644
--- a/service-report/src/main/java/com/java110/report/api/ReportInfoBackCityApi.java
+++ b/service-report/src/main/java/com/java110/report/api/ReportInfoBackCityApi.java
@@ -1,8 +1,8 @@
 package com.java110.report.api;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.reportInfoBackCity.ReportInfoBackCityDto;
-import com.java110.po.reportInfoBackCity.ReportInfoBackCityPo;
+import com.java110.dto.reportInfo.ReportInfoBackCityDto;
+import com.java110.po.reportInfo.ReportInfoBackCityPo;
 import com.java110.report.bmo.reportInfoBackCity.IDeleteReportInfoBackCityBMO;
 import com.java110.report.bmo.reportInfoBackCity.IGetReportInfoBackCityBMO;
 import com.java110.report.bmo.reportInfoBackCity.ISaveReportInfoBackCityBMO;
@@ -38,12 +38,21 @@
      */
     @RequestMapping(value = "/saveReportInfoBackCity", method = RequestMethod.POST)
     public ResponseEntity<String> saveReportInfoBackCity(@RequestBody JSONObject reqJson) {
-
         Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
-
-
         ReportInfoBackCityPo reportInfoBackCityPo = BeanConvertUtil.covertBean(reqJson, ReportInfoBackCityPo.class);
         return saveReportInfoBackCityBMOImpl.save(reportInfoBackCityPo);
+        /*//姝e垯鍖归厤韬唤璇佸彿鏄惁鏄纭殑锛�15浣嶆垨鑰�17浣嶆暟瀛�+鏁板瓧/x/X
+        if (reqJson.containsKey("idCard") && !StringUtil.isEmpty(reqJson.getString("idCard"))) {
+            if (reqJson.getString("idCard").matches("^\\d{15}|\\d{17}[\\dxX]$")) {
+                ReportInfoBackCityPo reportInfoBackCityPo = BeanConvertUtil.covertBean(reqJson, ReportInfoBackCityPo.class);
+                return saveReportInfoBackCityBMOImpl.save(reportInfoBackCityPo);
+            } else {
+                throw new IllegalArgumentException("韬唤璇佸彿鏍煎紡涓嶅锛�");
+            }
+        } else {
+            ReportInfoBackCityPo reportInfoBackCityPo = BeanConvertUtil.covertBean(reqJson, ReportInfoBackCityPo.class);
+            return saveReportInfoBackCityBMOImpl.save(reportInfoBackCityPo);
+        }*/
     }
 
     /**
@@ -94,9 +103,17 @@
      */
     @RequestMapping(value = "/queryReportInfoBackCity", method = RequestMethod.GET)
     public ResponseEntity<String> queryReportInfoBackCity(@RequestParam(value = "communityId") String communityId,
+                                                          @RequestParam(value = "name", required = false) String name,
+                                                          @RequestParam(value = "idCard", required = false) String idCard,
+                                                          @RequestParam(value = "source", required = false) String source,
+                                                          @RequestParam(value = "tel", required = false) String tel,
                                                           @RequestParam(value = "page") int page,
                                                           @RequestParam(value = "row") int row) {
         ReportInfoBackCityDto reportInfoBackCityDto = new ReportInfoBackCityDto();
+        reportInfoBackCityDto.setName(name);
+        reportInfoBackCityDto.setIdCard(idCard);
+        reportInfoBackCityDto.setSource(source);
+        reportInfoBackCityDto.setTel(tel);
         reportInfoBackCityDto.setPage(page);
         reportInfoBackCityDto.setRow(row);
         reportInfoBackCityDto.setCommunityId(communityId);

--
Gitblit v1.8.0