安全措施落实

This commit is contained in:
马三炮 2025-04-02 18:13:30 +08:00
parent 2adb518fbc
commit 9f9689f9e2
11 changed files with 585 additions and 0 deletions

View File

@ -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;
}
}

View File

@ -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<SafetyMeasuresReqVo> 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<SafetyMeasuresReqVo> 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<SafetyMeasuresVo> data) {
return safetyMeasuresService.addSafetyMeasures(data.getData());
}
}

View File

@ -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;
}

View File

@ -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<SysFileResourceVo> sysFileResourceList;
}

View File

@ -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<SafetyMeasuresVo> getSafetyMeasuresList(SafetyMeasuresReqVo data);
void deleteSafetyMeasures(SafetyMeasuresReqVo data);
void addSafetyMeasures(SafetyMeasuresVo data);
}

View File

@ -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);
}

View File

@ -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<SafetyMeasuresVo> list = safetyMeasuresMapper.getSafetyMeasuresList(data);
//获取图片信息
for (SafetyMeasuresVo safetyMeasuresVo : list) {
List<SysFileResourceVo> sysFileResourceList = sysFileResourceDao.getSysFileResourceList(safetyMeasuresVo.getId());
safetyMeasuresVo.setSysFileResourceList(sysFileResourceList);
}
PageInfo<SafetyMeasuresVo> 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<SysFileResourceVo> 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();
}
}

View File

@ -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<SysFileResourceVo> getSysFileResourceList(Long id);
void addSysFileResource(SysFileResourceVo sysFileResourceVo);
}

View File

@ -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质量检查ID3.安全措施落实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;
}

View File

@ -0,0 +1,71 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.imgTool.imageUpload.mapper.SafetyMeasuresMapper">
<insert id="addSafetyMeasures" useGeneratedKeys="true" keyProperty="id">
insert into tb_safety_measure
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="proId != null and proId != ''">pro_id,</if>
<if test="proName != null">pro_name,</if>
<if test="majorId != null and majorId != ''">major_id,</if>
<if test="majorName != null">major_name,</if>
<if test="gxId != null and gxId != ''">gx_id,</if>
<if test="gxName != null">gx_name,</if>
<if test="checkUserName != null">check_user_name,</if>
<if test="checkDate != null">check_date,</if>
<if test="checkPlace != null">check_place,</if>
<if test="checkDesc != null">check_desc,</if>
<if test="createUserId != null">create_user_id,</if>
<if test="createTime != null">create_time,</if>
<if test="createUserName != null">create_user_name,</if>
<if test="updateUserid != null">update_user_id,</if>
<if test="updateUserName != null">update_user_name,</if>
<if test="updateTime != null">update_time,</if>
<if test="dataSource != null">data_source,</if>
is_active
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="proId != null and proId != ''">#{proId},</if>
<if test="proName != null">#{proName},</if>
<if test="majorId != null and majorId != ''">#{majorId},</if>
<if test="majorName != null">#{majorName},</if>
<if test="gxId != null and gxId != ''">#{gxId},</if>
<if test="gxName != null and gxName != ''">#{gxName},</if>
<if test="checkUserName != null">#{checkUserName},</if>
<if test="checkDate != null and checkDate != ''">#{checkDate},</if>
<if test="checkPlace != null">#{checkPlace},</if>
<if test="checkDesc != null">#{checkDesc},</if>
<if test="createUserId != null">#{createUserId},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createUserName != null">#{createUserName},</if>
<if test="updateUserid != null">#{updateUserid},</if>
<if test="updateUserName != null">#{updateUserName},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="dataSource != null">#{dataSource},</if>
1
</trim>
</insert>
<delete id="deleteSafetyMeasures">
update tb_safety_measure set is_active ='0'
where id = #{id}
</delete>
<select id="getSafetyMeasuresList" resultType="com.bonus.imgTool.imageUpload.dto.SafetyMeasuresVo">
select * from tb_safety_measure
where is_active = '1'
<if test="proId != '' and proId != null"> and pro_id = #{proId}</if>
<if test="majorId != '' and majorId != null"> and major_id = #{majorId}</if>
<if test="gxId != '' and gxId != null"> and gx_id = #{gxId}</if>
<if test="keyWord != null and keyWord != ''">
and (
check_user_name like concat('%', #{keyWord}, '%') or
check_desc like concat('%', #{keyWord}, '%') or
check_place like concat('%', #{keyWord}, '%') or
)
</if>
</select>
</mapper>

View File

@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.imgTool.system.dao.SysFileResourceDao">
<insert id="addSysFileResource">
insert into sys_file_resource
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="fileName != null and fileName != ''">file_name,</if>
<if test="fileSuffix != null">file_suffix,</if>
<if test="fileSize != null and fileSize != ''">file_size,</if>
<if test="originalFilePath != null">original_file_path,</if>
<if test="compressFilePath != null and compressFilePath != ''">compress_file_path,</if>
<if test="watermarkFilePath != null">watermark_file_path,</if>
<if test="fileType != null">file_type,</if>
<if test="sourceId != null">source_id,</if>
<if test="uploadType != null">upload_type,</if>
<if test="sourceType != null">source_type,</if>
<if test="sourceTypeName != null">source_type_name,</if>
<if test="createTime != null">create_time,</if>
<if test="createUserName != null">create_user_name,</if>
<if test="createUser != null">create_user,</if>
is_active
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="fileName != null and fileName != ''">#{fileName},</if>
<if test="fileSuffix != null">#{fileSuffix},</if>
<if test="fileSize != null and fileSize != ''">#{fileSize},</if>
<if test="originalFilePath != null">#{originalFilePath},</if>
<if test="compressFilePath != null and compressFilePath != ''">#{compressFilePath},</if>
<if test="watermarkFilePath != null and watermarkFilePath != ''">#{watermarkFilePath},</if>
<if test="fileType != null">#{fileType},</if>
<if test="sourceId != null and checkDate != ''">#{sourceId},</if>
<if test="uploadType != null">#{uploadType},</if>
<if test="sourceType != null">#{sourceType},</if>
<if test="sourceTypeName != null">#{sourceTypeName},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createUserName != null">#{createUserName},</if>
<if test="createUser != null">#{createUser},</if>
1
</trim>
</insert>
<delete id="deleteFileResource">
update sys_file_resource set is_active ='0'
where source_id = #{id}
</delete>
<select id="getSysFileResourceList" resultType="com.bonus.imgTool.system.vo.SysFileResourceVo">
select * from sys_file_resource where source_id = #{id}
</select>
</mapper>