Browse Source

【功能完善】【DCR传输日志】

koul 1 year ago
parent
commit
ad7a053ab7

+ 12 - 0
src/main/java/com/uas/eis/controller/MESDataController.java

@@ -161,5 +161,17 @@ public class MESDataController {
 
     }
 
+    /**
+     * DCR设备日志
+     * @param data
+     * @return
+     */
+    @RequestMapping("/api/mes/DCRLogExcel")
+    public ApiResult<String> DCRLogExcel(HttpServletRequest request, String data){
+        String accessKey = request.getHeader("AccessKey");
+        String requestId = request.getHeader("RequestId");
+        return mesDataService.DCRLogExcel(accessKey, requestId, data);
+    }
+
 
 }

+ 2 - 0
src/main/java/com/uas/eis/service/MESDataService.java

@@ -31,4 +31,6 @@ public interface MESDataService {
 
 	ApiResult<String> uploadDCRFile(String accessKey, String requestId, MultipartFile file) throws IOException;
 
+	ApiResult<String>DCRLogExcel(String accessKey, String requestId, String data);
+
 }

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

@@ -382,7 +382,23 @@ public class MESDataServiceImpl implements MESDataService {
 		}
 	}
 
-   private String saveFile(MultipartFile file) throws IOException {
+	@Override
+	public ApiResult<String> DCRLogExcel(String accessKey, String requestId, String data) {
+		try {
+			String AE_MASTER = checkAccessKey(accessKey, requestId);
+			SpObserver.putSp(AE_MASTER);
+			Map<Object, Object> store = BaseUtil.parseFormStoreToMap(data);
+			store.put("dle_id",baseDao.getSeqId("dcrlogexcel_seq"));
+			String formSql = SqlUtil.getInsertSqlByMap(store, "DCRLogExcel");
+			baseDao.execute(formSql);
+			return ApiResponse.successRsp("0", "Success", requestId, "传输成功!");
+		}catch (Exception e) {
+			e.printStackTrace();
+			return ApiResponse.failRsp( "10020","传输失败"+(e.getMessage().length()>400 ? e.getMessage().substring(0,400):e.getMessage()));
+		}
+	}
+
+	private String saveFile(MultipartFile file) throws IOException {
 	   String path = "/dcr";
 	   File filep = new File(path);
 	   String fileName = file.getOriginalFilename();