修改接口参数传参

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

@@ -64,79 +64,79 @@ public class MESHelperServiceImpl implements MESHelperService {
 		Map<Object, Object> remap = new HashMap<Object, Object>();
 		switch(helperType){
 			case CheckRoutePassed:
-				remap = CheckRoutePassed(json);
+				remap = CheckRoutePassed(json,AE_MASTER);
 				break;
 			case CheckUserAndResourcePassed:
-				remap = CheckUserAndResourcePassed(json);
+				remap = CheckUserAndResourcePassed(json,AE_MASTER);
 				break;
 			case GetAddressRangeByMO:
-				remap = GetAddressRangeByMO(json);
+				remap = GetAddressRangeByMO(json,AE_MASTER);
 				break;
 			case GetMEIOrNetCodeRange:
-				remap = GetMEIOrNetCodeRange(json);
+				remap = GetMEIOrNetCodeRange(json,AE_MASTER);
 				break;
 			case GetRcardMOInfo:
-				remap = GetRcardMOInfo(json);
+				remap = GetRcardMOInfo(json,AE_MASTER);
 				break;
 			case GetMobileAllInfo:
-				remap = GetMobileAllInfo(json);
+				remap = GetMobileAllInfo(json,AE_MASTER);
 				break;
 			case SetAddressInfo:
-				remap = SetAddressInfo(json);
+				remap = SetAddressInfo(json,AE_MASTER);
 				break;
 			case GetMaster:
-				remap = GetMaster(json);
+				remap = GetMaster(json,AE_MASTER);
 				break;
 			case SetMobileData:
-				remap = SetMobileData(json);
+				remap = SetMobileData(json,AE_MASTER);
 				break;
 			case SetIMEIInfo:
-				remap = SetIMEIInfo(json);
+				remap = SetIMEIInfo(json,AE_MASTER);
 				break;
 			case SetTestDetail:
-				remap = SetTestDetail(json);
+				remap = SetTestDetail(json,AE_MASTER);
 				break;
 			case SetPcbaData:
-				remap = SetPcbaData(json);
+				remap = SetPcbaData(json,AE_MASTER);
 				break;
 			case GetInfoByMaterial:
-				remap = GetInfoByMaterial(json);
+				remap = GetInfoByMaterial(json,AE_MASTER);
 				break;
 			case GetPCBABySN:
-				remap = GetPCBABySN(json);
+				remap = GetPCBABySN(json,AE_MASTER);
 				break;
 			case GoMo:
-				remap = GoMo(json);
+				remap = GoMo(json,AE_MASTER);
 				break;
 			case GetMakeInfoBySN:
-				remap = GetMakeInfoBySN(json);
+				remap = GetMakeInfoBySN(json,AE_MASTER);
 				break;
 			case GetMakeInfoByProd:
-				remap = GetMakeInfoByProd(json);
+				remap = GetMakeInfoByProd(json,AE_MASTER);
 				break;
 			case GetProdInfo:
-				remap = GetProdInfo(json);
+				remap = GetProdInfo(json,AE_MASTER);
 				break;
 			case GetPSN:
-				remap = GetPSN(json);
+				remap = GetPSN(json,AE_MASTER);
 				break;
 			case GetMakeRelation:
-				remap = GetMakeRelation(json);
+				remap = GetMakeRelation(json,AE_MASTER);
 				break;
 			case GetFeeReason:
-				remap = GetFeeReason(json);
+				remap = GetFeeReason(json,AE_MASTER);
 				break;
 			case GetMakeSN:
-				remap = GetMakeSN(json);
+				remap = GetMakeSN(json,AE_MASTER);
 				break;
 			case SetFeeReason:
-				remap = SetFeeReason(json);
+				remap = SetFeeReason(json,AE_MASTER);
 				break;
 			case WriteMakeInfo:
-				remap = WriteMakeInfo(json);
+				remap = WriteMakeInfo(json,AE_MASTER);
 				break;
 			case GetMakeInfo:
-				remap = GetMakeInfo(json);
+				remap = GetMakeInfo(json,AE_MASTER);
 				break;
 			default:
 				err = -1;
@@ -175,7 +175,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return arr;
 	}
 
-	private Map<Object,Object> GetMakeInfo(JSONObject map){
+	private Map<Object,Object> GetMakeInfo(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iSN=null;
 		String oErrMessage=null;
@@ -206,7 +206,7 @@ public class MESHelperServiceImpl implements MESHelperService {
     }*/
 	}
 
-	private Map<Object,Object> WriteMakeInfo(JSONObject map){
+	private Map<Object,Object> WriteMakeInfo(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String oErrMessage=null;
 		if(map.get("iMakeCode")==null){
@@ -243,7 +243,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> GetMakeSN(JSONObject map){
+	private Map<Object,Object> GetMakeSN(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		List<Map<String, Object>> maps = new ArrayList<>();
 		String ma_custname="";
@@ -279,7 +279,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> GetFeeReason(JSONObject map){
+	private Map<Object,Object> GetFeeReason(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String oErrMessage="";
 		if(map.get("CT_ID")==null){
@@ -301,7 +301,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 	}
 
-	private Map<Object,Object> SetFeeReason(JSONObject map){
+	private Map<Object,Object> SetFeeReason(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String formstore=map.get("data").toString();
 		Map<Object, Object> gstore = BaseUtil.parseFormStoreToMap(formstore);
@@ -310,7 +310,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return null;
 	}
 
-	private Map<Object,Object> GoMo(JSONObject map){
+	private Map<Object,Object> GoMo(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iSN=null;
 		String iResCode=null;
@@ -364,7 +364,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> GetPCBABySN(JSONObject map){
+	private Map<Object,Object> GetPCBABySN(JSONObject map,String Master){
 		Object AE_MASTER = baseDao.getFieldDataByCondition("APIEMPLOYEE", "AE_MASTER", "AE_KEY='" + accessKey1 + "'");
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iSN="";
@@ -386,7 +386,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> GetInfoByMaterial(JSONObject map){
+	private Map<Object,Object> GetInfoByMaterial(JSONObject map,String Master){
 		Object AE_MASTER = baseDao.getFieldDataByCondition("APIEMPLOYEE", "AE_MASTER", "AE_KEY='" + accessKey1 + "'");
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iPCBA=null;
@@ -417,7 +417,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> CheckRoutePassed(JSONObject map){
+	private Map<Object,Object> CheckRoutePassed(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String iSN=map.get("iSN").toString();
@@ -457,7 +457,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> CheckUserAndResourcePassed(JSONObject map){
+	private Map<Object,Object> CheckUserAndResourcePassed(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage = null;
@@ -521,7 +521,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		rmap.put("oErrMessage",oErrMessage);
 		return rmap;
 	}
-	private Map<Object,Object> GetAddressRangeByMO(JSONObject map){
+	private Map<Object,Object> GetAddressRangeByMO(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String iSN="";
@@ -572,7 +572,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> GetMEIOrNetCodeRange(JSONObject map){
+	private Map<Object,Object> GetMEIOrNetCodeRange(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String iSN="";
@@ -628,7 +628,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> GetRcardMOInfo(JSONObject map){
+	private Map<Object,Object> GetRcardMOInfo(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		//取MakeProcess表中的执行记录ID最大的一个工单的号码
@@ -670,7 +670,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 
 
 
-	private Map<Object,Object> GetMobileAllInfo(JSONObject map){
+	private Map<Object,Object> GetMobileAllInfo(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String iSN="";
@@ -743,7 +743,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> SetAddressInfo(JSONObject map){
+	private Map<Object,Object> SetAddressInfo(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage = null;
@@ -800,7 +800,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> GetMaster(JSONObject map){
+	private Map<Object,Object> GetMaster(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		SqlRowList rs=baseDao.queryForRowSet("select ma_user,AE_KEY,AE_SECRET from mes.master left join MES.APIEMPLOYEE B  on ma_user=ae_master");
@@ -811,7 +811,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> SetMobileData(JSONObject map){
+	private Map<Object,Object> SetMobileData(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage = null;
@@ -859,7 +859,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> SetIMEIInfo(JSONObject map){
+	private Map<Object,Object> SetIMEIInfo(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage = null;
@@ -919,7 +919,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> SetTestDetail(JSONObject map){
+	private Map<Object,Object> SetTestDetail(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage=null;
@@ -975,7 +975,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> SetPcbaData(JSONObject map){
+	private Map<Object,Object> SetPcbaData(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage = null;
@@ -1067,7 +1067,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 	}
 
-	private Map<Object,Object> GetMakeInfoBySN(JSONObject map)
+	private Map<Object,Object> GetMakeInfoBySN(JSONObject map,String Master)
 	{
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iSN=null;
@@ -1107,7 +1107,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 	}
 
-	private Map<Object,Object> GetPSN(JSONObject map){
+	private Map<Object,Object> GetPSN(JSONObject map,String Master){
 		String oErrMessage="";
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		if(map.get("iSN")==null){
@@ -1152,7 +1152,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 	}
 
-	private Map<Object,Object> GetMakeRelation(JSONObject map){
+	private Map<Object,Object> GetMakeRelation(JSONObject map,String Master){
 		String oErrMessage="";
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		if(map.get("iSN")==null){
@@ -1280,7 +1280,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 	}
 
-	private Map<Object,Object> GetProdInfo(JSONObject map){
+	private Map<Object,Object> GetProdInfo(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iSN=null;
 		String oErrMessage=null;
@@ -1306,7 +1306,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}*/
 	}
 
-	private Map<Object,Object> GetMakeInfoByProd(JSONObject map)
+	private Map<Object,Object> GetMakeInfoByProd(JSONObject map,String Master)
 	{
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iSN=null;