bonus
/
yn_img_tool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

违章修改

This commit is contained in:
fl 2025-04-14 14:53:15 +08:00
parent 70f983bd14
commit 99501cbdea
3 changed files with 160 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

284
src/main/resources/mappers/backstage/SynthesisQueryMapper.xml
View File

@ -1,6 +1,6 @@
<?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">
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.imgTool.backstage.dao.SynthesisQueryDao">
<insert id="addComprehensiveQuery">
insert into tb_comprehensive_query
@ -14,12 +14,12 @@
<if test="gxName != null and gxName != ''">gx_name,</if>
<if test="checkUserName != null and checkUserName != ''">check_user_name,</if>
<if test="vioDate != null">vio_date,</if>
<if test="vioPlace != null and vioPlace != ''" >vio_place,</if>
<if test="vioDesc != null and vioDesc != ''" >vio_desc,</if>
<if test="vioPlace != null and vioPlace != ''">vio_place,</if>
<if test="vioDesc != null and vioDesc != ''">vio_desc,</if>
<if test="rectDate != null">rect_date,</if>
<if test="rectUserName != null and rectUserName != ''">rect_user_name,</if>
<if test="rectTime != null">rect_time,</if>
<if test="rectDesc != null and rectDesc != ''" >rect_desc,</if>
<if test="rectDesc != null and rectDesc != ''">rect_desc,</if>
<if test="rectStatus != null">rect_status,</if>
<if test="buildBeforeDesc != null">build_before_desc,</if>
<if test="buildUnderDesc != null">build_under_desc,</if>
@ -81,22 +81,25 @@
<if test="tempFilePath != null and tempFilePath != ''">#{tempFilePath},</if>
</trim>
</insert>
<delete id="deleteComprehensiveQuery">
update tb_comprehensive_query set is_active ='0'
where id = #{id} and upload_type = #{uploadType}
update tb_comprehensive_query
set is_active ='0'
where id = #{id}
and upload_type = #{uploadType}
</delete>
<!--综合查询-照片综合查询-照片数量-->
<select id="getImgNum" resultType="com.bonus.imgTool.backstage.entity.SynthesisNumVo">
SELECT COUNT(1) AS totalNum,
COUNT(IF(tcq.upload_type = '1', 1, NULL)) AS safetyVioNum,
COUNT(IF(tcq.upload_type = '2', 1, NULL)) AS qualityInsNum,
COUNT(IF(tcq.upload_type = '3', 1, NULL)) AS safetyMeasNum,
COUNT(IF(tcq.upload_type = '4', 1, NULL)) AS coordinatedPhotoNum,
COUNT(IF(tcq.upload_type = '5', 1, NULL)) AS importIssuesAndPublicityNum
COUNT(IF(tcq.upload_type = '1', 1, NULL)) AS safetyVioNum,
COUNT(IF(tcq.upload_type = '2', 1, NULL)) AS qualityInsNum,
COUNT(IF(tcq.upload_type = '3', 1, NULL)) AS safetyMeasNum,
COUNT(IF(tcq.upload_type = '4', 1, NULL)) AS coordinatedPhotoNum,
COUNT(IF(tcq.upload_type = '5', 1, NULL)) AS importIssuesAndPublicityNum
FROM tb_comprehensive_query tcq
LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND sfr.is_active = '1'
LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND
sfr.is_active = '1'
WHERE tcq.is_active = '1'
<if test="roleLevel = '0' and proIds != null and proIds.size() > 0">
AND tcq.pro_id IN
@ -111,27 +114,28 @@
<!--照片综合查询-->
<select id="getImgList" resultType="com.bonus.imgTool.backstage.entity.SynthesisQueryVo">
SELECT sfr.id,
sfr.original_file_path AS originalFilePath,
sfr.compress_file_path AS compressFilePath,
sfr.watermark_file_path AS watermarkFilePath,
sfr.upload_type AS uploadType,
CASE sfr.upload_type WHEN '1' THEN '安全违章' WHEN '2' THEN '质量检查' WHEN '3' THEN '安全措施落实'
WHEN '4' THEN '协调照片' WHEN '5' THEN '重要事项及宣传类' ELSE '' END AS uploadTypeName,
sfr.create_time AS uploadTime,
source_type AS sourceType,
A.dict_name AS sourceTypeName,
IF(tpc.file_resource_id IS NULL,'0','1') AS collectStatus,
tcq.title,
tcq.pro_name AS proName
SELECT sfr.id,
sfr.original_file_path AS originalFilePath,
sfr.compress_file_path AS compressFilePath,
sfr.watermark_file_path AS watermarkFilePath,
sfr.upload_type AS uploadType,
CASE sfr.upload_type WHEN '1' THEN '安全违章' WHEN '2' THEN '质量检查' WHEN '3' THEN '安全措施落实'
WHEN '4' THEN '协调照片' WHEN '5' THEN '重要事项及宣传类' ELSE '' END AS uploadTypeName,
sfr.create_time AS uploadTime,
source_type AS sourceType,
A.dict_name AS sourceTypeName,
IF(tpc.file_resource_id IS NULL,'0','1') AS collectStatus,
tcq.title,
tcq.pro_name AS proName
FROM tb_comprehensive_query tcq
LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND sfr.is_active = '1'
LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND
sfr.is_active = '1'
LEFT JOIN tb_photo_collect tpc ON sfr.id = tpc.file_resource_id AND tpc.collect_user_id = #{userId}
LEFT JOIN (
SELECT sd.dict_value,sd.dict_name
FROM sys_distinct sd
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
WHERE sd2.dict_code = 'file_source_type' AND sd.del_flag = 0
SELECT sd.dict_value,sd.dict_name
FROM sys_distinct sd
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
WHERE sd2.dict_code = 'file_source_type' AND sd.del_flag = 0
) A ON A.dict_value = sfr.source_type
<where>
<if test="queryType == 1">
@ -230,7 +234,9 @@
</select>
<!--获取水印照片地址-->
<select id="getSyData" resultType="java.lang.String">
SELECT watermark_file_path FROM sys_file_resource WHERE id = #{id}
SELECT watermark_file_path
FROM sys_file_resource
WHERE id = #{id}
</select>
<!--项目分类统计-->
<select id="getProClassifyStatisticsList"
@ -246,7 +252,8 @@
MAX(sfr.create_time) AS lastUpdateTime
FROM tb_comprehensive_query tcq
LEFT JOIN tb_project tp ON tcq.pro_id = tp.id
LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND sfr.is_active = '1'
LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND
sfr.is_active = '1'
<where>
<if test="roleLevel = '0' and proIds != null and proIds.size() > 0">
AND tcq.pro_id IN
@ -263,7 +270,7 @@
</select>
<!--项目分类统计-查看图片详情-->
<select id="getProImgList" resultType="com.bonus.imgTool.backstage.entity.SynthesisQueryVo">
SELECT sfr.id,
SELECT sfr.id,
sfr.original_file_path AS originalFilePath,
sfr.compress_file_path AS compressFilePath,
sfr.watermark_file_path AS watermarkFilePath,
@ -277,12 +284,13 @@
tcq.title,
tcq.pro_name AS proName
FROM tb_comprehensive_query tcq
LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND sfr.is_active = '1'
LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND
sfr.is_active = '1'
LEFT JOIN tb_photo_collect tpc ON sfr.id = tpc.file_resource_id AND tpc.collect_user_id = #{userId}
LEFT JOIN (
SELECT sd.dict_value,sd.dict_name
FROM sys_distinct sd
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
SELECT sd.dict_value,sd.dict_name
FROM sys_distinct sd
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
WHERE sd2.dict_code = 'file_source_type' AND sd.del_flag = 0
) A ON A.dict_value = sfr.source_type
<where>
@ -421,76 +429,7 @@
</select>
<!--获取图片-->
<select id="getImgs" resultType="com.bonus.imgTool.backstage.entity.SynthesisQueryVo">
SELECT sfr.id,
sfr.original_file_path AS originalFilePath,
sfr.compress_file_path AS compressFilePath,
sfr.watermark_file_path AS watermarkFilePath,
sfr.upload_type AS uploadType,
CASE sfr.upload_type WHEN '1' THEN '安全违章' WHEN '2' THEN '质量检查' WHEN '3' THEN '安全措施落实'
WHEN '4' THEN '协调照片' WHEN '5' THEN '重要事项及宣传类' ELSE '' END AS uploadTypeName,
sfr.create_time AS uploadTime,
sfr.source_type AS sourceType,
A.dict_name AS sourceTypeName,
IF(tpc.file_resource_id IS NULL,'0','1') AS collectStatus
FROM sys_file_resource sfr
LEFT JOIN tb_photo_collect tpc ON sfr.id = tpc.file_resource_id AND tpc.collect_user_id = #{params.userId}
LEFT JOIN (
SELECT sd.dict_value,sd.dict_name
FROM sys_distinct sd
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
WHERE sd2.dict_code = 'file_source_type' AND sd.del_flag = 0
) A ON A.dict_value = sfr.source_type
<where>
AND sfr.source_id = #{params.id} AND sfr.upload_type = #{params.uploadType} AND sfr.source_type = #{type} AND sfr.is_active = '1'
</where>
</select>
<!--查询原图/水印照片-->
<select id="findByAlbumId" resultType="com.bonus.imgTool.backstage.entity.Photo">
SELECT sfr.id AS photoId,
IF(#{type} = '1',sfr.original_file_path,sfr.watermark_file_path) AS filePath,
sfr.upload_type AS uploadType,
CASE sfr.upload_type WHEN '1' THEN '安全违章' WHEN '2' THEN '质量检查' WHEN '3' THEN '安全措施落实'
WHEN '4' THEN '协调照片' WHEN '5' THEN '重要事项及宣传类' ELSE '' END AS uploadTypeName,
A.dict_name AS sourceTypeName,
tcq.title
FROM tb_comprehensive_query tcq
LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND sfr.is_active = '1'
LEFT JOIN (
SELECT sd.dict_value,sd.dict_name
FROM sys_distinct sd
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
WHERE sd2.dict_code = 'file_source_type' AND sd.del_flag = 0
) A ON A.dict_value = sfr.source_type
WHERE tcq.pro_id = #{proId} AND tcq.is_active = '1'
ORDER BY sfr.create_time DESC
</select>
<!--查询图片未生成水印照片的数据-->
<select id="generateWatermark" resultType="com.bonus.imgTool.backstage.entity.SynthesisQueryVo">
SELECT sfr.id,
sfr.original_file_path AS originalFilePath,
sfr.compress_file_path AS compressFilePath,
sfr.watermark_file_path AS watermarkFilePath,
sfr.upload_type AS uploadType,
CASE sfr.upload_type WHEN '1' THEN '安全违章' WHEN '2' THEN '质量检查' WHEN '3' THEN '安全措施落实'
WHEN '4' THEN '协调照片' WHEN '5' THEN '重要事项及宣传类' ELSE '' END AS uploadTypeName,
sfr.create_time AS uploadTime,
source_type AS sourceType,
A.dict_name AS sourceTypeName,
tcq.title,
tcq.pro_name AS proName
FROM tb_comprehensive_query tcq
LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND sfr.is_active = '1'
LEFT JOIN (
SELECT sd.dict_value,sd.dict_name
FROM sys_distinct sd
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
WHERE sd2.dict_code = 'file_source_type' AND sd.del_flag = 0
) A ON A.dict_value = sfr.source_type
WHERE tcq.pro_id = #{proId} AND tcq.is_active = '1' AND sfr.watermark_file_path IS NULL
</select>
<select id="getPhotoImgList" resultType="com.bonus.imgTool.backstage.entity.SynthesisQueryVo">
SELECT sfr.id,
SELECT sfr.id,
sfr.original_file_path AS originalFilePath,
sfr.compress_file_path AS compressFilePath,
sfr.watermark_file_path AS watermarkFilePath,
@ -498,29 +437,121 @@
CASE sfr.upload_type WHEN '1' THEN '安全违章' WHEN '2' THEN '质量检查' WHEN '3' THEN '安全措施落实'
WHEN '4' THEN '协调照片' WHEN '5' THEN '重要事项及宣传类' ELSE '' END AS uploadTypeName,
sfr.create_time AS uploadTime,
source_type AS sourceType,
sfr.source_type AS sourceType,
A.dict_name AS sourceTypeName,
IF(tpc.file_resource_id IS NULL,'0','1') AS collectStatus,
tcq.title,
tcq.pro_name AS proName
FROM tb_comprehensive_query tcq
LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND sfr.is_active = '1'
LEFT JOIN tb_photo_collect tpc ON sfr.id = tpc.file_resource_id
IF(tpc.file_resource_id IS NULL,'0','1') AS collectStatus
FROM sys_file_resource sfr
LEFT JOIN tb_photo_collect tpc ON sfr.id = tpc.file_resource_id AND tpc.collect_user_id = #{params.userId}
LEFT JOIN (
SELECT sd.dict_value,sd.dict_name
FROM sys_distinct sd
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
WHERE sd2.dict_code = 'file_source_type' AND sd.del_flag = 0
) A ON A.dict_value = sfr.source_type
WHERE sfr.source_id = #{id} AND sfr.source_type = #{sourceType} and sfr.is_active = '1' AND tcq.is_active = '1'
<where>
AND sfr.source_id = #{params.id} AND sfr.upload_type = #{params.uploadType} AND sfr.source_type = #{type}
AND sfr.is_active = '1'
</where>
</select>
<!--查询原图/水印照片-->
<select id="findByAlbumId" resultType="com.bonus.imgTool.backstage.entity.Photo">
SELECT sfr.id AS photoId,
IF(#{type} = '1', sfr.original_file_path, sfr.watermark_file_path) AS filePath,
sfr.upload_type AS uploadType,
CASE sfr.upload_type
WHEN '1' THEN '安全违章'
WHEN '2' THEN '质量检查'
WHEN '3' THEN '安全措施落实'
WHEN '4' THEN '协调照片'
WHEN '5' THEN '重要事项及宣传类'
ELSE '' END AS uploadTypeName,
A.dict_name AS sourceTypeName,
tcq.title
FROM tb_comprehensive_query tcq
LEFT JOIN sys_file_resource sfr
ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND sfr.is_active = '1'
LEFT JOIN (SELECT sd.dict_value, sd.dict_name
FROM sys_distinct sd
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
WHERE sd2.dict_code = 'file_source_type'
AND sd.del_flag = 0) A ON A.dict_value = sfr.source_type
WHERE tcq.pro_id = #{proId}
AND tcq.is_active = '1'
ORDER BY sfr.create_time DESC
</select>
<!--查询图片未生成水印照片的数据-->
<select id="generateWatermark" resultType="com.bonus.imgTool.backstage.entity.SynthesisQueryVo">
SELECT sfr.id,
sfr.original_file_path AS originalFilePath,
sfr.compress_file_path AS compressFilePath,
sfr.watermark_file_path AS watermarkFilePath,
sfr.upload_type AS uploadType,
CASE sfr.upload_type
WHEN '1' THEN '安全违章'
WHEN '2' THEN '质量检查'
WHEN '3' THEN '安全措施落实'
WHEN '4' THEN '协调照片'
WHEN '5' THEN '重要事项及宣传类'
ELSE '' END AS uploadTypeName,
sfr.create_time AS uploadTime,
source_type AS sourceType,
A.dict_name AS sourceTypeName,
tcq.title,
tcq.pro_name AS proName
FROM tb_comprehensive_query tcq
LEFT JOIN sys_file_resource sfr
ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND sfr.is_active = '1'
LEFT JOIN (SELECT sd.dict_value, sd.dict_name
FROM sys_distinct sd
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
WHERE sd2.dict_code = 'file_source_type'
AND sd.del_flag = 0) A ON A.dict_value = sfr.source_type
WHERE tcq.pro_id = #{proId}
AND tcq.is_active = '1'
AND sfr.watermark_file_path IS NULL
</select>
<select id="getPhotoImgList" resultType="com.bonus.imgTool.backstage.entity.SynthesisQueryVo">
SELECT sfr.id,
sfr.original_file_path AS originalFilePath,
sfr.compress_file_path AS compressFilePath,
sfr.watermark_file_path AS watermarkFilePath,
sfr.upload_type AS uploadType,
CASE sfr.upload_type
WHEN '1' THEN '安全违章'
WHEN '2' THEN '质量检查'
WHEN '3' THEN '安全措施落实'
WHEN '4' THEN '协调照片'
WHEN '5' THEN '重要事项及宣传类'
ELSE '' END AS uploadTypeName,
sfr.create_time AS uploadTime,
source_type AS sourceType,
A.dict_name AS sourceTypeName,
IF(tpc.file_resource_id IS NULL, '0', '1') AS collectStatus,
tcq.title,
tcq.pro_name AS proName
FROM tb_comprehensive_query tcq
LEFT JOIN sys_file_resource sfr
ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND sfr.is_active = '1'
LEFT JOIN tb_photo_collect tpc ON sfr.id = tpc.file_resource_id
LEFT JOIN (SELECT sd.dict_value, sd.dict_name
FROM sys_distinct sd
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
WHERE sd2.dict_code = 'file_source_type'
AND sd.del_flag = 0) A ON A.dict_value = sfr.source_type
WHERE sfr.source_id = #{id}
AND sfr.source_type = #{sourceType}
and sfr.is_active = '1'
AND tcq.is_active = '1'
ORDER BY sfr.create_time DESC
</select>
<!--收藏/取消收藏图片-->
<update id="collectData">
<if test="collectType == 1">
INSERT INTO tb_photo_collect (file_resource_id, collect_user_id,collect_user_name, create_user,create_user_name)
INSERT INTO tb_photo_collect (file_resource_id, collect_user_id,collect_user_name,
create_user,create_user_name)
VALUES (
#{id},#{userId},#{userName},#{userId},#{userName}
#{id},#{userId},#{userName},#{userId},#{userName}
)
</if>
<if test="collectType == 2">
@ -529,17 +560,19 @@
</update>
<!--生成水印照片-->
<update id="updateSyData">
UPDATE sys_file_resource SET watermark_file_path = #{watermarkFilePath} WHERE id = #{id}
UPDATE sys_file_resource
SET watermark_file_path = #{watermarkFilePath}
WHERE id = #{id}
</update>
<update id="updateComprehensiveQuery">
update tb_comprehensive_query
<trim prefix="SET" suffixOverrides=",">
<if test="proId != null">pro_id = #{proId},</if>
<if test="proName != null">pro_name = #{proName},</if>
<if test="majorId != null">major_id = #{majorId},</if>
<if test="majorName != null">major_name = #{majorName},</if>
<if test="gxId != null">gx_id = #{gxId},</if>
<if test="gxName != null">gx_name = #{gxName},</if>
major_id = #{majorId},
major_name = #{majorName},
gx_id = #{gxId},
gx_name = #{gxName},
<if test="checkUserName != null">check_user_name = #{checkUserName},</if>
<if test="vioDate != null">vio_date = #{vioDate},</if>
<if test="vioPlace != null">vio_place = #{vioPlace},</if>
@ -571,6 +604,9 @@
</update>
<!--更新下载任务-->
<update id="updateTaskDownload">
UPDATE tb_download_task SET file_path = #{params.filePath},failure_time = #{nowTime} WHERE id = #{params.id}
UPDATE tb_download_task
SET file_path = #{params.filePath},
failure_time = #{nowTime}
WHERE id = #{params.id}
</update>
</mapper>

8
src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml
View File

@ -69,18 +69,10 @@
<if test="proName != null">
pro_name = #{proName},
</if>
<if test="majorId != null">
major_id = #{majorId},
</if>
<if test="majorName != null">
major_name = #{majorName},
</if>
<if test="gxId != null">
gx_id = #{gxId},
</if>
<if test="gxName != null">
gx_name = #{gxName},
</if>
<if test="checkUserName != null">
check_user_name = #{checkUserName},
</if>

8
src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml
View File

@ -101,18 +101,10 @@
<if test="proName != null">
pro_name = #{proName},
</if>
<if test="majorId != null">
major_id = #{majorId},
</if>
<if test="majorName != null">
major_name = #{majorName},
</if>
<if test="gxId != null">
gx_id = #{gxId},
</if>
<if test="gxName != null">
gx_name = #{gxName},
</if>
<if test="checkUserName != null">
check_user_name = #{checkUserName},
</if>