MES Dll的Web接口开发完成

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

@@ -10,6 +10,8 @@ import com.uas.eis.sdk.entity.ApiResult;
 import com.uas.eis.service.MESDataService;
 import com.uas.eis.service.MESHelperService;
 import com.uas.eis.utils.*;
+import net.sf.json.JSONObject;
+import net.sf.json.JsonConfig;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -44,6 +46,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			throw new ApiSystemException(new ApiResult(ErrorMessage.BUSINESS_DATAILLEGAL,requestId));
 		}
 		String type = map.get("type").toString();
+		JSONObject json = JSONObject.fromObject(map.get("detail"));
 		HelperType helperType = HelperType.getTypeByCode(type);
 		if(null == helperType){
 			throw new ApiSystemException(new ApiResult(ErrorMessage.BUSINESS_TYPEILLEGAL,requestId));
@@ -53,40 +56,40 @@ public class MESHelperServiceImpl implements MESHelperService {
 		Map<Object, Object> remap = new HashMap<Object, Object>();
 		switch(helperType){
 			case CheckRoutePassed:
-				remap = CheckRoutePassed(map.get("detail"));
+				remap = CheckRoutePassed(json);
 				break;
 			case CheckUserAndResourcePassed:
-				remap = CheckUserAndResourcePassed(map.get("detail"));
+				remap = CheckUserAndResourcePassed(json);
 				break;
 			case GetAddressRangeByMO:
-				remap = GetAddressRangeByMO(map.get("detail"));
+				remap = GetAddressRangeByMO(json);
 				break;
 			case GetMEIOrNetCodeRange:
-				remap = GetMEIOrNetCodeRange(map.get("detail"));
+				remap = GetMEIOrNetCodeRange(json);
 				break;
 			case GetRcardMOInfo:
-				remap = GetRcardMOInfo(map.get("detail"));
+				remap = GetRcardMOInfo(json);
 				break;
 			case GetMobileAllInfo:
-				remap = GetMobileAllInfo(map.get("detail"));
+				remap = GetMobileAllInfo(json);
 				break;
 			case SetAddressInfo:
-				remap = SetAddressInfo(map.get("detail"));
+				remap = SetAddressInfo(json);
 				break;
 			case GetMaster:
-				remap = GetMaster(map.get("detail"));
+				remap = GetMaster(json);
 				break;
 			case SetMobileData:
-				remap = SetMobileData(map.get("detail"));
+				remap = SetMobileData(json);
 				break;
 			case SetIMEIInfo:
-				remap = SetIMEIInfo(map.get("detail"));
+				remap = SetIMEIInfo(json);
 				break;
 			case SetTestDetail:
-				remap = SetTestDetail(map.get("detail"));
+				remap = SetTestDetail(json);
 				break;
 			case SetPcbaData:
-				remap = SetPcbaData(map.get("detail"));
+				remap = SetPcbaData(json);
 				break;
 			default:
 				err = -1;
@@ -99,8 +102,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return remap;
 	}
 
-	private Map<Object,Object> CheckRoutePassed(Object data){
-		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data.toString());
+	private Map<Object,Object> CheckRoutePassed(JSONObject map){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String iSN=map.get("iSN").toString();
@@ -136,8 +138,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> CheckUserAndResourcePassed(Object data){
-		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data.toString());
+	private Map<Object,Object> CheckUserAndResourcePassed(JSONObject map){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage = null;
@@ -201,8 +202,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		rmap.put("oErrMessage",oErrMessage);
 		return rmap;
 	}
-	private Map<Object,Object> GetAddressRangeByMO(Object data){
-		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data.toString());
+	private Map<Object,Object> GetAddressRangeByMO(JSONObject map){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String iSN="";
@@ -219,7 +219,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 		iSN=map.get("iSN").toString();
 		//判断工单是否归属
-		Map<Object, Object> map3=new HashMap<>();
+		JSONObject map3=new JSONObject();
 		map3.put("iSN",iSN);
 		Map<Object, Object> map2=GetRcardMOInfo(map3);
 		if(map2.get("oErrMessage")!=null){
@@ -250,8 +250,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> GetMEIOrNetCodeRange(Object data){
-		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data.toString());
+	private Map<Object,Object> GetMEIOrNetCodeRange(JSONObject map){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String iSN="";
@@ -312,8 +311,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> GetRcardMOInfo(Object data){
-		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data.toString());
+	private Map<Object,Object> GetRcardMOInfo(JSONObject map){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		//取MakeProcess表中的执行记录ID最大的一个工单的号码
@@ -352,8 +350,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> GetMobileAllInfo(Object data){
-		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data.toString());
+
+
+	private Map<Object,Object> GetMobileAllInfo(JSONObject map){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String iSN="";
@@ -426,53 +425,51 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> SetAddressInfo(Object data){
-		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data.toString());
+	private Map<Object,Object> SetAddressInfo(JSONObject map){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
-		String oErrMessage = "";
+		String oErrMessage = null;
 		if(map.get("iSN")==null){
 			oErrMessage = "SN不能为空";
 			rmap.put("oErrMessage",oErrMessage);
 			return rmap;
 		}
 		String iSN=map.get("iSN").toString();
-		String Mac = null;
-		String Bt = null;
-		String Code1 = null;
-		String Code2 = null;
-		String Code3 = null;
+		String iWIFI = null;
+		String iBT = null;
+		String iCode1 = null;
+		String iCode2 = null;
+		String iCode3 = null;
 		if(map.get("iWIFI")!=null){
-			Mac=map.get("iWIFI").toString();
+			iWIFI=map.get("iWIFI").toString();
 		}
 		if(map.get("iBT")!=null){
-			Mac=map.get("iBT").toString();
+			iBT=map.get("iBT").toString();
 		}
 		if(map.get("iCode1")!=null){
-			Mac=map.get("iCode1").toString();
+			iCode1=map.get("iCode1").toString();
 		}
 		if(map.get("iCode2")!=null){
-			Mac=map.get("iCode2").toString();
+			iCode2=map.get("iCode2").toString();
 		}
 		if(map.get("iCode3")!=null){
-			Mac=map.get("iCode3").toString();
+			iCode3=map.get("iCode3").toString();
 		}
 		List<String> list = new ArrayList<String>();
 		list = baseDao.callProcedureWithOut("CS_SETADDRESSINFO", new Object[]{
 				String.valueOf(iSN),
-				String.valueOf(Mac),
-				String.valueOf(Bt),
-				String.valueOf(Code1),
-				String.valueOf(Code2),
-				String.valueOf(Code3)
+				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});
 		oErrMessage = list.get(0);
 		rmap.put("oErrMessage",oErrMessage);
 		return rmap;
 	}
 
-	private Map<Object,Object> GetMaster(Object data){
-		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data.toString());
+	private Map<Object,Object> GetMaster(JSONObject map){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		SqlRowList rs=baseDao.queryForRowSet("select ma_user from mes.master");
@@ -483,11 +480,10 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> SetMobileData(Object data){
-		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data.toString());
+	private Map<Object,Object> SetMobileData(JSONObject map){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
-		String oErrMessage = "";
+		String oErrMessage = null;
 		if(map.get("iSN")==null||map.get("iTSN")==null){
 			oErrMessage = "SN不能为空";
 			rmap.put("oErrMessage",oErrMessage);
@@ -516,7 +512,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			iErrCode=map.get("iErrCode").toString();
 		}
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_SETADDRESSINFO", new Object[]{
+		list = baseDao.callProcedureWithOut("CS_DLLSNCHANGE", new Object[]{
 				String.valueOf(iTSN),
 				String.valueOf(iSN),
 				String.valueOf(iSourceCode),
@@ -528,11 +524,10 @@ public class MESHelperServiceImpl implements MESHelperService {
 		rmap.put("oErrMessage",oErrMessage);
 		return rmap;
 	}
-	private Map<Object,Object> SetIMEIInfo(Object data){
-		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data.toString());
+	private Map<Object,Object> SetIMEIInfo(JSONObject map){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
-		String oErrMessage = "";
+		String oErrMessage = null;
 		if(map.get("iSN")==null){
 			oErrMessage = "SN不能为空";
 			rmap.put("oErrMessage",oErrMessage);
@@ -572,7 +567,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			iID3=map.get("iID3").toString();
 		}
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_SETADDRESSINFO", new Object[]{
+		list = baseDao.callProcedureWithOut("CS_SETIMEIINFO", new Object[]{
 				String.valueOf(iSN),
 				String.valueOf(iIMEI1),
 				String.valueOf(iIMEI2),
@@ -588,8 +583,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		rmap.put("oErrMessage",oErrMessage);
 		return rmap;
 	}
-	private Map<Object,Object> SetTestDetail(Object data){
-		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data.toString());
+	private Map<Object,Object> SetTestDetail(JSONObject map){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage=null;
@@ -615,31 +609,31 @@ public class MESHelperServiceImpl implements MESHelperService {
 		if(map.get("iTestDetail")!=null){
 			iTestDetail=map.get("iTestDetail").toString();
 		}
-		Map<Object, Object> map3=new HashMap<>();
+		JSONObject map3=new JSONObject();
 		map3.put("iSN",iSN);
 		Map<Object, Object> map2=GetRcardMOInfo(map3);
 		String omakeCode = "";
 		StringBuffer sql=new StringBuffer();
 		String[] name=iClassName.split("\\|");
+		String[] result=iTestResult.split("\\|");
 		String[] value=iTestDetail.split("\\|");
-		if(name.length!=value.length){
+		if(name.length!=value.length||name.length!=result.length){
 			rmap.put("oErrMessage","测试项目名称和值的项次不一致");
 			return rmap;
 		}
 		for (int i=0;i<name.length;i++){
 			sql.setLength(0);
 			sql.append("Insert into STEPTESTDETAIL (STD_ID,STD_CLASS,STD_SN,STD_MAKECODE,STD_ACTUALVALUE,STD_TESTRESULT,STD_INDATE,STD_RESCODE)");
-			sql.append("values(STEPTESTDETAIL_SEQ.nextval,'"+name[i]+"','" + iSN + "','" + map2.get("oMoCode") + "','" + value[i] + "','" + iTestResult + "',sysdate,'" + iResCode + "')");
+			sql.append("values(STEPTESTDETAIL_SEQ.nextval,'"+name[i]+"','" + iSN + "','" + map2.get("oMoCode") + "','" + value[i] + "','" + result[i] + "',sysdate,'" + iResCode + "')");
 			baseDao.execute(sql.toString());
 		}
 		return rmap;
 	}
 
-	private Map<Object,Object> SetPcbaData(Object data){
-		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data.toString());
+	private Map<Object,Object> SetPcbaData(JSONObject map){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
-		String oErrMessage = "";
+		String oErrMessage = null;
 		if(map.get("iSN")==null){
 			oErrMessage = "SN不能为空";
 			rmap.put("oErrMessage",oErrMessage);
@@ -662,12 +656,15 @@ public class MESHelperServiceImpl implements MESHelperService {
 		if(map.get("iErrCode")!=null){
 			iErrCode=map.get("iErrCode").toString();
 		}
-		String oMakeCode = "";
-		Map<Object, Object> map3=new HashMap<>();
+		JSONObject map3=new JSONObject();
 		map3.put("iSN",iSN);
 		Map<Object, Object> map2=GetRcardMOInfo(map3);
+		String oMoCode=null;
+		if(map2.get("oMoCode")!=null){
+			oMoCode=map2.get("oMoCode").toString();
+		}
 		if (map2.get("oErrMessage")==null)
-			return SetStepFinish(oMakeCode, iResCode, iSN, "", iResult, iOperator, iErrCode);
+			return SetStepFinish(oMoCode, iResCode, iSN, "", iResult, iOperator, iErrCode);
 		return rmap;
 	}
 
@@ -698,10 +695,10 @@ public class MESHelperServiceImpl implements MESHelperService {
 
 	public Map<Object,Object> SetStepFinish(String iMakeCode, String iSourceCode, String iSN, String iMPKind, String iResult, String iUserCode, String iErrCode)
 	{
-		String oErrMessage = "";
+		String oErrMessage = null;
 		String StepCode = baseDao.getFieldDataByCondition("Makeserial", "ms_stepcode", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'").toString();
 		String CurrentStep = GetStepCodeBySource(iSourceCode);
-		String BgCode = baseDao.getFieldDataByCondition("step", "st_badgroupcode", "st_code='" + CurrentStep + "'").toString();
+		Object BgCode = baseDao.getFieldDataByCondition("step", "st_badgroupcode", "st_code='" + CurrentStep + "'");
 		Map<Object, Object> rmap = new HashMap<>();
 		switch (iResult)
 		{
@@ -726,7 +723,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 						sql.append("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,mb_indate,mb_stepcode");
 						sql.append(",mb_sourcecode,mb_badcode,mb_badtable,mb_bgcode,mb_soncode,mb_status) select '" + mb_id + "'");
 						sql.append(",ma_code,ms_code,ms_sncode,'" + iUserCode + "',sysdate,'" + CurrentStep + "','" + iSourceCode + "',:bc_code,'',");
-						sql.append("'" + BgCode + "',sp_soncode,'0' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
+						sql.append("'" + BgCode!=null?BgCode:"" + "',sp_soncode,'0' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
 						sql.append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
 						baseDao.execute(sql.toString().replace(":bc_code", "'" + BadCode[i] + "'"));
 					}
@@ -764,13 +761,12 @@ public class MESHelperServiceImpl implements MESHelperService {
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage=null;
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_SETADDRESSINFO", new Object[]{
+		list = baseDao.callProcedureWithOut("CS_SETSTEPRESULT", new Object[]{
 				String.valueOf(iMakeCode),
 				String.valueOf(iSourceCode),
 				String.valueOf(iSN),
 				String.valueOf(iUserCode),
 				String.valueOf(iResult),
-
 		}, new Integer[]{1, 2, 3, 4, 5}, new Integer[]{6});
 		oErrMessage = list.get(0);
 		rmap.put("oErrMessage",oErrMessage);