From dabbcc356af21f9f2f88ac69ff07994e6e32e4fc Mon Sep 17 00:00:00 2001
From: zhangjian <zhangjianrock@163.com>
Date: 星期二, 30 五月 2023 11:22:24 +0800
Subject: [PATCH] 视频巡检任务 重新生成表
---
ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectTaskStepService.java | 61 +++
ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectRecordMapper.java | 61 +++
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectRecordServiceImpl.java | 89 ++++
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskStepServiceImpl.java | 89 ++++
ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTask.java | 65 +-
ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java | 3
ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectTaskStepMapper.java | 61 +++
ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskStepMapper.xml | 83 ++++
ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml | 83 ++++
ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskStepController.java | 104 +++++
ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectRecordService.java | 61 +++
ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTaskStep.java | 100 ++--
ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml | 60 +-
ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectRecord.java | 121 ++++++
ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java | 104 +++++
15 files changed, 1,026 insertions(+), 119 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java
new file mode 100644
index 0000000..71d660e
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java
@@ -0,0 +1,104 @@
+package com.ruoyi.inspect.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.inspect.domain.ArdVideoInspectRecord;
+import com.ruoyi.inspect.service.IArdVideoInspectRecordService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 瑙嗛宸℃璁板綍Controller
+ *
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+@RestController
+@RequestMapping("/inspect/record")
+public class ArdVideoInspectRecordController extends BaseController
+{
+ @Autowired
+ private IArdVideoInspectRecordService ardVideoInspectRecordService;
+
+ /**
+ * 鏌ヨ瑙嗛宸℃璁板綍鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('inspect:record:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(ArdVideoInspectRecord ardVideoInspectRecord)
+ {
+ startPage();
+ List<ArdVideoInspectRecord> list = ardVideoInspectRecordService.selectArdVideoInspectRecordList(ardVideoInspectRecord);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭瑙嗛宸℃璁板綍鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('inspect:record:export')")
+ @Log(title = "瑙嗛宸℃璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ArdVideoInspectRecord ardVideoInspectRecord)
+ {
+ List<ArdVideoInspectRecord> list = ardVideoInspectRecordService.selectArdVideoInspectRecordList(ardVideoInspectRecord);
+ ExcelUtil<ArdVideoInspectRecord> util = new ExcelUtil<ArdVideoInspectRecord>(ArdVideoInspectRecord.class);
+ util.exportExcel(response, list, "瑙嗛宸℃璁板綍鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇瑙嗛宸℃璁板綍璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('inspect:record:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id)
+ {
+ return success(ardVideoInspectRecordService.selectArdVideoInspectRecordById(id));
+ }
+
+ /**
+ * 鏂板瑙嗛宸℃璁板綍
+ */
+ @PreAuthorize("@ss.hasPermi('inspect:record:add')")
+ @Log(title = "瑙嗛宸℃璁板綍", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ArdVideoInspectRecord ardVideoInspectRecord)
+ {
+ return toAjax(ardVideoInspectRecordService.insertArdVideoInspectRecord(ardVideoInspectRecord));
+ }
+
+ /**
+ * 淇敼瑙嗛宸℃璁板綍
+ */
+ @PreAuthorize("@ss.hasPermi('inspect:record:edit')")
+ @Log(title = "瑙嗛宸℃璁板綍", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ArdVideoInspectRecord ardVideoInspectRecord)
+ {
+ return toAjax(ardVideoInspectRecordService.updateArdVideoInspectRecord(ardVideoInspectRecord));
+ }
+
+ /**
+ * 鍒犻櫎瑙嗛宸℃璁板綍
+ */
+ @PreAuthorize("@ss.hasPermi('inspect:record:remove')")
+ @Log(title = "瑙嗛宸℃璁板綍", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String[] ids)
+ {
+ return toAjax(ardVideoInspectRecordService.deleteArdVideoInspectRecordByIds(ids));
+ }
+}
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java
index b8bea9c..ceac81a 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.uuid.UUID;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -77,6 +79,7 @@
@PostMapping
public AjaxResult add(@RequestBody ArdVideoInspectTask ardVideoInspectTask)
{
+ ardVideoInspectTask.setId(UUID.randomUUID().toString());
return toAjax(ardVideoInspectTaskService.insertArdVideoInspectTask(ardVideoInspectTask));
}
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskStepController.java b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskStepController.java
new file mode 100644
index 0000000..ec75e98
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskStepController.java
@@ -0,0 +1,104 @@
+package com.ruoyi.inspect.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.inspect.domain.ArdVideoInspectTaskStep;
+import com.ruoyi.inspect.service.IArdVideoInspectTaskStepService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 瑙嗛宸℃姝ラController
+ *
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+@RestController
+@RequestMapping("/inspect/step")
+public class ArdVideoInspectTaskStepController extends BaseController
+{
+ @Autowired
+ private IArdVideoInspectTaskStepService ardVideoInspectTaskStepService;
+
+ /**
+ * 鏌ヨ瑙嗛宸℃姝ラ鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('inspect:step:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(ArdVideoInspectTaskStep ardVideoInspectTaskStep)
+ {
+ startPage();
+ List<ArdVideoInspectTaskStep> list = ardVideoInspectTaskStepService.selectArdVideoInspectTaskStepList(ardVideoInspectTaskStep);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭瑙嗛宸℃姝ラ鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('inspect:step:export')")
+ @Log(title = "瑙嗛宸℃姝ラ", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ArdVideoInspectTaskStep ardVideoInspectTaskStep)
+ {
+ List<ArdVideoInspectTaskStep> list = ardVideoInspectTaskStepService.selectArdVideoInspectTaskStepList(ardVideoInspectTaskStep);
+ ExcelUtil<ArdVideoInspectTaskStep> util = new ExcelUtil<ArdVideoInspectTaskStep>(ArdVideoInspectTaskStep.class);
+ util.exportExcel(response, list, "瑙嗛宸℃姝ラ鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇瑙嗛宸℃姝ラ璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('inspect:step:query')")
+ @GetMapping(value = "/{taskId}")
+ public AjaxResult getInfo(@PathVariable("taskId") String taskId)
+ {
+ return success(ardVideoInspectTaskStepService.selectArdVideoInspectTaskStepByTaskId(taskId));
+ }
+
+ /**
+ * 鏂板瑙嗛宸℃姝ラ
+ */
+ @PreAuthorize("@ss.hasPermi('inspect:step:add')")
+ @Log(title = "瑙嗛宸℃姝ラ", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ArdVideoInspectTaskStep ardVideoInspectTaskStep)
+ {
+ return toAjax(ardVideoInspectTaskStepService.insertArdVideoInspectTaskStep(ardVideoInspectTaskStep));
+ }
+
+ /**
+ * 淇敼瑙嗛宸℃姝ラ
+ */
+ @PreAuthorize("@ss.hasPermi('inspect:step:edit')")
+ @Log(title = "瑙嗛宸℃姝ラ", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ArdVideoInspectTaskStep ardVideoInspectTaskStep)
+ {
+ return toAjax(ardVideoInspectTaskStepService.updateArdVideoInspectTaskStep(ardVideoInspectTaskStep));
+ }
+
+ /**
+ * 鍒犻櫎瑙嗛宸℃姝ラ
+ */
+ @PreAuthorize("@ss.hasPermi('inspect:step:remove')")
+ @Log(title = "瑙嗛宸℃姝ラ", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{taskIds}")
+ public AjaxResult remove(@PathVariable String[] taskIds)
+ {
+ return toAjax(ardVideoInspectTaskStepService.deleteArdVideoInspectTaskStepByTaskIds(taskIds));
+ }
+}
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
new file mode 100644
index 0000000..0b4395d
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectRecord.java
@@ -0,0 +1,121 @@
+package com.ruoyi.inspect.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 瑙嗛宸℃璁板綍瀵硅薄 ard_video_inspect_record
+ *
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+public class ArdVideoInspectRecord extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** id */
+ private String id;
+
+ /** 宸℃寮�濮嬫椂闂� */
+ @Excel(name = "宸℃寮�濮嬫椂闂�")
+ private String startTime;
+
+ /** 宸℃缁撴潫鏃堕棿 */
+ @Excel(name = "宸℃缁撴潫鏃堕棿")
+ private String endTime;
+
+ /** 褰曞儚鏂囦欢璺緞 */
+ @Excel(name = "褰曞儚鏂囦欢璺緞")
+ private String recordFilePath;
+
+ /** 姝ラid */
+ @Excel(name = "姝ラid")
+ private String stepId;
+
+ /** 閮ㄩ棬id */
+ @Excel(name = "閮ㄩ棬id")
+ private String deptId;
+
+ /** 鐢ㄦ埛id */
+ @Excel(name = "鐢ㄦ埛id")
+ private String userId;
+
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+ public void setStartTime(String startTime)
+ {
+ this.startTime = startTime;
+ }
+
+ public String getStartTime()
+ {
+ return startTime;
+ }
+ public void setEndTime(String endTime)
+ {
+ this.endTime = endTime;
+ }
+
+ public String getEndTime()
+ {
+ return endTime;
+ }
+ public void setRecordFilePath(String recordFilePath)
+ {
+ this.recordFilePath = recordFilePath;
+ }
+
+ public String getRecordFilePath()
+ {
+ return recordFilePath;
+ }
+ public void setStepId(String stepId)
+ {
+ this.stepId = stepId;
+ }
+
+ public String getStepId()
+ {
+ return stepId;
+ }
+ public void setDeptId(String deptId)
+ {
+ this.deptId = deptId;
+ }
+
+ public String getDeptId()
+ {
+ return deptId;
+ }
+ public void setUserId(String userId)
+ {
+ this.userId = userId;
+ }
+
+ public String getUserId()
+ {
+ return userId;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("startTime", getStartTime())
+ .append("endTime", getEndTime())
+ .append("recordFilePath", getRecordFilePath())
+ .append("stepId", getStepId())
+ .append("deptId", getDeptId())
+ .append("userId", getUserId())
+ .toString();
+ }
+}
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTask.java b/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTask.java
index 2a06551..d30d151 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTask.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTask.java
@@ -32,7 +32,6 @@
private String endTime;
/** 閲嶅鍛ㄦ湡 */
- @Excel(name = "閲嶅鍛ㄦ湡")
private String repeatPeriod;
/** 宸℃妯″紡 */
@@ -51,21 +50,17 @@
@Excel(name = "閫氶亾鍙�")
private Integer channel;
- /** 褰撳墠姝ラ */
- @Excel(name = "褰撳墠姝ラ")
- private String currentStepId;
-
- /** 褰撳墠姝ラ寮�濮嬫椂闂� */
- @Excel(name = "褰撳墠姝ラ寮�濮嬫椂闂�")
- private String currentStepStartTime;
-
/** 閮ㄩ棬id */
- @Excel(name = "閮ㄩ棬id")
private String deptId;
/** 鐢ㄦ埛id */
- @Excel(name = "鐢ㄦ埛id")
private String userId;
+
+ /** 褰撳墠姝ラ */
+ private String currentStepId;
+
+ /** 褰撳墠姝ラ寮�濮嬫椂闂� */
+ private String currentStepStartTime;
/** 瑙嗛宸℃姝ラ淇℃伅 */
private List<ArdVideoInspectTaskStep> ardVideoInspectTaskStepList;
@@ -142,32 +137,14 @@
{
return cameraId;
}
- public void setChannel(Integer channel)
+ public void setChannel(Integer channel)
{
this.channel = channel;
}
- public Integer getChannel()
+ public Integer getChannel()
{
return channel;
- }
- public void setCurrentStepId(String currentStepId)
- {
- this.currentStepId = currentStepId;
- }
-
- public String getCurrentStepId()
- {
- return currentStepId;
- }
- public void setCurrentStepStartTime(String currentStepStartTime)
- {
- this.currentStepStartTime = currentStepStartTime;
- }
-
- public String getCurrentStepStartTime()
- {
- return currentStepStartTime;
}
public void setDeptId(String deptId)
{
@@ -186,6 +163,24 @@
public String getUserId()
{
return userId;
+ }
+ public void setCurrentStepId(String currentStepId)
+ {
+ this.currentStepId = currentStepId;
+ }
+
+ public String getCurrentStepId()
+ {
+ return currentStepId;
+ }
+ public void setCurrentStepStartTime(String currentStepStartTime)
+ {
+ this.currentStepStartTime = currentStepStartTime;
+ }
+
+ public String getCurrentStepStartTime()
+ {
+ return currentStepStartTime;
}
public List<ArdVideoInspectTaskStep> getArdVideoInspectTaskStepList()
@@ -209,15 +204,15 @@
.append("inspectMode", getInspectMode())
.append("menualSwitch", getMenualSwitch())
.append("createBy", getCreateBy())
- .append("cameraId", getCameraId())
- .append("channel", getChannel())
- .append("currentStepId", getCurrentStepId())
- .append("currentStepStartTime", getCurrentStepStartTime())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
+ .append("cameraId", getCameraId())
+ .append("channel", getChannel())
.append("deptId", getDeptId())
.append("userId", getUserId())
+ .append("currentStepId", getCurrentStepId())
+ .append("currentStepStartTime", getCurrentStepStartTime())
.append("ardVideoInspectTaskStepList", getArdVideoInspectTaskStepList())
.toString();
}
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTaskStep.java b/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTaskStep.java
index 4e9e42c..fac9d06 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTaskStep.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTaskStep.java
@@ -15,21 +15,6 @@
{
private static final long serialVersionUID = 1L;
- /** id */
- private String id;
-
- /** 鎺掑簭 */
- @Excel(name = "鎺掑簭")
- private Integer orderNumber;
-
- /** 褰曞埗鏃堕棿 */
- @Excel(name = "褰曞埗鏃堕棿")
- private Integer recordingTime;
-
- /** 浜昳d */
- @Excel(name = "浜昳d")
- private String wellId;
-
/** 浠诲姟id */
@Excel(name = "浠诲姟id")
private String taskId;
@@ -42,42 +27,21 @@
@Excel(name = "鐢ㄦ埛id")
private String userId;
- public void setId(String id)
- {
- this.id = id;
- }
+ /** id */
+ private String id;
- public String getId()
- {
- return id;
- }
- public void setOrderNumber(Integer orderNumber)
- {
- this.orderNumber = orderNumber;
- }
+ /** 鎺掑簭 */
+ @Excel(name = "鎺掑簭")
+ private String orderNumber;
- public Integer getOrderNumber()
- {
- return orderNumber;
- }
- public void setRecordingTime(Integer recordingTime)
- {
- this.recordingTime = recordingTime;
- }
+ /** 褰曞埗鏃堕棿 */
+ @Excel(name = "褰曞埗鏃堕棿")
+ private String recordingTime;
- public Integer getRecordingTime()
- {
- return recordingTime;
- }
- public void setWellId(String wellId)
- {
- this.wellId = wellId;
- }
+ /** 浜昳d */
+ @Excel(name = "浜昳d")
+ private String wellId;
- public String getWellId()
- {
- return wellId;
- }
public void setTaskId(String taskId)
{
this.taskId = taskId;
@@ -105,17 +69,53 @@
{
return userId;
}
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+ public void setOrderNumber(String orderNumber)
+ {
+ this.orderNumber = orderNumber;
+ }
+
+ public String getOrderNumber()
+ {
+ return orderNumber;
+ }
+ public void setRecordingTime(String recordingTime)
+ {
+ this.recordingTime = recordingTime;
+ }
+
+ public String getRecordingTime()
+ {
+ return recordingTime;
+ }
+ public void setWellId(String wellId)
+ {
+ this.wellId = wellId;
+ }
+
+ public String getWellId()
+ {
+ return wellId;
+ }
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("taskId", getTaskId())
+ .append("deptId", getDeptId())
+ .append("userId", getUserId())
.append("id", getId())
.append("orderNumber", getOrderNumber())
.append("recordingTime", getRecordingTime())
.append("wellId", getWellId())
- .append("taskId", getTaskId())
- .append("deptId", getDeptId())
- .append("userId", getUserId())
.toString();
}
}
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
new file mode 100644
index 0000000..9d59a93
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectRecordMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.inspect.mapper;
+
+import java.util.List;
+import com.ruoyi.inspect.domain.ArdVideoInspectRecord;
+
+/**
+ * 瑙嗛宸℃璁板綍Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+public interface ArdVideoInspectRecordMapper
+{
+ /**
+ * 鏌ヨ瑙嗛宸℃璁板綍
+ *
+ * @param id 瑙嗛宸℃璁板綍涓婚敭
+ * @return 瑙嗛宸℃璁板綍
+ */
+ public ArdVideoInspectRecord selectArdVideoInspectRecordById(String id);
+
+ /**
+ * 鏌ヨ瑙嗛宸℃璁板綍鍒楄〃
+ *
+ * @param ardVideoInspectRecord 瑙嗛宸℃璁板綍
+ * @return 瑙嗛宸℃璁板綍闆嗗悎
+ */
+ public List<ArdVideoInspectRecord> selectArdVideoInspectRecordList(ArdVideoInspectRecord ardVideoInspectRecord);
+
+ /**
+ * 鏂板瑙嗛宸℃璁板綍
+ *
+ * @param ardVideoInspectRecord 瑙嗛宸℃璁板綍
+ * @return 缁撴灉
+ */
+ public int insertArdVideoInspectRecord(ArdVideoInspectRecord ardVideoInspectRecord);
+
+ /**
+ * 淇敼瑙嗛宸℃璁板綍
+ *
+ * @param ardVideoInspectRecord 瑙嗛宸℃璁板綍
+ * @return 缁撴灉
+ */
+ public int updateArdVideoInspectRecord(ArdVideoInspectRecord ardVideoInspectRecord);
+
+ /**
+ * 鍒犻櫎瑙嗛宸℃璁板綍
+ *
+ * @param id 瑙嗛宸℃璁板綍涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteArdVideoInspectRecordById(String id);
+
+ /**
+ * 鎵归噺鍒犻櫎瑙嗛宸℃璁板綍
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteArdVideoInspectRecordByIds(String[] ids);
+}
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectTaskStepMapper.java b/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectTaskStepMapper.java
new file mode 100644
index 0000000..0acfbee
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectTaskStepMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.inspect.mapper;
+
+import java.util.List;
+import com.ruoyi.inspect.domain.ArdVideoInspectTaskStep;
+
+/**
+ * 瑙嗛宸℃姝ラMapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+public interface ArdVideoInspectTaskStepMapper
+{
+ /**
+ * 鏌ヨ瑙嗛宸℃姝ラ
+ *
+ * @param taskId 瑙嗛宸℃姝ラ涓婚敭
+ * @return 瑙嗛宸℃姝ラ
+ */
+ public ArdVideoInspectTaskStep selectArdVideoInspectTaskStepByTaskId(String taskId);
+
+ /**
+ * 鏌ヨ瑙嗛宸℃姝ラ鍒楄〃
+ *
+ * @param ardVideoInspectTaskStep 瑙嗛宸℃姝ラ
+ * @return 瑙嗛宸℃姝ラ闆嗗悎
+ */
+ public List<ArdVideoInspectTaskStep> selectArdVideoInspectTaskStepList(ArdVideoInspectTaskStep ardVideoInspectTaskStep);
+
+ /**
+ * 鏂板瑙嗛宸℃姝ラ
+ *
+ * @param ardVideoInspectTaskStep 瑙嗛宸℃姝ラ
+ * @return 缁撴灉
+ */
+ public int insertArdVideoInspectTaskStep(ArdVideoInspectTaskStep ardVideoInspectTaskStep);
+
+ /**
+ * 淇敼瑙嗛宸℃姝ラ
+ *
+ * @param ardVideoInspectTaskStep 瑙嗛宸℃姝ラ
+ * @return 缁撴灉
+ */
+ public int updateArdVideoInspectTaskStep(ArdVideoInspectTaskStep ardVideoInspectTaskStep);
+
+ /**
+ * 鍒犻櫎瑙嗛宸℃姝ラ
+ *
+ * @param taskId 瑙嗛宸℃姝ラ涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteArdVideoInspectTaskStepByTaskId(String taskId);
+
+ /**
+ * 鎵归噺鍒犻櫎瑙嗛宸℃姝ラ
+ *
+ * @param taskIds 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteArdVideoInspectTaskStepByTaskIds(String[] taskIds);
+}
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectRecordService.java b/ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectRecordService.java
new file mode 100644
index 0000000..bb844f0
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectRecordService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.inspect.service;
+
+import java.util.List;
+import com.ruoyi.inspect.domain.ArdVideoInspectRecord;
+
+/**
+ * 瑙嗛宸℃璁板綍Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+public interface IArdVideoInspectRecordService
+{
+ /**
+ * 鏌ヨ瑙嗛宸℃璁板綍
+ *
+ * @param id 瑙嗛宸℃璁板綍涓婚敭
+ * @return 瑙嗛宸℃璁板綍
+ */
+ public ArdVideoInspectRecord selectArdVideoInspectRecordById(String id);
+
+ /**
+ * 鏌ヨ瑙嗛宸℃璁板綍鍒楄〃
+ *
+ * @param ardVideoInspectRecord 瑙嗛宸℃璁板綍
+ * @return 瑙嗛宸℃璁板綍闆嗗悎
+ */
+ public List<ArdVideoInspectRecord> selectArdVideoInspectRecordList(ArdVideoInspectRecord ardVideoInspectRecord);
+
+ /**
+ * 鏂板瑙嗛宸℃璁板綍
+ *
+ * @param ardVideoInspectRecord 瑙嗛宸℃璁板綍
+ * @return 缁撴灉
+ */
+ public int insertArdVideoInspectRecord(ArdVideoInspectRecord ardVideoInspectRecord);
+
+ /**
+ * 淇敼瑙嗛宸℃璁板綍
+ *
+ * @param ardVideoInspectRecord 瑙嗛宸℃璁板綍
+ * @return 缁撴灉
+ */
+ public int updateArdVideoInspectRecord(ArdVideoInspectRecord ardVideoInspectRecord);
+
+ /**
+ * 鎵归噺鍒犻櫎瑙嗛宸℃璁板綍
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑瑙嗛宸℃璁板綍涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteArdVideoInspectRecordByIds(String[] ids);
+
+ /**
+ * 鍒犻櫎瑙嗛宸℃璁板綍淇℃伅
+ *
+ * @param id 瑙嗛宸℃璁板綍涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteArdVideoInspectRecordById(String id);
+}
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectTaskStepService.java b/ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectTaskStepService.java
new file mode 100644
index 0000000..3738182
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectTaskStepService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.inspect.service;
+
+import java.util.List;
+import com.ruoyi.inspect.domain.ArdVideoInspectTaskStep;
+
+/**
+ * 瑙嗛宸℃姝ラService鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+public interface IArdVideoInspectTaskStepService
+{
+ /**
+ * 鏌ヨ瑙嗛宸℃姝ラ
+ *
+ * @param taskId 瑙嗛宸℃姝ラ涓婚敭
+ * @return 瑙嗛宸℃姝ラ
+ */
+ public ArdVideoInspectTaskStep selectArdVideoInspectTaskStepByTaskId(String taskId);
+
+ /**
+ * 鏌ヨ瑙嗛宸℃姝ラ鍒楄〃
+ *
+ * @param ardVideoInspectTaskStep 瑙嗛宸℃姝ラ
+ * @return 瑙嗛宸℃姝ラ闆嗗悎
+ */
+ public List<ArdVideoInspectTaskStep> selectArdVideoInspectTaskStepList(ArdVideoInspectTaskStep ardVideoInspectTaskStep);
+
+ /**
+ * 鏂板瑙嗛宸℃姝ラ
+ *
+ * @param ardVideoInspectTaskStep 瑙嗛宸℃姝ラ
+ * @return 缁撴灉
+ */
+ public int insertArdVideoInspectTaskStep(ArdVideoInspectTaskStep ardVideoInspectTaskStep);
+
+ /**
+ * 淇敼瑙嗛宸℃姝ラ
+ *
+ * @param ardVideoInspectTaskStep 瑙嗛宸℃姝ラ
+ * @return 缁撴灉
+ */
+ public int updateArdVideoInspectTaskStep(ArdVideoInspectTaskStep ardVideoInspectTaskStep);
+
+ /**
+ * 鎵归噺鍒犻櫎瑙嗛宸℃姝ラ
+ *
+ * @param taskIds 闇�瑕佸垹闄ょ殑瑙嗛宸℃姝ラ涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteArdVideoInspectTaskStepByTaskIds(String[] taskIds);
+
+ /**
+ * 鍒犻櫎瑙嗛宸℃姝ラ淇℃伅
+ *
+ * @param taskId 瑙嗛宸℃姝ラ涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteArdVideoInspectTaskStepByTaskId(String taskId);
+}
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectRecordServiceImpl.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectRecordServiceImpl.java
new file mode 100644
index 0000000..e1dda22
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectRecordServiceImpl.java
@@ -0,0 +1,89 @@
+package com.ruoyi.inspect.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.inspect.mapper.ArdVideoInspectRecordMapper;
+import com.ruoyi.inspect.domain.ArdVideoInspectRecord;
+import com.ruoyi.inspect.service.IArdVideoInspectRecordService;
+
+/**
+ * 瑙嗛宸℃璁板綍Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+@Service
+public class ArdVideoInspectRecordServiceImpl implements IArdVideoInspectRecordService {
+ @Autowired
+ private ArdVideoInspectRecordMapper ardVideoInspectRecordMapper;
+
+ /**
+ * 鏌ヨ瑙嗛宸℃璁板綍
+ *
+ * @param id 瑙嗛宸℃璁板綍涓婚敭
+ * @return 瑙嗛宸℃璁板綍
+ */
+ @Override
+ public ArdVideoInspectRecord selectArdVideoInspectRecordById(String id) {
+ return ardVideoInspectRecordMapper.selectArdVideoInspectRecordById(id);
+ }
+
+ /**
+ * 鏌ヨ瑙嗛宸℃璁板綍鍒楄〃
+ *
+ * @param ardVideoInspectRecord 瑙嗛宸℃璁板綍
+ * @return 瑙嗛宸℃璁板綍
+ */
+ @Override
+ public List<ArdVideoInspectRecord> selectArdVideoInspectRecordList(ArdVideoInspectRecord ardVideoInspectRecord) {
+ return ardVideoInspectRecordMapper.selectArdVideoInspectRecordList(ardVideoInspectRecord);
+ }
+
+ /**
+ * 鏂板瑙嗛宸℃璁板綍
+ *
+ * @param ardVideoInspectRecord 瑙嗛宸℃璁板綍
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertArdVideoInspectRecord(ArdVideoInspectRecord ardVideoInspectRecord) {
+ ardVideoInspectRecord.setUserId(SecurityUtils.getUserId());
+ return ardVideoInspectRecordMapper.insertArdVideoInspectRecord(ardVideoInspectRecord);
+ }
+
+ /**
+ * 淇敼瑙嗛宸℃璁板綍
+ *
+ * @param ardVideoInspectRecord 瑙嗛宸℃璁板綍
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateArdVideoInspectRecord(ArdVideoInspectRecord ardVideoInspectRecord) {
+ return ardVideoInspectRecordMapper.updateArdVideoInspectRecord(ardVideoInspectRecord);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎瑙嗛宸℃璁板綍
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑瑙嗛宸℃璁板綍涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteArdVideoInspectRecordByIds(String[] ids) {
+ return ardVideoInspectRecordMapper.deleteArdVideoInspectRecordByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎瑙嗛宸℃璁板綍淇℃伅
+ *
+ * @param id 瑙嗛宸℃璁板綍涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteArdVideoInspectRecordById(String id) {
+ return ardVideoInspectRecordMapper.deleteArdVideoInspectRecordById(id);
+ }
+}
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskStepServiceImpl.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskStepServiceImpl.java
new file mode 100644
index 0000000..b96363c
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskStepServiceImpl.java
@@ -0,0 +1,89 @@
+package com.ruoyi.inspect.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.inspect.mapper.ArdVideoInspectTaskStepMapper;
+import com.ruoyi.inspect.domain.ArdVideoInspectTaskStep;
+import com.ruoyi.inspect.service.IArdVideoInspectTaskStepService;
+
+/**
+ * 瑙嗛宸℃姝ラService涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+@Service
+public class ArdVideoInspectTaskStepServiceImpl implements IArdVideoInspectTaskStepService {
+ @Autowired
+ private ArdVideoInspectTaskStepMapper ardVideoInspectTaskStepMapper;
+
+ /**
+ * 鏌ヨ瑙嗛宸℃姝ラ
+ *
+ * @param taskId 瑙嗛宸℃姝ラ涓婚敭
+ * @return 瑙嗛宸℃姝ラ
+ */
+ @Override
+ public ArdVideoInspectTaskStep selectArdVideoInspectTaskStepByTaskId(String taskId) {
+ return ardVideoInspectTaskStepMapper.selectArdVideoInspectTaskStepByTaskId(taskId);
+ }
+
+ /**
+ * 鏌ヨ瑙嗛宸℃姝ラ鍒楄〃
+ *
+ * @param ardVideoInspectTaskStep 瑙嗛宸℃姝ラ
+ * @return 瑙嗛宸℃姝ラ
+ */
+ @Override
+ public List<ArdVideoInspectTaskStep> selectArdVideoInspectTaskStepList(ArdVideoInspectTaskStep ardVideoInspectTaskStep) {
+ return ardVideoInspectTaskStepMapper.selectArdVideoInspectTaskStepList(ardVideoInspectTaskStep);
+ }
+
+ /**
+ * 鏂板瑙嗛宸℃姝ラ
+ *
+ * @param ardVideoInspectTaskStep 瑙嗛宸℃姝ラ
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertArdVideoInspectTaskStep(ArdVideoInspectTaskStep ardVideoInspectTaskStep) {
+ ardVideoInspectTaskStep.setUserId(SecurityUtils.getUserId());
+ return ardVideoInspectTaskStepMapper.insertArdVideoInspectTaskStep(ardVideoInspectTaskStep);
+ }
+
+ /**
+ * 淇敼瑙嗛宸℃姝ラ
+ *
+ * @param ardVideoInspectTaskStep 瑙嗛宸℃姝ラ
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateArdVideoInspectTaskStep(ArdVideoInspectTaskStep ardVideoInspectTaskStep) {
+ return ardVideoInspectTaskStepMapper.updateArdVideoInspectTaskStep(ardVideoInspectTaskStep);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎瑙嗛宸℃姝ラ
+ *
+ * @param taskIds 闇�瑕佸垹闄ょ殑瑙嗛宸℃姝ラ涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteArdVideoInspectTaskStepByTaskIds(String[] taskIds) {
+ return ardVideoInspectTaskStepMapper.deleteArdVideoInspectTaskStepByTaskIds(taskIds);
+ }
+
+ /**
+ * 鍒犻櫎瑙嗛宸℃姝ラ淇℃伅
+ *
+ * @param taskId 瑙嗛宸℃姝ラ涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteArdVideoInspectTaskStepByTaskId(String taskId) {
+ return ardVideoInspectTaskStepMapper.deleteArdVideoInspectTaskStepByTaskId(taskId);
+ }
+}
diff --git a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml
new file mode 100644
index 0000000..c08b4cc
--- /dev/null
+++ b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml
@@ -0,0 +1,83 @@
+<?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">
+<mapper namespace="com.ruoyi.inspect.mapper.ArdVideoInspectRecordMapper">
+
+ <resultMap type="ArdVideoInspectRecord" id="ArdVideoInspectRecordResult">
+ <result property="id" column="id" />
+ <result property="startTime" column="start_time" />
+ <result property="endTime" column="end_time" />
+ <result property="recordFilePath" column="record_file_path" />
+ <result property="stepId" column="step_id" />
+ <result property="deptId" column="dept_id" />
+ <result property="userId" column="user_id" />
+ </resultMap>
+
+ <sql id="selectArdVideoInspectRecordVo">
+ select id, start_time, end_time, record_file_path, step_id, dept_id, user_id from ard_video_inspect_record
+ </sql>
+
+ <select id="selectArdVideoInspectRecordList" parameterType="ArdVideoInspectRecord" resultMap="ArdVideoInspectRecordResult">
+ <include refid="selectArdVideoInspectRecordVo"/>
+ <where>
+ <if test="startTime != null and startTime != ''"> and start_time = #{startTime}</if>
+ <if test="endTime != null and endTime != ''"> and end_time = #{endTime}</if>
+ <if test="recordFilePath != null and recordFilePath != ''"> and record_file_path = #{recordFilePath}</if>
+ <if test="stepId != null and stepId != ''"> and step_id = #{stepId}</if>
+ <if test="deptId != null and deptId != ''"> and dept_id = #{deptId}</if>
+ <if test="userId != null and userId != ''"> and user_id = #{userId}</if>
+ </where>
+ </select>
+
+ <select id="selectArdVideoInspectRecordById" parameterType="String" resultMap="ArdVideoInspectRecordResult">
+ <include refid="selectArdVideoInspectRecordVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertArdVideoInspectRecord" parameterType="ArdVideoInspectRecord">
+ insert into ard_video_inspect_record
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
+ <if test="startTime != null">start_time,</if>
+ <if test="endTime != null">end_time,</if>
+ <if test="recordFilePath != null">record_file_path,</if>
+ <if test="stepId != null">step_id,</if>
+ <if test="deptId != null">dept_id,</if>
+ <if test="userId != null">user_id,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id},</if>
+ <if test="startTime != null">#{startTime},</if>
+ <if test="endTime != null">#{endTime},</if>
+ <if test="recordFilePath != null">#{recordFilePath},</if>
+ <if test="stepId != null">#{stepId},</if>
+ <if test="deptId != null">#{deptId},</if>
+ <if test="userId != null">#{userId},</if>
+ </trim>
+ </insert>
+
+ <update id="updateArdVideoInspectRecord" parameterType="ArdVideoInspectRecord">
+ update ard_video_inspect_record
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="startTime != null">start_time = #{startTime},</if>
+ <if test="endTime != null">end_time = #{endTime},</if>
+ <if test="recordFilePath != null">record_file_path = #{recordFilePath},</if>
+ <if test="stepId != null">step_id = #{stepId},</if>
+ <if test="deptId != null">dept_id = #{deptId},</if>
+ <if test="userId != null">user_id = #{userId},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteArdVideoInspectRecordById" parameterType="String">
+ delete from ard_video_inspect_record where id = #{id}
+ </delete>
+
+ <delete id="deleteArdVideoInspectRecordByIds" parameterType="String">
+ delete from ard_video_inspect_record where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
index 19a7263..2aa0b51 100644
--- a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
@@ -13,56 +13,48 @@
<result property="inspectMode" column="inspect_mode" />
<result property="menualSwitch" column="menual_switch" />
<result property="createBy" column="create_by" />
- <result property="cameraId" column="camera_id" />
- <result property="channel" column="channel" />
- <result property="currentStepId" column="current_step_id" />
- <result property="currentStepStartTime" column="current_step_start_time" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
+ <result property="cameraId" column="camera_id" />
+ <result property="channel" column="channel" />
<result property="deptId" column="dept_id" />
<result property="userId" column="user_id" />
+ <result property="currentStepId" column="current_step_id" />
+ <result property="currentStepStartTime" column="current_step_start_time" />
</resultMap>
<resultMap id="ArdVideoInspectTaskArdVideoInspectTaskStepResult" type="ArdVideoInspectTask" extends="ArdVideoInspectTaskResult">
- <collection property="ardVideoInspectTaskStepList" notNullColumn="sub_id" javaType="java.util.List" resultMap="ArdVideoInspectTaskStepResult" />
+ <collection property="ardVideoInspectTaskStepList" notNullColumn="sub_task_id" javaType="java.util.List" resultMap="ArdVideoInspectTaskStepResult" />
</resultMap>
<resultMap type="ArdVideoInspectTaskStep" id="ArdVideoInspectTaskStepResult">
+ <result property="taskId" column="sub_task_id" />
+ <result property="deptId" column="sub_dept_id" />
+ <result property="userId" column="sub_user_id" />
<result property="id" column="sub_id" />
<result property="orderNumber" column="sub_order_number" />
<result property="recordingTime" column="sub_recording_time" />
<result property="wellId" column="sub_well_id" />
- <result property="taskId" column="sub_task_id" />
- <result property="deptId" column="sub_dept_id" />
- <result property="userId" column="sub_user_id" />
</resultMap>
<sql id="selectArdVideoInspectTaskVo">
- select id, task_name, start_time, end_time, repeat_period, inspect_mode, menual_switch, create_by, camera_id, channel, current_step_id, current_step_start_time, create_time, update_by, update_time, dept_id, user_id from ard_video_inspect_task
+ select id, task_name, start_time, end_time, repeat_period, inspect_mode, menual_switch, create_by, create_time, update_by, update_time, camera_id, channel, dept_id, user_id, current_step_id, current_step_start_time from ard_video_inspect_task
</sql>
<select id="selectArdVideoInspectTaskList" parameterType="ArdVideoInspectTask" resultMap="ArdVideoInspectTaskResult">
<include refid="selectArdVideoInspectTaskVo"/>
<where>
<if test="taskName != null and taskName != ''"> and task_name like '%'||#{taskName}||'%'</if>
- <if test="params.beginStartTime != null and params.beginStartTime != '' and params.endStartTime != null and params.endStartTime != ''"> and start_time between #{params.beginStartTime} and #{params.endStartTime}</if>
- <if test="params.beginEndTime != null and params.beginEndTime != '' and params.endEndTime != null and params.endEndTime != ''"> and end_time between #{params.beginEndTime} and #{params.endEndTime}</if>
- <if test="repeatPeriod != null and repeatPeriod != ''"> and repeat_period = #{repeatPeriod}</if>
<if test="inspectMode != null and inspectMode != ''"> and inspect_mode = #{inspectMode}</if>
- <if test="menualSwitch != null and menualSwitch != ''"> and menual_switch = #{menualSwitch}</if>
<if test="cameraId != null and cameraId != ''"> and camera_id = #{cameraId}</if>
- <if test="channel != null and channel != ''"> and channel = #{channel}</if>
- <if test="currentStepId != null and currentStepId != ''"> and current_step_id = #{currentStepId}</if>
- <if test="currentStepStartTime != null and currentStepStartTime != ''"> and current_step_start_time = #{currentStepStartTime}</if>
- <if test="deptId != null and deptId != ''"> and dept_id = #{deptId}</if>
- <if test="userId != null and userId != ''"> and user_id = #{userId}</if>
+ <if test="channel != null "> and channel = #{channel}</if>
</where>
</select>
<select id="selectArdVideoInspectTaskById" parameterType="String" resultMap="ArdVideoInspectTaskArdVideoInspectTaskStepResult">
- select a.id, a.task_name, a.start_time, a.end_time, a.repeat_period, a.inspect_mode, a.menual_switch, a.create_by, a.camera_id, a.channel, a.current_step_id, a.current_step_start_time, a.create_time, a.update_by, a.update_time, a.dept_id, a.user_id,
- b.id as sub_id, b.order_number as sub_order_number, b.recording_time as sub_recording_time, b.well_id as sub_well_id, b.task_id as sub_task_id, b.dept_id as sub_dept_id, b.user_id as sub_user_id
+ select a.id, a.task_name, a.start_time, a.end_time, a.repeat_period, a.inspect_mode, a.menual_switch, a.create_by, a.create_time, a.update_by, a.update_time, a.camera_id, a.channel, a.dept_id, a.user_id, a.current_step_id, a.current_step_start_time,
+ b.task_id as sub_task_id, b.dept_id as sub_dept_id, b.user_id as sub_user_id, b.id as sub_id, b.order_number as sub_order_number, b.recording_time as sub_recording_time, b.well_id as sub_well_id
from ard_video_inspect_task a
left join ard_video_inspect_task_step b on b.task_id = a.id
where a.id = #{id}
@@ -79,15 +71,15 @@
<if test="inspectMode != null">inspect_mode,</if>
<if test="menualSwitch != null">menual_switch,</if>
<if test="createBy != null">create_by,</if>
- <if test="cameraId != null">camera_id,</if>
- <if test="channel != null">channel,</if>
- <if test="currentStepId != null">current_step_id,</if>
- <if test="currentStepStartTime != null">current_step_start_time,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
+ <if test="cameraId != null">camera_id,</if>
+ <if test="channel != null">channel,</if>
<if test="deptId != null">dept_id,</if>
<if test="userId != null">user_id,</if>
+ <if test="currentStepId != null">current_step_id,</if>
+ <if test="currentStepStartTime != null">current_step_start_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -98,15 +90,15 @@
<if test="inspectMode != null">#{inspectMode},</if>
<if test="menualSwitch != null">#{menualSwitch},</if>
<if test="createBy != null">#{createBy},</if>
- <if test="cameraId != null">#{cameraId},</if>
- <if test="channel != null">#{channel},</if>
- <if test="currentStepId != null">#{currentStepId},</if>
- <if test="currentStepStartTime != null">#{currentStepStartTime},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
+ <if test="cameraId != null">#{cameraId},</if>
+ <if test="channel != null">#{channel},</if>
<if test="deptId != null">#{deptId},</if>
<if test="userId != null">#{userId},</if>
+ <if test="currentStepId != null">#{currentStepId},</if>
+ <if test="currentStepStartTime != null">#{currentStepStartTime},</if>
</trim>
</insert>
@@ -120,15 +112,15 @@
<if test="inspectMode != null">inspect_mode = #{inspectMode},</if>
<if test="menualSwitch != null">menual_switch = #{menualSwitch},</if>
<if test="createBy != null">create_by = #{createBy},</if>
- <if test="cameraId != null">camera_id = #{cameraId},</if>
- <if test="channel != null">channel = #{channel},</if>
- <if test="currentStepId != null">current_step_id = #{currentStepId},</if>
- <if test="currentStepStartTime != null">current_step_start_time = #{currentStepStartTime},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="cameraId != null">camera_id = #{cameraId},</if>
+ <if test="channel != null">channel = #{channel},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="userId != null">user_id = #{userId},</if>
+ <if test="currentStepId != null">current_step_id = #{currentStepId},</if>
+ <if test="currentStepStartTime != null">current_step_start_time = #{currentStepStartTime},</if>
</trim>
where id = #{id}
</update>
@@ -156,9 +148,9 @@
</delete>
<insert id="batchArdVideoInspectTaskStep">
- insert into ard_video_inspect_task_step( id, order_number, recording_time, well_id, task_id, dept_id, user_id) values
+ insert into ard_video_inspect_task_step( task_id, dept_id, user_id, order_number, recording_time, well_id) values
<foreach item="item" index="index" collection="list" separator=",">
- ( #{item.id}, #{item.orderNumber}, #{item.recordingTime}, #{item.wellId}, #{item.taskId}, #{item.deptId}, #{item.userId})
+ ( #{item.taskId}, #{item.deptId}, #{item.userId}, #{item.orderNumber}, #{item.recordingTime}, #{item.wellId})
</foreach>
</insert>
</mapper>
\ No newline at end of file
diff --git a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskStepMapper.xml b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskStepMapper.xml
new file mode 100644
index 0000000..7cb49a8
--- /dev/null
+++ b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskStepMapper.xml
@@ -0,0 +1,83 @@
+<?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">
+<mapper namespace="com.ruoyi.inspect.mapper.ArdVideoInspectTaskStepMapper">
+
+ <resultMap type="ArdVideoInspectTaskStep" id="ArdVideoInspectTaskStepResult">
+ <result property="taskId" column="task_id" />
+ <result property="deptId" column="dept_id" />
+ <result property="userId" column="user_id" />
+ <result property="id" column="id" />
+ <result property="orderNumber" column="order_number" />
+ <result property="recordingTime" column="recording_time" />
+ <result property="wellId" column="well_id" />
+ </resultMap>
+
+ <sql id="selectArdVideoInspectTaskStepVo">
+ select task_id, dept_id, user_id, id, order_number, recording_time, well_id from ard_video_inspect_task_step
+ </sql>
+
+ <select id="selectArdVideoInspectTaskStepList" parameterType="ArdVideoInspectTaskStep" resultMap="ArdVideoInspectTaskStepResult">
+ <include refid="selectArdVideoInspectTaskStepVo"/>
+ <where>
+ <if test="taskId != null and taskId != ''"> and task_id = #{taskId}</if>
+ <if test="deptId != null and deptId != ''"> and dept_id = #{deptId}</if>
+ <if test="userId != null and userId != ''"> and user_id = #{userId}</if>
+ <if test="orderNumber != null and orderNumber != ''"> and order_number = #{orderNumber}</if>
+ <if test="recordingTime != null and recordingTime != ''"> and recording_time = #{recordingTime}</if>
+ <if test="wellId != null and wellId != ''"> and well_id = #{wellId}</if>
+ </where>
+ </select>
+
+ <select id="selectArdVideoInspectTaskStepByTaskId" parameterType="String" resultMap="ArdVideoInspectTaskStepResult">
+ <include refid="selectArdVideoInspectTaskStepVo"/>
+ where task_id = #{taskId}
+ </select>
+
+ <insert id="insertArdVideoInspectTaskStep" parameterType="ArdVideoInspectTaskStep">
+ insert into ard_video_inspect_task_step
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="taskId != null">task_id,</if>
+ <if test="deptId != null">dept_id,</if>
+ <if test="userId != null">user_id,</if>
+ <if test="id != null">id,</if>
+ <if test="orderNumber != null">order_number,</if>
+ <if test="recordingTime != null">recording_time,</if>
+ <if test="wellId != null">well_id,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="taskId != null">#{taskId},</if>
+ <if test="deptId != null">#{deptId},</if>
+ <if test="userId != null">#{userId},</if>
+ <if test="id != null">#{id},</if>
+ <if test="orderNumber != null">#{orderNumber},</if>
+ <if test="recordingTime != null">#{recordingTime},</if>
+ <if test="wellId != null">#{wellId},</if>
+ </trim>
+ </insert>
+
+ <update id="updateArdVideoInspectTaskStep" parameterType="ArdVideoInspectTaskStep">
+ update ard_video_inspect_task_step
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="deptId != null">dept_id = #{deptId},</if>
+ <if test="userId != null">user_id = #{userId},</if>
+ <if test="id != null">id = #{id},</if>
+ <if test="orderNumber != null">order_number = #{orderNumber},</if>
+ <if test="recordingTime != null">recording_time = #{recordingTime},</if>
+ <if test="wellId != null">well_id = #{wellId},</if>
+ </trim>
+ where task_id = #{taskId}
+ </update>
+
+ <delete id="deleteArdVideoInspectTaskStepByTaskId" parameterType="String">
+ delete from ard_video_inspect_task_step where task_id = #{taskId}
+ </delete>
+
+ <delete id="deleteArdVideoInspectTaskStepByTaskIds" parameterType="String">
+ delete from ard_video_inspect_task_step where task_id in
+ <foreach item="taskId" collection="array" open="(" separator="," close=")">
+ #{taskId}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3