~liusuyi/ruoyi-api.git

			@@ -194,9 +194,9 @@
			Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(true);
			return AjaxResult.success(deptAndCamera);
			}
			@GetMapping("/getDeptAndCamera1")
			@ApiOperation("获取部门和相机1")
			public AjaxResult getDeptAndCamera1() {
			@GetMapping("/getDeptAndCameraByRole")
			@ApiOperation("获取部门和相机按角色")
			public AjaxResult getDeptAndCameraByRole() {
			List<DeptAndCamerasDto> deptAndCamera = ardCamerasService.getChildDeptAndCamera();
			return AjaxResult.success(deptAndCamera);
			}

			@@ -572,7 +572,7 @@
			ardVideoInspectRecord.setWellName(ardAlarmpointsWell.getWellId());
			}
			Date currentStepStartDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, currentStepStartTime);
			Date currentStepStopDate = DateUtils.addMinutes(currentStepStartDate, step.getRecordingTime());
			Date currentStepStopDate = DateUtils.addSeconds(currentStepStartDate, step.getRecordingTime());
			ardVideoInspectRecord.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, currentStepStartDate));
			ardVideoInspectRecord.setEndTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, currentStepStopDate));
			ardVideoInspectRecord.setRecordFilePath(url);
			@@ -598,7 +598,7 @@
			ArdVideoInspectTaskStep currentStep = objectOptional.get();
			/获取到当前步骤的开始和结束时间/
			Date currentStepStartDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, currentStepStartTime);
			Date currentStepStopDate = DateUtils.addMinutes(currentStepStartDate, currentStep.getRecordingTime());
			Date currentStepStopDate = DateUtils.addSeconds(currentStepStartDate, currentStep.getRecordingTime());
			/判断当前步骤时间是否过期/
			if (!DateUtils.TimeCompare(currentStepStartDate, currentStepStopDate)) {
			return true;

			@@ -107,6 +107,7 @@
			<!-- 数据范围过滤 -->
			${params.dataScope}
			</where>
			order by c.name
			</select>
			<select id="selectArdCamerasListNoDataScope" parameterType="ArdCameras" resultMap="ArdCamerasResult">
			<include refid="selectArdCamerasVo"/>

	ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史