From 6b9d5de37ea698d14a652d5ee0f680b387ba0858 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 11:14:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=B0=83=E7=85=A7=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CoordinatePhotoController.java | 77 ++++++++++++ .../controller/SafetyMeasuresController.java | 12 +- .../imageUpload/dto/CoordinatePhotoReqVo.java | 35 ++++++ .../imageUpload/dto/CoordinatePhotoVo.java | 106 ++++++++++++++++ .../mapper/CoordinatePhotoMapper.java | 16 +++ .../mapper/SafetyMeasuresMapper.java | 2 + .../service/CoordinatePhotoService.java | 15 +++ .../service/SafetyMeasuresService.java | 2 + .../impl/CoordinatePhotoServiceImpl.java | 113 ++++++++++++++++++ .../impl/SafetyMeasuresServiceImpl.java | 48 ++++++-- .../system/dao/SysFileResourceDao.java | 3 +- .../service/SysFileResourceService.java | 15 +++ .../impl/SysFileResourceServiceImpl.java | 40 +++++++ .../imageUpload/CoordinatePhotoMapper.xml | 88 ++++++++++++++ .../imageUpload/SafetMeasuresMapper.xml | 19 +++ 15 files changed, 576 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/bonus/imgTool/imageUpload/controller/CoordinatePhotoController.java create mode 100644 src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoReqVo.java create mode 100644 src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoVo.java create mode 100644 src/main/java/com/bonus/imgTool/imageUpload/mapper/CoordinatePhotoMapper.java create mode 100644 src/main/java/com/bonus/imgTool/imageUpload/service/CoordinatePhotoService.java create mode 100644 src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java create mode 100644 src/main/java/com/bonus/imgTool/system/service/SysFileResourceService.java create mode 100644 src/main/java/com/bonus/imgTool/system/service/impl/SysFileResourceServiceImpl.java create mode 100644 src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml diff --git a/src/main/java/com/bonus/imgTool/imageUpload/controller/CoordinatePhotoController.java b/src/main/java/com/bonus/imgTool/imageUpload/controller/CoordinatePhotoController.java new file mode 100644 index 0000000..c20fee0 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/imageUpload/controller/CoordinatePhotoController.java @@ -0,0 +1,77 @@ +package com.bonus.imgTool.imageUpload.controller; + + +import com.bonus.imgTool.annotation.DecryptAndVerify; +import com.bonus.imgTool.annotation.LogAnnotation; +import com.bonus.imgTool.imageUpload.dto.CoordinatePhotoReqVo; +import com.bonus.imgTool.imageUpload.dto.CoordinatePhotoVo; +import com.bonus.imgTool.imageUpload.service.CoordinatePhotoService; +import com.bonus.imgTool.system.vo.EncryptedReq; +import com.bonus.imgTool.utils.ServerResponse; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 协调照片 + */ +@Slf4j +@RestController +@RequestMapping("/coordinatePhoto") +public class CoordinatePhotoController { + + + @Resource + private CoordinatePhotoService coordinatePhotoService; + + /** + * 协调照片--查询 + * @param data + * @return + */ + @PostMapping(value = "/getCoordinatePhotoList") + @DecryptAndVerify(decryptedClass = CoordinatePhotoReqVo.class) + @LogAnnotation(operModul = "安全措施落实-查询", operation = "查询照片", operDesc = "系统级事件",operType="查询") + public ServerResponse getCoordinatePhotoList(EncryptedReq data) { + return coordinatePhotoService.getCoordinatePhotoList(data.getData()); + } + + /** + * 协调照片--删除 + * @param data + * @return + */ + @PostMapping(value = "/deleteCoordinatePhoto") + @DecryptAndVerify(decryptedClass = CoordinatePhotoReqVo.class) + @LogAnnotation(operModul = "协调照片--删除", operation = "查询照片", operDesc = "系统级事件",operType="查询") + public ServerResponse deleteCoordinatePhoto(EncryptedReq data) { + return coordinatePhotoService.deleteCoordinatePhoto(data.getData()); + } + + /** + * 协调照片--新增 + * @param data + * @return + */ + @PostMapping(value = "/addCoordinatePhoto") + @DecryptAndVerify(decryptedClass = CoordinatePhotoVo.class) + @LogAnnotation(operModul = "协调照片--新增", operation = "查询照片", operDesc = "系统级事件",operType="查询") + public ServerResponse addCoordinatePhoto(EncryptedReq data) { + return coordinatePhotoService.addCoordinatePhoto(data.getData()); + } + + /** + * 协调照片--修改 + * @param data + * @return + */ + @PostMapping(value = "/updateCoordinatePhoto") + @DecryptAndVerify(decryptedClass = CoordinatePhotoVo.class) + @LogAnnotation(operModul = "协调照片--修改", operation = "查询照片", operDesc = "系统级事件",operType="查询") + public ServerResponse updateCoordinatePhoto(EncryptedReq data) { + return coordinatePhotoService.updateCoordinatePhoto(data.getData()); + } +} diff --git a/src/main/java/com/bonus/imgTool/imageUpload/controller/SafetyMeasuresController.java b/src/main/java/com/bonus/imgTool/imageUpload/controller/SafetyMeasuresController.java index fb6c4b9..4282a74 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/controller/SafetyMeasuresController.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/controller/SafetyMeasuresController.java @@ -2,7 +2,6 @@ package com.bonus.imgTool.imageUpload.controller; import com.bonus.imgTool.annotation.DecryptAndVerify; import com.bonus.imgTool.annotation.LogAnnotation; -import com.bonus.imgTool.backstage.entity.QueryParamDto; import com.bonus.imgTool.imageUpload.dto.SafetyMeasuresReqVo; import com.bonus.imgTool.imageUpload.dto.SafetyMeasuresVo; import com.bonus.imgTool.imageUpload.service.SafetyMeasuresService; @@ -62,4 +61,15 @@ public class SafetyMeasuresController { public ServerResponse addSafetyMeasures(EncryptedReq data) { return safetyMeasuresService.addSafetyMeasures(data.getData()); } + /** + * 安全措施落实修改 + * @param data + * @return + */ + @PostMapping(value = "/updateSafetyMeasures") + @DecryptAndVerify(decryptedClass = SafetyMeasuresVo.class) + @LogAnnotation(operModul = "安全措施落实-修改", operation = "查询照片", operDesc = "系统级事件",operType="查询") + public ServerResponse updateSafetyMeasures(EncryptedReq data) { + return safetyMeasuresService.updateSafetyMeasures(data.getData()); + } } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoReqVo.java b/src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoReqVo.java new file mode 100644 index 0000000..16b7a10 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoReqVo.java @@ -0,0 +1,35 @@ +package com.bonus.imgTool.imageUpload.dto; + +import lombok.Data; + +@Data +public class CoordinatePhotoReqVo { + + /** + * id + */ + private Long id; + + /** + * 工程id + */ + private Long proId; + + /** + * 专业id + */ + private Long majorId; + + /** + * 工序id + */ + private Long gxId; + + /** + * 关键字 + */ + private String keyWord; + + private int pageNum = 1; + private int pageSize = 15; +} diff --git a/src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoVo.java b/src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoVo.java new file mode 100644 index 0000000..75c8d41 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoVo.java @@ -0,0 +1,106 @@ +package com.bonus.imgTool.imageUpload.dto; + +import com.bonus.imgTool.system.vo.SysFileResourceVo; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +@Data +public class CoordinatePhotoVo { + + /** + * id + */ + private Long id; + + /** + * 工程id + */ + private Long proId; + + /** + * 工程名称 + */ + private String proName; + + /** + * 专业id + */ + private Long majorId; + + /** + * 专业名称 + */ + private String majorName; + + /** + * 工序id + */ + private Long gxId; + + /** + * 工序名称 + */ + private String gxName; + + /** + * 建设地点 + */ + private String buildPlace; + + /** + * 建设前描述 + */ + private String buildBeforeDesc; + + /** + * 建设中描述 + */ + private String buildUnderDesc; + + /** + * 恢复后描述 + */ + private String buildAfterDesc; + + /** + * 创建人 + */ + private Long createUserId; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建人姓名 + */ + private String createUserName; + + /** + * 修改人 + */ + private Long updateUserId; + + /** + * 修改时间 + */ + private Date updateTime; + + /** + * 修改人姓名 + */ + private String updateUserName; + + /** + * 数据来源 1.web 2.app + */ + private String dataSource; + + /** + * 图片信息 + */ + private List sysFileResourceList; +} diff --git a/src/main/java/com/bonus/imgTool/imageUpload/mapper/CoordinatePhotoMapper.java b/src/main/java/com/bonus/imgTool/imageUpload/mapper/CoordinatePhotoMapper.java new file mode 100644 index 0000000..133da15 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/imageUpload/mapper/CoordinatePhotoMapper.java @@ -0,0 +1,16 @@ +package com.bonus.imgTool.imageUpload.mapper; + +import com.bonus.imgTool.imageUpload.dto.CoordinatePhotoReqVo; +import com.bonus.imgTool.imageUpload.dto.CoordinatePhotoVo; +import java.util.List; + +public interface CoordinatePhotoMapper { + + List getCoordinatePhotoList(CoordinatePhotoReqVo data); + + void deleteCoordinatePhoto(CoordinatePhotoReqVo data); + + void addCoordinatePhoto(CoordinatePhotoVo data); + + void updateCoordinatePhoto(CoordinatePhotoVo data); +} diff --git a/src/main/java/com/bonus/imgTool/imageUpload/mapper/SafetyMeasuresMapper.java b/src/main/java/com/bonus/imgTool/imageUpload/mapper/SafetyMeasuresMapper.java index c01b2f9..0a27172 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/mapper/SafetyMeasuresMapper.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/mapper/SafetyMeasuresMapper.java @@ -12,4 +12,6 @@ public interface SafetyMeasuresMapper { void addSafetyMeasures(SafetyMeasuresVo data); + + void updateSafetyMeasures(SafetyMeasuresVo data); } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/CoordinatePhotoService.java b/src/main/java/com/bonus/imgTool/imageUpload/service/CoordinatePhotoService.java new file mode 100644 index 0000000..868dc2b --- /dev/null +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/CoordinatePhotoService.java @@ -0,0 +1,15 @@ +package com.bonus.imgTool.imageUpload.service; + +import com.bonus.imgTool.imageUpload.dto.CoordinatePhotoReqVo; +import com.bonus.imgTool.imageUpload.dto.CoordinatePhotoVo; +import com.bonus.imgTool.utils.ServerResponse; + +public interface CoordinatePhotoService { + ServerResponse getCoordinatePhotoList(CoordinatePhotoReqVo data); + + ServerResponse deleteCoordinatePhoto(CoordinatePhotoReqVo data); + + ServerResponse addCoordinatePhoto(CoordinatePhotoVo data); + + ServerResponse updateCoordinatePhoto(CoordinatePhotoVo data); +} diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/SafetyMeasuresService.java b/src/main/java/com/bonus/imgTool/imageUpload/service/SafetyMeasuresService.java index df702f2..2583e49 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/SafetyMeasuresService.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/SafetyMeasuresService.java @@ -10,4 +10,6 @@ public interface SafetyMeasuresService { ServerResponse deleteSafetyMeasures(SafetyMeasuresReqVo data); ServerResponse addSafetyMeasures(SafetyMeasuresVo data); + + ServerResponse updateSafetyMeasures(SafetyMeasuresVo data); } 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 new file mode 100644 index 0000000..08390dc --- /dev/null +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java @@ -0,0 +1,113 @@ +package com.bonus.imgTool.imageUpload.service.impl; + + +import com.bonus.imgTool.imageUpload.dto.CoordinatePhotoReqVo; +import com.bonus.imgTool.imageUpload.dto.CoordinatePhotoVo; +import com.bonus.imgTool.imageUpload.mapper.CoordinatePhotoMapper; +import com.bonus.imgTool.imageUpload.service.CoordinatePhotoService; +import com.bonus.imgTool.system.service.SysFileResourceService; +import com.bonus.imgTool.system.vo.SysFileResourceVo; +import com.bonus.imgTool.utils.ServerResponse; +import com.bonus.imgTool.utils.UserUtil; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +@Service +@Slf4j +@Transactional +public class CoordinatePhotoServiceImpl implements CoordinatePhotoService { + + @Resource + private CoordinatePhotoMapper coordinatePhotoMapper; + + @Resource + private SysFileResourceService sysFileResourceService; + + /** + * 协调照片--查询 + * @param data + * @return + */ + @Override + public ServerResponse getCoordinatePhotoList(CoordinatePhotoReqVo data) { + PageHelper.startPage(data.getPageNum(), data.getPageSize()); + try { + List list = coordinatePhotoMapper.getCoordinatePhotoList(data); + //获取图片信息 + for (CoordinatePhotoVo coordinatePhotoVo : list) { + List sysFileResourceList = sysFileResourceService.getSysFileResourceList(coordinatePhotoVo.getId()); + coordinatePhotoVo.setSysFileResourceList(sysFileResourceList); + } + PageInfo pageInfo = new PageInfo<>(list); + return ServerResponse.createSuccess(pageInfo); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("查询失败"); + } + } + + /** + * 协调照片--删除 + * @param data + * @return + */ + @Override + public ServerResponse deleteCoordinatePhoto(CoordinatePhotoReqVo data) { + try { + coordinatePhotoMapper.deleteCoordinatePhoto(data); + sysFileResourceService.deleteFileResource(data.getId()); + return ServerResponse.createSuccess(); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("删除失败"); + } + } + + @Override + public ServerResponse addCoordinatePhoto(CoordinatePhotoVo data) { + try { + //保存 + 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); + } + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("删除失败"); + } + return ServerResponse.createSuccess(); + } + + @Override + public ServerResponse updateCoordinatePhoto(CoordinatePhotoVo data) { + try { + //修改 + coordinatePhotoMapper.updateCoordinatePhoto(data); + //附件先删除，后新增 + sysFileResourceService.deleteFileResource(data.getId()); + //保存附件 + 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); + } + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("修改失败"); + } + return ServerResponse.createSuccess(); + } + + +} 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 0c6b9e6..a29f84f 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 @@ -1,12 +1,11 @@ package com.bonus.imgTool.imageUpload.service.impl; import com.bonus.imgTool.Enum.FileSourceTypeEnum; -import com.bonus.imgTool.backstage.entity.SynthesisQueryVo; import com.bonus.imgTool.imageUpload.dto.SafetyMeasuresReqVo; import com.bonus.imgTool.imageUpload.dto.SafetyMeasuresVo; import com.bonus.imgTool.imageUpload.mapper.SafetyMeasuresMapper; import com.bonus.imgTool.imageUpload.service.SafetyMeasuresService; -import com.bonus.imgTool.system.dao.SysFileResourceDao; +import com.bonus.imgTool.system.service.SysFileResourceService; import com.bonus.imgTool.system.vo.SysFileResourceVo; import com.bonus.imgTool.utils.ServerResponse; import com.bonus.imgTool.utils.UserUtil; @@ -17,9 +16,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; -import java.util.Optional; @Slf4j @Service @@ -30,7 +27,7 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { private SafetyMeasuresMapper safetyMeasuresMapper; @Resource - private SysFileResourceDao sysFileResourceDao; + private SysFileResourceService sysFileResourceService; /** * 安全措施落实获取列表 @@ -44,7 +41,7 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { List list = safetyMeasuresMapper.getSafetyMeasuresList(data); //获取图片信息 for (SafetyMeasuresVo safetyMeasuresVo : list) { - List sysFileResourceList = sysFileResourceDao.getSysFileResourceList(safetyMeasuresVo.getId()); + List sysFileResourceList = sysFileResourceService.getSysFileResourceList(safetyMeasuresVo.getId()); safetyMeasuresVo.setSysFileResourceList(sysFileResourceList); } PageInfo pageInfo = new PageInfo<>(list); @@ -64,7 +61,7 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { public ServerResponse deleteSafetyMeasures(SafetyMeasuresReqVo data) { try { safetyMeasuresMapper.deleteSafetyMeasures(data); - sysFileResourceDao.deleteFileResource(data); + sysFileResourceService.deleteFileResource(data.getId()); return ServerResponse.createSuccess(); } catch (Exception e) { log.error(e.toString(), e); @@ -85,13 +82,11 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { //保存附件 List sysFileResourceList = data.getSysFileResourceList(); for (SysFileResourceVo sysFileResourceVo: sysFileResourceList ) { - sysFileResourceVo.setSourceId(data.getId()); - sysFileResourceVo.setUploadType("3"); sysFileResourceVo.setSourceType(FileSourceTypeEnum.FILE_SOURCE_TYPE_5.getStatus()); sysFileResourceVo.setSourceTypeName(FileSourceTypeEnum.FILE_SOURCE_TYPE_5.getStatusName()); - sysFileResourceVo.setCreateUser(UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0); - sysFileResourceVo.setCreateUserName(UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser():null); - sysFileResourceDao.addSysFileResource(sysFileResourceVo); + 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); } } catch (Exception e) { log.error(e.toString(), e); @@ -99,4 +94,33 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { } return ServerResponse.createSuccess(); } + + /** + * 安全措施落实修改 + * @param data + * @return + */ + @Override + public ServerResponse updateSafetyMeasures(SafetyMeasuresVo data) { + + try { + //修改 + safetyMeasuresMapper.updateSafetyMeasures(data); + //附件先删除，后新增 + sysFileResourceService.deleteFileResource(data.getId()); + //保存附件 + List sysFileResourceList = data.getSysFileResourceList(); + 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); + } + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("修改失败"); + } + return ServerResponse.createSuccess(); + } } diff --git a/src/main/java/com/bonus/imgTool/system/dao/SysFileResourceDao.java b/src/main/java/com/bonus/imgTool/system/dao/SysFileResourceDao.java index 7039682..aff8ef8 100644 --- a/src/main/java/com/bonus/imgTool/system/dao/SysFileResourceDao.java +++ b/src/main/java/com/bonus/imgTool/system/dao/SysFileResourceDao.java @@ -1,6 +1,5 @@ package com.bonus.imgTool.system.dao; -import com.bonus.imgTool.imageUpload.dto.SafetyMeasuresReqVo; import com.bonus.imgTool.system.vo.SysFileResourceVo; import org.springframework.stereotype.Repository; @@ -9,7 +8,7 @@ import java.util.List; @Repository public interface SysFileResourceDao { - void deleteFileResource(SafetyMeasuresReqVo data); + void deleteFileResource(Long id); List getSysFileResourceList(Long id); diff --git a/src/main/java/com/bonus/imgTool/system/service/SysFileResourceService.java b/src/main/java/com/bonus/imgTool/system/service/SysFileResourceService.java new file mode 100644 index 0000000..159aaa6 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/system/service/SysFileResourceService.java @@ -0,0 +1,15 @@ +package com.bonus.imgTool.system.service; + +import com.bonus.imgTool.imageUpload.dto.SafetyMeasuresReqVo; +import com.bonus.imgTool.system.vo.SysFileResourceVo; + +import java.util.List; + +public interface SysFileResourceService { + List getSysFileResourceList(Long id); + + void deleteFileResource(Long id); + + + void addSysFileResource(SysFileResourceVo sysFileResourceVo, Long id, String uploadType, Long createUserId, String createUserName); +} diff --git a/src/main/java/com/bonus/imgTool/system/service/impl/SysFileResourceServiceImpl.java b/src/main/java/com/bonus/imgTool/system/service/impl/SysFileResourceServiceImpl.java new file mode 100644 index 0000000..d9c3f5b --- /dev/null +++ b/src/main/java/com/bonus/imgTool/system/service/impl/SysFileResourceServiceImpl.java @@ -0,0 +1,40 @@ +package com.bonus.imgTool.system.service.impl; + +import com.bonus.imgTool.imageUpload.dto.SafetyMeasuresReqVo; +import com.bonus.imgTool.system.dao.SysFileResourceDao; +import com.bonus.imgTool.system.service.SysFileResourceService; +import com.bonus.imgTool.system.vo.SysFileResourceVo; +import com.bonus.imgTool.utils.UserUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +@Service +@Slf4j +public class SysFileResourceServiceImpl implements SysFileResourceService { + + @Resource + private SysFileResourceDao sysFileResourceDao; + + @Override + public List getSysFileResourceList(Long id) { + return sysFileResourceDao.getSysFileResourceList(id); + } + + @Override + public void deleteFileResource(Long id) { + sysFileResourceDao.deleteFileResource(id); + } + + @Override + public void addSysFileResource(SysFileResourceVo sysFileResourceVo, Long id, String uploadType, Long createUserId, String createUserName) { + sysFileResourceVo.setSourceId(id); + sysFileResourceVo.setUploadType(uploadType); + sysFileResourceVo.setCreateUser(UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0); + sysFileResourceVo.setCreateUserName(UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser(): null); + sysFileResourceDao.addSysFileResource(sysFileResourceVo); + } +} diff --git a/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml b/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml new file mode 100644 index 0000000..847f20e --- /dev/null +++ b/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml @@ -0,0 +1,88 @@ + + + + + insert into tb_coordinate_photo + + pro_id, + pro_name, + major_id, + major_name, + gx_id, + gx_name, + build_place, + build_before_desc, + build_under_desc, + build_after_desc, + create_user_id, + create_time, + create_user_name, + update_user_id, + update_user_name, + update_time, + data_source, + is_active + + + #{proId}, + #{proName}, + #{majorId}, + #{majorName}, + #{gxId}, + #{gxName}, + #{buildPlace}, + #{buildBeforeDesc}, + #{buildUnderDesc}, + #{buildAfterDesc}, + #{createUserId}, + #{createTime}, + #{createUserName}, + #{updateUserid}, + #{updateUserName}, + #{updateTime}, + #{dataSource}, + 1 + + + + + update tb_safety_measure + + pro_id = #{proId}, + pro_name = #{proName}, + major_id = #{majorId}, + major_name = #{majorName}, + gx_id = #{gxId}, + gx_name = #{gxName}, + build_place = #{buildPlace}, + build_before_desc = #{buildBeforeDesc}, + build_under_desc = #{buildUnderDesc}, + build_after_desc = #{buildAfterDesc}, + update_user_id = #{updateUserId}, + update_user_name = #{updateUserName}, + update_time = NOW() + + where id = #{id} + + + + update tb_coordinate_photo set is_active ='0' + where id = #{id} + + + + diff --git a/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml b/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml index 9c6acbe..dd7c735 100644 --- a/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml +++ b/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml @@ -46,6 +46,25 @@ + + update tb_safety_measure + + pro_id = #{proId}, + pro_name = #{proName}, + major_id = #{majorId}, + major_name = #{majorName}, + gx_id = #{gxId}, + gx_name = #{gxName}, + check_user_name = #{checkUserName}, + check_date = #{checkDate}, + check_place = #{checkPlace}, + check_desc = #{checkDesc}, + update_user_id = #{updateUserId}, + update_user_name = #{updateUserName}, + update_time = NOW() + + where id = #{id} + update tb_safety_measure set is_active ='0' where id = #{id}