贴片机接口调整

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

@@ -287,9 +287,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 
 		JSONObject object = JSONObject.fromObject(data);
-		Object object1 = object.get("data");
-		JSONObject obj = JSONObject.fromObject(object1);
-		JSONObject SetupResultDetail=obj.getJSONObject("SetupResultDetail");
+		JSONObject SetupResultDetail=object.getJSONObject("SetupResultDetail");
 		if(SetupResultDetail!=null){
 			String ActionType=SetupResultDetail.get("ActionType").toString();
 			String MessageSendTime=Time(SetupResultDetail.getString("MessageSendTime"));
@@ -376,9 +374,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 	public Map<Object,Object> StateEventDetail(String data) {
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		JSONObject object = JSONObject.fromObject(data);
-		Object object1 = object.get("data");
-		JSONObject obj = JSONObject.fromObject(object1);
-		JSONObject StateEventDetail=obj.getJSONObject("StateEventDetail");
+		JSONObject StateEventDetail=object.getJSONObject("StateEventDetail");
 		if(StateEventDetail!=null){
 			int st_id=baseDao.getSeqId("StateEventDetail_seq");
 			String MessageSendTime=Time(StateEventDetail.getString("MessageSendTime"));
@@ -433,9 +429,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 	public Map<Object,Object> SendPlaceData(String data) {
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		JSONObject object = JSONObject.fromObject(data);
-		Object object1 = object.get("data");
-		JSONObject obj = JSONObject.fromObject(object1);
-		JSONObject PlacedDataDetail=obj.getJSONObject("PlacedDataDetail");
+		JSONObject PlacedDataDetail=object.getJSONObject("PlacedDataDetail");
 		if(PlacedDataDetail!=null){
 			int pd_id=baseDao.getSeqId("PlacedDataDetail_seq");
 			String MESSAGESENDTIME=Time(PlacedDataDetail.getString("MessageSendTime"));
@@ -528,9 +522,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		Integer td_id=baseDao.getSeqId("TRACEDATA_seq");
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		JSONObject object = JSONObject.fromObject(data);
-		Object object1 = object.get("data");
-		JSONObject obj = JSONObject.fromObject(object1);
-		JSONObject TraceabilityDataDetail=obj.getJSONObject("TraceabilityDataDetail");
+		JSONObject TraceabilityDataDetail=object.getJSONObject("TraceabilityDataDetail");
 		if(TraceabilityDataDetail!=null){
 			String DateBegin=Time(TraceabilityDataDetail.get("DateBegin").toString());
 			String DateCompleted=Time(TraceabilityDataDetail.get("DateCompleted").toString());