From 4cb2c280c69a7d6bb48b831df60f5f1a793097b5 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 19 四月 2023 01:00:00 +0800
Subject: [PATCH] 优化部分不合规代码

---
 service-common/src/main/java/com/java110/common/api/AttrSpecApi.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/api/AttrSpecApi.java b/service-common/src/main/java/com/java110/common/api/AttrSpecApi.java
old mode 100644
new mode 100755
index 76f2fd1..29d24f0
--- a/service-common/src/main/java/com/java110/common/api/AttrSpecApi.java
+++ b/service-common/src/main/java/com/java110/common/api/AttrSpecApi.java
@@ -43,7 +43,7 @@
     @RequestMapping(value = "/saveAttrSpec", method = RequestMethod.POST)
     public ResponseEntity<String> saveAttrSpec(@RequestBody JSONObject reqJson) {
 
-        Assert.hasKeyAndValue(reqJson, "specCd", "璇锋眰鎶ユ枃涓湭鍖呭惈specCd");
+        //Assert.hasKeyAndValue(reqJson, "specCd", "璇锋眰鎶ユ枃涓湭鍖呭惈specCd");
         Assert.hasKeyAndValue(reqJson, "tableName", "璇锋眰鎶ユ枃涓湭鍖呭惈tableName");
         Assert.hasKeyAndValue(reqJson, "specName", "璇锋眰鎶ユ枃涓湭鍖呭惈specName");
         Assert.hasKeyAndValue(reqJson, "specHoldplace", "璇锋眰鎶ユ枃涓湭鍖呭惈specHoldplace");
@@ -70,6 +70,7 @@
     public ResponseEntity<String> updateAttrSpec(@RequestBody JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "specCd", "璇锋眰鎶ユ枃涓湭鍖呭惈specCd");
+        Assert.hasKeyAndValue(reqJson, "specId", "璇锋眰鎶ユ枃涓湭鍖呭惈specId");
         Assert.hasKeyAndValue(reqJson, "tableName", "璇锋眰鎶ユ枃涓湭鍖呭惈tableName");
         Assert.hasKeyAndValue(reqJson, "specName", "璇锋眰鎶ユ枃涓湭鍖呭惈specName");
         Assert.hasKeyAndValue(reqJson, "specHoldplace", "璇锋眰鎶ユ枃涓湭鍖呭惈specHoldplace");
@@ -95,9 +96,8 @@
      */
     @RequestMapping(value = "/deleteAttrSpec", method = RequestMethod.POST)
     public ResponseEntity<String> deleteAttrSpec(@RequestBody JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
 
-        Assert.hasKeyAndValue(reqJson, "specCd", "specCd涓嶈兘涓虹┖");
+        Assert.hasKeyAndValue(reqJson, "specId", "specId涓嶈兘涓虹┖");
 
 
         AttrSpecPo attrSpecPo = BeanConvertUtil.covertBean(reqJson, AttrSpecPo.class);
@@ -113,9 +113,21 @@
      * @path /app/attrSpec/queryAttrSpec
      */
     @RequestMapping(value = "/queryAttrSpec", method = RequestMethod.GET)
-    public ResponseEntity<String> queryAttrSpec(@RequestParam(value = "tableName",required = false) String tableName) {
+    public ResponseEntity<String> queryAttrSpec(@RequestParam(value = "tableName", required = false) String tableName,
+                                                @RequestParam(value = "specCd", required = false) String specCd,
+                                                @RequestParam(value = "specId", required = false) String specId,
+                                                @RequestParam(value = "specName", required = false) String specName,
+                                                @RequestParam(value = "domain", required = false) String domain,
+                                                @RequestParam(value = "page", required = false) int page,
+                                                @RequestParam(value = "row", required = false) int row) {
         AttrSpecDto attrSpecDto = new AttrSpecDto();
         attrSpecDto.setTableName(tableName);
+        attrSpecDto.setPage(page);
+        attrSpecDto.setRow(row);
+        attrSpecDto.setSpecCd(specCd);
+        attrSpecDto.setSpecName(specName);
+        attrSpecDto.setDomain(domain);
+        attrSpecDto.setSpecId(specId);
         return getAttrSpecBMOImpl.get(attrSpecDto);
     }
 }

--
Gitblit v1.8.0