修改上传的格式

src/main/java/com/qlm/controller/jinzai/ProductController.java

@@ -39,14 +39,11 @@ public class ProductController extends CommonController{
 	public void getProduceData(){
 		JSONObject obj = new JSONObject();
 		
-		List<Record> t_jz_productList = Db.find("select * from t_jz_product");
-	
-		List<Record> t_jz_product_typeList = Db.find("select * from t_jz_product_type");
+		List<Record> t_jz_productList = Db.find("SELECT i.sku,i.kouwei,p.product_name,i.id,i.product_id,p.xiang_num,p.tuo_num from t_jz_item i left join t_jz_product p on (i.product_id = p.id) where p.line_on = 1");
 	
 		
 		obj.put("products", t_jz_productList);
 		
-		obj.put("types", t_jz_product_typeList);
 		
 		renderJson(obj);
 	}

src/main/java/com/qlm/service/UploadService.java

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -45,6 +46,9 @@ public class UploadService {
 			}
 		}
 		Set<Entry<String,JSONObject>> entrySet = masterMap.entrySet();
+		List<Record> find = Db.find("SELECT i.sku,i.kouwei,p.product_name,i.id,i.product_id from t_jz_item i left join t_jz_product p on (i.product_id = p.id)");
+		
+		Map<String, Record> skuMap = find.stream().collect(Collectors.toMap(r->r.getStr("sku"), r->r));
 		
 		for (Entry<String, JSONObject> entry : entrySet) {
 			String master = entry.getKey();
@@ -52,17 +56,23 @@ public class UploadService {
 			String addTime = jsonObject.getString("g");
 			String duoma = jsonObject.getString("t");
 			String taskNo = jsonObject.getString("s");
-			String kouwei = jsonObject.getString("k");
-			String pinxiang = jsonObject.getString("p");
+			String sku = jsonObject.getString("k");
 			String productDate = jsonObject.getString("d");
 			
 			String banzu = jsonObject.getString("b");
 			Record masterInfo = new Record();
 			
-			
+			Record record = skuMap.get(sku);
+			String pinXiang = "";
+			String kouwei = "";
+			if(record != null){
+				pinXiang = record.getStr("product_name");
+				kouwei = record.getStr("kouwei");
+			}
 			masterInfo.set("id", master).set("create_time", new Date()).set("produce_date", productDate)
 			.set("duo_code", duoma).set("device_no", deviceId).set("guo_time", addTime)
-			.set("pinxiang", pinxiang).set("kouwei", kouwei).set("task_no", taskNo).set("banzu", banzu);
+			.set("pinxiang", pinXiang).set("kouwei", kouwei).set("sku", sku).set("task_no", taskNo).set("banzu", banzu);
+			
 			xiangList.add(masterInfo);
 		}