万利达接口修改

src/main/java/com/uas/eis/entity/HelperType.java

@@ -16,6 +16,7 @@ public enum HelperType {
     GetMaster("GetMaster","获取账套信息") ,//获取账套信息
     SetMobileData("SetMobileData","设置测试结果，结果必须为NG或者OK") ,//设置测试结果，结果必须为NG或者OK
     SetIMEIInfo("SetIMEIInfo","设置IMEI信息") ,//设置IMEI信息
+    SetIMEIInfo_NEW("SetIMEIInfo_NEW","设置IMEI信息") ,//设置IMEI信息
     SetTestDetail("SetTestDetail","设置测试结果") ,//设置测试结果
     SetPcbaData("SetPcbaData","检测XXX") ,//设置测试结果
     SetPcbaData_NG("SetPcbaData_NG","检测XXX") ,//设置测试结果

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

@@ -89,6 +89,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 			case SetIMEIInfo:
 				remap = SetIMEIInfo(json);
 				break;
+			case SetIMEIInfo_NEW:
+				remap = SetIMEIInfo_NEW(json);
+				break;
 			case SetTestDetail:
 				remap = SetTestDetail(json);
 				break;
@@ -879,6 +882,111 @@ public class MESHelperServiceImpl implements MESHelperService {
 		rmap.put("oErrMessage",oErrMessage);
 		return rmap;
 	}
+
+	private Map<Object,Object> SetIMEIInfo_NEW(JSONObject map){
+		//实际业务数据
+		Map<Object, Object> rmap = new HashMap<>();
+		String oErrMessage = null;
+		if(map.get("iSN")==null){
+			oErrMessage = "SN不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		String iSN=map.get("iSN").toString();
+		String iIMEI1=null;
+		String iIMEI2 = null;
+		String iIMEI3 = null;
+		String iMEID = null;
+		String iNET = null;
+		String iID1 = null;
+		String iID2 = null;
+		String iID3 = null;
+		String iUUID = null;
+		String iKEYID = null;
+		String iKEYPRODCODE = null;
+		String iCCID = null;
+		String iMSI = null;
+		String iSIM = null;
+		String iCARDCODE = null;
+		String iCORLID = null;
+		String iCPU = null;
+		if(map.get("iIMEI1")!=null){
+			iIMEI1=map.get("iIMEI1").toString();
+		}
+		if(map.get("iIMEI2")!=null){
+			iIMEI2=map.get("iIMEI2").toString();
+		}
+		if(map.get("iIMEI3")!=null){
+			iIMEI3=map.get("iIMEI3").toString();
+		}
+		if(map.get("iMEID")!=null){
+			iMEID=map.get("iMEID").toString();
+		}
+		if(map.get("iNET")!=null){
+			iNET=map.get("iNET").toString();
+		}
+		if(map.get("iID1")!=null){
+			iID1=map.get("iID1").toString();
+		}
+		if(map.get("iID2")!=null){
+			iID2=map.get("iID2").toString();
+		}
+		if(map.get("iID3")!=null){
+			iID3=map.get("iID3").toString();
+		}
+		if(map.get("iUUID")!=null){
+			iUUID=map.get("iUUID").toString();
+		}
+		if(map.get("iKEYID")!=null){
+			iKEYID=map.get("iKEYID").toString();
+		}
+		if(map.get("iKEYPRODCODE")!=null){
+			iKEYPRODCODE=map.get("iKEYPRODCODE").toString();
+		}
+		if(map.get("iCCID")!=null){
+			iCCID=map.get("iCCID").toString();
+		}
+		if(map.get("iMSI")!=null){
+			iMSI=map.get("iMSI").toString();
+		}
+		if(map.get("iSIM")!=null){
+			iSIM=map.get("iSIM").toString();
+		}
+		if(map.get("iCARDCODE")!=null){
+			iCARDCODE=map.get("iCARDCODE").toString();
+		}
+		if(map.get("iCORLID")!=null){
+			iCORLID=map.get("iCORLID").toString();
+		}
+		if(map.get("iCPU")!=null){
+			iCPU=map.get("iCPU").toString();
+		}
+		List<String> list = new ArrayList<String>();
+		list = baseDao.callProcedureWithOut("CS_SETIMEIINFO_NEW", new Object[]{
+				String.valueOf(iSN),
+				String.valueOf(iIMEI1),
+				String.valueOf(iIMEI2),
+				String.valueOf(iIMEI3),
+				String.valueOf(iMEID),
+				String.valueOf(iNET),
+				String.valueOf(""),
+				String.valueOf(iID1),
+				String.valueOf(iID2),
+				String.valueOf(iID3),
+				String.valueOf(iUUID),
+				String.valueOf(iKEYID),
+				String.valueOf(iKEYPRODCODE),
+				String.valueOf(iCCID),
+				String.valueOf(iMSI),
+				String.valueOf(iSIM),
+				String.valueOf(iCARDCODE),
+				String.valueOf(iCORLID),
+				String.valueOf(iCPU),
+		}, new Integer[]{1, 2, 3, 4, 5, 6,7,8,9,10,11,12,13,14,15,16,17,18,19}, new Integer[]{20});
+		oErrMessage = list.get(0);
+		rmap.put("oErrMessage",oErrMessage);
+		return rmap;
+	}
 	private Map<Object,Object> SetTestDetail(JSONObject map){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();