111

topsun-xt/src/main/webapp/biz/topsun/product/productDetail.js

@@ -162,7 +162,7 @@ var dataMapping = {
         "modulus" , "columnNum", "rowNum", "contactNum", "columnDoubleBlade", "rowDoubleBlade"
         , "dispatchMultiple", "sheetLength", "sheetWidth", "productSheetConf"
     ],
-    productFace: {
+    frontFace: {
         id: "productFaceId",
         columns: [ "productFaceId", "productImage" ]
     },
@@ -187,6 +187,7 @@ var dataMapping = {
 function faceGrid(elId, data) {
     var toolbarOptions = UICtrl.getDefaultToolbarOptions({
         addHandler: function(rawData){
+            debugger;
         },
         updateHandler: function(){
             updateHandler();
@@ -209,8 +210,8 @@ function faceGrid(elId, data) {
         enabledEdit: true,
         checkbox: true,
         usePager: false,
-        width: "100%",
-        height: 150,
+        width: "98%",
+        height: "100%",
         onBeforeEdit : function(editParm, gg) {
             console.log('original run onBeforeEdit()');
         },

topsun/src/main/java/com/huigou/topsun/product/application/impl/ProductApplicationImpl.java

@@ -174,6 +174,7 @@ public class ProductApplicationImpl implements ProductApplication {
         Product product = objectMapper.convertValue(newData.get("Product"), Product.class);
         ProductDetail productDetail = objectMapper.convertValue(newData.get("ProductDetail"), ProductDetail.class);
         ProductLooked productLooked = objectMapper.convertValue(newData.get("ProductLooked"), ProductLooked.class);
+        ProductFace productFace = objectMapper.convertValue(newData.get("frontFace"), ProductFace.class);
         ProductTechnology productTechnology = objectMapper.convertValue(newData.get("ProductTechnology"),
                 ProductTechnology.class);
         ProductPublishedConf productPublishedConf = objectMapper.convertValue(newData.get("ProductPublishedConf"),
@@ -198,6 +199,7 @@ public class ProductApplicationImpl implements ProductApplication {
         entitys.add(mergedMap);
         entitys.add(product);
         entitys.add(productDetail);
+        entitys.add(productFace);
         entitys.add(productLooked);
         entitys.add(productTechnology);
         entitys.add(productPublishedConf);
@@ -208,10 +210,13 @@ public class ProductApplicationImpl implements ProductApplication {
 
         entityManager.flush();
 
-        String str = null;
-        str.length();
+//        String str = null;
+//        str.length();
 
-        return null;
+        HashMap<String, Object>  map = new HashMap<>(5);
+        map.put("save", "ok");
+
+        return map;
     }
 
     @SuppressWarnings("unchecked")

topsun/src/main/java/com/huigou/topsun/product/domain/ProductFace.java

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.huigou.topsun.common.NumberToStringSerializer;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -35,7 +37,20 @@ public class ProductFace implements Serializable {
 	 */
 	@Column(name = "product_image", nullable = true, length = 512)
 	private String productImage;
-	
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+		ProductFace that = (ProductFace) o;
+		return new EqualsBuilder().append(productFaceId, that.productFaceId).append(productImage, that.productImage).isEquals();
+	}
+
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder(17, 37).append(productFaceId).append(productImage).toHashCode();
+	}
+
 	public BigDecimal getProductFaceId() {
 		return this.productFaceId;
 	}