From 9f9689f9e2bbdb5ff7e3a0b556b29b33f16e4577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Wed, 2 Apr 2025 18:13:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=8E=AA=E6=96=BD=E8=90=BD?= =?UTF-8?q?=E5=AE=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../imgTool/Enum/FileSourceTypeEnum.java | 26 +++++ .../controller/SafetyMeasuresController.java | 65 +++++++++++ .../imageUpload/dto/SafetyMeasuresReqVo.java | 35 ++++++ .../imageUpload/dto/SafetyMeasuresVo.java | 106 ++++++++++++++++++ .../mapper/SafetyMeasuresMapper.java | 15 +++ .../service/SafetyMeasuresService.java | 13 +++ .../impl/SafetyMeasuresServiceImpl.java | 102 +++++++++++++++++ .../system/dao/SysFileResourceDao.java | 17 +++ .../imgTool/system/vo/SysFileResourceVo.java | 84 ++++++++++++++ .../imageUpload/SafetMeasuresMapper.xml | 71 ++++++++++++ .../mappers/system/SysFileResourceMapper.xml | 51 +++++++++ 11 files changed, 585 insertions(+) create mode 100644 src/main/java/com/bonus/imgTool/Enum/FileSourceTypeEnum.java create mode 100644 src/main/java/com/bonus/imgTool/imageUpload/controller/SafetyMeasuresController.java create mode 100644 src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresReqVo.java create mode 100644 src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresVo.java create mode 100644 src/main/java/com/bonus/imgTool/imageUpload/mapper/SafetyMeasuresMapper.java create mode 100644 src/main/java/com/bonus/imgTool/imageUpload/service/SafetyMeasuresService.java create mode 100644 src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java create mode 100644 src/main/java/com/bonus/imgTool/system/dao/SysFileResourceDao.java create mode 100644 src/main/java/com/bonus/imgTool/system/vo/SysFileResourceVo.java create mode 100644 src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml create mode 100644 src/main/resources/mappers/system/SysFileResourceMapper.xml diff --git a/src/main/java/com/bonus/imgTool/Enum/FileSourceTypeEnum.java b/src/main/java/com/bonus/imgTool/Enum/FileSourceTypeEnum.java new file mode 100644 index 0000000..50bef21 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/Enum/FileSourceTypeEnum.java @@ -0,0 +1,26 @@ +package com.bonus.imgTool.Enum; + +import lombok.Getter; + +@Getter +public enum FileSourceTypeEnum { + + FILE_SOURCE_TYPE_1("1", "安全违章-违章照片"), + FILE_SOURCE_TYPE_2("2", "安全违章-整改照片"), + FILE_SOURCE_TYPE_3("3", "质量检查-缺陷问题照片"), + FILE_SOURCE_TYPE_4("4", "质量检查-整改照片"), + FILE_SOURCE_TYPE_5("5", "安全措施落实-现场照片"), + FILE_SOURCE_TYPE_6("6", "协调照片-建设前"), + FILE_SOURCE_TYPE_7("7", "协调照片-建设中"), + FILE_SOURCE_TYPE_8("8", "协调照片-恢复后"), + FILE_SOURCE_TYPE_9("9", "重要事项及宣传-照片"); + private final String status; + private final String statusName; + + FileSourceTypeEnum(String status, String statusName) { + this.status = status; + this.statusName = statusName; + } + + +} diff --git a/src/main/java/com/bonus/imgTool/imageUpload/controller/SafetyMeasuresController.java b/src/main/java/com/bonus/imgTool/imageUpload/controller/SafetyMeasuresController.java new file mode 100644 index 0000000..fb6c4b9 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/imageUpload/controller/SafetyMeasuresController.java @@ -0,0 +1,65 @@ +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; +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("/safetyMeasure") +public class SafetyMeasuresController { + + @Resource + private SafetyMeasuresService safetyMeasuresService; + + + /** + * 安全措施落实获取列表 + * @param data + * @return + */ + @PostMapping(value = "/getSafetyMeasuresList") + @DecryptAndVerify(decryptedClass = SafetyMeasuresReqVo.class) + @LogAnnotation(operModul = "安全措施落实-查询", operation = "查询照片", operDesc = "系统级事件",operType="查询") + public ServerResponse getSafetyMeasuresList(EncryptedReq data) { + return safetyMeasuresService.getSafetyMeasuresList(data.getData()); + } + + /** + * 安全措施落实删除 + * @param data + * @return + */ + @PostMapping(value = "/deleteSafetyMeasures") + @DecryptAndVerify(decryptedClass = SafetyMeasuresReqVo.class) + @LogAnnotation(operModul = "安全措施落实-删除", operation = "查询照片", operDesc = "系统级事件",operType="查询") + public ServerResponse deleteSafetyMeasures(EncryptedReq data) { + return safetyMeasuresService.deleteSafetyMeasures(data.getData()); + } + + /** + * 安全措施落实新增 + * @param data + * @return + */ + @PostMapping(value = "/addSafetyMeasures") + @DecryptAndVerify(decryptedClass = SafetyMeasuresVo.class) + @LogAnnotation(operModul = "安全措施落实-新增", operation = "查询照片", operDesc = "系统级事件",operType="查询") + public ServerResponse addSafetyMeasures(EncryptedReq data) { + return safetyMeasuresService.addSafetyMeasures(data.getData()); + } +} diff --git a/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresReqVo.java b/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresReqVo.java new file mode 100644 index 0000000..d58fa5c --- /dev/null +++ b/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresReqVo.java @@ -0,0 +1,35 @@ +package com.bonus.imgTool.imageUpload.dto; + +import lombok.Data; + +@Data +public class SafetyMeasuresReqVo { + + /** + * 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/SafetyMeasuresVo.java b/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresVo.java new file mode 100644 index 0000000..9df67ba --- /dev/null +++ b/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresVo.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 SafetyMeasuresVo { + + /** + * 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 checkUserName; + + /** + * 检查时间 + */ + private Date checkDate; + + /** + * 检查地点 + */ + private String checkPlace; + + /** + * 违章描述 + */ + private String checkDesc; + + /** + * 创建人 + */ + 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/SafetyMeasuresMapper.java b/src/main/java/com/bonus/imgTool/imageUpload/mapper/SafetyMeasuresMapper.java new file mode 100644 index 0000000..c01b2f9 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/imageUpload/mapper/SafetyMeasuresMapper.java @@ -0,0 +1,15 @@ +package com.bonus.imgTool.imageUpload.mapper; + +import com.bonus.imgTool.imageUpload.dto.SafetyMeasuresReqVo; +import com.bonus.imgTool.imageUpload.dto.SafetyMeasuresVo; + +import java.util.List; + +public interface SafetyMeasuresMapper { + List getSafetyMeasuresList(SafetyMeasuresReqVo data); + + void deleteSafetyMeasures(SafetyMeasuresReqVo data); + + + void addSafetyMeasures(SafetyMeasuresVo 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 new file mode 100644 index 0000000..df702f2 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/SafetyMeasuresService.java @@ -0,0 +1,13 @@ +package com.bonus.imgTool.imageUpload.service; + +import com.bonus.imgTool.imageUpload.dto.SafetyMeasuresReqVo; +import com.bonus.imgTool.imageUpload.dto.SafetyMeasuresVo; +import com.bonus.imgTool.utils.ServerResponse; + +public interface SafetyMeasuresService { + ServerResponse getSafetyMeasuresList(SafetyMeasuresReqVo data); + + ServerResponse deleteSafetyMeasures(SafetyMeasuresReqVo data); + + ServerResponse addSafetyMeasures(SafetyMeasuresVo 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 new file mode 100644 index 0000000..0c6b9e6 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java @@ -0,0 +1,102 @@ +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.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.ArrayList; +import java.util.List; +import java.util.Optional; + +@Slf4j +@Service +@Transactional +public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { + + @Resource + private SafetyMeasuresMapper safetyMeasuresMapper; + + @Resource + private SysFileResourceDao sysFileResourceDao; + + /** + * 安全措施落实获取列表 + * @param data + * @return + */ + @Override + public ServerResponse getSafetyMeasuresList(SafetyMeasuresReqVo data) { + PageHelper.startPage(data.getPageNum(), data.getPageSize()); + try { + List list = safetyMeasuresMapper.getSafetyMeasuresList(data); + //获取图片信息 + for (SafetyMeasuresVo safetyMeasuresVo : list) { + List sysFileResourceList = sysFileResourceDao.getSysFileResourceList(safetyMeasuresVo.getId()); + safetyMeasuresVo.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 deleteSafetyMeasures(SafetyMeasuresReqVo data) { + try { + safetyMeasuresMapper.deleteSafetyMeasures(data); + sysFileResourceDao.deleteFileResource(data); + return ServerResponse.createSuccess(); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("删除失败"); + } + } + + /** + * 安全措施落实新增 + * @param data + * @return + */ + @Override + public ServerResponse addSafetyMeasures(SafetyMeasuresVo data) { + try { + //保存 + safetyMeasuresMapper.addSafetyMeasures(data); + //保存附件 + 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); + } + } 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 new file mode 100644 index 0000000..7039682 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/system/dao/SysFileResourceDao.java @@ -0,0 +1,17 @@ +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; + +import java.util.List; + +@Repository +public interface SysFileResourceDao { + + void deleteFileResource(SafetyMeasuresReqVo data); + + List getSysFileResourceList(Long id); + + void addSysFileResource(SysFileResourceVo sysFileResourceVo); +} diff --git a/src/main/java/com/bonus/imgTool/system/vo/SysFileResourceVo.java b/src/main/java/com/bonus/imgTool/system/vo/SysFileResourceVo.java new file mode 100644 index 0000000..b66a2a8 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/system/vo/SysFileResourceVo.java @@ -0,0 +1,84 @@ +package com.bonus.imgTool.system.vo; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class SysFileResourceVo { + + /** + * id + */ + private Long id; + + /** + * 文件名称 + */ + private String fileName; + + /** + * 文件后缀 + */ + private String fileSuffix; + + /** + * 文件大小 Mb单位 + */ + private BigDecimal fileSize; + + /** + * 原图图片路径 + */ + private String originalFilePath; + + /** + * 压缩图片路径 + */ + private String compressFilePath; + + /** + * 图片水印路径 + */ + private String watermarkFilePath; + + /** + * 文件类型 1.图片 2.文件 + */ + private String fileType; + + /** + * 资源id（安全违章ID、质量检查ID、3.安全措施落实ID、协调照片ID、重要事项及宣传照片ID） + */ + private Long sourceId; + + /** + * 上传类型 1.安全违章、2.质量检查、3.安全措施落实、4.协调照片、5.重要事项及宣传照片 + */ + private String uploadType; + + /** + * 资源类型 码表配置（照片类型或阶段） + */ + private String sourceType; + + /** + * 资源类型名称 + */ + private String sourceTypeName; + + /** + * 创建日期 + */ + private String createTime; + + /** + * 创建人 + */ + private Long createUser; + + /** + * 创建人 + */ + private String createUserName; +} diff --git a/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml b/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml new file mode 100644 index 0000000..9c6acbe --- /dev/null +++ b/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml @@ -0,0 +1,71 @@ + + + + + insert into tb_safety_measure + + pro_id, + pro_name, + major_id, + major_name, + gx_id, + gx_name, + check_user_name, + check_date, + check_place, + check_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}, + #{checkUserName}, + #{checkDate}, + #{checkPlace}, + #{checkDesc}, + #{createUserId}, + #{createTime}, + #{createUserName}, + #{updateUserid}, + #{updateUserName}, + #{updateTime}, + #{dataSource}, + 1 + + + + + update tb_safety_measure set is_active ='0' + where id = #{id} + + + + + + diff --git a/src/main/resources/mappers/system/SysFileResourceMapper.xml b/src/main/resources/mappers/system/SysFileResourceMapper.xml new file mode 100644 index 0000000..494a4d0 --- /dev/null +++ b/src/main/resources/mappers/system/SysFileResourceMapper.xml @@ -0,0 +1,51 @@ + + + + + insert into sys_file_resource + + file_name, + file_suffix, + file_size, + original_file_path, + compress_file_path, + watermark_file_path, + file_type, + source_id, + upload_type, + source_type, + source_type_name, + create_time, + create_user_name, + create_user, + is_active + + + #{fileName}, + #{fileSuffix}, + #{fileSize}, + #{originalFilePath}, + #{compressFilePath}, + #{watermarkFilePath}, + #{fileType}, + #{sourceId}, + #{uploadType}, + #{sourceType}, + #{sourceTypeName}, + #{createTime}, + #{createUserName}, + #{createUser}, + 1 + + + + + update sys_file_resource set is_active ='0' + where source_id = #{id} + + +