优化代码 属性加入ID

java110-bean/src/main/java/com/java110/dto/attrSpec/AttrSpecDto.java

@@ -27,6 +27,7 @@ public class AttrSpecDto extends PageDto implements Serializable {
     private String tableName;
     private String listShow;
     private String domain;
+    private String specId;
 
     private Date createTime;
 
@@ -130,4 +131,12 @@ public class AttrSpecDto extends PageDto implements Serializable {
     public void setDomain(String domain) {
         this.domain = domain;
     }
+
+    public String getSpecId() {
+        return specId;
+    }
+
+    public void setSpecId(String specId) {
+        this.specId = specId;
+    }
 }

java110-bean/src/main/java/com/java110/dto/attrSpec/AttrValueDto.java

@@ -19,6 +19,7 @@ public class AttrValueDto extends PageDto implements Serializable {
     private String valueName;
     private String valueShow;
     private String specCd;
+    private String specId;
     private String value;
     private String domain;
 
@@ -92,4 +93,12 @@ public class AttrValueDto extends PageDto implements Serializable {
     public void setDomain(String domain) {
         this.domain = domain;
     }
+
+    public String getSpecId() {
+        return specId;
+    }
+
+    public void setSpecId(String specId) {
+        this.specId = specId;
+    }
 }

java110-bean/src/main/java/com/java110/po/attrSpec/AttrSpecPo.java

@@ -9,6 +9,7 @@ public class AttrSpecPo implements Serializable {
     private String specHoldplace;
     private String specValueType;
     private String specCd;
+    private String specId;
     private String statusCd = "0";
     private String specShow;
     private String required;
@@ -17,6 +18,7 @@ public class AttrSpecPo implements Serializable {
     private String domain;
 
 
+
     public String getSpecType() {
         return specType;
     }
@@ -104,4 +106,12 @@ public class AttrSpecPo implements Serializable {
     public void setDomain(String domain) {
         this.domain = domain;
     }
+
+    public String getSpecId() {
+        return specId;
+    }
+
+    public void setSpecId(String specId) {
+        this.specId = specId;
+    }
 }

java110-bean/src/main/java/com/java110/po/attrValue/AttrValuePo.java

@@ -1,53 +1,70 @@
 package com.java110.po.attrValue;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class AttrValuePo implements Serializable {
 
     private String valueId;
-private String valueName;
-private String valueShow;
-private String specCd;
-private String statusCd = "0";
-private String value;
-public String getValueId() {
+    private String valueName;
+    private String valueShow;
+    private String specCd;
+    private String specId;
+    private String statusCd = "0";
+    private String value;
+
+    public String getValueId() {
         return valueId;
     }
-public void setValueId(String valueId) {
+
+    public void setValueId(String valueId) {
         this.valueId = valueId;
     }
-public String getValueName() {
+
+    public String getValueName() {
         return valueName;
     }
-public void setValueName(String valueName) {
+
+    public void setValueName(String valueName) {
         this.valueName = valueName;
     }
-public String getValueShow() {
+
+    public String getValueShow() {
         return valueShow;
     }
-public void setValueShow(String valueShow) {
+
+    public void setValueShow(String valueShow) {
         this.valueShow = valueShow;
     }
-public String getSpecCd() {
+
+    public String getSpecCd() {
         return specCd;
     }
-public void setSpecCd(String specCd) {
+
+    public void setSpecCd(String specCd) {
         this.specCd = specCd;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getValue() {
+
+    public String getValue() {
         return value;
     }
-public void setValue(String value) {
+
+    public void setValue(String value) {
         this.value = value;
     }
 
+    public String getSpecId() {
+        return specId;
+    }
 
-
+    public void setSpecId(String specId) {
+        this.specId = specId;
+    }
 }

java110-db/src/main/resources/mapper/common/AttrSpecServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存属性规格表信息 add by wuxw 2018-07-03 -->
     <insert id="saveAttrSpecInfo" parameterType="Map">
         insert into attr_spec(
-        spec_type,spec_name,spec_holdplace,spec_value_type,spec_cd,spec_show,required,table_name,list_show,domain
+        spec_type,spec_name,spec_holdplace,spec_value_type,spec_cd,spec_id,spec_show,required,table_name,list_show,domain
         ) values (
-        #{specType},#{specName},#{specHoldplace},#{specValueType},#{specCd},#{specShow},#{required},#{tableName},#{listShow},#{domain}
+        #{specType},#{specName},#{specHoldplace},#{specValueType},#{specCd},#{specId},#{specShow},#{required},#{tableName},#{listShow},#{domain}
         )
     </insert>
 
@@ -20,7 +20,7 @@
         select t.spec_type,t.spec_type specType,t.spec_name,t.spec_name specName,t.spec_holdplace,t.spec_holdplace
         specHoldplace,t.spec_value_type,t.spec_value_type specValueType,t.spec_cd,t.spec_cd
         specCd,t.status_cd,t.status_cd statusCd,t.spec_show,t.spec_show specShow,t.required,t.table_name,t.table_name
-        tableName,t.list_show,t.list_show listShow,t.domain
+        tableName,t.list_show,t.list_show listShow,t.domain,t.spec_id specId
         from attr_spec t
         where 1 =1
         <if test="specType !=null and specType != ''">
@@ -38,6 +38,9 @@
         <if test="specCd !=null and specCd != ''">
             and t.spec_cd= #{specCd}
         </if>
+        <if test="specId !=null and specId != ''">
+            and t.spec_id= #{specId}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
@@ -97,9 +100,12 @@
         <if test="domain !=null and domain != ''">
             , t.domain= #{domain}
         </if>
-        where 1=1
         <if test="specCd !=null and specCd != ''">
-            and t.spec_cd= #{specCd}
+            , t.spec_cd= #{specCd}
+        </if>
+        where 1=1
+        <if test="specId !=null and specId != ''">
+            and t.spec_id= #{specId}
         </if>
 
     </update>
@@ -124,6 +130,9 @@
         <if test="specCd !=null and specCd != ''">
             and t.spec_cd= #{specCd}
         </if>
+        <if test="specId !=null and specId != ''">
+            and t.spec_id= #{specId}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>

java110-db/src/main/resources/mapper/common/AttrValueServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存属性值信息 add by wuxw 2018-07-03 -->
     <insert id="saveAttrValueInfo" parameterType="Map">
         insert into attr_value(
-        value_id,value_name,value_show,spec_cd,value
+        value_id,value_name,value_show,spec_id,value
         ) values (
-        #{valueId},#{valueName},#{valueShow},#{specCd},#{value}
+        #{valueId},#{valueName},#{valueShow},#{specId},#{value}
         )
     </insert>
 
@@ -18,9 +18,9 @@
     <!-- 查询属性值信息 add by wuxw 2018-07-03 -->
     <select id="getAttrValueInfo" parameterType="Map" resultType="Map">
         select t.value_id,t.value_id valueId,t.value_name,t.value_name valueName,t.value_show,t.value_show
-        valueShow,t.spec_cd,t.spec_cd specCd,t.status_cd,t.status_cd statusCd,t.value
+        valueShow,t.spec_id,t.spec_id specId,t.status_cd,t.status_cd statusCd,t.value
         from attr_value t
-        LEFT JOIN attr_spec spec on t.spec_cd = spec.spec_cd and spec.status_cd = '0'
+        LEFT JOIN attr_spec spec on t.spec_id = spec.spec_id and spec.status_cd = '0'
         where 1 =1
         <if test="valueId !=null and valueId != ''">
             and t.value_id= #{valueId}
@@ -28,14 +28,17 @@
         <if test="domain !=null and domain != ''">
             and spec.domain= #{domain}
         </if>
+        <if test="specCd !=null and specCd != ''">
+            and spec.spec_cd= #{specCd}
+        </if>
         <if test="valueName !=null and valueName != ''">
             and t.value_name= #{valueName}
         </if>
         <if test="valueShow !=null and valueShow != ''">
             and t.value_show= #{valueShow}
         </if>
-        <if test="specCd !=null and specCd != ''">
-            and t.spec_cd= #{specCd}
+        <if test="specId !=null and specId != ''">
+            and t.spec_id= #{specId}
         </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
@@ -63,8 +66,8 @@
         <if test="valueShow !=null and valueShow != ''">
             , t.value_show= #{valueShow}
         </if>
-        <if test="specCd !=null and specCd != ''">
-            , t.spec_cd= #{specCd}
+        <if test="specId !=null and specId != ''">
+            , t.spec_id= #{specId}
         </if>
         <if test="value !=null and value != ''">
             , t.value= #{value}
@@ -80,7 +83,7 @@
     <select id="queryAttrValuesCount" parameterType="Map" resultType="Map">
         select count(1) count
         from attr_value t
-        LEFT JOIN attr_spec spec on t.spec_cd = spec.spec_cd and spec.status_cd = '0'
+        LEFT JOIN attr_spec spec on t.spec_id = spec.spec_id and spec.status_cd = '0'
         where 1 =1
         <if test="valueId !=null and valueId != ''">
             and t.value_id= #{valueId}
@@ -88,6 +91,9 @@
         <if test="domain !=null and domain != ''">
             and spec.domain= #{domain}
         </if>
+        <if test="specCd !=null and specCd != ''">
+            and spec.spec_cd= #{specCd}
+        </if>
         <if test="valueId !=null and valueId != ''">
             and t.value_id= #{valueId}
         </if>
@@ -97,8 +103,8 @@
         <if test="valueShow !=null and valueShow != ''">
             and t.value_show= #{valueShow}
         </if>
-        <if test="specCd !=null and specCd != ''">
-            and t.spec_cd= #{specCd}
+        <if test="specId !=null and specId != ''">
+            and t.spec_id= #{specId}
         </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}

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

@@ -70,6 +70,7 @@ public class AttrSpecApi {
     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");
@@ -96,7 +97,7 @@ public class AttrSpecApi {
     @RequestMapping(value = "/deleteAttrSpec", method = RequestMethod.POST)
     public ResponseEntity<String> deleteAttrSpec(@RequestBody JSONObject reqJson) {
 
-        Assert.hasKeyAndValue(reqJson, "specCd", "specCd不能为空");
+        Assert.hasKeyAndValue(reqJson, "specId", "specId不能为空");
 
 
         AttrSpecPo attrSpecPo = BeanConvertUtil.covertBean(reqJson, AttrSpecPo.class);
@@ -114,6 +115,7 @@ public class AttrSpecApi {
     @RequestMapping(value = "/queryAttrSpec", method = RequestMethod.GET)
     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,
@@ -127,6 +129,7 @@ public class AttrSpecApi {
         attrSpecDto.setSpecCd(specCd);
         attrSpecDto.setSpecName(specName);
         attrSpecDto.setDomain(domain);
+        attrSpecDto.setSpecId(specId);
         return getAttrSpecBMOImpl.get(attrSpecDto);
     }
 }

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

@@ -43,7 +43,7 @@ public class AttrValueApi {
     @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 @@ public class AttrValueApi {
     @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,7 +106,8 @@ public class AttrValueApi {
      * 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,
@@ -122,6 +123,7 @@ public class AttrValueApi {
         attrValueDto.setValueName(valueName);
         attrValueDto.setValueShow(valueShow);
         attrValueDto.setDomain(domain);
+        attrValueDto.setSpecId(specId);
         return getAttrValueBMOImpl.get(attrValueDto);
     }
 }

service-common/src/main/java/com/java110/common/bmo/attrSpec/impl/SaveAttrSpecBMOImpl.java

@@ -5,6 +5,7 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.common.IAttrSpecInnerServiceSMO;
 import com.java110.po.attrSpec.AttrSpecPo;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -24,8 +25,10 @@ public class SaveAttrSpecBMOImpl implements ISaveAttrSpecBMO {
      */
     @Java110Transactional
     public ResponseEntity<String> save(AttrSpecPo attrSpecPo) {
-
-        attrSpecPo.setSpecCd(GenerateCodeFactory.getSpecCd());
+        attrSpecPo.setSpecId(GenerateCodeFactory.getGeneratorId("11"));
+        if(StringUtil.isEmpty(attrSpecPo.getSpecCd())) {
+            attrSpecPo.setSpecCd(GenerateCodeFactory.getSpecCd());
+        }
         int flag = attrSpecInnerServiceSMOImpl.saveAttrSpec(attrSpecPo);
 
         if (flag > 0) {