浏览代码

修改洗眼器导出模板;添加图片压缩路径;

jiangbiao 2 天之前
父节点
当前提交
7cbf8fadff

+ 3 - 1
master/src/main/java/com/ruoyi/framework/task/ImageCompressionTask.java

@@ -31,7 +31,9 @@ public class ImageCompressionTask extends BaseController {
             // 需要压缩的文件夹路径列表
             List<String> directories = Arrays.asList(
                 "D:/ruoyi",
-                "/u03/cpmsfile/uploadPath/xxxx"
+                "/u03/cpmsfile/uploadPath/xxxx",
+                "/u03/cpmsfile/uploadPath/upload/eyewash",
+                "/u03/cpmsfile/uploadPath/upload/annihilator"
                 // 在这里添加更多需要压缩的文件夹路径
             );
 

+ 20 - 20
master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyEyewashController.java

@@ -141,16 +141,16 @@ public class TEmergencyEyewashController extends BaseController {
         sheet.addMergedRegion(new CellRangeAddress(3, 4, 1, 1));
         sheet.addMergedRegion(new CellRangeAddress(3, 4, 2, 2));
         ExcelUtils.createVoidCell(0, 2, row5);
-        row5.createCell(3).setCellValue("洗眼器标识醒目并处于良好状况");
-        row5.createCell(4).setCellValue("洗眼器周围2米内无障碍物,易接近");
-        row5.createCell(5).setCellValue("所处区域有良好的照明,且没有被遮挡");
-        row5.createCell(6).setCellValue("洗眼器配件没有损坏或丢失,也没有可见的腐蚀");
-        row5.createCell(7).setCellValue("洗眼器上游手阀处于全开状态,并采取常开保护措施");
-        row5.createCell(8).setCellValue("洗眼器从出水点起高度在10-30厘米并均匀流动");
-        row5.createCell(9).setCellValue("洗眼器出水干净不黑无污染,没有颗粒");
-        row5.createCell(10).setCellValue("洗眼器出水温度不高于25℃");
-        row5.createCell(11).setCellValue("洗眼器手推板、脚踏板及喷淋拉杆灵活,能保持全开");
-        row5.createCell(12).setCellValue("洗眼器测试前已通知ERC");
+        row5.createCell(3).setCellValue("洗眼器测试前已通知ERC");
+        row5.createCell(4).setCellValue("洗眼器标识醒目并处于良好状况");
+        row5.createCell(5).setCellValue("洗眼器周围2米内无障碍物,易接近");
+        row5.createCell(6).setCellValue("所处区域有良好的照明,且没有被遮挡");
+        row5.createCell(7).setCellValue("洗眼器配件没有损坏或丢失,也没有可见的腐蚀");
+        row5.createCell(8).setCellValue("洗眼器上游手阀处于全开状态,并采取常开保护措施");
+        row5.createCell(9).setCellValue("洗眼器手推板、脚踏板及喷淋拉杆灵活,能保持全开");
+        row5.createCell(10).setCellValue("洗眼器从出水点起高度在10-30厘米并均匀流动");
+        row5.createCell(11).setCellValue("洗眼器出水干净不黑无污染,没有颗粒");
+        row5.createCell(12).setCellValue("洗眼器出水温度适宜");
         row5.createCell(13).setCellValue("现场声光报警装置工作正常");
         row5.createCell(14).setCellValue("ERC接收到洗眼器报警测试信号,报警信号已反馈至DCS和中控室迷你盘");
         row5.createCell(15).setCellValue("检查人");
@@ -163,16 +163,16 @@ public class TEmergencyEyewashController extends BaseController {
             row.createCell(0).setCellValue(i + 1);
             row.createCell(1).setCellValue(eyewash.getDevNo());
             row.createCell(2).setCellValue(eyewash.getPosition());
-            row.createCell(3).setCellValue("1".equals(eyewash.getIdentifying()) ? "√" : eyewash.getIdentifying());
-            row.createCell(4).setCellValue("1".equals(eyewash.getNoObstacle()) ? "√" : eyewash.getNoObstacle());
-            row.createCell(5).setCellValue("1".equals(eyewash.getNoOcclusion()) ? "√" : eyewash.getNoOcclusion());
-            row.createCell(6).setCellValue("1".equals(eyewash.getNoDamage()) ? "√" : eyewash.getNoDamage());
-            row.createCell(7).setCellValue("1".equals(eyewash.getInSafe()) ? "√" : eyewash.getInSafe());
-            row.createCell(8).setCellValue("1".equals(eyewash.getExitPoint()) ? "√" : eyewash.getExitPoint());
-            row.createCell(9).setCellValue("1".equals(eyewash.getExitClean()) ? "√" : eyewash.getExitClean());
-            row.createCell(10).setCellValue("1".equals(eyewash.getExitTemp()) ? "√" : eyewash.getExitTemp());
-            row.createCell(11).setCellValue("1".equals(eyewash.getKeepOpen()) ? "√" : eyewash.getKeepOpen());
-            row.createCell(12).setCellValue("1".equals(eyewash.getNoticed()) ? "√" : eyewash.getNoticed());
+            row.createCell(3).setCellValue("1".equals(eyewash.getNoticed()) ? "√" : eyewash.getNoticed());
+            row.createCell(4).setCellValue("1".equals(eyewash.getIdentifying()) ? "√" : eyewash.getIdentifying());
+            row.createCell(5).setCellValue("1".equals(eyewash.getNoObstacle()) ? "√" : eyewash.getNoObstacle());
+            row.createCell(6).setCellValue("1".equals(eyewash.getNoOcclusion()) ? "√" : eyewash.getNoOcclusion());
+            row.createCell(7).setCellValue("1".equals(eyewash.getNoDamage()) ? "√" : eyewash.getNoDamage());
+            row.createCell(8).setCellValue("1".equals(eyewash.getInSafe()) ? "√" : eyewash.getInSafe());
+            row.createCell(9).setCellValue("1".equals(eyewash.getKeepOpen()) ? "√" : eyewash.getKeepOpen());
+            row.createCell(10).setCellValue("1".equals(eyewash.getExitPoint()) ? "√" : eyewash.getExitPoint());
+            row.createCell(11).setCellValue("1".equals(eyewash.getExitClean()) ? "√" : eyewash.getExitClean());
+            row.createCell(12).setCellValue("1".equals(eyewash.getExitTemp()) ? "√" : eyewash.getExitTemp());
             row.createCell(13).setCellValue("1".equals(eyewash.getNormalOperation()) ? "√" : eyewash.getNormalOperation());
             row.createCell(14).setCellValue("1".equals(eyewash.getFeedback()) ? "√" : eyewash.getFeedback());
             XSSFCell cell15 = row.createCell(15);