Pārlūkot izejas kodu

添加时间戳接口

callm 1 nedēļu atpakaļ
vecāks
revīzija
9c1bf8a532

+ 0 - 7
src/main/java/com/uas/eis/controller/MESHelperController.java

@@ -98,13 +98,6 @@ public class MESHelperController {
         return map;
         return map;
     }
     }
 
 
-    @RequestMapping(value="/GetTimeSpan")
-    public Map<Object,Object> GetTimeSpan(HttpServletRequest request,  @RequestBody String json){
-        Map<String, Object> modelMap = new HashMap<String, Object>();
-        Map<Object,Object> map = mesHelperService.GetTimeSpan(json);
-        return map;
-    }
-
     //SPI接口
     //SPI接口
     @RequestMapping(value="/SPI")
     @RequestMapping(value="/SPI")
     public Map<Object,Object> SPI(HttpServletRequest request,  @RequestBody String json){
     public Map<Object,Object> SPI(HttpServletRequest request,  @RequestBody String json){

+ 1 - 0
src/main/java/com/uas/eis/entity/HelperType.java

@@ -19,6 +19,7 @@ public enum HelperType {
     SetPcbaData("SetPcbaData","检测XXX") ,//设置测试结果
     SetPcbaData("SetPcbaData","检测XXX") ,//设置测试结果
     GoMo("GoMo","检测XXX") ,//序列号归属工单
     GoMo("GoMo","检测XXX") ,//序列号归属工单
     GetInfoByMaterial("GetInfoByMaterial","根据上料信息获取到SN相关信息"),
     GetInfoByMaterial("GetInfoByMaterial","根据上料信息获取到SN相关信息"),
+    GetTimeSpan("GetTimeSpan","根据上料信息获取到SN相关信息"),
     GetMakeInfoBySN("GetMakeInfoBySN","根据SN获取工单相关信息");
     GetMakeInfoBySN("GetMakeInfoBySN","根据SN获取工单相关信息");
 
 
     private String code;
     private String code;

+ 0 - 1
src/main/java/com/uas/eis/service/MESHelperService.java

@@ -24,7 +24,6 @@ public interface MESHelperService {
 
 
 	Map<Object, Object> SPI(String data);
 	Map<Object, Object> SPI(String data);
 
 
-	Map<Object, Object> GetTimeSpan(String data);
 
 
 	String CheckSteel(String data);
 	String CheckSteel(String data);
 
 

+ 5 - 2
src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -136,14 +136,14 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 		}
 	}
 	}
 
 
-	@Override
-	public Map<Object,Object> GetTimeSpan(String data) {
+	public Map<Object,Object> GetTimeSpan(JSONObject map) {
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		long timestamp = System.currentTimeMillis();
 		long timestamp = System.currentTimeMillis();
 		rmap.put("TimeSpan",timestamp);
 		rmap.put("TimeSpan",timestamp);
 		return rmap;
 		return rmap;
 	}
 	}
 
 
+
 	@Override
 	@Override
 	public Map<Object,Object> SPI(String data) {
 	public Map<Object,Object> SPI(String data) {
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
@@ -804,6 +804,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 			case CheckUserAndResourcePassed:
 			case CheckUserAndResourcePassed:
 				remap = CheckUserAndResourcePassed(json);
 				remap = CheckUserAndResourcePassed(json);
 				break;
 				break;
+			case GetTimeSpan:
+				remap = GetTimeSpan(json);
+				break;
 			case GetAddressRangeByMO:
 			case GetAddressRangeByMO:
 				remap = GetAddressRangeByMO(json);
 				remap = GetAddressRangeByMO(json);
 				break;
 				break;