Browse Source

添加设备接口

yhluo 1 week ago
parent
commit
8668da6f0e

+ 13 - 3
src/main/java/com/uas/eis/controller/MESHelperController.java

@@ -31,9 +31,19 @@ public class MESHelperController {
     private MESHelperService mesHelperService;
 
     // 超材料设备对接接口
-    @RequestMapping(value="/TestInsertLog")
-    public Map<Object,Object> TestInsertLog(HttpServletRequest request,  @RequestBody String json){
-        Map<Object,Object> map = mesHelperService.TestInsertLog(json);
+    @RequestMapping(value="/DeviceRunLog1")
+    public Map<Object,Object> DeviceRunLog1(HttpServletRequest request,  @RequestBody String json){
+        Map<Object,Object> map = mesHelperService.DeviceRunLog1(json);
+        return map;
+    }
+    @RequestMapping(value="/DeviceRunLog2")
+    public Map<Object,Object> DeviceRunLog2(HttpServletRequest request,  @RequestBody String json){
+        Map<Object,Object> map = mesHelperService.DeviceRunLog2(json);
+        return map;
+    }
+    @RequestMapping(value="/DeviceRunLog3")
+    public Map<Object,Object> DeviceRunLog3(HttpServletRequest request,  @RequestBody String json){
+        Map<Object,Object> map = mesHelperService.DeviceRunLog3(json);
         return map;
     }
 

+ 1 - 1
src/main/java/com/uas/eis/core/support/MesHelperApiLoginInterceptor.java

@@ -33,7 +33,7 @@ public class MesHelperApiLoginInterceptor extends HandlerInterceptorAdapter {
 
 
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        String accessKey = "N_MES_ZS";
+        String accessKey = "N_MES_AW";
         String accessSecret = "394thg9egn8e9g";
         String requestId = request.getHeader(RequestId);
 

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

@@ -6,8 +6,12 @@ import java.util.List;
 import java.util.Map;
 
 public interface MESHelperService {
+	Map<Object, Object> DeviceRunLog1(String data);
+
+	Map<Object, Object> DeviceRunLog2(String data);
+
+	Map<Object, Object> DeviceRunLog3(String data);
 
-	Map<Object, Object> TestInsertLog(String data);
 
 	Map<Object, Object> UploadReelInfo(String data);
 

+ 17 - 1
src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -51,7 +51,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 	private String username;
 
 	@Override
-	public Map<Object,Object> TestInsertLog(String data){
+	public Map<Object,Object> DeviceRunLog1(String data){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		baseDao.execute("insert into EISDATA(ed_id,ed_data,ed_indate)values(EISDATA_seq.nextval,?,sysdate)",data);
 		rmap.put("result","OK");
@@ -59,6 +59,22 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+	@Override
+	public Map<Object,Object> DeviceRunLog2(String data){
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		baseDao.execute("insert into EISDATA(ed_id,ed_data,ed_indate)values(EISDATA_seq.nextval,?,sysdate)",data);
+		rmap.put("result","OK");
+		rmap.put("message", "OK,写入数据成功");
+		return rmap;
+	}
+	@Override
+	public Map<Object,Object> DeviceRunLog3(String data){
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		baseDao.execute("insert into EISDATA(ed_id,ed_data,ed_indate)values(EISDATA_seq.nextval,?,sysdate)",data);
+		rmap.put("result","OK");
+		rmap.put("message", "OK,写入数据成功");
+		return rmap;
+	}
 	@Override
 	public Map<Object,Object> UploadReelInfo(String data) {
 		Map<Object, Object> rmap = new HashMap<Object, Object>();

+ 1 - 1
src/main/resources/application.yml

@@ -2,7 +2,7 @@ spring:
     datasource:
         type: org.apache.tomcat.jdbc.pool.DataSource
         driverClassName: oracle.jdbc.OracleDriver
-        username: N_MES_ZS
+        username: N_MES_AW
         password: select!#%*(
         url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
     http: