视频巡检任务

zhangjian

2023-05-29 9763c7a6ed43a60c099d49cc149c86652fbb3cfa

视频巡检任务

 .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

 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>

 ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java

@@ -27,7 +27,10 @@
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;

/**
 * 井管理Controller
@@ -38,8 +41,7 @@
@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));
    }

@@ -112,8 +109,7 @@
    @Log(title = "井管理", businessType = BusinessType.DELETE)
    @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;
    }
}

 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 井管理

 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);

    /**
     * 新增井管理
     * 

 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 井管理

 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;
    }

}

 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);
}

 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);
}

 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);
    }
}

 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));
    }
}

 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();
    }

 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
{

 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);
}

 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);
}

 ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java

@@ -1,11 +1,14 @@
package com.ruoyi.inspect.service.impl;

import java.util.List;

        import com.ruoyi.common.utils.DateUtils;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

    import java.util.ArrayList;
import java.util.UUID;

    import com.ruoyi.common.utils.StringUtils;
    import com.ruoyi.common.utils.SecurityUtils;
@@ -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);
    }

    /**
@@ -60,6 +63,7 @@
                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;
@@ -76,7 +80,7 @@
    public int updateArdVideoInspectTask(ArdVideoInspectTask ardVideoInspectTask) {
                ardVideoInspectTask.setUpdateBy(SecurityUtils.getUsername());
                ardVideoInspectTask.setUpdateTime(DateUtils.getNowDate());
                ardVideoInspectTaskMapper.deleteArdVideoInspectTaskStepByTaskId(ardVideoInspectTask.getInspectMode())
        ardVideoInspectTaskMapper.deleteArdVideoInspectTaskStepByTaskId(ardVideoInspectTask.getId())
            ;
            insertArdVideoInspectTaskStep(ardVideoInspectTask);
        return ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);
@@ -85,27 +89,27 @@
    /**
     * 批量删除视频巡检任务
     *
     * @param inspectModes 需要删除的视频巡检任务主键
     * @param ids 需要删除的视频巡检任务主键
     * @return 结果
     */
        @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
    @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);
    }

        /**
@@ -115,12 +119,11 @@
         */
        public void insertArdVideoInspectTaskStep(ArdVideoInspectTask ardVideoInspectTask) {
            List<ArdVideoInspectTaskStep> ardVideoInspectTaskStepList = ardVideoInspectTask.getArdVideoInspectTaskStepList();
            String inspectMode = ardVideoInspectTask.getInspectMode();
        String id = ardVideoInspectTask.getId();
            if (StringUtils.isNotNull(ardVideoInspectTaskStepList)) {
                List<ArdVideoInspectTaskStep> list = new ArrayList<ArdVideoInspectTaskStep>();
                for (ArdVideoInspectTaskStep ardVideoInspectTaskStep :ardVideoInspectTaskStepList)
                {
                    ardVideoInspectTaskStep.setTaskId(inspectMode);
            for (ArdVideoInspectTaskStep ardVideoInspectTaskStep : ardVideoInspectTaskStepList) {
                ardVideoInspectTaskStep.setTaskId(id);
                    list.add(ardVideoInspectTaskStep);
                }
                if (list.size() > 0) {

 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}

 ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml

@@ -33,8 +33,30 @@
    </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
@@ -56,7 +78,9 @@
            <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="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>
@@ -86,7 +110,9 @@
            <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="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>
@@ -201,7 +227,9 @@
    </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">
@@ -210,4 +238,13 @@
            #{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>

 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>

 ard-work/target/classes/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.class

Binary files differ

 ard-work/target/classes/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.class

Binary files differ

 ard-work/target/classes/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.class

Binary files differ

 ard-work/target/classes/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.class

Binary files differ

 ard-work/target/classes/com/ruoyi/device/camera/controller/ArdCamerasController.class

Binary files differ

 ard-work/target/classes/com/ruoyi/device/camera/mapper/ArdCamerasMapper.class

Binary files differ

 ard-work/target/classes/com/ruoyi/device/camera/service/IArdCamerasService.class

Binary files differ

 ard-work/target/classes/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.class

Binary files differ

 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}

 ard-work/target/classes/mapper/device/ArdCamerasMapper.xml

@@ -33,8 +33,30 @@
    </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
@@ -56,7 +78,9 @@
            <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="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>
@@ -86,7 +110,9 @@
            <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="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>
@@ -201,7 +227,9 @@
    </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">
@@ -210,4 +238,13 @@
            #{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>

 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>

 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>

 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>

 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" />