【慧眼EIS，查询接口调整】

src/main/java/com/uas/eis/controller/QueryController.java

@@ -6,7 +6,6 @@ import java.util.Map;
 
 import com.uas.eis.sdk.entity.ApiResult;
 import org.springframework.beans.factory.annotation.Autowired;
-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.RestController;
@@ -47,8 +46,8 @@ public class QueryController {
 	}
 
 	//http://xx.xx.xx.xx:xxx/api/ItemCode/getAssemblyInfo?partcode=xxx&materialcode=xxxx&proname=xxx&ver=1.0
-	@RequestMapping(value = "/ItemCode/getAssemblyInfo" , method = RequestMethod.GET)
-	public ApiResult<List<Map<String,Object>>> getAssemblyInfo(HttpServletRequest request, String partcode,String materialcode,String proname,String ver){
-		return queryService.getAssemblyInfo(partcode,materialcode,proname,ver);
+	@RequestMapping(value = "/ItemCode/getItemCode" )
+	public Map<String,Object> getItemCode(HttpServletRequest request, String partcode, String materialcode, String proname, String ver){
+		return queryService.getItemCode(partcode,materialcode,proname,ver);
 	}
 }

src/main/java/com/uas/eis/service/QueryService.java

@@ -1,6 +1,7 @@
 package com.uas.eis.service;
 
 import com.uas.eis.sdk.entity.ApiResult;
+import com.uas.eis.sdk.entity.StepWorkApiResult;
 
 import java.util.List;
 import java.util.Map;
@@ -19,5 +20,5 @@ public interface QueryService {
 
 	ApiResult<List<Map<String,Object>>> getMakeProcess(String accessKey, String requestId, String macode);
 
-    ApiResult<List<Map<String, Object>>> getAssemblyInfo(String partcode, String materialcode, String proname, String ver);
+	Map<String,Object> getItemCode(String partcode, String materialcode, String proname, String ver);
 }

src/main/java/com/uas/eis/serviceImpl/QueryServiceImpl.java

@@ -15,7 +15,9 @@ import com.uas.eis.entity.*;
 import com.uas.eis.exception.ApiSystemException;
 import com.uas.eis.exception.SystemException;
 import com.uas.eis.sdk.entity.ApiResult;
+import com.uas.eis.sdk.entity.StepWorkApiResult;
 import com.uas.eis.sdk.resp.ApiResponse;
+import com.uas.eis.sdk.resp.StepWorkApiResponse;
 import com.uas.eis.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
@@ -309,10 +311,30 @@ public class QueryServiceImpl implements QueryService {
 	}
 
 	@Override
-	public ApiResult<List<Map<String, Object>>> getAssemblyInfo(String partcode, String materialcode, String proname, String ver) {
+	public Map<String,Object> getItemCode(String partcode, String materialcode, String proname, String ver) {
 		String data = "partcode:"+partcode+",materialcode:"+materialcode+",proname:"+proname+",ver:"+ver;
-		baseDao.execute("insert into eisquerydata(ed_id,ed_data,ed_type) SELECT eisquerydata_SEQ.NEXTVAL,?,? FROM DUAL",data,"getAssemblyInfo");
-		return ApiResponse.successRsp("0","requestId","成功"+data);
+		baseDao.execute("insert into eisquerydata(ed_id,ed_data,ed_type) SELECT eisquerydata_SEQ.NEXTVAL,?,? FROM DUAL",data,"getItemCode");
+		Map<String,Object> map = new HashMap<>();
+		Map<String,Object> map1 = new HashMap<>();
+		map1.put("msg","成功");
+		map1.put("code","0000");
+		map.put("code",map1);
+		Map<String,Object> map2 = new HashMap<>();
+		map2.put("itemName","IP Camera|高清智能摄像头");
+		map2.put("itemCode","060020300406");
+		map2.put("bomVersion","1.0");
+		map.put("bo",map2);
+		return map;
+		/*{
+			"code" : {
+			"msg": "成功",
+					"code": "0000"
+		},
+			"bo": {
+			"itemName": "IP Camera|高清智能摄像头",
+					"itemCode": "060020300406",
+					"bomVersion": "1.0"
+		}}*/
 	}
 
 	private String checkAccessKey(String accessKey,String requestId){