获取IMEI添加KEYID和HashValue字段

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

@@ -622,6 +622,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String oID1 = "";
 		String oID2 = "";
 		String oID3 = "";
+		String oKeyID = "";
+		String oHashValue = "";
 		if(map.get("iSN")==null){
 			oErrMessage = "SN不能为空";
 			rmap.put("oErrMessage",oErrMessage);
@@ -635,12 +637,12 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 		iSN=map.get("iSN").toString();
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut(Master+".CS_GETIMEIORNETCODERANGE", new Object[]{
+		list = baseDao.callProcedureWithOut(Master+".CS_GETIMEIORNETCODERANGE_T", new Object[]{
 				String.valueOf(iSN),
 				String.valueOf(""),
 				String.valueOf(oIMEI1),
 				String.valueOf(oNetCode),
-		}, new Integer[]{1,2,3,4}, new Integer[]{5,6,7,8,9,10,11,12,13,14});
+		}, new Integer[]{1,2,3,4}, new Integer[]{5,6,7,8,9,10,11,12,13,14,15,16});
 		oIMEI1 = list.get(0);
 		oIMEI2 =  list.get(1);
 		oMEID =  list.get(3);
@@ -649,7 +651,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 		oID1 =  list.get(6);
 		oID2 =  list.get(7);
 		oID3 =  list.get(8);
-		oErrMessage= list.get(9);
+		oKeyID =  list.get(9);
+		oHashValue =  list.get(10);
+		oErrMessage= list.get(11);
 		if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null"){
 			rmap.put("oIMEI1",oIMEI1);
 			rmap.put("oIMEI2",oIMEI2);
@@ -659,6 +663,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 			rmap.put("oID1",oID1);
 			rmap.put("oID2",oID2);
 			rmap.put("oID3",oID3);
+			rmap.put("oKeyID",oKeyID);
+			rmap.put("oHashValue",oHashValue);
 		}
 		else
 			rmap.put("oErrMessage",oErrMessage);
@@ -678,6 +684,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String oID1 = "";
 		String oID2 = "";
 		String oID3 = "";
+		String oKeyID = "";
+		String oHashValue = "";
 		if(map.get("iSN")==null){
 			oErrMessage = "SN不能为空";
 			rmap.put("oErrMessage",oErrMessage);
@@ -691,12 +699,12 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 		iSN=map.get("iSN").toString();
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut(Master+".CS_GETIMEIORNETCODERANGEBYPO", new Object[]{
+		list = baseDao.callProcedureWithOut(Master+".CS_GETIMEIORNETCODERANGEBYPO_T", new Object[]{
 				String.valueOf(iSN),
 				String.valueOf(""),
 				String.valueOf(oIMEI1),
 				String.valueOf(oNetCode),
-		}, new Integer[]{1,2,3,4}, new Integer[]{5,6,7,8,9,10,11,12,13,14});
+		}, new Integer[]{1,2,3,4}, new Integer[]{5,6,7,8,9,10,11,12,13,14,15,16});
 		oIMEI1 = list.get(0);
 		oIMEI2 =  list.get(1);
 		oMEID =  list.get(3);
@@ -705,7 +713,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 		oID1 =  list.get(6);
 		oID2 =  list.get(7);
 		oID3 =  list.get(8);
-		oErrMessage= list.get(9);
+		oKeyID =  list.get(9);
+		oHashValue =  list.get(10);
+		oErrMessage= list.get(11);
 		if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null"){
 			rmap.put("oIMEI1",oIMEI1);
 			rmap.put("oIMEI2",oIMEI2);
@@ -715,6 +725,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 			rmap.put("oID1",oID1);
 			rmap.put("oID2",oID2);
 			rmap.put("oID3",oID3);
+			rmap.put("oKeyID",oKeyID);
+			rmap.put("oHashValue",oHashValue);
 		}
 		else
 			rmap.put("oErrMessage",oErrMessage);