行之成EIS增加DCR附件上传接口,增加参数stepcode

src/main/java/com/uas/eis/controller/MESDataController.java

@@ -106,10 +106,12 @@ public class MESDataController {
     /**
      * DCR 附件上传
      * @param file
+     * @param sncode SN号
+     * @param stepcode 工站
      * @return
      */
     @RequestMapping("/api/mes/uploadDCRFile")
-    public ApiResult<String> uploadDCRFile(HttpServletRequest request, @RequestParam("file") MultipartFile file, String sncode){
+    public ApiResult<String> uploadDCRFile(HttpServletRequest request, @RequestParam("file") MultipartFile file, String sncode,String stepcode){
         String accessKey = request.getHeader("AccessKey");
         String requestId = request.getHeader("RequestId");
         try {
@@ -120,7 +122,10 @@ public class MESDataController {
             if(!StringUtil.hasText(sncode)){
                 return ApiResponse.failRsp("10011","sncode必填！");
             }
-            return mesDataService.uploadDCRFile(accessKey,requestId,file,sncode);
+            if(!StringUtil.hasText(stepcode)){
+                return ApiResponse.failRsp("10011","stepcode必填！");
+            }
+            return mesDataService.uploadDCRFile(accessKey,requestId,file,sncode,stepcode);
         } catch (Exception e) {
             e.printStackTrace();
             return ApiResponse.failRsp( "10011","上传失败"+(e.getMessage().length()>400 ? e.getMessage().substring(0,400):e.getMessage()));

src/main/java/com/uas/eis/service/MESDataService.java

@@ -21,8 +21,8 @@ public interface MESDataService {
 
 	List<Map<Object,Object>> packageDetail(String accessKey, String requestId, String data);
 
-	int saveFilePath(String accessKey, String requestId,String path, int size, String filename,String sncode) throws Exception;
+	int saveFilePath(String accessKey, String requestId,String path, int size, String filename,String sncode,String stepcode) throws Exception;
 
-	ApiResult<String> uploadDCRFile(String accessKey, String requestId, MultipartFile file, String sncode) throws IOException;
+	ApiResult<String> uploadDCRFile(String accessKey, String requestId, MultipartFile file, String sncode,String stepcode) throws IOException;
 
 }

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

@@ -244,7 +244,7 @@ public class MESDataServiceImpl implements MESDataService {
 
 	@Override
 	@Transactional
-	public int saveFilePath(String accessKey, String requestId,String path, int size, String filename,String sncode) throws Exception {
+	public int saveFilePath(String accessKey, String requestId,String path, int size, String filename,String sncode,String stepcode) throws Exception {
 		String AE_MASTER = checkAccessKey(accessKey, requestId);
 		SpObserver.putSp(AE_MASTER);
 		int id = baseDao.getSeqId("filepath_seq");
@@ -254,17 +254,17 @@ public class MESDataServiceImpl implements MESDataService {
 		baseDao.execute("INSERT INTO filepath(fp_id,fp_path,fp_size,fp_man,fp_date,fp_name) values(" + id + ",'" + path + "'," + size
 				+ ",'" + accessKey+ "'," + DateUtil.parseDateToOracleString(Constant.YMD_HMS, new Date()) + ",'" + filename
 				+ "')");
-		baseDao.execute("insert into DCRFILEDATA (DF_ID ,DF_DATE,DF_INMAN,DF_ATTACH,DF_FILENAME,DF_RESULT)" +
-				" select DCRFILEDATA_seq.nextval,sysdate,?,?,?,? from dual ",accessKey,id,filename,sncode);
+		baseDao.execute("insert into DCRFILEDATA (DF_ID ,DF_DATE,DF_INMAN,DF_ATTACH,DF_FILENAME,DF_RESULT,DF_STEPCODE)" +
+				" select DCRFILEDATA_seq.nextval,sysdate,?,?,?,? from dual ",accessKey,id,filename,sncode,stepcode);
 		return id;
 	}
 
 	@Override
-	public ApiResult<String> uploadDCRFile(String accessKey, String requestId, MultipartFile file, String sncode) throws IOException {
+	public ApiResult<String> uploadDCRFile(String accessKey, String requestId, MultipartFile file, String sncode,String stepcode) throws IOException {
 		try {
 			String filename = file.getOriginalFilename();
 			String path = saveFile(file);
-			int id = saveFilePath(accessKey, requestId,path, (int) file.getSize(), filename,sncode);
+			int id = saveFilePath(accessKey, requestId,path, (int) file.getSize(), filename,sncode,stepcode);
 			return ApiResponse.successRsp("0", "Success", requestId, "");
 		}catch (Exception e) {
 			e.printStackTrace();