From 9763c7a6ed43a60c099d49cc149c86652fbb3cfa Mon Sep 17 00:00:00 2001
From: zhangjian <zhangjianrock@163.com>
Date: 星期一, 29 五月 2023 16:31:07 +0800
Subject: [PATCH] 视频巡检任务
---
ard-work/target/classes/mapper/device/ArdCamerasMapper.xml | 197 +++++++-----
.gitignore | 48 +++
ard-work/target/classes/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.class | 0
ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java | 14
ard-work/target/classes/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.class | 0
ard-work/target/classes/com/ruoyi/device/camera/service/IArdCamerasService.class | 0
ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java | 53 ++-
ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectTaskService.java | 14
ard-work/target/classes/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml | 10
ard-work/target/classes/com/ruoyi/device/camera/controller/ArdCamerasController.class | 0
ruoyi-admin/ruoyi-admin.iml | 1
ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTaskStep.java | 2
ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java | 1
ard-work/target/classes/com/ruoyi/device/camera/mapper/ArdCamerasMapper.class | 0
ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml | 8
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java | 11
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | 105 +++---
ard-work/target/classes/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.class | 0
ruoyi-framework/ruoyi-framework.iml | 1
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java | 8
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 19 +
ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTask.java | 115 +++---
ard-work/src/main/java/com/ruoyi/device/camera/service/IArdCamerasService.java | 2
ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectTaskMapper.java | 22
ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml | 10
ard-work/target/classes/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.class | 0
ard-work/ard-work.iml | 1
ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml | 197 +++++++-----
ard-work/target/classes/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.class | 0
ard-work/src/main/java/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.java | 7
ruoyi.iml | 1
ruoyi-quartz/ruoyi-quartz.iml | 1
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 4
33 files changed, 531 insertions(+), 321 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5152181..66c20a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,50 @@
/ardLog/logs/
/ardLog/
+
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+######################################################################
+# IDE
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### JRebel ###
+rebel.xml
+
+### NetBeans ###
+nbproject/private/
+build/*
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
+######################################################################
+# Others
+*.log
+*.xml.versionsBackup
+*.swp
+
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml
diff --git a/ard-work/ard-work.iml b/ard-work/ard-work.iml
index 3032348..504d3e4 100644
--- a/ard-work/ard-work.iml
+++ b/ard-work/ard-work.iml
@@ -164,5 +164,6 @@
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.9" level="project" />
+ <orderEntry type="library" name="Maven: org.gavaghan:geodesy:1.1.3" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java
index 78e357e..4ed36a0 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java
@@ -27,19 +27,21 @@
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 浜曠鐞咰ontroller
- *
+ *
* @author 鍒樿嫃涔�
* @date 2023-03-07
*/
@RestController
@RequestMapping("/alarmpoints/well")
@Api(tags = "浜曠鐞嗘帴鍙�")
-public class ArdAlarmpointsWellController extends BaseController
-{
+public class ArdAlarmpointsWellController extends BaseController {
@Resource
private IArdAlarmpointsWellService ardAlarmpointsWellService;
@@ -49,8 +51,7 @@
@PreAuthorize("@ss.hasPermi('alarmpoints:well:list')")
@GetMapping("/list")
@ApiOperation("鏌ヨ浜曞垪琛�")
- public TableDataInfo list(ArdAlarmpointsWell ardAlarmpointsWell)
- {
+ public TableDataInfo list(ArdAlarmpointsWell ardAlarmpointsWell) {
startPage();
List<ArdAlarmpointsWell> list = ardAlarmpointsWellService.selectArdAlarmpointsWellList(ardAlarmpointsWell);
return getDataTable(list);
@@ -63,8 +64,7 @@
@Log(title = "浜曠鐞�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation("瀵煎嚭浜曞垪琛�")
- public void export(HttpServletResponse response, ArdAlarmpointsWell ardAlarmpointsWell)
- {
+ public void export(HttpServletResponse response, ArdAlarmpointsWell ardAlarmpointsWell) {
List<ArdAlarmpointsWell> list = ardAlarmpointsWellService.selectArdAlarmpointsWellList(ardAlarmpointsWell);
ExcelUtil<ArdAlarmpointsWell> util = new ExcelUtil<ArdAlarmpointsWell>(ArdAlarmpointsWell.class);
util.exportExcel(response, list, "浜曠鐞嗘暟鎹�");
@@ -76,8 +76,7 @@
@PreAuthorize("@ss.hasPermi('alarmpoints:well:query')")
@GetMapping(value = "/{id}")
@ApiOperation("鑾峰彇浜曡缁嗕俊鎭�")
- public AjaxResult getInfo(@PathVariable("id") String id)
- {
+ public AjaxResult getInfo(@PathVariable("id") String id) {
return success(ardAlarmpointsWellService.selectArdAlarmpointsWellById(id));
}
@@ -88,8 +87,7 @@
@Log(title = "浜曠鐞�", businessType = BusinessType.INSERT)
@PostMapping
@ApiOperation("鏂板浜�")
- public AjaxResult add(@RequestBody ArdAlarmpointsWell ardAlarmpointsWell)
- {
+ public AjaxResult add(@RequestBody ArdAlarmpointsWell ardAlarmpointsWell) {
return toAjax(ardAlarmpointsWellService.insertArdAlarmpointsWell(ardAlarmpointsWell));
}
@@ -100,8 +98,7 @@
@Log(title = "浜曠鐞�", businessType = BusinessType.UPDATE)
@PutMapping
@ApiOperation("淇敼浜�")
- public AjaxResult edit(@RequestBody ArdAlarmpointsWell ardAlarmpointsWell)
- {
+ public AjaxResult edit(@RequestBody ArdAlarmpointsWell ardAlarmpointsWell) {
return toAjax(ardAlarmpointsWellService.updateArdAlarmpointsWell(ardAlarmpointsWell));
}
@@ -110,10 +107,9 @@
*/
@PreAuthorize("@ss.hasPermi('alarmpoints:well:remove')")
@Log(title = "浜曠鐞�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @DeleteMapping("/{ids}")
@ApiOperation("鍒犻櫎浜�")
- public AjaxResult remove(@PathVariable String[] ids)
- {
+ public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(ardAlarmpointsWellService.deleteArdAlarmpointsWellByIds(ids));
}
@@ -121,19 +117,36 @@
@PreAuthorize("@ss.hasPermi('alarmpoints:well:import')")
@PostMapping("/importData")
@ApiOperation("瀵煎叆浜�")
- public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
- {
+ public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
ExcelUtil<ArdAlarmpointsWell> util = new ExcelUtil<ArdAlarmpointsWell>(ArdAlarmpointsWell.class);
List<ArdAlarmpointsWell> userList = util.importExcel(file.getInputStream());
String operName = getUsername();
String message = ardAlarmpointsWellService.importUser(userList, updateSupport, operName);
return success(message);
}
+
@PostMapping("/importTemplate")
@ApiOperation("浜曞鍏ユā鏉�")
- public void importTemplate(HttpServletResponse response)
- {
+ public void importTemplate(HttpServletResponse response) {
ExcelUtil<ArdAlarmpointsWell> util = new ExcelUtil<ArdAlarmpointsWell>(ArdAlarmpointsWell.class);
util.importTemplateExcel(response, "浜曟暟鎹�");
}
+
+ /**
+ * 浜曢�夐」鏁版嵁
+ */
+ @GetMapping("/options")
+ @ApiOperation("浜曢�夐」鏁版嵁")
+ public List options(ArdAlarmpointsWell ardAlarmpointsWell) {
+ List<ArdAlarmpointsWell> list = ardAlarmpointsWellService.selectArdAlarmpointsWellByWellIdLike(ardAlarmpointsWell);
+ List options = new ArrayList();
+ for (ArdAlarmpointsWell item : list) {
+ Map option = new HashMap();
+ option.put("value", item.getId());
+ option.put("label", item.getWellId());
+ option.put("description", item.getOilProduction());
+ options.add(option);
+ }
+ return options;
+ }
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.java
index 740c162..2eeb3c9 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.java
@@ -28,6 +28,13 @@
*/
public ArdAlarmpointsWell selectArdAlarmpointsWellByWellId(String wellId);
/**
+ * 鏌ヨ浜曠鐞�
+ *
+ * @param ardAlarmpointsWell 鎸夌紪鍙锋煡璇�
+ * @return
+ */
+ public List selectArdAlarmpointsWellByWellIdLike(ArdAlarmpointsWell ardAlarmpointsWell);
+ /**
* 鏌ヨ浜曠鐞嗗垪琛�
*
* @param ardAlarmpointsWell 浜曠鐞�
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java
index 6a3f950..1db5728 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java
@@ -34,6 +34,14 @@
*/
public List<ArdAlarmpointsWell> selectArdAlarmpointsWellList(ArdAlarmpointsWell ardAlarmpointsWell);
+
+ /**
+ *
+ * @param ardAlarmpointsWell 鎸変簳缂栧彿鏌ヨ
+ * @return
+ */
+ public List<ArdAlarmpointsWell> selectArdAlarmpointsWellByWellIdLike(ArdAlarmpointsWell ardAlarmpointsWell);
+
/**
* 鏂板浜曠鐞�
*
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
index e7c4321..e0a498f 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
@@ -68,6 +68,17 @@
}
/**
+ *
+ * @param ardAlarmpointsWell 鎸変簳缂栧彿鏌ヨ
+ * @return
+ */
+ @Override
+ @DataScope(deptAlias = "d",userAlias = "u")
+ public List<ArdAlarmpointsWell> selectArdAlarmpointsWellByWellIdLike(ArdAlarmpointsWell ardAlarmpointsWell) {
+ return ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellIdLike(ardAlarmpointsWell);
+ }
+
+ /**
* 鏂板浜曠鐞�
*
* @param ardAlarmpointsWell 浜曠鐞�
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
index 1ba9a14..a7cbd54 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
@@ -3,6 +3,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.device.hiksdk.service.impl.hikClientServiceImpl;
@@ -27,7 +28,10 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.page.TableDataInfo;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 鐩告満璁惧Controller
@@ -143,4 +147,19 @@
}
return toAjax(ardCamerasService.deleteArdCamerasByIds(ids));
}
+ @GetMapping("/options")
+ @ApiOperation("閫夋嫨鐩告満鏁版嵁")
+ public List options(ArdCameras ardCameras) {
+ List<ArdCameras> list = ardCamerasService.findOptions(ardCameras);
+ List options = new ArrayList();
+ for (ArdCameras item : list) {
+ Map option = new HashMap();
+ option.put("value", item.getId());
+ option.put("label", item.getName());
+ // option.put("description", item.getOilProduction());
+ options.add(option);
+ }
+ return options;
+ }
+
}
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java b/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java
index 72a726c..c14115b 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java
@@ -66,4 +66,5 @@
* @return 缁撴灉
*/
public int deleteArdCamerasByIds(String[] ids);
+ public List findOptions(ArdCameras ardCameras);
}
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/service/IArdCamerasService.java b/ard-work/src/main/java/com/ruoyi/device/camera/service/IArdCamerasService.java
index 5f0ae85..1cd7fe6 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/service/IArdCamerasService.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/service/IArdCamerasService.java
@@ -65,4 +65,6 @@
* @return 缁撴灉
*/
public int deleteArdCamerasById(String id);
+
+ public List findOptions(ArdCameras ardCameras);
}
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
index 45f092a..6ebfb97 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
@@ -104,4 +104,8 @@
public int deleteArdCamerasById(String id) {
return ardCamerasMapper.deleteArdCamerasById(id);
}
+
+ public List findOptions(ArdCameras ardCameras) {
+ return ardCamerasMapper.findOptions(ardCameras);
+ }
}
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 4b2de62..9e93432 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
@@ -25,7 +25,7 @@
* 瑙嗛宸℃浠诲姟Controller
*
* @author ruoyi
- * @date 2023-05-25
+ * @date 2023-05-26
*/
@RestController
@RequestMapping("/inspect/task")
@@ -63,10 +63,10 @@
* 鑾峰彇瑙嗛宸℃浠诲姟璇︾粏淇℃伅
*/
@PreAuthorize("@ss.hasPermi('inspect:task:query')")
- @GetMapping(value = "/{inspectMode}")
- public AjaxResult getInfo(@PathVariable("inspectMode") String inspectMode)
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id)
{
- return success(ardVideoInspectTaskService.selectArdVideoInspectTaskByInspectMode(inspectMode));
+ return success(ardVideoInspectTaskService.selectArdVideoInspectTaskById(id));
}
/**
@@ -96,9 +96,9 @@
*/
@PreAuthorize("@ss.hasPermi('inspect:task:remove')")
@Log(title = "瑙嗛宸℃浠诲姟", businessType = BusinessType.DELETE)
- @DeleteMapping("/{inspectModes}")
- public AjaxResult remove(@PathVariable String[] inspectModes)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String[] ids)
{
- return toAjax(ardVideoInspectTaskService.deleteArdVideoInspectTaskByInspectModes(inspectModes));
+ return toAjax(ardVideoInspectTaskService.deleteArdVideoInspectTaskByIds(ids));
}
}
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 1834441..a650951 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
@@ -10,27 +10,11 @@
* 瑙嗛宸℃浠诲姟瀵硅薄 ard_video_inspect_task
*
* @author ruoyi
- * @date 2023-05-25
+ * @date 2023-05-26
*/
public class ArdVideoInspectTask extends BaseEntity
{
private static final long serialVersionUID = 1L;
-
- /** 宸℃妯″紡 */
- @Excel(name = "宸℃妯″紡")
- private String inspectMode;
-
- /** 鎵嬪姩寮�鍏� */
- @Excel(name = "鎵嬪姩寮�鍏�")
- private String menualSwitch;
-
- /** 閮ㄩ棬id */
- @Excel(name = "閮ㄩ棬id")
- private String deptId;
-
- /** 鐢ㄦ埛id */
- @Excel(name = "鐢ㄦ埛id")
- private String userId;
/** id */
private String id;
@@ -48,48 +32,25 @@
private String endTime;
/** 閲嶅鍛ㄦ湡 */
- @Excel(name = "閲嶅鍛ㄦ湡")
private String repeatPeriod;
+
+ /** 宸℃妯″紡 */
+ @Excel(name = "宸℃妯″紡")
+ private String inspectMode;
+
+ /** 鎵嬪姩寮�鍏� */
+ @Excel(name = "鎵嬪姩寮�鍏�")
+ private String menualSwitch;
+
+ /** 閮ㄩ棬id */
+ private String deptId;
+
+ /** 鐢ㄦ埛id */
+ private String userId;
/** 瑙嗛宸℃姝ラ淇℃伅 */
private List<ArdVideoInspectTaskStep> ardVideoInspectTaskStepList;
- public void setInspectMode(String inspectMode)
- {
- this.inspectMode = inspectMode;
- }
-
- public String getInspectMode()
- {
- return inspectMode;
- }
- public void setMenualSwitch(String menualSwitch)
- {
- this.menualSwitch = menualSwitch;
- }
-
- public String getMenualSwitch()
- {
- return menualSwitch;
- }
- 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;
- }
public void setId(String id)
{
this.id = id;
@@ -135,6 +96,42 @@
{
return repeatPeriod;
}
+ public void setInspectMode(String inspectMode)
+ {
+ this.inspectMode = inspectMode;
+ }
+
+ public String getInspectMode()
+ {
+ return inspectMode;
+ }
+ public void setMenualSwitch(String menualSwitch)
+ {
+ this.menualSwitch = menualSwitch;
+ }
+
+ public String getMenualSwitch()
+ {
+ return menualSwitch;
+ }
+ 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;
+ }
public List<ArdVideoInspectTaskStep> getArdVideoInspectTaskStepList()
{
@@ -149,6 +146,11 @@
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("taskName", getTaskName())
+ .append("startTime", getStartTime())
+ .append("endTime", getEndTime())
+ .append("repeatPeriod", getRepeatPeriod())
.append("inspectMode", getInspectMode())
.append("menualSwitch", getMenualSwitch())
.append("createBy", getCreateBy())
@@ -157,11 +159,6 @@
.append("updateTime", getUpdateTime())
.append("deptId", getDeptId())
.append("userId", getUserId())
- .append("id", getId())
- .append("taskName", getTaskName())
- .append("startTime", getStartTime())
- .append("endTime", getEndTime())
- .append("repeatPeriod", getRepeatPeriod())
.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 7cda574..635c610 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
@@ -9,7 +9,7 @@
* 瑙嗛宸℃姝ラ瀵硅薄 ard_video_inspect_task_step
*
* @author ruoyi
- * @date 2023-05-25
+ * @date 2023-05-26
*/
public class ArdVideoInspectTaskStep extends BaseEntity
{
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 905fc8e..d739a56 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
@@ -8,17 +8,17 @@
* 瑙嗛宸℃浠诲姟Mapper鎺ュ彛
*
* @author ruoyi
- * @date 2023-05-25
+ * @date 2023-05-26
*/
public interface ArdVideoInspectTaskMapper
{
/**
* 鏌ヨ瑙嗛宸℃浠诲姟
*
- * @param inspectMode 瑙嗛宸℃浠诲姟涓婚敭
+ * @param id 瑙嗛宸℃浠诲姟涓婚敭
* @return 瑙嗛宸℃浠诲姟
*/
- public ArdVideoInspectTask selectArdVideoInspectTaskByInspectMode(String inspectMode);
+ public ArdVideoInspectTask selectArdVideoInspectTaskById(String id);
/**
* 鏌ヨ瑙嗛宸℃浠诲姟鍒楄〃
@@ -47,26 +47,26 @@
/**
* 鍒犻櫎瑙嗛宸℃浠诲姟
*
- * @param inspectMode 瑙嗛宸℃浠诲姟涓婚敭
+ * @param id 瑙嗛宸℃浠诲姟涓婚敭
* @return 缁撴灉
*/
- public int deleteArdVideoInspectTaskByInspectMode(String inspectMode);
+ public int deleteArdVideoInspectTaskById(String id);
/**
* 鎵归噺鍒犻櫎瑙嗛宸℃浠诲姟
*
- * @param inspectModes 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
- public int deleteArdVideoInspectTaskByInspectModes(String[] inspectModes);
+ public int deleteArdVideoInspectTaskByIds(String[] ids);
/**
* 鎵归噺鍒犻櫎瑙嗛宸℃姝ラ
*
- * @param inspectModes 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
- public int deleteArdVideoInspectTaskStepByTaskIds(String[] inspectModes);
+ public int deleteArdVideoInspectTaskStepByTaskIds(String[] ids);
/**
* 鎵归噺鏂板瑙嗛宸℃姝ラ
@@ -80,8 +80,8 @@
/**
* 閫氳繃瑙嗛宸℃浠诲姟涓婚敭鍒犻櫎瑙嗛宸℃姝ラ淇℃伅
*
- * @param inspectMode 瑙嗛宸℃浠诲姟ID
+ * @param id 瑙嗛宸℃浠诲姟ID
* @return 缁撴灉
*/
- public int deleteArdVideoInspectTaskStepByTaskId(String inspectMode);
+ public int deleteArdVideoInspectTaskStepByTaskId(String id);
}
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectTaskService.java b/ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectTaskService.java
index 7dc6ec4..7f2cbe7 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectTaskService.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectTaskService.java
@@ -7,17 +7,17 @@
* 瑙嗛宸℃浠诲姟Service鎺ュ彛
*
* @author ruoyi
- * @date 2023-05-25
+ * @date 2023-05-26
*/
public interface IArdVideoInspectTaskService
{
/**
* 鏌ヨ瑙嗛宸℃浠诲姟
*
- * @param inspectMode 瑙嗛宸℃浠诲姟涓婚敭
+ * @param id 瑙嗛宸℃浠诲姟涓婚敭
* @return 瑙嗛宸℃浠诲姟
*/
- public ArdVideoInspectTask selectArdVideoInspectTaskByInspectMode(String inspectMode);
+ public ArdVideoInspectTask selectArdVideoInspectTaskById(String id);
/**
* 鏌ヨ瑙嗛宸℃浠诲姟鍒楄〃
@@ -46,16 +46,16 @@
/**
* 鎵归噺鍒犻櫎瑙嗛宸℃浠诲姟
*
- * @param inspectModes 闇�瑕佸垹闄ょ殑瑙嗛宸℃浠诲姟涓婚敭闆嗗悎
+ * @param ids 闇�瑕佸垹闄ょ殑瑙嗛宸℃浠诲姟涓婚敭闆嗗悎
* @return 缁撴灉
*/
- public int deleteArdVideoInspectTaskByInspectModes(String[] inspectModes);
+ public int deleteArdVideoInspectTaskByIds(String[] ids);
/**
* 鍒犻櫎瑙嗛宸℃浠诲姟淇℃伅
*
- * @param inspectMode 瑙嗛宸℃浠诲姟涓婚敭
+ * @param id 瑙嗛宸℃浠诲姟涓婚敭
* @return 缁撴灉
*/
- public int deleteArdVideoInspectTaskByInspectMode(String inspectMode);
+ public int deleteArdVideoInspectTaskById(String id);
}
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 56e354e..10b519d 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
@@ -1,16 +1,19 @@
package com.ruoyi.inspect.service.impl;
import java.util.List;
- import com.ruoyi.common.utils.DateUtils;
+
+import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
- import java.util.ArrayList;
- import com.ruoyi.common.utils.StringUtils;
- import com.ruoyi.common.utils.SecurityUtils;
- import org.springframework.transaction.annotation.Transactional;
- import com.ruoyi.inspect.domain.ArdVideoInspectTaskStep;
+import java.util.ArrayList;
+import java.util.UUID;
+
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.inspect.domain.ArdVideoInspectTaskStep;
import com.ruoyi.inspect.mapper.ArdVideoInspectTaskMapper;
import com.ruoyi.inspect.domain.ArdVideoInspectTask;
import com.ruoyi.inspect.service.IArdVideoInspectTaskService;
@@ -19,7 +22,7 @@
* 瑙嗛宸℃浠诲姟Service涓氬姟灞傚鐞�
*
* @author ruoyi
- * @date 2023-05-25
+ * @date 2023-05-26
*/
@Service
public class ArdVideoInspectTaskServiceImpl implements IArdVideoInspectTaskService {
@@ -29,12 +32,12 @@
/**
* 鏌ヨ瑙嗛宸℃浠诲姟
*
- * @param inspectMode 瑙嗛宸℃浠诲姟涓婚敭
+ * @param id 瑙嗛宸℃浠诲姟涓婚敭
* @return 瑙嗛宸℃浠诲姟
*/
@Override
- public ArdVideoInspectTask selectArdVideoInspectTaskByInspectMode(String inspectMode) {
- return ardVideoInspectTaskMapper.selectArdVideoInspectTaskByInspectMode(inspectMode);
+ public ArdVideoInspectTask selectArdVideoInspectTaskById(String id) {
+ return ardVideoInspectTaskMapper.selectArdVideoInspectTaskById(id);
}
/**
@@ -54,15 +57,16 @@
* @param ardVideoInspectTask 瑙嗛宸℃浠诲姟
* @return 缁撴灉
*/
- @Transactional
+ @Transactional
@Override
public int insertArdVideoInspectTask(ArdVideoInspectTask ardVideoInspectTask) {
- ardVideoInspectTask.setCreateBy(SecurityUtils.getUsername());
- ardVideoInspectTask.setCreateTime(DateUtils.getNowDate());
- ardVideoInspectTask.setUserId(SecurityUtils.getUserId());
- int rows = ardVideoInspectTaskMapper.insertArdVideoInspectTask(ardVideoInspectTask);
- insertArdVideoInspectTaskStep(ardVideoInspectTask);
- return rows;
+ ardVideoInspectTask.setCreateBy(SecurityUtils.getUsername());
+ ardVideoInspectTask.setCreateTime(DateUtils.getNowDate());
+ ardVideoInspectTask.setUserId(SecurityUtils.getUserId());
+ ardVideoInspectTask.setId(UUID.randomUUID().toString());//task 涓婚敭 UUID
+ int rows = ardVideoInspectTaskMapper.insertArdVideoInspectTask(ardVideoInspectTask);
+ insertArdVideoInspectTaskStep(ardVideoInspectTask);
+ return rows;
}
/**
@@ -71,61 +75,60 @@
* @param ardVideoInspectTask 瑙嗛宸℃浠诲姟
* @return 缁撴灉
*/
- @Transactional
+ @Transactional
@Override
public int updateArdVideoInspectTask(ArdVideoInspectTask ardVideoInspectTask) {
- ardVideoInspectTask.setUpdateBy(SecurityUtils.getUsername());
- ardVideoInspectTask.setUpdateTime(DateUtils.getNowDate());
- ardVideoInspectTaskMapper.deleteArdVideoInspectTaskStepByTaskId(ardVideoInspectTask.getInspectMode())
- ;
- insertArdVideoInspectTaskStep(ardVideoInspectTask);
+ ardVideoInspectTask.setUpdateBy(SecurityUtils.getUsername());
+ ardVideoInspectTask.setUpdateTime(DateUtils.getNowDate());
+ ardVideoInspectTaskMapper.deleteArdVideoInspectTaskStepByTaskId(ardVideoInspectTask.getId())
+ ;
+ insertArdVideoInspectTaskStep(ardVideoInspectTask);
return ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);
}
/**
* 鎵归噺鍒犻櫎瑙嗛宸℃浠诲姟
*
- * @param inspectModes 闇�瑕佸垹闄ょ殑瑙嗛宸℃浠诲姟涓婚敭
+ * @param ids 闇�瑕佸垹闄ょ殑瑙嗛宸℃浠诲姟涓婚敭
* @return 缁撴灉
*/
- @Transactional
+ @Transactional
@Override
- public int deleteArdVideoInspectTaskByInspectModes(String[] inspectModes) {
- ardVideoInspectTaskMapper.deleteArdVideoInspectTaskStepByTaskIds(inspectModes);
- return ardVideoInspectTaskMapper.deleteArdVideoInspectTaskByInspectModes(inspectModes);
+ public int deleteArdVideoInspectTaskByIds(String[] ids) {
+ ardVideoInspectTaskMapper.deleteArdVideoInspectTaskStepByTaskIds(ids);
+ return ardVideoInspectTaskMapper.deleteArdVideoInspectTaskByIds(ids);
}
/**
* 鍒犻櫎瑙嗛宸℃浠诲姟淇℃伅
*
- * @param inspectMode 瑙嗛宸℃浠诲姟涓婚敭
+ * @param id 瑙嗛宸℃浠诲姟涓婚敭
* @return 缁撴灉
*/
- @Transactional
+ @Transactional
@Override
- public int deleteArdVideoInspectTaskByInspectMode(String inspectMode) {
- ardVideoInspectTaskMapper.deleteArdVideoInspectTaskStepByTaskId(inspectMode);
- return ardVideoInspectTaskMapper.deleteArdVideoInspectTaskByInspectMode(inspectMode);
+ public int deleteArdVideoInspectTaskById(String id) {
+ ardVideoInspectTaskMapper.deleteArdVideoInspectTaskStepByTaskId(id);
+ return ardVideoInspectTaskMapper.deleteArdVideoInspectTaskById(id);
}
- /**
- * 鏂板瑙嗛宸℃姝ラ淇℃伅
- *
- * @param ardVideoInspectTask 瑙嗛宸℃浠诲姟瀵硅薄
- */
- public void insertArdVideoInspectTaskStep(ArdVideoInspectTask ardVideoInspectTask) {
- List<ArdVideoInspectTaskStep> ardVideoInspectTaskStepList = ardVideoInspectTask.getArdVideoInspectTaskStepList();
- String inspectMode = ardVideoInspectTask.getInspectMode();
- if (StringUtils.isNotNull(ardVideoInspectTaskStepList)) {
- List<ArdVideoInspectTaskStep> list = new ArrayList<ArdVideoInspectTaskStep>();
- for (ArdVideoInspectTaskStep ardVideoInspectTaskStep :ardVideoInspectTaskStepList)
- {
- ardVideoInspectTaskStep.setTaskId(inspectMode);
- list.add(ardVideoInspectTaskStep);
- }
- if (list.size() > 0) {
- ardVideoInspectTaskMapper.batchArdVideoInspectTaskStep(list);
- }
+ /**
+ * 鏂板瑙嗛宸℃姝ラ淇℃伅
+ *
+ * @param ardVideoInspectTask 瑙嗛宸℃浠诲姟瀵硅薄
+ */
+ public void insertArdVideoInspectTaskStep(ArdVideoInspectTask ardVideoInspectTask) {
+ List<ArdVideoInspectTaskStep> ardVideoInspectTaskStepList = ardVideoInspectTask.getArdVideoInspectTaskStepList();
+ String id = ardVideoInspectTask.getId();
+ if (StringUtils.isNotNull(ardVideoInspectTaskStepList)) {
+ List<ArdVideoInspectTaskStep> list = new ArrayList<ArdVideoInspectTaskStep>();
+ for (ArdVideoInspectTaskStep ardVideoInspectTaskStep : ardVideoInspectTaskStepList) {
+ ardVideoInspectTaskStep.setTaskId(id);
+ list.add(ardVideoInspectTaskStep);
+ }
+ if (list.size() > 0) {
+ ardVideoInspectTaskMapper.batchArdVideoInspectTaskStep(list);
}
}
+ }
}
diff --git a/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml b/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
index c6ec2dc..a471902 100644
--- a/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
@@ -71,6 +71,16 @@
</where>
</select>
+ <select id="selectArdAlarmpointsWellByWellIdLike" parameterType="ArdAlarmpointsWell" resultMap="ArdAlarmpointsWellResult">
+ <include refid="selectArdAlarmpointsWellVo"/>
+ <where>
+ <if test="id != null and id != ''">and c.id = #{id}</if>
+ <if test="wellId != null and wellId != ''"> and well_id like ('%${wellId}%')</if>
+ <!-- 鏁版嵁鑼冨洿杩囨护 -->
+ ${params.dataScope}
+ </where>
+ </select>
+
<select id="selectArdAlarmpointsWellById" parameterType="String" resultMap="ArdAlarmpointsWellResult">
<include refid="selectArdAlarmpointsWellVo"/>
where id = #{id}
diff --git a/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml b/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
index f3bd068..2b3c5fe 100644
--- a/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
@@ -1,71 +1,95 @@
<?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">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.device.camera.mapper.ArdCamerasMapper">
<resultMap type="ArdCameras" id="ArdCamerasResult">
- <result property="id" column="id" />
- <result property="name" column="name" />
- <result property="ip" column="ip" />
- <result property="port" column="port" />
- <result property="rtspPort" column="rtsp_port" />
- <result property="username" column="username" />
- <result property="password" column="password" />
- <result property="gdtype" column="gdtype" />
- <result property="channel" column="channel" />
- <result property="longitude" column="longitude" />
- <result property="latitude" column="latitude" />
- <result property="altitude" column="altitude" />
- <result property="userId" column="user_id" />
- <result property="deptId" column="dept_id" />
- <result property="camHeading" column="cam_heading" />
- <result property="camPitch" column="cam_pitch" />
- <result property="camRoll" column="cam_roll" />
- <result property="camNear" column="cam_near" />
- <result property="camFar" column="cam_far" />
- <result property="camAspectratio" column="cam_aspectratio" />
- <result property="camDepth" column="cam_depth" />
- <result property="camFov" column="cam_fov" />
- <result property="loginId" column="login_id" />
- <result property="operatorId" column="operator_id" />
- <result property="operatorExpired" column="operator_expired" />
+ <result property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="ip" column="ip"/>
+ <result property="port" column="port"/>
+ <result property="rtspPort" column="rtsp_port"/>
+ <result property="username" column="username"/>
+ <result property="password" column="password"/>
+ <result property="gdtype" column="gdtype"/>
+ <result property="channel" column="channel"/>
+ <result property="longitude" column="longitude"/>
+ <result property="latitude" column="latitude"/>
+ <result property="altitude" column="altitude"/>
+ <result property="userId" column="user_id"/>
+ <result property="deptId" column="dept_id"/>
+ <result property="camHeading" column="cam_heading"/>
+ <result property="camPitch" column="cam_pitch"/>
+ <result property="camRoll" column="cam_roll"/>
+ <result property="camNear" column="cam_near"/>
+ <result property="camFar" column="cam_far"/>
+ <result property="camAspectratio" column="cam_aspectratio"/>
+ <result property="camDepth" column="cam_depth"/>
+ <result property="camFov" column="cam_fov"/>
+ <result property="loginId" column="login_id"/>
+ <result property="operatorId" column="operator_id"/>
+ <result property="operatorExpired" column="operator_expired"/>
</resultMap>
<sql id="selectArdCamerasVo">
- select c.id, c.name, c.ip, c.port,c.rtsp_port, c.username, c.password, c.gdtype, c.channel, c.longitude, c.latitude, c.altitude, c.user_id, c.dept_id,
- c.cam_heading, c.cam_pitch, c.cam_roll, c.cam_near, c.cam_far, c.cam_aspectratio, c.cam_depth, c.cam_fov,c.operator_id,c.operator_expired
+ select c.id,
+ c.name,
+ c.ip,
+ c.port,
+ c.rtsp_port,
+ c.username,
+ c.password,
+ c.gdtype,
+ c.channel,
+ c.longitude,
+ c.latitude,
+ c.altitude,
+ c.user_id,
+ c.dept_id,
+ c.cam_heading,
+ c.cam_pitch,
+ c.cam_roll,
+ c.cam_near,
+ c.cam_far,
+ c.cam_aspectratio,
+ c.cam_depth,
+ c.cam_fov,
+ c.operator_id,
+ c.operator_expired
from ard_cameras c
- left join sys_dept d on d.dept_id=c.dept_id
- left join sys_user u on u.user_id=c.user_id
+ left join sys_dept d on d.dept_id = c.dept_id
+ left join sys_user u on u.user_id = c.user_id
</sql>
<select id="selectArdCamerasList" parameterType="ArdCameras" resultMap="ArdCamerasResult">
<include refid="selectArdCamerasVo"/>
<where>
- <if test="id != null and id != ''"> and c.id = #{id}</if>
- <if test="name != null and name != ''"> and c.name like '%'||#{name}||'%'</if>
- <if test="ip != null and ip != ''"> and c.ip = #{ip}</if>
- <if test="port != null "> and c.port = #{port}</if>
- <if test="rtspPort != null "> and c.rtsp_port = #{rtspPort}</if>
- <if test="username != null and username != ''"> and c.username like '%'||#{username}||'%'</if>
- <if test="password != null and password != ''"> and c.password = #{password}</if>
- <if test="gdtype != null and gdtype != ''"> and c.gdtype = #{gdtype}</if>
- <if test="channel != null "> and c.channel = #{channel}</if>
- <if test="longitude != null "> and c.longitude = #{longitude}</if>
- <if test="latitude != null "> and c.latitude = #{latitude}</if>
- <if test="altitude != null "> and c.altitude = #{altitude}</if>
- <if test="userId != null and userId != ''"> and c.user_id = #{userId}</if>
- <if test="deptId != null "> and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))</if>
- <if test="camHeading != null "> and c.cam_heading = #{camHeading}</if>
- <if test="camPitch != null "> and c.cam_pitch = #{camPitch}</if>
- <if test="camRoll != null "> and c.cam_roll = #{camRoll}</if>
- <if test="camNear != null "> and c.cam_near = #{camNear}</if>
- <if test="camFar != null "> and c.cam_far = #{camFar}</if>
- <if test="camAspectratio != null "> and c.cam_aspectratio = #{camAspectratio}</if>
- <if test="camDepth != null "> and c.cam_depth = #{camDepth}</if>
- <if test="camFov != null "> and c.cam_fov = #{camFov}</if>
- <if test="loginId != null "> and c.login_id = #{loginId}</if>
+ <if test="id != null and id != ''">and c.id = #{id}</if>
+ <if test="name != null and name != ''">and c.name like '%'||#{name}||'%'</if>
+ <if test="ip != null and ip != ''">and c.ip = #{ip}</if>
+ <if test="port != null ">and c.port = #{port}</if>
+ <if test="rtspPort != null ">and c.rtsp_port = #{rtspPort}</if>
+ <if test="username != null and username != ''">and c.username like '%'||#{username}||'%'</if>
+ <if test="password != null and password != ''">and c.password = #{password}</if>
+ <if test="gdtype != null and gdtype != ''">and c.gdtype = #{gdtype}</if>
+ <if test="channel != null ">and c.channel = #{channel}</if>
+ <if test="longitude != null ">and c.longitude = #{longitude}</if>
+ <if test="latitude != null ">and c.latitude = #{latitude}</if>
+ <if test="altitude != null ">and c.altitude = #{altitude}</if>
+ <if test="userId != null and userId != ''">and c.user_id = #{userId}</if>
+ <if test="deptId != null ">and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t
+ WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
+ </if>
+ <if test="camHeading != null ">and c.cam_heading = #{camHeading}</if>
+ <if test="camPitch != null ">and c.cam_pitch = #{camPitch}</if>
+ <if test="camRoll != null ">and c.cam_roll = #{camRoll}</if>
+ <if test="camNear != null ">and c.cam_near = #{camNear}</if>
+ <if test="camFar != null ">and c.cam_far = #{camFar}</if>
+ <if test="camAspectratio != null ">and c.cam_aspectratio = #{camAspectratio}</if>
+ <if test="camDepth != null ">and c.cam_depth = #{camDepth}</if>
+ <if test="camFov != null ">and c.cam_fov = #{camFov}</if>
+ <if test="loginId != null ">and c.login_id = #{loginId}</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
</where>
@@ -73,36 +97,38 @@
<select id="selectArdCamerasListNoDataScope" parameterType="ArdCameras" resultMap="ArdCamerasResult">
<include refid="selectArdCamerasVo"/>
<where>
- <if test="id != null and id != ''"> and c.id = #{id}</if>
- <if test="name != null and name != ''"> and c.name like '%'||#{name}||'%'</if>
- <if test="ip != null and ip != ''"> and c.ip = #{ip}</if>
- <if test="port != null "> and c.port = #{port}</if>
- <if test="rtspPort != null "> and c.rtsp_port = #{rtspPort}</if>
- <if test="username != null and username != ''"> and c.username like '%'||#{username}||'%'</if>
- <if test="password != null and password != ''"> and c.password = #{password}</if>
- <if test="gdtype != null and gdtype != ''"> and c.gdtype = #{gdtype}</if>
- <if test="channel != null "> and c.channel = #{channel}</if>
- <if test="longitude != null "> and c.longitude = #{longitude}</if>
- <if test="latitude != null "> and c.latitude = #{latitude}</if>
- <if test="altitude != null "> and c.altitude = #{altitude}</if>
- <if test="userId != null and userId != ''"> and c.user_id = #{userId}</if>
- <if test="deptId != null "> and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))</if>
- <if test="camHeading != null "> and c.cam_heading = #{camHeading}</if>
- <if test="camPitch != null "> and c.cam_pitch = #{camPitch}</if>
- <if test="camRoll != null "> and c.cam_roll = #{camRoll}</if>
- <if test="camNear != null "> and c.cam_near = #{camNear}</if>
- <if test="camFar != null "> and c.cam_far = #{camFar}</if>
- <if test="camAspectratio != null "> and c.cam_aspectratio = #{camAspectratio}</if>
- <if test="camDepth != null "> and c.cam_depth = #{camDepth}</if>
- <if test="camFov != null "> and c.cam_fov = #{camFov}</if>
- <if test="loginId != null "> and c.login_id = #{loginId}</if>
+ <if test="id != null and id != ''">and c.id = #{id}</if>
+ <if test="name != null and name != ''">and c.name like '%'||#{name}||'%'</if>
+ <if test="ip != null and ip != ''">and c.ip = #{ip}</if>
+ <if test="port != null ">and c.port = #{port}</if>
+ <if test="rtspPort != null ">and c.rtsp_port = #{rtspPort}</if>
+ <if test="username != null and username != ''">and c.username like '%'||#{username}||'%'</if>
+ <if test="password != null and password != ''">and c.password = #{password}</if>
+ <if test="gdtype != null and gdtype != ''">and c.gdtype = #{gdtype}</if>
+ <if test="channel != null ">and c.channel = #{channel}</if>
+ <if test="longitude != null ">and c.longitude = #{longitude}</if>
+ <if test="latitude != null ">and c.latitude = #{latitude}</if>
+ <if test="altitude != null ">and c.altitude = #{altitude}</if>
+ <if test="userId != null and userId != ''">and c.user_id = #{userId}</if>
+ <if test="deptId != null ">and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t
+ WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
+ </if>
+ <if test="camHeading != null ">and c.cam_heading = #{camHeading}</if>
+ <if test="camPitch != null ">and c.cam_pitch = #{camPitch}</if>
+ <if test="camRoll != null ">and c.cam_roll = #{camRoll}</if>
+ <if test="camNear != null ">and c.cam_near = #{camNear}</if>
+ <if test="camFar != null ">and c.cam_far = #{camFar}</if>
+ <if test="camAspectratio != null ">and c.cam_aspectratio = #{camAspectratio}</if>
+ <if test="camDepth != null ">and c.cam_depth = #{camDepth}</if>
+ <if test="camFov != null ">and c.cam_fov = #{camFov}</if>
+ <if test="loginId != null ">and c.login_id = #{loginId}</if>
</where>
</select>
<select id="selectArdCamerasById" parameterType="String" resultMap="ArdCamerasResult">
<include refid="selectArdCamerasVo"/>
where id = #{id}
</select>
-
+
<insert id="insertArdCameras" parameterType="ArdCameras">
insert into ard_cameras
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -201,13 +227,24 @@
</update>
<delete id="deleteArdCamerasById" parameterType="String">
- delete from ard_cameras where id = #{id}
+ delete
+ from ard_cameras
+ where id = #{id}
</delete>
<delete id="deleteArdCamerasByIds" parameterType="String">
- delete from ard_cameras where id in
+ delete from ard_cameras where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
+
+
+ <select id="findOptions" parameterType="String" resultMap="ArdCamerasResult">
+ <include refid="selectArdCamerasVo"/>
+ <where>
+ <if test="id != null and id != ''">and c.id = #{id}</if>
+ <if test="name != null and name != ''">and c.name like '%'||#{name}||'%'</if>
+ </where>
+ </select>
</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 f06edcc..ab97e71 100644
--- a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
@@ -45,12 +45,10 @@
<if test="taskName != null and taskName != ''"> and task_name like '%'||#{taskName}||'%'</if>
<if test="startTime != null and startTime != ''"> and start_time = #{startTime}</if>
<if test="endTime != null and endTime != ''"> and end_time = #{endTime}</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="deptId != null and deptId != ''"> and dept_id = #{deptId}</if>
- <if test="userId != null and userId != ''"> and user_id = #{userId}</if>
</where>
+ ORDER BY start_time desc
</select>
<select id="selectArdVideoInspectTaskById" parameterType="String" resultMap="ArdVideoInspectTaskArdVideoInspectTaskStepResult">
@@ -137,9 +135,9 @@
</delete>
<insert id="batchArdVideoInspectTaskStep">
- insert into ard_video_inspect_task_step( id, order_number, camera_id, recording_time, well_id, task_id, dept_id, user_id) values
+ insert into ard_video_inspect_task_step( order_number, camera_id, recording_time, well_id, task_id, dept_id, user_id) values
<foreach item="item" index="index" collection="list" separator=",">
- ( #{item.id}, #{item.orderNumber}, #{item.cameraId}, #{item.recordingTime}, #{item.wellId}, #{item.taskId}, #{item.deptId}, #{item.userId})
+ ( #{item.orderNumber}, #{item.cameraId}, #{item.recordingTime}, #{item.wellId}, #{item.taskId}, #{item.deptId}, #{item.userId})
</foreach>
</insert>
</mapper>
\ No newline at end of file
diff --git a/ard-work/target/classes/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.class b/ard-work/target/classes/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.class
index 5348f37..1e5a9fa 100644
--- a/ard-work/target/classes/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.class
+++ b/ard-work/target/classes/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.class
Binary files differ
diff --git a/ard-work/target/classes/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.class b/ard-work/target/classes/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.class
index bc13dc9..45f8ea2 100644
--- a/ard-work/target/classes/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.class
+++ b/ard-work/target/classes/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.class
Binary files differ
diff --git a/ard-work/target/classes/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.class b/ard-work/target/classes/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.class
index 50652d4..6ce1f9d 100644
--- a/ard-work/target/classes/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.class
+++ b/ard-work/target/classes/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.class
Binary files differ
diff --git a/ard-work/target/classes/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.class b/ard-work/target/classes/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.class
index 56446bd..bed6545 100644
--- a/ard-work/target/classes/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.class
+++ b/ard-work/target/classes/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.class
Binary files differ
diff --git a/ard-work/target/classes/com/ruoyi/device/camera/controller/ArdCamerasController.class b/ard-work/target/classes/com/ruoyi/device/camera/controller/ArdCamerasController.class
index c5c8158..6e589e2 100644
--- a/ard-work/target/classes/com/ruoyi/device/camera/controller/ArdCamerasController.class
+++ b/ard-work/target/classes/com/ruoyi/device/camera/controller/ArdCamerasController.class
Binary files differ
diff --git a/ard-work/target/classes/com/ruoyi/device/camera/mapper/ArdCamerasMapper.class b/ard-work/target/classes/com/ruoyi/device/camera/mapper/ArdCamerasMapper.class
index 34bb799..fae47d9 100644
--- a/ard-work/target/classes/com/ruoyi/device/camera/mapper/ArdCamerasMapper.class
+++ b/ard-work/target/classes/com/ruoyi/device/camera/mapper/ArdCamerasMapper.class
Binary files differ
diff --git a/ard-work/target/classes/com/ruoyi/device/camera/service/IArdCamerasService.class b/ard-work/target/classes/com/ruoyi/device/camera/service/IArdCamerasService.class
index 92ab135..79956f4 100644
--- a/ard-work/target/classes/com/ruoyi/device/camera/service/IArdCamerasService.class
+++ b/ard-work/target/classes/com/ruoyi/device/camera/service/IArdCamerasService.class
Binary files differ
diff --git a/ard-work/target/classes/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.class b/ard-work/target/classes/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.class
index a5d353b..0180f42 100644
--- a/ard-work/target/classes/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.class
+++ b/ard-work/target/classes/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.class
Binary files differ
diff --git a/ard-work/target/classes/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml b/ard-work/target/classes/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
index c6ec2dc..a471902 100644
--- a/ard-work/target/classes/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
+++ b/ard-work/target/classes/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
@@ -71,6 +71,16 @@
</where>
</select>
+ <select id="selectArdAlarmpointsWellByWellIdLike" parameterType="ArdAlarmpointsWell" resultMap="ArdAlarmpointsWellResult">
+ <include refid="selectArdAlarmpointsWellVo"/>
+ <where>
+ <if test="id != null and id != ''">and c.id = #{id}</if>
+ <if test="wellId != null and wellId != ''"> and well_id like ('%${wellId}%')</if>
+ <!-- 鏁版嵁鑼冨洿杩囨护 -->
+ ${params.dataScope}
+ </where>
+ </select>
+
<select id="selectArdAlarmpointsWellById" parameterType="String" resultMap="ArdAlarmpointsWellResult">
<include refid="selectArdAlarmpointsWellVo"/>
where id = #{id}
diff --git a/ard-work/target/classes/mapper/device/ArdCamerasMapper.xml b/ard-work/target/classes/mapper/device/ArdCamerasMapper.xml
index f3bd068..2b3c5fe 100644
--- a/ard-work/target/classes/mapper/device/ArdCamerasMapper.xml
+++ b/ard-work/target/classes/mapper/device/ArdCamerasMapper.xml
@@ -1,71 +1,95 @@
<?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">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.device.camera.mapper.ArdCamerasMapper">
<resultMap type="ArdCameras" id="ArdCamerasResult">
- <result property="id" column="id" />
- <result property="name" column="name" />
- <result property="ip" column="ip" />
- <result property="port" column="port" />
- <result property="rtspPort" column="rtsp_port" />
- <result property="username" column="username" />
- <result property="password" column="password" />
- <result property="gdtype" column="gdtype" />
- <result property="channel" column="channel" />
- <result property="longitude" column="longitude" />
- <result property="latitude" column="latitude" />
- <result property="altitude" column="altitude" />
- <result property="userId" column="user_id" />
- <result property="deptId" column="dept_id" />
- <result property="camHeading" column="cam_heading" />
- <result property="camPitch" column="cam_pitch" />
- <result property="camRoll" column="cam_roll" />
- <result property="camNear" column="cam_near" />
- <result property="camFar" column="cam_far" />
- <result property="camAspectratio" column="cam_aspectratio" />
- <result property="camDepth" column="cam_depth" />
- <result property="camFov" column="cam_fov" />
- <result property="loginId" column="login_id" />
- <result property="operatorId" column="operator_id" />
- <result property="operatorExpired" column="operator_expired" />
+ <result property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="ip" column="ip"/>
+ <result property="port" column="port"/>
+ <result property="rtspPort" column="rtsp_port"/>
+ <result property="username" column="username"/>
+ <result property="password" column="password"/>
+ <result property="gdtype" column="gdtype"/>
+ <result property="channel" column="channel"/>
+ <result property="longitude" column="longitude"/>
+ <result property="latitude" column="latitude"/>
+ <result property="altitude" column="altitude"/>
+ <result property="userId" column="user_id"/>
+ <result property="deptId" column="dept_id"/>
+ <result property="camHeading" column="cam_heading"/>
+ <result property="camPitch" column="cam_pitch"/>
+ <result property="camRoll" column="cam_roll"/>
+ <result property="camNear" column="cam_near"/>
+ <result property="camFar" column="cam_far"/>
+ <result property="camAspectratio" column="cam_aspectratio"/>
+ <result property="camDepth" column="cam_depth"/>
+ <result property="camFov" column="cam_fov"/>
+ <result property="loginId" column="login_id"/>
+ <result property="operatorId" column="operator_id"/>
+ <result property="operatorExpired" column="operator_expired"/>
</resultMap>
<sql id="selectArdCamerasVo">
- select c.id, c.name, c.ip, c.port,c.rtsp_port, c.username, c.password, c.gdtype, c.channel, c.longitude, c.latitude, c.altitude, c.user_id, c.dept_id,
- c.cam_heading, c.cam_pitch, c.cam_roll, c.cam_near, c.cam_far, c.cam_aspectratio, c.cam_depth, c.cam_fov,c.operator_id,c.operator_expired
+ select c.id,
+ c.name,
+ c.ip,
+ c.port,
+ c.rtsp_port,
+ c.username,
+ c.password,
+ c.gdtype,
+ c.channel,
+ c.longitude,
+ c.latitude,
+ c.altitude,
+ c.user_id,
+ c.dept_id,
+ c.cam_heading,
+ c.cam_pitch,
+ c.cam_roll,
+ c.cam_near,
+ c.cam_far,
+ c.cam_aspectratio,
+ c.cam_depth,
+ c.cam_fov,
+ c.operator_id,
+ c.operator_expired
from ard_cameras c
- left join sys_dept d on d.dept_id=c.dept_id
- left join sys_user u on u.user_id=c.user_id
+ left join sys_dept d on d.dept_id = c.dept_id
+ left join sys_user u on u.user_id = c.user_id
</sql>
<select id="selectArdCamerasList" parameterType="ArdCameras" resultMap="ArdCamerasResult">
<include refid="selectArdCamerasVo"/>
<where>
- <if test="id != null and id != ''"> and c.id = #{id}</if>
- <if test="name != null and name != ''"> and c.name like '%'||#{name}||'%'</if>
- <if test="ip != null and ip != ''"> and c.ip = #{ip}</if>
- <if test="port != null "> and c.port = #{port}</if>
- <if test="rtspPort != null "> and c.rtsp_port = #{rtspPort}</if>
- <if test="username != null and username != ''"> and c.username like '%'||#{username}||'%'</if>
- <if test="password != null and password != ''"> and c.password = #{password}</if>
- <if test="gdtype != null and gdtype != ''"> and c.gdtype = #{gdtype}</if>
- <if test="channel != null "> and c.channel = #{channel}</if>
- <if test="longitude != null "> and c.longitude = #{longitude}</if>
- <if test="latitude != null "> and c.latitude = #{latitude}</if>
- <if test="altitude != null "> and c.altitude = #{altitude}</if>
- <if test="userId != null and userId != ''"> and c.user_id = #{userId}</if>
- <if test="deptId != null "> and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))</if>
- <if test="camHeading != null "> and c.cam_heading = #{camHeading}</if>
- <if test="camPitch != null "> and c.cam_pitch = #{camPitch}</if>
- <if test="camRoll != null "> and c.cam_roll = #{camRoll}</if>
- <if test="camNear != null "> and c.cam_near = #{camNear}</if>
- <if test="camFar != null "> and c.cam_far = #{camFar}</if>
- <if test="camAspectratio != null "> and c.cam_aspectratio = #{camAspectratio}</if>
- <if test="camDepth != null "> and c.cam_depth = #{camDepth}</if>
- <if test="camFov != null "> and c.cam_fov = #{camFov}</if>
- <if test="loginId != null "> and c.login_id = #{loginId}</if>
+ <if test="id != null and id != ''">and c.id = #{id}</if>
+ <if test="name != null and name != ''">and c.name like '%'||#{name}||'%'</if>
+ <if test="ip != null and ip != ''">and c.ip = #{ip}</if>
+ <if test="port != null ">and c.port = #{port}</if>
+ <if test="rtspPort != null ">and c.rtsp_port = #{rtspPort}</if>
+ <if test="username != null and username != ''">and c.username like '%'||#{username}||'%'</if>
+ <if test="password != null and password != ''">and c.password = #{password}</if>
+ <if test="gdtype != null and gdtype != ''">and c.gdtype = #{gdtype}</if>
+ <if test="channel != null ">and c.channel = #{channel}</if>
+ <if test="longitude != null ">and c.longitude = #{longitude}</if>
+ <if test="latitude != null ">and c.latitude = #{latitude}</if>
+ <if test="altitude != null ">and c.altitude = #{altitude}</if>
+ <if test="userId != null and userId != ''">and c.user_id = #{userId}</if>
+ <if test="deptId != null ">and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t
+ WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
+ </if>
+ <if test="camHeading != null ">and c.cam_heading = #{camHeading}</if>
+ <if test="camPitch != null ">and c.cam_pitch = #{camPitch}</if>
+ <if test="camRoll != null ">and c.cam_roll = #{camRoll}</if>
+ <if test="camNear != null ">and c.cam_near = #{camNear}</if>
+ <if test="camFar != null ">and c.cam_far = #{camFar}</if>
+ <if test="camAspectratio != null ">and c.cam_aspectratio = #{camAspectratio}</if>
+ <if test="camDepth != null ">and c.cam_depth = #{camDepth}</if>
+ <if test="camFov != null ">and c.cam_fov = #{camFov}</if>
+ <if test="loginId != null ">and c.login_id = #{loginId}</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
</where>
@@ -73,36 +97,38 @@
<select id="selectArdCamerasListNoDataScope" parameterType="ArdCameras" resultMap="ArdCamerasResult">
<include refid="selectArdCamerasVo"/>
<where>
- <if test="id != null and id != ''"> and c.id = #{id}</if>
- <if test="name != null and name != ''"> and c.name like '%'||#{name}||'%'</if>
- <if test="ip != null and ip != ''"> and c.ip = #{ip}</if>
- <if test="port != null "> and c.port = #{port}</if>
- <if test="rtspPort != null "> and c.rtsp_port = #{rtspPort}</if>
- <if test="username != null and username != ''"> and c.username like '%'||#{username}||'%'</if>
- <if test="password != null and password != ''"> and c.password = #{password}</if>
- <if test="gdtype != null and gdtype != ''"> and c.gdtype = #{gdtype}</if>
- <if test="channel != null "> and c.channel = #{channel}</if>
- <if test="longitude != null "> and c.longitude = #{longitude}</if>
- <if test="latitude != null "> and c.latitude = #{latitude}</if>
- <if test="altitude != null "> and c.altitude = #{altitude}</if>
- <if test="userId != null and userId != ''"> and c.user_id = #{userId}</if>
- <if test="deptId != null "> and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))</if>
- <if test="camHeading != null "> and c.cam_heading = #{camHeading}</if>
- <if test="camPitch != null "> and c.cam_pitch = #{camPitch}</if>
- <if test="camRoll != null "> and c.cam_roll = #{camRoll}</if>
- <if test="camNear != null "> and c.cam_near = #{camNear}</if>
- <if test="camFar != null "> and c.cam_far = #{camFar}</if>
- <if test="camAspectratio != null "> and c.cam_aspectratio = #{camAspectratio}</if>
- <if test="camDepth != null "> and c.cam_depth = #{camDepth}</if>
- <if test="camFov != null "> and c.cam_fov = #{camFov}</if>
- <if test="loginId != null "> and c.login_id = #{loginId}</if>
+ <if test="id != null and id != ''">and c.id = #{id}</if>
+ <if test="name != null and name != ''">and c.name like '%'||#{name}||'%'</if>
+ <if test="ip != null and ip != ''">and c.ip = #{ip}</if>
+ <if test="port != null ">and c.port = #{port}</if>
+ <if test="rtspPort != null ">and c.rtsp_port = #{rtspPort}</if>
+ <if test="username != null and username != ''">and c.username like '%'||#{username}||'%'</if>
+ <if test="password != null and password != ''">and c.password = #{password}</if>
+ <if test="gdtype != null and gdtype != ''">and c.gdtype = #{gdtype}</if>
+ <if test="channel != null ">and c.channel = #{channel}</if>
+ <if test="longitude != null ">and c.longitude = #{longitude}</if>
+ <if test="latitude != null ">and c.latitude = #{latitude}</if>
+ <if test="altitude != null ">and c.altitude = #{altitude}</if>
+ <if test="userId != null and userId != ''">and c.user_id = #{userId}</if>
+ <if test="deptId != null ">and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t
+ WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
+ </if>
+ <if test="camHeading != null ">and c.cam_heading = #{camHeading}</if>
+ <if test="camPitch != null ">and c.cam_pitch = #{camPitch}</if>
+ <if test="camRoll != null ">and c.cam_roll = #{camRoll}</if>
+ <if test="camNear != null ">and c.cam_near = #{camNear}</if>
+ <if test="camFar != null ">and c.cam_far = #{camFar}</if>
+ <if test="camAspectratio != null ">and c.cam_aspectratio = #{camAspectratio}</if>
+ <if test="camDepth != null ">and c.cam_depth = #{camDepth}</if>
+ <if test="camFov != null ">and c.cam_fov = #{camFov}</if>
+ <if test="loginId != null ">and c.login_id = #{loginId}</if>
</where>
</select>
<select id="selectArdCamerasById" parameterType="String" resultMap="ArdCamerasResult">
<include refid="selectArdCamerasVo"/>
where id = #{id}
</select>
-
+
<insert id="insertArdCameras" parameterType="ArdCameras">
insert into ard_cameras
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -201,13 +227,24 @@
</update>
<delete id="deleteArdCamerasById" parameterType="String">
- delete from ard_cameras where id = #{id}
+ delete
+ from ard_cameras
+ where id = #{id}
</delete>
<delete id="deleteArdCamerasByIds" parameterType="String">
- delete from ard_cameras where id in
+ delete from ard_cameras where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
+
+
+ <select id="findOptions" parameterType="String" resultMap="ArdCamerasResult">
+ <include refid="selectArdCamerasVo"/>
+ <where>
+ <if test="id != null and id != ''">and c.id = #{id}</if>
+ <if test="name != null and name != ''">and c.name like '%'||#{name}||'%'</if>
+ </where>
+ </select>
</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/ruoyi-admin.iml b/ruoyi-admin/ruoyi-admin.iml
index f03f8fa..a46799c 100644
--- a/ruoyi-admin/ruoyi-admin.iml
+++ b/ruoyi-admin/ruoyi-admin.iml
@@ -205,5 +205,6 @@
<orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.22" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.9" level="project" />
+ <orderEntry type="library" name="Maven: org.gavaghan:geodesy:1.1.3" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/ruoyi-framework/ruoyi-framework.iml b/ruoyi-framework/ruoyi-framework.iml
index 95ba208..d2f7106 100644
--- a/ruoyi-framework/ruoyi-framework.iml
+++ b/ruoyi-framework/ruoyi-framework.iml
@@ -172,5 +172,6 @@
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.9" level="project" />
+ <orderEntry type="library" name="Maven: org.gavaghan:geodesy:1.1.3" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/ruoyi-quartz/ruoyi-quartz.iml b/ruoyi-quartz/ruoyi-quartz.iml
index c11dbad..1146355 100644
--- a/ruoyi-quartz/ruoyi-quartz.iml
+++ b/ruoyi-quartz/ruoyi-quartz.iml
@@ -167,5 +167,6 @@
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.9" level="project" />
+ <orderEntry type="library" name="Maven: org.gavaghan:geodesy:1.1.3" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/ruoyi.iml b/ruoyi.iml
index f409c0e..8330569 100644
--- a/ruoyi.iml
+++ b/ruoyi.iml
@@ -5,6 +5,7 @@
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
+ <excludeFolder url="file://$MODULE_DIR$/ardLog" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
--
Gitblit v1.9.3