From 20f84e1b1e20dca7b52d5c2213fd0fe1198b7b28 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 05 六月 2023 12:05:49 +0800
Subject: [PATCH] 巡检记录增加wellName字段
---
ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectRecordMapper.java | 3 ++-
ard-work/src/main/java/com/ruoyi/constant/Global.java | 3 +--
ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectTaskMapper.java | 6 ++++--
ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml | 2 +-
ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectRecord.java | 13 ++++++++++++-
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | 7 ++++++-
ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml | 2 ++
7 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/constant/Global.java b/ard-work/src/main/java/com/ruoyi/constant/Global.java
index dae57c1..6eb2dd9 100644
--- a/ard-work/src/main/java/com/ruoyi/constant/Global.java
+++ b/ard-work/src/main/java/com/ruoyi/constant/Global.java
@@ -1,9 +1,7 @@
package com.ruoyi.constant;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* @Description: 鍏ㄥ眬绫�
@@ -14,5 +12,6 @@
**/
public class Global {
+ //寮�鍚綍鍍忕殑浠诲姟鍒楄〃
public static List<String> task_record=new ArrayList<>();
}
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectRecord.java b/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectRecord.java
index 0b4395d..1b32a2f 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectRecord.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectRecord.java
@@ -41,8 +41,19 @@
/** 鐢ㄦ埛id */
@Excel(name = "鐢ㄦ埛id")
private String userId;
+ /** 浜曞悕绉� */
+ @Excel(name = "浜曞悕绉�")
+ private String wellName;
- public void setId(String id)
+ public String getWellName() {
+ return wellName;
+ }
+
+ public void setWellName(String wellName) {
+ this.wellName = wellName;
+ }
+
+ public void setId(String id)
{
this.id = id;
}
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectRecordMapper.java b/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectRecordMapper.java
index 7b80456..7ff8fea 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectRecordMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectRecordMapper.java
@@ -26,6 +26,7 @@
* @return 瑙嗛宸℃璁板綍闆嗗悎
*/
public List<ArdVideoInspectRecord> selectArdVideoInspectRecordList(ArdVideoInspectRecord ardVideoInspectRecord);
+ @SuppressWarnings("MybatisXMapperMethodInspection")
public List selectArdVideoInspectRecordListByStartTime(ArdVideoInspectRecord ardVideoInspectRecord);
/**
@@ -59,6 +60,6 @@
* @return 缁撴灉
*/
public int deleteArdVideoInspectRecordByIds(String[] ids);
-
+ @SuppressWarnings("MybatisXMapperMethodInspection")
List selectArdVideoInspectRecordCountByStartMonth(String startMonth);
}
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectTaskMapper.java b/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectTaskMapper.java
index 5b30986..237f952 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectTaskMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectTaskMapper.java
@@ -1,6 +1,8 @@
package com.ruoyi.inspect.mapper;
import java.util.List;
+import java.util.Map;
+
import com.ruoyi.inspect.domain.ArdVideoInspectTask;
import com.ruoyi.inspect.domain.ArdVideoInspectTaskStep;
@@ -90,6 +92,6 @@
* @return 缁撴灉
*/
public int deleteArdVideoInspectTaskStepByTaskId(String id);
-
- public List getTaskUsedCameraPeriods(String cameraId);
+ @SuppressWarnings("MybatisXMapperMethodInspection")
+ public List<Map<String,Object>> getTaskUsedCameraPeriods(String cameraId);
}
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
index 25576d7..11c9de2 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
@@ -61,7 +61,7 @@
}
ardVideoInspectTask.setCurrentStepId("");
ardVideoInspectTask.setCurrentStepStartTime("");
- ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);
+ ardVideoInspectTaskMapper.updateArdVideoInspectTaskWithCurrentSetpInfo(ardVideoInspectTask);
}
}
@@ -514,6 +514,11 @@
/*鎻掑叆宸℃璁板綍*/
ArdVideoInspectRecord ardVideoInspectRecord = new ArdVideoInspectRecord();
ardVideoInspectRecord.setStepId(step.getId());
+ ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(step.getWellId());
+ if(StringUtils.isNotNull(ardAlarmpointsWell))
+ {
+ ardVideoInspectRecord.setWellName(ardAlarmpointsWell.getWellId());
+ }
Date currentStepStartDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, currentStepStartTime);
Date currentStepStopDate = DateUtils.addMinutes(currentStepStartDate, step.getRecordingTime());
ardVideoInspectRecord.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, currentStepStartDate));
diff --git a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml
index 33a95ee..cf1963a 100644
--- a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml
+++ b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml
@@ -58,6 +58,7 @@
<if test="stepId != null">step_id,</if>
<if test="deptId != null">dept_id,</if>
<if test="userId != null">user_id,</if>
+ <if test="wellName != null">well_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -67,6 +68,7 @@
<if test="stepId != null">#{stepId},</if>
<if test="deptId != null">#{deptId},</if>
<if test="userId != null">#{userId},</if>
+ <if test="wellName != null">#{wellName},</if>
</trim>
</insert>
diff --git a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
index 0829d05..86edb02 100644
--- a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
@@ -178,7 +178,7 @@
</insert>
<!--鏌ヨ浠诲姟涓浉鏈哄凡浣跨敤鏃舵-->
- <select id="getTaskUsedCameraPeriods" parameterType="String" resultType="java.util.List">
+ <select id="getTaskUsedCameraPeriods" parameterType="String" resultType="java.util.HashMap">
select t.start_time,t.end_time from ard_video_inspect_task t
where t.camera_id=#{startMonth}
ORDER BY t.start_time
--
Gitblit v1.9.3