优化zhi

java110-generator/src/main/resources/web/template_1.json

@@ -1,141 +1,70 @@
 {
-  "templateName":"属性配置",
+  "templateName":"属性值",
   "directories": "dev",
-  "templateCode":"attrSpec",
-  "templateKey":"specCd",
-  "templateKeyName":"规格",
-  "searchCode": "specCd",
-  "searchName": "规格",
+  "templateCode":"attrValue",
+  "templateKey":"valueId",
+  "templateKeyName":"值ID",
+  "searchCode": "valueId",
+  "searchName": "值ID",
   "conditions": [
     {
-      "name": "规格名称",
+      "name": "值",
       "inputType": "input",
-      "code": "specName",
+      "code": "value",
       "whereCondition": "equal"
     },
     {
-      "name": "表名",
+      "name": "显示",
       "inputType": "select",
-      "selectValue":"building_room_attr",
-      "selectValueName":"房屋属性",
-      "code": "tableName",
+      "selectValue":"Y,N",
+      "selectValueName":"是,否",
+      "code": "valueShow",
       "whereCondition": "equal"
     },
     {
-      "name": "规格",
+      "name": "值名称",
       "inputType": "input",
-      "code": "specCd",
+      "code": "valueName",
       "whereCondition": "equal"
     }
   ],
   "columns":[
     {
-      "code":"tableName",
-      "cnCode":"属性表",
-      "desc":"必填，请选择属性",
-      "required":true,
-      "hasDefaultValue":false,
-      "inputType": "select",
-      "selectValue":"building_room_attr",
-      "selectValueName":"房屋属性",
-      "limit":"",
-      "limitParam":"",
-      "limitErrInfo":"模板格式错误",
-      "show": true
-    },
-    {
-      "code": "specName",
-      "cnCode":"规格名称",
-      "desc":"必填，请填写规格名称",
+      "code":"value",
+      "cnCode":"值",
+      "desc":"必填，请填写值",
       "required":true,
       "hasDefaultValue":false,
       "inputType": "input",
       "limit":"maxLength",
-      "limitParam":"64",
-      "limitErrInfo":"规格名称太长",
+      "limitParam":"200",
+      "limitErrInfo":"值超过200位",
       "show": true
     },
     {
-      "code": "specHoldplace",
-      "cnCode":"说明",
-      "desc":"选填，请填写说明",
-      "required":false,
+      "code": "valueName",
+      "cnCode":"值名称",
+      "desc":"必填，请填写值名称",
+      "required":true,
       "hasDefaultValue":false,
       "inputType": "input",
       "limit":"maxLength",
       "limitParam":"200",
-      "limitErrInfo":"说明不能超过500位",
-      "show": false
-    },
-    {
-      "code":"required",
-      "cnCode":"必填",
-      "desc":"必填，请选择是否必填",
-      "required":true,
-      "hasDefaultValue":false,
-      "inputType": "select",
-      "selectValue":"Y,N",
-      "selectValueName":"是,否",
-      "limit":"",
-      "limitParam":"",
-      "limitErrInfo":"模板格式错误",
-      "show": true
-    },
-    {
-      "code":"specShow",
-      "cnCode":"展示",
-      "desc":"必填，请选择是否添加编辑时展示",
-      "required":true,
-      "hasDefaultValue":false,
-      "inputType": "select",
-      "selectValue":"Y,N",
-      "selectValueName":"是,否",
-      "limit":"",
-      "limitParam":"",
-      "limitErrInfo":"模板格式错误",
+      "limitErrInfo":"值名称超过200位",
       "show": true
     },
     {
-      "code":"specValueType",
-      "cnCode":"值类型",
-      "desc":"必填，请选择值类型",
-      "required":true,
-      "hasDefaultValue":false,
-      "inputType": "select",
-      "selectValue":"1001,2002,3003",
-      "selectValueName":"字符串,整数,金额",
-      "limit":"num",
-      "limitParam":"",
-      "limitErrInfo":"值类型格式错误",
-      "show": true
-    },
-    {
-      "code":"specType",
-      "cnCode":"规格类型",
-      "desc":"必填，请选择规格类型",
-      "required":true,
-      "hasDefaultValue":false,
-      "inputType": "select",
-      "selectValue":"2233,3344",
-      "selectValueName":"input,select",
-      "limit":"num",
-      "limitParam":"",
-      "limitErrInfo":"规格类型错误",
-      "show": true
-    }
-  ,
-    {
-      "code":"listShow",
-      "cnCode":"查询显示",
-      "desc":"必填，请选择查询显示",
+      "code":"valueShow",
+      "cnCode":"显示",
+      "desc":"必填，请选择是否显示",
       "required":true,
       "hasDefaultValue":false,
       "inputType": "select",
       "selectValue":"Y,N",
       "selectValueName":"是,否",
-      "limit":"",
-      "limitParam":"",
-      "limitErrInfo":"规格类型错误",
+      "limit":"maxLength",
+      "limitParam":"2",
+      "limitErrInfo":"显示格式错误",
       "show": true
     }
   ]

java110-generator/src/main/resources/web/template_attrSpec.json

@@ -0,0 +1,142 @@
+{
+  "templateName":"属性配置",
+  "directories": "dev",
+  "templateCode":"attrSpec",
+  "templateKey":"specCd",
+  "templateKeyName":"规格",
+  "searchCode": "specCd",
+  "searchName": "规格",
+  "conditions": [
+    {
+      "name": "规格名称",
+      "inputType": "input",
+      "code": "specName",
+      "whereCondition": "equal"
+    },
+    {
+      "name": "表名",
+      "inputType": "select",
+      "selectValue":"building_room_attr",
+      "selectValueName":"房屋属性",
+      "code": "tableName",
+      "whereCondition": "equal"
+    },
+    {
+      "name": "规格",
+      "inputType": "input",
+      "code": "specCd",
+      "whereCondition": "equal"
+    }
+  ],
+  "columns":[
+    {
+      "code":"tableName",
+      "cnCode":"属性表",
+      "desc":"必填，请选择属性",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "select",
+      "selectValue":"building_room_attr",
+      "selectValueName":"房屋属性",
+      "limit":"",
+      "limitParam":"",
+      "limitErrInfo":"模板格式错误",
+      "show": true
+    },
+    {
+      "code": "specName",
+      "cnCode":"规格名称",
+      "desc":"必填，请填写规格名称",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "input",
+      "limit":"maxLength",
+      "limitParam":"64",
+      "limitErrInfo":"规格名称太长",
+      "show": true
+    },
+    {
+      "code": "specHoldplace",
+      "cnCode":"说明",
+      "desc":"选填，请填写说明",
+      "required":false,
+      "hasDefaultValue":false,
+      "inputType": "input",
+      "limit":"maxLength",
+      "limitParam":"200",
+      "limitErrInfo":"说明不能超过500位",
+      "show": false
+    },
+    {
+      "code":"required",
+      "cnCode":"必填",
+      "desc":"必填，请选择是否必填",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "select",
+      "selectValue":"Y,N",
+      "selectValueName":"是,否",
+      "limit":"",
+      "limitParam":"",
+      "limitErrInfo":"模板格式错误",
+      "show": true
+    },
+    {
+      "code":"specShow",
+      "cnCode":"展示",
+      "desc":"必填，请选择是否添加编辑时展示",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "select",
+      "selectValue":"Y,N",
+      "selectValueName":"是,否",
+      "limit":"",
+      "limitParam":"",
+      "limitErrInfo":"模板格式错误",
+      "show": true
+    },
+    {
+      "code":"specValueType",
+      "cnCode":"值类型",
+      "desc":"必填，请选择值类型",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "select",
+      "selectValue":"1001,2002,3003",
+      "selectValueName":"字符串,整数,金额",
+      "limit":"num",
+      "limitParam":"",
+      "limitErrInfo":"值类型格式错误",
+      "show": true
+    },
+    {
+      "code":"specType",
+      "cnCode":"规格类型",
+      "desc":"必填，请选择规格类型",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "select",
+      "selectValue":"2233,3344",
+      "selectValueName":"input,select",
+      "limit":"num",
+      "limitParam":"",
+      "limitErrInfo":"规格类型错误",
+      "show": true
+    }
+  ,
+    {
+      "code":"listShow",
+      "cnCode":"查询显示",
+      "desc":"必填，请选择查询显示",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "select",
+      "selectValue":"Y,N",
+      "selectValueName":"是,否",
+      "limit":"",
+      "limitParam":"",
+      "limitErrInfo":"规格类型错误",
+      "show": true
+    }
+  ]
+}

service-common/src/main/java/com/java110/common/api/AttrValueApi.java

@@ -11,7 +11,11 @@ import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 
 @RestController
@@ -97,11 +101,25 @@ public class AttrValueApi {
      * @return
      * @serviceCode /attrValue/queryAttrValue
      * @path /app/attrValue/queryAttrValue
+     * value: '',
+     * valueShow: '',
+     * valueName: '',
      */
     @RequestMapping(value = "/queryAttrValue", method = RequestMethod.GET)
-    public ResponseEntity<String> queryAttrValue(@RequestParam(value = "specCd") String specCd) {
+    public ResponseEntity<String> queryAttrValue(@RequestParam(value = "specCd") String specCd,
+                                                 @RequestParam(value = "page", required = false) int page,
+                                                 @RequestParam(value = "row", required = false) int row,
+                                                 @RequestParam(value = "value", required = false) String value,
+                                                 @RequestParam(value = "valueShow", required = false) String valueShow,
+                                                 @RequestParam(value = "valueName", required = false) String valueName
+    ) {
         AttrValueDto attrValueDto = new AttrValueDto();
         attrValueDto.setSpecCd(specCd);
+        attrValueDto.setPage(page);
+        attrValueDto.setRow(row);
+        attrValueDto.setValue(value);
+        attrValueDto.setValueName(valueName);
+        attrValueDto.setValueShow(valueShow);
         return getAttrValueBMOImpl.get(attrValueDto);
     }
 }