From e81ea399132bc942729a5784a7b99e215370adbc Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Thu, 3 Apr 2025 11:29:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9D=E7=AB=A0=E5=A2=9E=E5=88=A0=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SafetyViolationController.java | 2 +- .../impl/SafetyViolationServiceImpl.java | 58 ++++++++++--------- .../imgUpload/SafetyViolationMapper.xml | 2 - 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/bonus/imgTool/imgUpload/controller/SafetyViolationController.java b/src/main/java/com/bonus/imgTool/imgUpload/controller/SafetyViolationController.java index 15f5bd4..94929dd 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/controller/SafetyViolationController.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/controller/SafetyViolationController.java @@ -63,7 +63,7 @@ public class SafetyViolationController { return ServerResponse.createErroe("操作失败"); } - @PostMapping(value = "getSafetyViolationById") + @GetMapping(value = "getSafetyViolationById") @DecryptAndVerify(decryptedClass = SafetyViolationDto.class)//加解密统一管理 @LogAnnotation(operModul = "安全违章", operation = "查询单个数据", operDesc = "系统级事件",operType="查询") // @PreAuthorize("@pms.hasPermission('sys:safetyViolation:query')" ) diff --git a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java index 2df52f3..d3ad29e 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java @@ -42,14 +42,13 @@ public class SafetyViolationServiceImpl implements SafetyViolationService { int i = dao.insertSafetyViolation(bean); if (i > 0) { List fileList = bean.getFileList(); - fileList.forEach(item -> { - item.setId(2L); - item.setSourceId(bean.getId()); - item.setCreateUser(bean.getCreateUserId()); - item.setCreateUserName(bean.getCreateUserName()); - }); //照片入库 - if (!bean.getFileList().isEmpty()) { + if (!fileList.isEmpty()) { + fileList.forEach(item -> { + item.setSourceId(bean.getId()); + item.setCreateUser(bean.getCreateUserId()); + item.setCreateUserName(bean.getCreateUserName()); + }); int j = dao.insertImgPhoto(bean.getFileList()); } //存入总库 TODO @@ -62,13 +61,16 @@ public class SafetyViolationServiceImpl implements SafetyViolationService { @Override public SafetyViolationVo getSafetyViolationById(Long id) { SafetyViolationVo bean = dao.getSafetyViolationById(id); - //照片查询 - FileStorageDto fileStorageDto = new FileStorageDto(); - fileStorageDto.setSourceId(id); - fileStorageDto.setSourceType("1"); - bean.setVioPhotoList(dao.getImgPhotoList(fileStorageDto)); - fileStorageDto.setSourceType("2"); - bean.setRectPhotoList(dao.getImgPhotoList(fileStorageDto)); + if(bean != null){ + //照片查询 + FileStorageDto fileStorageDto = new FileStorageDto(); + fileStorageDto.setSourceId(id); + fileStorageDto.setSourceType("1"); + bean.setVioPhotoList(dao.getImgPhotoList(fileStorageDto)); + fileStorageDto.setSourceType("2"); + bean.setRectPhotoList(dao.getImgPhotoList(fileStorageDto)); + } + return bean; } @@ -81,22 +83,26 @@ public class SafetyViolationServiceImpl implements SafetyViolationService { if (num > 0) { List fileList = bean.getFileList(); List delFileList = bean.getDelFileList(); - fileList.forEach(item -> { - item.setSourceId(bean.getId()); - item.setCreateUser(bean.getUpdateUserId()); - item.setCreateUserName(bean.getUpdateUserName()); - }); - delFileList.forEach(item -> { - item.setSourceId(bean.getId()); - item.setCreateUser(bean.getUpdateUserId()); - item.setCreateUserName(bean.getUpdateUserName()); - }); + //照片入库 - if (!bean.getFileList().isEmpty()) { + if (!fileList.isEmpty()) { + fileList.forEach(item -> { + item.setSourceId(bean.getId()); + item.setCreateUser(bean.getUpdateUserId()); + item.setCreateUserName(bean.getUpdateUserName()); + }); int j = dao.insertImgPhoto(bean.getFileList()); } + + + //照片删除 - if (!bean.getDelFileList().isEmpty()) { + if (!delFileList.isEmpty()) { + delFileList.forEach(item -> { + item.setSourceId(bean.getId()); + item.setCreateUser(bean.getUpdateUserId()); + item.setCreateUserName(bean.getUpdateUserName()); + }); int j = dao.delImgPhoto(bean.getDelFileList()); } //总库修改 TODO diff --git a/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml b/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml index 3fcbe59..97e4e1d 100644 --- a/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml +++ b/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml @@ -51,7 +51,6 @@ INSERT INTO sys_file_resource ( - id, file_name, file_suffix, file_size, @@ -67,7 +66,6 @@ )values ( - #{item.id}, #{item.fileName}, #{item.fileSuffix}, #{item.fileSize},