From fd2f72c3cdefa0f7d832d0dee50b416e46dd36d7 Mon Sep 17 00:00:00 2001 From: weitang Date: Tue, 13 May 2025 18:26:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AE=97=E6=B3=95=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AlgorithmClassComponentController.java | 26 ++++++++++++++++ .../controller/AlgorithmClassController.java | 14 ++++----- .../controller/AlgorithmDeviceController.java | 18 +++++++++++ .../controller/AlgorithmParamsController.java | 11 ++++--- .../mapper/AlgorithmParamsMapper.java | 5 ++++ .../IAlgorithmClassComponentService.java | 15 ++++++++++ .../service/IAlgorithmDeviceService.java | 9 ++++++ .../service/IAlgorithmParamsService.java | 5 +++- .../AlgorithmClassComponentServiceImpl.java | 30 ++++++++++++++++++- .../impl/AlgorithmDeviceServiceImpl.java | 13 +++++++- .../impl/AlgorithmParamsServiceImpl.java | 15 ++++++---- .../controller/AlarmLogController.java | 4 +-- .../patroltask/mapper/AlarmLogMapper.java | 2 +- .../patroltask/service/IAlarmLogService.java | 2 +- .../service/impl/AlarmLogServiceImpl.java | 6 ++-- .../patroltask/service/impl/TodoTaskJob.java | 1 + .../algorithm/AlgorithmParamsMapper.xml | 26 ++++++++++++++++ .../mapper/patroltask/AlarmLogMapper.xml | 4 ++- 18 files changed, 179 insertions(+), 27 deletions(-) diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassComponentController.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassComponentController.java index 0f1c1a6..4790920 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassComponentController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassComponentController.java @@ -1,6 +1,13 @@ package com.yfd.platform.modules.algorithm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.modules.algorithm.domain.AlgorithmClassComponent; import com.yfd.platform.modules.algorithm.service.IAlgorithmClassComponentService; +import com.yfd.platform.modules.auxcontrol.domain.DeviceSignal; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -21,4 +28,23 @@ public class AlgorithmClassComponentController { @Resource private IAlgorithmClassComponentService algorithmClassComponentService; + + @GetMapping("/getAlgorithmClassComponentPage") + @ApiOperation("算法关联主设备部件") + public ResponseResult getAlgorithmClassComponentPage(String algorithmId, Page page) { + Page algorithmClassComponentPage = + algorithmClassComponentService.getAlgorithmClassComponentPage(algorithmId, page); + return ResponseResult.successData(algorithmClassComponentPage); + } + + @PostMapping("/deleteAlgorithmClassComponent") + @ApiOperation("删除算法关联主设备部件") + public ResponseResult deleteAlgorithmClassComponent(String id) { + boolean isOK = algorithmClassComponentService.deleteAlgorithmClassComponent(id); + if (isOK) { + return ResponseResult.success(); + } else { + return ResponseResult.error(); + } + } } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassController.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassController.java index 6ae5e20..8654938 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassController.java @@ -2,11 +2,9 @@ package com.yfd.platform.modules.algorithm.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.config.ResponseResult; import com.yfd.platform.modules.algorithm.domain.AlgorithmClass; import com.yfd.platform.modules.algorithm.service.IAlgorithmClassService; -import com.yfd.platform.modules.auxcontrol.domain.DeviceSignal; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -31,9 +29,11 @@ public class AlgorithmClassController { @GetMapping("/getAlgorithmClassList") @ApiOperation("查询算法分类") - public ResponseResult getAlgorithmClassList() { - List list = - algorithmClassService.list(new LambdaQueryWrapper().orderByAsc(AlgorithmClass::getAlgorithmClassCode)); + public ResponseResult getAlgorithmClassList(String algorithmClassName) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.like(StrUtil.isNotBlank(algorithmClassName), AlgorithmClass::getAlgorithmClassName, + algorithmClassName).orderByAsc(AlgorithmClass::getAlgorithmClassCode); + List list = algorithmClassService.list(queryWrapper); return ResponseResult.successData(list); } @@ -49,7 +49,7 @@ public class AlgorithmClassController { } @PostMapping("/updateAlgorithmClass") - @ApiOperation("新增算法分类") + @ApiOperation("修改算法分类") public ResponseResult updateAlgorithmClass(@RequestBody AlgorithmClass algorithmClass) { boolean isOK = algorithmClassService.updateAlgorithmClass(algorithmClass); if (isOK) { @@ -60,7 +60,7 @@ public class AlgorithmClassController { } @PostMapping("/deleteAlgorithmClass") - @ApiOperation("新增算法分类") + @ApiOperation("删除算法分类") public ResponseResult deleteAlgorithmClass(String id) { boolean isOK = algorithmClassService.deleteAlgorithmClass(id); if (isOK) { diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmDeviceController.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmDeviceController.java index a11be04..5714f07 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmDeviceController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmDeviceController.java @@ -1,10 +1,17 @@ package com.yfd.platform.modules.algorithm.controller; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.modules.algorithm.domain.AlgorithmClass; +import com.yfd.platform.modules.algorithm.domain.AlgorithmDevice; import com.yfd.platform.modules.algorithm.service.IAlgorithmDeviceService; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** *

@@ -21,4 +28,15 @@ public class AlgorithmDeviceController { @Resource private IAlgorithmDeviceService algorithmDeviceService; + + @PostMapping("/batchAddAlgorithmDevice") + @ApiOperation("批量新增算法分类部件点位关联数据") + public ResponseResult batchAddAlgorithmDevice(@RequestBody List algorithmDeviceList) { + boolean isOK = algorithmDeviceService.batchAddAlgorithmDevice(algorithmDeviceList); + if (isOK) { + return ResponseResult.success(); + } else { + return ResponseResult.error(); + } + } } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmParamsController.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmParamsController.java index 835ed21..1eeadbe 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmParamsController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmParamsController.java @@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; +import java.util.Map; /** *

@@ -27,10 +29,11 @@ public class AlgorithmParamsController { @Resource private IAlgorithmParamsService algorithmParamsService; - @GetMapping("/getAlgorithmClassPage") + @GetMapping("/getAlgorithmParamsList") @ApiOperation("查询算法分类") - public ResponseResult getAlgorithmClassPage(String algorithmId, Page page) { - Page algorithmClassPage = algorithmParamsService.getAlgorithmClassPage(algorithmId, page); - return ResponseResult.successData(algorithmClassPage); + public ResponseResult getAlgorithmParamsList(String algorithmId) { + List> algorithmClassList = algorithmParamsService.getAlgorithmParamsList(algorithmId); + return ResponseResult.successData(algorithmClassList); } + } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/mapper/AlgorithmParamsMapper.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/mapper/AlgorithmParamsMapper.java index 6889271..f2057f5 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/mapper/AlgorithmParamsMapper.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/mapper/AlgorithmParamsMapper.java @@ -3,6 +3,9 @@ package com.yfd.platform.modules.algorithm.mapper; import com.yfd.platform.modules.algorithm.domain.AlgorithmParams; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +import java.util.Map; + /** *

* Mapper 接口 @@ -13,4 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface AlgorithmParamsMapper extends BaseMapper { + List> getAlgorithmParamsList(String algorithmId); + } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmClassComponentService.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmClassComponentService.java index 5c1c78e..767906b 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmClassComponentService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmClassComponentService.java @@ -1,5 +1,6 @@ package com.yfd.platform.modules.algorithm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.modules.algorithm.domain.AlgorithmClassComponent; import com.baomidou.mybatisplus.extension.service.IService; @@ -13,4 +14,18 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IAlgorithmClassComponentService extends IService { + /********************************** + * 用途说明: 算法关联主设备部件 + * 参数说明 algorithmId 算法分类id + * 参数说明 page 分页参数 + * 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page + ***********************************/ + Page getAlgorithmClassComponentPage(String algorithmId, Page page); + + /********************************** + * 用途说明: 删除算法关联主设备部件 + * 参数说明 id 算法部件id + * 返回值说明: boolean + ***********************************/ + boolean deleteAlgorithmClassComponent(String id); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmDeviceService.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmDeviceService.java index d570cdc..7ca501b 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmDeviceService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmDeviceService.java @@ -3,6 +3,8 @@ package com.yfd.platform.modules.algorithm.service; import com.yfd.platform.modules.algorithm.domain.AlgorithmDevice; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 服务类 @@ -13,4 +15,11 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IAlgorithmDeviceService extends IService { + /********************************** + * 用途说明: 批量新增算法分类部件点位关联数据 + * 参数说明 algorithmDeviceList + * 返回值说明: boolean + ***********************************/ + boolean batchAddAlgorithmDevice(List algorithmDeviceList); + } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmParamsService.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmParamsService.java index dfc3986..2ba0e8a 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmParamsService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmParamsService.java @@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.modules.algorithm.domain.AlgorithmParams; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; +import java.util.Map; + /** *

* 服务类 @@ -14,5 +17,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IAlgorithmParamsService extends IService { - Page getAlgorithmClassPage(String algorithmId, Page page); + List> getAlgorithmParamsList(String algorithmId); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmClassComponentServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmClassComponentServiceImpl.java index 641645a..557f3e3 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmClassComponentServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmClassComponentServiceImpl.java @@ -1,9 +1,12 @@ package com.yfd.platform.modules.algorithm.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.modules.algorithm.domain.AlgorithmClassComponent; import com.yfd.platform.modules.algorithm.mapper.AlgorithmClassComponentMapper; import com.yfd.platform.modules.algorithm.service.IAlgorithmClassComponentService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.bcel.generic.LADD; import org.springframework.stereotype.Service; /** @@ -15,6 +18,31 @@ import org.springframework.stereotype.Service; * @since 2025-05-13 */ @Service -public class AlgorithmClassComponentServiceImpl extends ServiceImpl implements IAlgorithmClassComponentService { +public class AlgorithmClassComponentServiceImpl extends ServiceImpl implements IAlgorithmClassComponentService { + /********************************** + * 用途说明: 算法关联主设备部件 + * 参数说明 algorithmId 算法分类id + * 参数说明 page 分页参数 + * 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page + ***********************************/ + @Override + public Page getAlgorithmClassComponentPage(String algorithmId, + Page page) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AlgorithmClassComponent::getAlgorithmId, algorithmId); + return this.page(page, queryWrapper); + } + + /********************************** + * 用途说明: 删除算法关联主设备部件 + * 参数说明 id 算法部件id + * 返回值说明: boolean + ***********************************/ + @Override + public boolean deleteAlgorithmClassComponent(String id) { + return this.removeById(id); + } } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmDeviceServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmDeviceServiceImpl.java index 2f26a35..3f9bba4 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmDeviceServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmDeviceServiceImpl.java @@ -6,9 +6,11 @@ import com.yfd.platform.modules.algorithm.service.IAlgorithmDeviceService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; + /** *

- * 服务实现类 + * 服务实现类 *

* * @author zhengsl @@ -17,4 +19,13 @@ import org.springframework.stereotype.Service; @Service public class AlgorithmDeviceServiceImpl extends ServiceImpl implements IAlgorithmDeviceService { + /********************************** + * 用途说明: 批量新增算法分类部件点位关联数据 + * 参数说明 algorithmDeviceList + * 返回值说明: boolean + ***********************************/ + @Override + public boolean batchAddAlgorithmDevice(List algorithmDeviceList) { + return this.saveOrUpdateBatch(algorithmDeviceList); + } } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmParamsServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmParamsServiceImpl.java index a403dd2..412b7ce 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmParamsServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmParamsServiceImpl.java @@ -1,12 +1,15 @@ package com.yfd.platform.modules.algorithm.service.impl; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yfd.platform.modules.algorithm.domain.AlgorithmParams; import com.yfd.platform.modules.algorithm.mapper.AlgorithmParamsMapper; import com.yfd.platform.modules.algorithm.service.IAlgorithmParamsService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + /** *

* 服务实现类 @@ -18,9 +21,11 @@ import org.springframework.stereotype.Service; @Service public class AlgorithmParamsServiceImpl extends ServiceImpl implements IAlgorithmParamsService { - @Override - public Page getAlgorithmClassPage(String algorithmId, Page page) { + @Resource + private AlgorithmParamsMapper algorithmParamsMapper; - return null; + @Override + public List> getAlgorithmParamsList(String algorithmId) { + return algorithmParamsMapper.getAlgorithmParamsList(algorithmId); } } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/AlarmLogController.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/AlarmLogController.java index 9f76e86..9c7aae1 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/AlarmLogController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/AlarmLogController.java @@ -187,12 +187,12 @@ public class AlarmLogController { @GetMapping("/getAlarmLogPage") @ApiOperation("告警信息确认分页") public ResponseResult getAlarmLogPage(Page> page, String stationCode, String taskAlarmType, - String alarmLevel, String checkFlag, String startDate, String endDate) { + String alarmLevel, String checkFlag,String alarmSourceType, String startDate, String endDate) { if (StrUtil.isBlank(stationCode)) { return ResponseResult.error("未传变电站信息"); } Page> alarmList = alarmLogService.getAlarmLogPage(page, stationCode, taskAlarmType, - alarmLevel, checkFlag, startDate, endDate); + alarmLevel, checkFlag,alarmSourceType, startDate, endDate); List> records = alarmList.getRecords(); records.forEach(r -> { diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/mapper/AlarmLogMapper.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/mapper/AlarmLogMapper.java index a96b953..fefeff8 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/mapper/AlarmLogMapper.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/mapper/AlarmLogMapper.java @@ -59,6 +59,6 @@ public interface AlarmLogMapper extends BaseMapper { List getNotCheckAlarmCount(String stationId); - Page> getAlarmLogPage(Page> page, String stationCode, String taskAlarmType, String alarmLevel, String checkFlag, String startDate, String endDate); + Page> getAlarmLogPage(Page> page, String stationCode, String taskAlarmType, String alarmLevel, String checkFlag, String alarmSourceType, String startDate, String endDate); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/IAlarmLogService.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/IAlarmLogService.java index 2a32610..d83a273 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/IAlarmLogService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/IAlarmLogService.java @@ -50,7 +50,7 @@ public interface IAlarmLogService extends IService { Page> getAlarmListPage(Page> page, String patrolDeviceCode, String monitorType, String startDate, String endDate); Page> getAlarmLogPage(Page> page, String stationCode, String taskAlarmType, - String alarmLevel, String checkFlag, String startDate, String endDate); + String alarmLevel, String checkFlag, String alarmSourceType,String startDate, String endDate); boolean setAlarmLogStatus(AlarmLog alarmLog); diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/AlarmLogServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/AlarmLogServiceImpl.java index 12bdde3..8ce59ea 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/AlarmLogServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/AlarmLogServiceImpl.java @@ -1090,10 +1090,10 @@ public class AlarmLogServiceImpl extends ServiceImpl i @Override public Page> getAlarmLogPage(Page> page, String stationCode, - String taskAlarmType, String alarmLevel, String checkFlag, + String taskAlarmType, String alarmLevel, String checkFlag, String alarmSourceType, String startDate, String endDate) { return alarmLogMapper.getAlarmLogPage(page, stationCode, taskAlarmType, - alarmLevel, checkFlag, startDate, endDate); + alarmLevel, checkFlag,alarmSourceType, startDate, endDate); } @Override @@ -2256,7 +2256,7 @@ public class AlarmLogServiceImpl extends ServiceImpl i // alarmLog.setLastmodifier(SecurityUtils.getCurrentUsername()); alarmLog.setLastmodifier("admin"); alarmLog.setLastmodifydate(new Timestamp(System.currentTimeMillis())); - alarmLog.setAlarmSourceType("2"); + alarmLog.setTaskAlarmType("4"); alarmLog.setId(IdUtil.fastSimpleUUID()); // 创建 SimpleDateFormat 对象，指定日期格式 if ("yx".equals(type)) { diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/TodoTaskJob.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/TodoTaskJob.java index 4bd03ce..3cddce5 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/TodoTaskJob.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/TodoTaskJob.java @@ -403,6 +403,7 @@ public class TodoTaskJob extends QuartzJobBean implements InterruptableJob { try { String patroldeviceCode = map.get("patroldeviceCode").toString(); voiceServerService.sendVoiceServerControl(patroldeviceCode, "ON", fullfilename); + FileUtil.copy("", config.getSnapFilePath() + fullfilename, true); Thread.sleep(duration * 1000); voiceServerService.sendVoiceServerControl(patroldeviceCode, "OFF", fullfilename); } catch (Exception e) { diff --git a/riis-system/src/main/resources/mapper/algorithm/AlgorithmParamsMapper.xml b/riis-system/src/main/resources/mapper/algorithm/AlgorithmParamsMapper.xml index 1c32174..1aed917 100644 --- a/riis-system/src/main/resources/mapper/algorithm/AlgorithmParamsMapper.xml +++ b/riis-system/src/main/resources/mapper/algorithm/AlgorithmParamsMapper.xml @@ -2,4 +2,30 @@ + diff --git a/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml b/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml index 17d4b75..879bf30 100644 --- a/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml +++ b/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml @@ -133,7 +133,9 @@ AND al.check_flag = #{checkFlag} - + + AND al.alarm_source_type = #{alarmSourceType} + and al.alarm_date >= #{startDate}