添加5G和ETHMAC接口

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

@@ -723,6 +723,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String iCode1 = null;
 		String iCode2 = null;
 		String iCode3 = null;
+		String MAC5G=null;
+		String ETHMAC=null;
 		if(map.get("iWIFI")!=null){
 			iWIFI=map.get("iWIFI").toString();
 		}
@@ -738,15 +740,23 @@ public class MESHelperServiceImpl implements MESHelperService {
 		if(map.get("iCode3")!=null){
 			iCode3=map.get("iCode3").toString();
 		}
+		if(map.get("iMac5G")!=null){
+			MAC5G=map.get("iMac5G").toString();
+		}
+		if(map.get("iEthMac")!=null){
+			ETHMAC=map.get("iEthMac").toString();
+		}
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_SETADDRESSINFO", new Object[]{
+		list = baseDao.callProcedureWithOut("CS_SETADDRESSINFO_TOOL", new Object[]{
 				String.valueOf(iSN),
 				String.valueOf(iWIFI),
 				String.valueOf(iBT),
 				String.valueOf(iCode1),
 				String.valueOf(iCode2),
 				String.valueOf(iCode3)
-		}, new Integer[]{1, 2, 3, 4, 5, 6}, new Integer[]{7});
+				String.valueOf(MAC5G)
+				String.valueOf(ETHMAC)
+		}, new Integer[]{1, 2, 3, 4, 5, 6,7,8}, new Integer[]{9});
 		oErrMessage = list.get(0);
 		rmap.put("oErrMessage",oErrMessage);
 		return rmap;