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/AttrValueApi.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/api/AttrValueApi.java b/service-common/src/main/java/com/java110/common/api/AttrValueApi.java
old mode 100644
new mode 100755
index a5ef6f2..cb87162
--- a/service-common/src/main/java/com/java110/common/api/AttrValueApi.java
+++ b/service-common/src/main/java/com/java110/common/api/AttrValueApi.java
@@ -5,7 +5,7 @@
 import com.java110.common.bmo.attrValue.IGetAttrValueBMO;
 import com.java110.common.bmo.attrValue.ISaveAttrValueBMO;
 import com.java110.common.bmo.attrValue.IUpdateAttrValueBMO;
-import com.java110.dto.attrValue.AttrValueDto;
+import com.java110.dto.attrSpec.AttrValueDto;
 import com.java110.po.attrValue.AttrValuePo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -43,7 +43,7 @@
     @RequestMapping(value = "/saveAttrValue", method = RequestMethod.POST)
     public ResponseEntity<String> saveAttrValue(@RequestBody JSONObject reqJson) {
 
-        Assert.hasKeyAndValue(reqJson, "specCd", "璇锋眰鎶ユ枃涓湭鍖呭惈specCd");
+        Assert.hasKeyAndValue(reqJson, "specId", "璇锋眰鎶ユ枃涓湭鍖呭惈specId");
         Assert.hasKeyAndValue(reqJson, "value", "璇锋眰鎶ユ枃涓湭鍖呭惈value");
         Assert.hasKeyAndValue(reqJson, "valueName", "璇锋眰鎶ユ枃涓湭鍖呭惈valueName");
         Assert.hasKeyAndValue(reqJson, "valueShow", "璇锋眰鎶ユ枃涓湭鍖呭惈valueShow");
@@ -64,7 +64,7 @@
     @RequestMapping(value = "/updateAttrValue", method = RequestMethod.POST)
     public ResponseEntity<String> updateAttrValue(@RequestBody JSONObject reqJson) {
 
-        Assert.hasKeyAndValue(reqJson, "specCd", "璇锋眰鎶ユ枃涓湭鍖呭惈specCd");
+        Assert.hasKeyAndValue(reqJson, "specId", "璇锋眰鎶ユ枃涓湭鍖呭惈specId");
         Assert.hasKeyAndValue(reqJson, "value", "璇锋眰鎶ユ枃涓湭鍖呭惈value");
         Assert.hasKeyAndValue(reqJson, "valueName", "璇锋眰鎶ユ枃涓湭鍖呭惈valueName");
         Assert.hasKeyAndValue(reqJson, "valueShow", "璇锋眰鎶ユ枃涓湭鍖呭惈valueShow");
@@ -106,10 +106,12 @@
      * valueName: '',
      */
     @RequestMapping(value = "/queryAttrValue", method = RequestMethod.GET)
-    public ResponseEntity<String> queryAttrValue(@RequestParam(value = "specCd") String specCd,
+    public ResponseEntity<String> queryAttrValue(@RequestParam(value = "specCd",required = false) String specCd,
+                                                 @RequestParam(value = "specId",required = false) String specId,
                                                  @RequestParam(value = "page", required = false) int page,
                                                  @RequestParam(value = "row", required = false) int row,
                                                  @RequestParam(value = "value", required = false) String value,
+                                                 @RequestParam(value = "domain", required = false) String domain,
                                                  @RequestParam(value = "valueShow", required = false) String valueShow,
                                                  @RequestParam(value = "valueName", required = false) String valueName
     ) {
@@ -120,6 +122,8 @@
         attrValueDto.setValue(value);
         attrValueDto.setValueName(valueName);
         attrValueDto.setValueShow(valueShow);
+        attrValueDto.setDomain(domain);
+        attrValueDto.setSpecId(specId);
         return getAttrValueBMOImpl.get(attrValueDto);
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0