From 715a1f7f7a61d55e6b33600ee56f3c145dc724e6 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Mon, 14 Apr 2025 14:34:42 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../child/coordinatePhotoForm.js | 19 ++++++++++++++----- .../child/importantMatterForm.js | 19 ++++++++++++++----- .../child/qualityInspectionForm.js | 19 ++++++++++++++----- .../safetyMeasure/child/safetyMeasureForm.js | 19 ++++++++++++++----- .../child/safetyViolationsForm.js | 18 ++++++++++++++---- 5 files changed, 70 insertions(+), 24 deletions(-) diff --git a/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js b/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js index 579fe92..25b99d7 100644 --- a/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js +++ b/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js @@ -223,9 +223,13 @@ function setParams(params) { form.on('select(majorId)', function (data) { const selectedId = data.value; // 获取选中项的 value 值 const selectedName = $(data.elem).find("option:selected").text(); // 获取选中项的文本 - majorId = selectedId; - majorName = selectedName; - + if (selectedId === '' || selectedId == '') { + majorId = ''; + majorName = ''; + }else { + majorId = selectedId; + majorName = selectedName; + } let gxs = getGxsSelect(data.value); setSelectValueName(gxs, 'gxId', '请选择工序'); }); @@ -233,8 +237,13 @@ function setParams(params) { form.on('select(gxId)', function (data) { const selectedId = data.value; // 获取选中项的 value 值 const selectedName = $(data.elem).find("option:selected").text(); // 获取选中项的文本 - gxId = selectedId; - gxName = selectedName; + if (selectedId === '' || selectedId == '') { + gxId = ''; + gxName = ''; + }else{ + gxId = selectedId; + gxName = selectedName; + } }); form.render();//重新渲染页面checkbox控件 diff --git a/src/main/resources/static/js/imageUpload/importantMatter/child/importantMatterForm.js b/src/main/resources/static/js/imageUpload/importantMatter/child/importantMatterForm.js index 73cb508..58859d7 100644 --- a/src/main/resources/static/js/imageUpload/importantMatter/child/importantMatterForm.js +++ b/src/main/resources/static/js/imageUpload/importantMatter/child/importantMatterForm.js @@ -113,9 +113,13 @@ function setParams(params) { form.on('select(majorId)', function (data) { const selectedId = data.value; // 获取选中项的 value 值 const selectedName = $(data.elem).find("option:selected").text(); // 获取选中项的文本 - majorId = selectedId; - majorName = selectedName; - + if(selectedId === '' || selectedId == '' ){ + majorId = ''; + majorName = ''; + }else{ + majorId = selectedId; + majorName = selectedName; + } let gxs = getGxsSelect(data.value); setSelectValueName(gxs, 'gxId', '请选择工序'); }); @@ -123,8 +127,13 @@ function setParams(params) { form.on('select(gxId)', function (data) { const selectedId = data.value; // 获取选中项的 value 值 const selectedName = $(data.elem).find("option:selected").text(); // 获取选中项的文本 - gxId = selectedId; - gxName = selectedName; + if(selectedId === ''){ + gxId = ''; + gxName = ''; + }else{ + gxId = selectedId; + gxName = selectedName; + } }); form.render();//重新渲染页面checkbox控件 diff --git a/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js b/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js index b042489..2f2ade9 100644 --- a/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js +++ b/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js @@ -169,9 +169,13 @@ function setParams(params) { form.on('select(majorId)', function (data) { const selectedId = data.value; // 获取选中项的 value 值 const selectedName = $(data.elem).find("option:selected").text(); // 获取选中项的文本 - majorId = selectedId; - majorName = selectedName; - + if(selectedId === '' || selectedId == '' ){ + majorId = ''; + majorName = ''; + }else{ + majorId = selectedId; + majorName = selectedName; + } let gxs = getGxsSelect(data.value); setSelectValueName(gxs, 'gxId', '请选择工序'); }); @@ -179,8 +183,13 @@ function setParams(params) { form.on('select(gxId)', function (data) { const selectedId = data.value; // 获取选中项的 value 值 const selectedName = $(data.elem).find("option:selected").text(); // 获取选中项的文本 - gxId = selectedId; - gxName = selectedName; + if(selectedId === '' || selectedId == '' ){ + gxId = ''; + gxName = ''; + }else{ + gxId = selectedId; + gxName = selectedName; + } }); form.render();//重新渲染页面checkbox控件 diff --git a/src/main/resources/static/js/imageUpload/safetyMeasure/child/safetyMeasureForm.js b/src/main/resources/static/js/imageUpload/safetyMeasure/child/safetyMeasureForm.js index e848f20..3f7e957 100644 --- a/src/main/resources/static/js/imageUpload/safetyMeasure/child/safetyMeasureForm.js +++ b/src/main/resources/static/js/imageUpload/safetyMeasure/child/safetyMeasureForm.js @@ -113,9 +113,13 @@ function setParams(params) { form.on('select(majorId)', function (data) { const selectedId = data.value; // 获取选中项的 value 值 const selectedName = $(data.elem).find("option:selected").text(); // 获取选中项的文本 - majorId = selectedId; - majorName = selectedName; - + if(selectedId === '' || selectedId == '' ){ + majorId = ''; + majorName = ''; + }else{ + majorId = selectedId; + majorName = selectedName; + } let gxs = getGxsSelect(data.value); setSelectValueName(gxs, 'gxId', '请选择工序'); }); @@ -123,8 +127,13 @@ function setParams(params) { form.on('select(gxId)', function (data) { const selectedId = data.value; // 获取选中项的 value 值 const selectedName = $(data.elem).find("option:selected").text(); // 获取选中项的文本 - gxId = selectedId; - gxName = selectedName; + if(selectedId === '' || selectedId == '' ){ + gxId = ''; + gxName = ''; + }else{ + gxId = selectedId; + gxName = selectedName; + } }); form.render();//重新渲染页面checkbox控件 diff --git a/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js b/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js index 1f2aca8..9b054fc 100644 --- a/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js +++ b/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js @@ -178,8 +178,13 @@ function setParams(params) { form.on('select(majorId)', function (data) { const selectedId = data.value; // 获取选中项的 value 值 const selectedName = $(data.elem).find("option:selected").text(); // 获取选中项的文本 - majorId = selectedId; - majorName = selectedName; + if(selectedId === '' || selectedId == '' ){ + majorId = ''; + majorName = ''; + }else{ + majorId = selectedId; + majorName = selectedName; + } let gxs = getGxsSelect(data.value); setSelectValueName(gxs, 'gxId', '请选择工序'); @@ -188,8 +193,13 @@ function setParams(params) { form.on('select(gxId)', function (data) { const selectedId = data.value; // 获取选中项的 value 值 const selectedName = $(data.elem).find("option:selected").text(); // 获取选中项的文本 - gxId = selectedId; - gxName = selectedName; + if(selectedId === '' || selectedId == '' ){ + gxId = ''; + gxName = ''; + }else{ + gxId = selectedId; + gxName = selectedName; + } }); form.render();//重新渲染页面checkbox控件 From 70f983bd14559f33f69812a09f501743f791b0a6 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 14 Apr 2025 14:51:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backstage/entity/ProClassifyStatisticsVo.java | 2 +- .../bonus/imgTool/backstage/service/DownloadService.java | 1 + .../com/bonus/imgTool/utils/HighQualityWatermark.java | 9 +++++---- .../resources/static/js/synthesisQuery/fileDownload.js | 2 +- .../resources/static/js/synthesisQuery/highSearchForm.js | 3 +++ 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/bonus/imgTool/backstage/entity/ProClassifyStatisticsVo.java b/src/main/java/com/bonus/imgTool/backstage/entity/ProClassifyStatisticsVo.java index 2e685a8..8fa3ab0 100644 --- a/src/main/java/com/bonus/imgTool/backstage/entity/ProClassifyStatisticsVo.java +++ b/src/main/java/com/bonus/imgTool/backstage/entity/ProClassifyStatisticsVo.java @@ -25,7 +25,7 @@ public class ProClassifyStatisticsVo extends SynthesisNumVo{ @Excel(name = "工程名称", width = 30.0, orderNum = "1") private String proName; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8") @Excel(name = "最后更新时间", width = 20.0, orderNum = "8",format = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date lastUpdateTime; diff --git a/src/main/java/com/bonus/imgTool/backstage/service/DownloadService.java b/src/main/java/com/bonus/imgTool/backstage/service/DownloadService.java index 505c618..7c7e1b7 100644 --- a/src/main/java/com/bonus/imgTool/backstage/service/DownloadService.java +++ b/src/main/java/com/bonus/imgTool/backstage/service/DownloadService.java @@ -171,6 +171,7 @@ public class DownloadService { try { // 查询图片未生成水印照片的数据 List list = Optional.ofNullable(synthesisQueryDao.generateWatermark(proId)).orElseGet(ArrayList::new); + System.err.println("查询图片未生成水印照片的数据：" + list.size()); List futureList = new ArrayList<>(); List newList = new ArrayList<>(); for (SynthesisQueryVo vo : list) { diff --git a/src/main/java/com/bonus/imgTool/utils/HighQualityWatermark.java b/src/main/java/com/bonus/imgTool/utils/HighQualityWatermark.java index 1a6f6f2..3f2746a 100644 --- a/src/main/java/com/bonus/imgTool/utils/HighQualityWatermark.java +++ b/src/main/java/com/bonus/imgTool/utils/HighQualityWatermark.java @@ -49,9 +49,10 @@ public class HighQualityWatermark { opacity = Math.max(MIN_OPACITY, Math.min(opacity, MAX_OPACITY)); // 读取原始图片并获取其类型 BufferedImage originalImage = ImageIO.read(new File(sourceImagePath)); - int imageType = originalImage.getTransparency() == Transparency.OPAQUE + /*int imageType = originalImage.getTransparency() == Transparency.OPAQUE ? BufferedImage.TYPE_INT_RGB - : BufferedImage.TYPE_INT_ARGB; + : BufferedImage.TYPE_INT_ARGB;*/ + int imageType = BufferedImage.TYPE_INT_RGB; // 创建与原始图片相同大小的新图像 BufferedImage sourceImage = new BufferedImage( originalImage.getWidth(), @@ -347,8 +348,8 @@ public class HighQualityWatermark { watermarkLines.add(proName.replaceAll("(.{18})", "$1@@")); watermarkLines.add("安全违章"); watermarkLines.add("违章照片"); - String localPath = "C:\\Users\\10488\\Desktop\\3.jpg"; - String outPath = "C:\\Users\\10488\\Desktop\\output.jpg"; + String localPath = "C:\\Users\\10488\\Desktop\\新建文件夹 (2)\\2.png"; + String outPath = "C:\\Users\\10488\\Desktop\\output.png"; // 添加高质量水印 addHighQualityWatermark(localPath, outPath, watermarkLines, "bottom-left", diff --git a/src/main/resources/static/js/synthesisQuery/fileDownload.js b/src/main/resources/static/js/synthesisQuery/fileDownload.js index 220540f..3789404 100644 --- a/src/main/resources/static/js/synthesisQuery/fileDownload.js +++ b/src/main/resources/static/js/synthesisQuery/fileDownload.js @@ -21,7 +21,7 @@ document.addEventListener('DOMContentLoaded', function() { try { // 1. 生成唯一任务ID - currentTaskId = 'task_' + Date.now(); + currentTaskId = Date.now(); // 2. 显示等待提示 const swalInstance = Swal.fire({ title: '正在生成压缩包', diff --git a/src/main/resources/static/js/synthesisQuery/highSearchForm.js b/src/main/resources/static/js/synthesisQuery/highSearchForm.js index 458abd5..e9cda53 100644 --- a/src/main/resources/static/js/synthesisQuery/highSearchForm.js +++ b/src/main/resources/static/js/synthesisQuery/highSearchForm.js @@ -24,6 +24,9 @@ function setParams(obj) { setSelectValueName(majors,'majorId','请选择专业'); setSelectValueName(gxs,'gxId','请选择工序'); form.val('formInfo', highSearchData); + $('input[name="photoType"]').each(function(){ + $(this).prop('checked', false); + }) $.each(highSearchData.photoType,function(index,item){ $('input[name="photoType"][value='+item+']').prop('checked', true); }) From 99501cbdea2cb2c53651b08425b429056a462c82 Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Mon, 14 Apr 2025 14:53:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=BF=9D=E7=AB=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backstage/SynthesisQueryMapper.xml | 284 ++++++++++-------- .../imgUpload/QualityInspectionMapper.xml | 8 - .../imgUpload/SafetyViolationMapper.xml | 8 - 3 files changed, 160 insertions(+), 140 deletions(-) diff --git a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml index 34469e1..c4f6e3c 100644 --- a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml +++ b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml @@ -1,6 +1,6 @@ + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> insert into tb_comprehensive_query @@ -14,12 +14,12 @@ gx_name, check_user_name, vio_date, - vio_place, - vio_desc, + vio_place, + vio_desc, rect_date, rect_user_name, rect_time, - rect_desc, + rect_desc, rect_status, build_before_desc, build_under_desc, @@ -81,22 +81,25 @@ #{tempFilePath}, - + - 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} - 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 @@ -230,7 +234,9 @@ - - - - - - + + + + + + - 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} ) @@ -529,17 +560,19 @@ - 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 tb_comprehensive_query pro_id = #{proId}, pro_name = #{proName}, - major_id = #{majorId}, - major_name = #{majorName}, - gx_id = #{gxId}, - gx_name = #{gxName}, + major_id = #{majorId}, + major_name = #{majorName}, + gx_id = #{gxId}, + gx_name = #{gxName}, check_user_name = #{checkUserName}, vio_date = #{vioDate}, vio_place = #{vioPlace}, @@ -571,6 +604,9 @@ - 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} diff --git a/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml b/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml index bc7b765..92456a6 100644 --- a/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml +++ b/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml @@ -69,18 +69,10 @@ pro_name = #{proName}, - major_id = #{majorId}, - - major_name = #{majorName}, - - gx_id = #{gxId}, - - gx_name = #{gxName}, - check_user_name = #{checkUserName}, diff --git a/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml b/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml index 7750286..e70615f 100644 --- a/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml +++ b/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml @@ -101,18 +101,10 @@ pro_name = #{proName}, - major_id = #{majorId}, - - major_name = #{majorName}, - - gx_id = #{gxId}, - - gx_name = #{gxName}, - check_user_name = #{checkUserName}, From c9d58da3af96d0a41985e8b79b2a4f17ace614e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Mon, 14 Apr 2025 15:00:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ImportantMatterServiceImpl.java | 3 +++ .../impl/SafetyMeasuresServiceImpl.java | 9 +++++++++ .../imageUpload/CoordinatePhotoMapper.xml | 20 ++++--------------- .../imageUpload/ImportantMatterMapper.xml | 19 ++++-------------- .../imageUpload/SafetMeasuresMapper.xml | 19 +++--------------- 5 files changed, 23 insertions(+), 47 deletions(-) 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 9049d31..4f26c36 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 @@ -134,6 +134,9 @@ public class ImportantMatterServiceImpl implements ImportantMatterService { String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getUsername(): null; data.setUpdateUserId(CreateUserId); data.setUpdateUserName(CreateUserName); + if (data.getTime().isEmpty()){ + data.setTime(null); + } importantMatterMapper.updateImportantMatter(data); //附件先删除，后新增 sysFileResourceService.deleteFileResource(data.getId()); 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 e8c8a23..b8d0219 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 @@ -137,6 +137,9 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getUsername(): null; data.setUpdateUserId(CreateUserId); data.setUpdateUserName(CreateUserName); + if (data.getCheckDate().isEmpty()){ + data.setCheckDate(null); + } //修改 safetyMeasuresMapper.updateSafetyMeasures(data); //附件先删除，后新增 @@ -153,6 +156,12 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { //修改综合查询 ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); BeanUtils.copyProperties(data,comprehensiveQueryVo); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + if (data.getCheckDate() != null && !data.getCheckDate().trim().isEmpty()) { + comprehensiveQueryVo.setRectDate(dateFormat.parse(data.getCheckDate())); + } + comprehensiveQueryVo.setVioPlace(data.getCheckPlace()); + comprehensiveQueryVo.setVioDesc(data.getCheckDesc()); synthesisQueryService.updateComprehensiveQuery(comprehensiveQueryVo); } catch (Exception e) { log.error(e.toString(), e); diff --git a/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml b/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml index fd7ad94..f5c0eb3 100644 --- a/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml +++ b/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml @@ -47,22 +47,10 @@ - update tb_coordinate_photo - - 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() - + update tb_coordinate_photo set pro_id = #{proId},pro_name = #{proName},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}, + major_name = #{majorName},major_id = #{majorId},update_time = NOW() where id = #{id} diff --git a/src/main/resources/mappers/imageUpload/ImportantMatterMapper.xml b/src/main/resources/mappers/imageUpload/ImportantMatterMapper.xml index e446da6..121e25d 100644 --- a/src/main/resources/mappers/imageUpload/ImportantMatterMapper.xml +++ b/src/main/resources/mappers/imageUpload/ImportantMatterMapper.xml @@ -46,21 +46,10 @@ - update tb_main_matter_publicize_photo - - pro_id = #{proId}, - pro_name = #{proName}, - major_id = #{majorId}, - major_name = #{majorName}, - gx_id = #{gxId}, - gx_name = #{gxName}, - time = #{time}, - title = #{title}, - content = #{content}, - update_user_id = #{updateUserId}, - update_user_name = #{updateUserName}, - update_time = NOW() - + update tb_main_matter_publicize_photo set pro_id = #{proId},pro_name = #{proName},major_id = #{majorId}, + major_name = #{majorName},gx_id = #{gxId},gx_name = #{gxName},time = #{time}, + title = #{title},content = #{content}, + update_user_id = #{updateUserId},update_user_name = #{updateUserName},update_time = NOW() where id = #{id} diff --git a/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml b/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml index 070fcf6..85105a3 100644 --- a/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml +++ b/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml @@ -47,22 +47,9 @@ - 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() - + update tb_safety_measure set 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} From 8304c056b4898d34c19f55bb3d9718168c91627b Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 14 Apr 2025 15:31:05 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../img/synthesisQuery/download_icon2.png | Bin 0 -> 266 bytes .../static/img/synthesisQuery/water_icon.png | Bin 0 -> 323 bytes .../js/synthesisQuery/synthesisQueryCommon.js | 21 ++++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 src/main/resources/static/img/synthesisQuery/download_icon2.png create mode 100644 src/main/resources/static/img/synthesisQuery/water_icon.png diff --git a/src/main/resources/static/img/synthesisQuery/download_icon2.png b/src/main/resources/static/img/synthesisQuery/download_icon2.png new file mode 100644 index 0000000000000000000000000000000000000000..80949233f875a4905df5f41317ae677c98371e30 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL^R}M?75|LoEE? zPPr)9WFX*DZoN==qtI62wJvL1-W>4@yXI-cC^SLR?yUOF%AL1wH{W*AHB2X--Wp7(TSH5vK3e+pu@ zG*)j`(qT^(2siFJtmD3LFN<_k#^Kfc4C~6+em+~1@{uL2b8o>`R}WEPx#{YgYYR5(w~l-&)&FbssxlTbEc6X+B?0+RrfP#&2An8fgbjY7mvh5A6GN{t<# z?`$WgftC$~qhW#Ey^++ISqH<|PbJMHwQ2vv{>I4Nj{sc*Pw`D6i2X_up!iwX@@!{j z`0vu(eJ6=v7~LEMnAs`V;U_r#{4c_`F|)P?T4sh)hPxwieYHLOkpLwm948Ry%R*X- z1B>$uAQZs#iBV=GC<9Yo_lD6E%bL+wX_B^4d=#+8)G~q4Plin#q?n^Ph=hZrdC{@# z-eWZCVwbg{%?S(`$x`~ho~;Ce0kfjMU8{$)*A;nH>|cRkOsn5smtKteyb%8fbOB}8 VgcGP-Ex-T(002ovPDHLkV1l2>jCcS5 literal 0 HcmV?d00001 diff --git a/src/main/resources/static/js/synthesisQuery/synthesisQueryCommon.js b/src/main/resources/static/js/synthesisQuery/synthesisQueryCommon.js index d5201cd..741ee39 100644 --- a/src/main/resources/static/js/synthesisQuery/synthesisQueryCommon.js +++ b/src/main/resources/static/js/synthesisQuery/synthesisQueryCommon.js @@ -3,6 +3,7 @@ function viewImg(item) { layer.photos({ shade: 0.5, footer: false, + // toolbar: ['prev', 'next', 'download', 'customBtn'], // 添加自定义按钮标识 photos: { "title": "图片预览", "start": 0, @@ -13,6 +14,26 @@ function viewImg(item) { } ] }, + success: function(layero){ + // 获取工具栏元素 + var toolbar = $(layero).find('.layui-layer-photos-toolbar'); + // 添加自定义按钮 + var customBtn = $('
'+ + '
'); + toolbar.append(customBtn); + // 绑定点击事件 + customBtn.on('click', function(){ + imgDownLoad(item,1); + }); + + var customBtn2 = $('
'+ + '
'); + toolbar.append(customBtn2); + // 绑定点击事件 + customBtn2.on('click', function(){ + generateWatermark(item) + }); + } }); }