From 44b3f74168f3bbb8e57c2cb21b725f1f2001c46e Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Sat, 16 Nov 2024 16:53:04 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/service/PartApplyAppServiceImp.java | 15 +++++-------- .../bases/service/PartApplyServiceImpl.java | 16 +++++++------- .../business/utils/FileUploadService.java | 4 +--- .../mappers/app/PartApplyAppMapper.xml | 22 ++++++++++++++++--- .../mappers/bases/StatisticsMapper.xml | 15 +++++++------ 5 files changed, 42 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/bonus/gzgqj/business/app/service/PartApplyAppServiceImp.java b/src/main/java/com/bonus/gzgqj/business/app/service/PartApplyAppServiceImp.java index 7cd7db1..221c360 100644 --- a/src/main/java/com/bonus/gzgqj/business/app/service/PartApplyAppServiceImp.java +++ b/src/main/java/com/bonus/gzgqj/business/app/service/PartApplyAppServiceImp.java @@ -164,17 +164,14 @@ public class PartApplyAppServiceImp { */ public ServerResponse uploadImage(HttpServletRequest request) { try{ - String id=request.getParameter("params"); - String bast64s=request.getParameter("bast64"); - List files=JSON.parseArray(bast64s,String.class); - if(StringHelper.isEmpty(id)){ - return ServerResponse.createErroe("请选择申请记录"); - } - if(files==null || files.size()<1){ + String id=request.getParameter("recordId"); + String bast64=request.getParameter("bast64"); + + if(StringHelper.isEmpty(bast64)){ return ServerResponse.createErroe("请先上传文件"); } - List fileList=uploadService.uploadImageBast64(files,id,"t_part_apply","使用照片"); - if(StringUtils.isEmpty(fileList) || fileList.size()!=files.size()){ + List fileList=uploadService.uploadImageBast64(bast64,id,"t_part_apply","使用照片"); + if(StringUtils.isEmpty(fileList) || fileList.size()<1){ return ServerResponse.createErroe("文件上传失败"); } return ServerResponse.createSuccess("文件上传成功","文件上传成功"); diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyServiceImpl.java index ecbde17..ead6f26 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyServiceImpl.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyServiceImpl.java @@ -72,14 +72,14 @@ public class PartApplyServiceImpl implements PartApplyService{ String infoMsg = String.join(",", info); vo.setInfoMsg(infoMsg); //图片转换 - String bast641=transBast64(vo.getLyUrl()); - String bast642=transBast64(vo.getCkUrl()); - String bast643=transBast64(vo.getShUrl()); - String bast644=transBast64(vo.getZdUrl()); - vo.setLyUrl(bast641); - vo.setCkUser(bast642); - vo.setShUrl(bast643); - vo.setZdUrl(bast644); +// String bast641=transBast64(vo.getLyUrl()); +// String bast642=transBast64(vo.getCkUrl()); +// String bast643=transBast64(vo.getShUrl()); +// String bast644=transBast64(vo.getZdUrl()); +// vo.setLyUrl(bast641); +// vo.setCkUser(bast642); +// vo.setShUrl(bast643); +// vo.setZdUrl(bast644); List flieList=uploadService.getFileList(data.getId(),"t_part_apply",null); vo.setFileList(flieList); return ServerResponse.createSuccess(vo); diff --git a/src/main/java/com/bonus/gzgqj/business/utils/FileUploadService.java b/src/main/java/com/bonus/gzgqj/business/utils/FileUploadService.java index 99e0e57..68a703b 100644 --- a/src/main/java/com/bonus/gzgqj/business/utils/FileUploadService.java +++ b/src/main/java/com/bonus/gzgqj/business/utils/FileUploadService.java @@ -37,10 +37,9 @@ public class FileUploadService { - public List uploadImageBast64(List files , String outId, String table,String type){ + public List uploadImageBast64(String bast64, String outId, String table,String type){ List list=new ArrayList<>(); try { - for (String bast64 : files) { String fileName=IDUtils.createID()+".png"; String filePath= "/"+DateTimeHelper.getNowYMD()+"/"+ fileName; String newPath= SystemUtils.getUploadPath()+filePath; @@ -68,7 +67,6 @@ public class FileUploadService { } list.add(vo); mapper.insertFileUpload(vo); - } }catch (Exception e){ log.error(e.toString(),e); } diff --git a/src/main/resources/mappers/app/PartApplyAppMapper.xml b/src/main/resources/mappers/app/PartApplyAppMapper.xml index a16fa31..09a7c11 100644 --- a/src/main/resources/mappers/app/PartApplyAppMapper.xml +++ b/src/main/resources/mappers/app/PartApplyAppMapper.xml @@ -5,9 +5,25 @@ INSERT INTO t_part_apply( code, creator, user_name, create_time, type, remark, status, updater, - update_time, dev_id,dev_code, dev_type, pro_id, pro_name, - apply_num,status_type)values( - #{code},#{creator},#{userName},now(), #{type},#{remark},#{status},#{updater}, now(),#{deviceId},#{devCode}, #{devType},#{proId},#{proName} + update_time, + + dev_id, + + dev_code, dev_type, + + pro_id , + + pro_name, + apply_num,status_type)values( + #{code},#{creator},#{userName},now(), #{type},#{remark},#{status},#{updater}, now(), + + #{deviceId}, + + #{devCode}, #{devType}, + + #{proId}, + + #{proName} ,#{applyNum},#{statusType}) diff --git a/src/main/resources/mappers/bases/StatisticsMapper.xml b/src/main/resources/mappers/bases/StatisticsMapper.xml index 1d487af..338a002 100644 --- a/src/main/resources/mappers/bases/StatisticsMapper.xml +++ b/src/main/resources/mappers/bases/StatisticsMapper.xml @@ -69,20 +69,21 @@