diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml index b3f3b6f..a17851a 100644 --- a/.idea/sqldialects.xml +++ b/.idea/sqldialects.xml @@ -12,6 +12,7 @@ + diff --git a/src/main/java/com/bonus/gzcar/business/app/controller/AppController.java b/src/main/java/com/bonus/gzcar/business/app/controller/AppController.java index 02809f5..14a3e44 100644 --- a/src/main/java/com/bonus/gzcar/business/app/controller/AppController.java +++ b/src/main/java/com/bonus/gzcar/business/app/controller/AppController.java @@ -153,11 +153,6 @@ public class AppController{ return supDispatchCarService.getDispatchCarListData(dto.getData()); } - @PostMapping("uploadFile") - @DecryptAndVerify(decryptedClass = CarPlanOutVo.class) - public ServerResponse uploadFile(EncryptedReq dto) { - return service.uploadFile(dto.getData()); - } @ApiOperation(value = "APP文件上传") @PostMapping("appUploadFile") public ServerResponse appUploadFile(@RequestParam(value = "file") MultipartFile file,HttpServletRequest request){ diff --git a/src/main/java/com/bonus/gzcar/business/app/service/AppService.java b/src/main/java/com/bonus/gzcar/business/app/service/AppService.java index e2cefe0..d99740a 100644 --- a/src/main/java/com/bonus/gzcar/business/app/service/AppService.java +++ b/src/main/java/com/bonus/gzcar/business/app/service/AppService.java @@ -49,12 +49,7 @@ public interface AppService { */ ServerResponse getAuditDetails(AppPlanVo data); - /** - * 上传文件 - * @param data - * @return - */ - ServerResponse uploadFile(CarPlanOutVo data); + /** * 文件上传 diff --git a/src/main/java/com/bonus/gzcar/business/app/service/AppServiceImpl.java b/src/main/java/com/bonus/gzcar/business/app/service/AppServiceImpl.java index 5135c9c..db3ef24 100644 --- a/src/main/java/com/bonus/gzcar/business/app/service/AppServiceImpl.java +++ b/src/main/java/com/bonus/gzcar/business/app/service/AppServiceImpl.java @@ -127,21 +127,13 @@ public class AppServiceImpl implements AppService{ } - @Override - public ServerResponse uploadFile(CarPlanOutVo data) { - try{ - uploadService.uploadImageBast64(data.getFile(),data.getId(),"car_plan_out","到货确认单"); - return ServerResponse.createBySuccessMsg("上传成功"); - }catch (Exception e){ - log.error(e.toString(),e); - } - return null; - } + @Override public ServerResponse appUploadFile(MultipartFile file, HttpServletRequest request) { try{ String id=request.getParameter("id"); + System.err.println(id); if(StringHelper.isEmpty(id) || "undefined".equals(id)){ return ServerResponse.createErroe("id不能为空"); }