From 13c70b027a3037ee4affd06ca7935cfe9554e298 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 27 二月 2026 17:36:46 +0800
Subject: [PATCH] 安全生产，巡检任务设定自定义拍照或相册
---
src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java | 13 ++++++-------
src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java | 12 ++++++++++++
src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java | 8 ++++++++
src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java | 3 +++
src/main/resources/application-kthg.yml | 8 ++++++++
src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java | 3 +++
6 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
index 4d95a96..9d10172 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
@@ -91,4 +91,16 @@
@TableField(exist = false)
private String dateStr;
+
+ @ApiModelProperty(value = "鏄惁蹇呴』鎵嬫満鎷嶇収")
+ private boolean takePhone;
+
+ @ApiModelProperty(value = "鏄惁鍙互涓婁紶鐩稿唽")
+ private boolean takeAlbum;
+
+ @ApiModelProperty(value = "鏄惁鎻愪氦杩囧贰妫�")
+ private boolean inspectionSubmitted;
+
+ @ApiModelProperty(value = "宸℃鏈熼檺")
+ private String inspectionDeadline;
}
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
index fb852be..5a5ac89 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
@@ -106,4 +106,12 @@
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value = "鏄惁蹇呴』鎵嬫満鎷嶇収")
+ private boolean takePhone;
+
+ @ApiModelProperty(value = "鏄惁鍙互涓婁紶鐩稿唽")
+ private boolean takeAlbum;
+
+ @ApiModelProperty(value = "宸℃鏈熼檺")
+ private String inspectionDeadline;
}
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
index 8c30cb3..772caad 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
@@ -8,7 +8,6 @@
import com.ruoyi.basic.dto.StorageBlobDTO;
import com.ruoyi.basic.mapper.StorageAttachmentMapper;
import com.ruoyi.basic.mapper.StorageBlobMapper;
-import com.ruoyi.basic.pojo.StorageAttachment;
import com.ruoyi.basic.pojo.StorageBlob;
import com.ruoyi.basic.service.StorageAttachmentService;
import com.ruoyi.common.enums.FileNameType;
@@ -35,9 +34,6 @@
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
-
-import static com.ruoyi.common.constant.StorageAttachmentConstants.StorageAttachmentFile;
-import static com.ruoyi.common.enums.StorageAttachmentRecordType.InspectionTasks;
/**
* @author :yys
@@ -162,9 +158,12 @@
dto.setDateStr(inspectionTask.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
// 鍒濆鍖栦笁涓檮浠跺垪琛�
- dto.setCommonFileList(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION.getValue())).collect(Collectors.toList()));
- dto.setCommonFileListAfter(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION_PRODUCTION_AFTER.getValue())).collect(Collectors.toList()));
- dto.setCommonFileListBefore(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION_PRODUCTION_BEFORE.getValue())).collect(Collectors.toList()));
+ dto.setCommonFileList(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION.getValue())
+ && commonFile.getCommonId().equals(dto.getId())).collect(Collectors.toList()));
+ dto.setCommonFileListAfter(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION_PRODUCTION_AFTER.getValue())
+ && commonFile.getCommonId().equals(dto.getId())).collect(Collectors.toList()));
+ dto.setCommonFileListBefore(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION_PRODUCTION_BEFORE.getValue())
+ && commonFile.getCommonId().equals(dto.getId())).collect(Collectors.toList()));
return dto;
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
index b8ffdf5..7c4be7b 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
@@ -116,6 +116,9 @@
inspectionTask.setFrequencyType(timingTask.getFrequencyType());
inspectionTask.setFrequencyDetail(timingTask.getFrequencyDetail());
inspectionTask.setTenantId(timingTask.getTenantId());
+ inspectionTask.setTakeAlbum(timingTask.isTakeAlbum());
+ inspectionTask.setTakePhone(timingTask.isTakePhone());
+ inspectionTask.setInspectionDeadline(timingTask.getInspectionDeadline());
return inspectionTask;
}
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java
index 125f311..1bd644a 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java
@@ -102,6 +102,9 @@
jobDataMap.put("taskId", task.getId()); // 浠诲姟ID锛圠ong锛屽彲搴忓垪鍖栵級
jobDataMap.put("taskName", task.getTaskName()); // 浠诲姟鍚嶇О锛圫tring锛屽彲搴忓垪鍖栵級
jobDataMap.put("taskType", task.getFrequencyType()); // 浠诲姟绫诲瀷锛圫tring锛�
+ jobDataMap.put("takePhone", task.isTakePhone()); // 鏄惁蹇呴』鎵嬫満鎷嶇収
+ jobDataMap.put("takeAlbum", task.isTakeAlbum()); // 鏄惁鍙互涓婁紶鐩稿唽
+ jobDataMap.put("inspectionDeadline", task.getInspectionDeadline()); // 宸℃鏈熼檺
// 鎸夐渶娣诲姞鍏朵粬蹇呰鐨勫熀鏈被鍨嬪弬鏁�
// 3. 鏋勫缓JobDetail锛岃缃寔涔呭寲鐩稿叧灞炴��
diff --git a/src/main/resources/application-kthg.yml b/src/main/resources/application-kthg.yml
index 60b0e16..ae2a6d5 100644
--- a/src/main/resources/application-kthg.yml
+++ b/src/main/resources/application-kthg.yml
@@ -16,6 +16,14 @@
# 鍗忓悓瀹℃壒缂栧彿鍓嶇紑(閰嶇疆鏂囦欢鍚庣紑鍛藉悕)
approvalNumberPrefix: NEW
+ getui:
+ appId: PfjyAAE0FK64FaO1w2CMb1
+ appKey: zTMb831OEL6J4GK1uE3Ob4
+ masterSecret: K1GFtsv42v61tXGnF7SGE5
+ domain: https://restapi.getui.cn/v2/
+ # 绂荤嚎鎺ㄩ�佷娇鐢ㄧ殑鍖呭悕/缁勪欢鍚�
+ intentComponent: uni.app.UNI099A590/io.dcloud.PandoraEntry
+
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
--
Gitblit v1.9.3