From bdc4ff10f63c32c49f150ff7918883fbcda2a40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Thu, 3 Apr 2025 16:54:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CoordinatePhotoServiceImpl.java | 15 +++++++++++---- .../service/impl/ImportantMatterServiceImpl.java | 9 ++++++--- .../service/impl/SafetyMeasuresServiceImpl.java | 15 ++++++++++----- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java index 221466c..8c184ba 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -85,13 +86,17 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService { @Override public ServerResponse addCoordinatePhoto(CoordinatePhotoVo data) { try { + Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0; + String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser(): null; + data.setCreateUserId(CreateUserId); + data.setCreateUserName(CreateUserName); + data.setCreateTime(new Date()); //保存 coordinatePhotoMapper.addCoordinatePhoto(data); //保存附件 List sysFileResourceList = data.getSysFileResourceList(); for (SysFileResourceVo sysFileResourceVo: sysFileResourceList ) { - Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0; - String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser(): null; + sysFileResourceService.addSysFileResource(sysFileResourceVo,data.getId(),"4",CreateUserId,CreateUserName); } //存入综合查询 @@ -113,6 +118,10 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService { @Override public ServerResponse updateCoordinatePhoto(CoordinatePhotoVo data) { try { + Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0; + String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser(): null; + data.setUpdateUserId(CreateUserId); + data.setUpdateUserName(CreateUserName); //修改 coordinatePhotoMapper.updateCoordinatePhoto(data); //附件先删除，后新增 @@ -120,8 +129,6 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService { //保存附件 List sysFileResourceList = data.getSysFileResourceList(); for (SysFileResourceVo sysFileResourceVo: sysFileResourceList ) { - Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0; - String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser(): null; sysFileResourceService.addSysFileResource(sysFileResourceVo,data.getId(),"4",CreateUserId,CreateUserName); } ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java index fed7860..23365d0 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -83,13 +84,16 @@ public class ImportantMatterServiceImpl implements ImportantMatterService { @Override public ServerResponse addImportantMatter(ImportantMatterVo data) { try { + Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0; + String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser(): null; + data.setCreateUserId(CreateUserId); + data.setCreateUserName(CreateUserName); + data.setCreateTime(new Date()); //保存 importantMatterMapper.addImportantMatter(data); //保存附件 List sysFileResourceList = data.getSysFileResourceList(); for (SysFileResourceVo sysFileResourceVo: sysFileResourceList ) { - Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0; - String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser(): null; sysFileResourceService.addSysFileResource(sysFileResourceVo,data.getId(),"4",CreateUserId,CreateUserName); } //存入综合查询 @@ -113,7 +117,6 @@ public class ImportantMatterServiceImpl implements ImportantMatterService { try { Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0; String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser(): null; - //修改 data.setUpdateUserId(CreateUserId); data.setUpdateUserName(CreateUserName); importantMatterMapper.updateImportantMatter(data); diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java index 9dde27d..9c89c17 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Slf4j @@ -84,6 +85,11 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { @Override public ServerResponse addSafetyMeasures(SafetyMeasuresVo data) { try { + Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0; + String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser(): null; + data.setCreateUserId(CreateUserId); + data.setCreateUserName(CreateUserName); + data.setCreateTime(new Date()); //保存 safetyMeasuresMapper.addSafetyMeasures(data); //保存附件 @@ -91,8 +97,6 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { for (SysFileResourceVo sysFileResourceVo: sysFileResourceList ) { sysFileResourceVo.setSourceType(FileSourceTypeEnum.FILE_SOURCE_TYPE_5.getStatus()); sysFileResourceVo.setSourceTypeName(FileSourceTypeEnum.FILE_SOURCE_TYPE_5.getStatusName()); - Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0; - String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser(): null; sysFileResourceService.addSysFileResource(sysFileResourceVo,data.getId(),"3",CreateUserId,CreateUserName); } //存入综合查询 @@ -113,8 +117,11 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { */ @Override public ServerResponse updateSafetyMeasures(SafetyMeasuresVo data) { - try { + Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0; + String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser(): null; + data.setUpdateUserId(CreateUserId); + data.setUpdateUserName(CreateUserName); //修改 safetyMeasuresMapper.updateSafetyMeasures(data); //附件先删除，后新增 @@ -124,8 +131,6 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { for (SysFileResourceVo sysFileResourceVo: sysFileResourceList ) { sysFileResourceVo.setSourceType(FileSourceTypeEnum.FILE_SOURCE_TYPE_5.getStatus()); sysFileResourceVo.setSourceTypeName(FileSourceTypeEnum.FILE_SOURCE_TYPE_5.getStatusName()); - Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0; - String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser(): null; sysFileResourceService.addSysFileResource(sysFileResourceVo,data.getId(),"3",CreateUserId,CreateUserName); } //修改综合查询