lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
青云
2025-10-11 10:55:31 +08:00
parent 9a698857ce 00e9fa1ea3
commit 9d586f7b77
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml
View File

@ -298,6 +298,8 @@ dxf2GeoJson:
ys7: ys7:
app-key: 3acf9f1a43dc4209841e0893003db0a2 app-key: 3acf9f1a43dc4209841e0893003db0a2
app-secret: 09e29c70ae1161fbc3ce2030fc09ba2e app-secret: 09e29c70ae1161fbc3ce2030fc09ba2e
job:
capture-enabled: false # 控制是否启用萤石抓拍任务
#ys7: #ys7:
# app-key: 081b0d6d5f7f4de8bc5c7fa350fb26ec # app-key: 081b0d6d5f7f4de8bc5c7fa350fb26ec
# app-secret: caa37b9f60ef02deb57e563bc190e6db # app-secret: caa37b9f60ef02deb57e563bc190e6db

2
xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml
View File

@ -301,6 +301,8 @@ dxf2GeoJson:
ys7: ys7:
app-key: 3acf9f1a43dc4209841e0893003db0a2 app-key: 3acf9f1a43dc4209841e0893003db0a2
app-secret: 4bbf3e9394f55d3af6e3af27b2d3db36 app-secret: 4bbf3e9394f55d3af6e3af27b2d3db36
job:
capture-enabled: true # 控制是否启用萤石抓拍任务
# 斯巴达算法 # 斯巴达算法
sparta: sparta:
url: http://119.3.204.120:8040 url: http://119.3.204.120:8040

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/cycle/IncSyncYs7DeviceCapturePicData.java
View File

@ -10,6 +10,7 @@ import org.dromara.other.domain.enums.OthDeviceStatusEnum;
import org.dromara.other.service.IOthDevicePresetService; import org.dromara.other.service.IOthDevicePresetService;
import org.dromara.other.service.IOthYs7DeviceImgService; import org.dromara.other.service.IOthYs7DeviceImgService;
import org.dromara.other.service.IOthYs7DeviceService; import org.dromara.other.service.IOthYs7DeviceService;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -27,6 +28,7 @@ import java.util.stream.Collectors;
*/ */
@Slf4j @Slf4j
@Component @Component
@ConditionalOnProperty(prefix = "ys7.job", name = "capture-enabled", havingValue = "true")
public class IncSyncYs7DeviceCapturePicData { public class IncSyncYs7DeviceCapturePicData {
@Resource @Resource
@ -44,8 +46,9 @@ public class IncSyncYs7DeviceCapturePicData {
private final ExecutorService executorService = Executors.newFixedThreadPool(5); private final ExecutorService executorService = Executors.newFixedThreadPool(5);
// 每 15 分钟执行一次 // 每 15 分钟执行一次
@Scheduled(cron = "0 */15 7-19 * * ?") @Scheduled(cron = "0 */10 7-19 * * ?")
public void run() { public void run() {
log.info("执行萤石设备抓拍图片");
// 查询所有在线的摄像头设备，仅获取必要字段 // 查询所有在线的摄像头设备，仅获取必要字段
List<OthYs7Device> deviceList = ys7DeviceService.lambdaQuery() List<OthYs7Device> deviceList = ys7DeviceService.lambdaQuery()
.select(OthYs7Device::getId, OthYs7Device::getDeviceSerial, OthYs7Device::getDeviceName) .select(OthYs7Device::getId, OthYs7Device::getDeviceSerial, OthYs7Device::getDeviceName)