From 19a3df435e6865f3d3028e955029f83bffb24afd Mon Sep 17 00:00:00 2001 From: weitang Date: Tue, 20 May 2025 09:57:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/AlgorithmDeviceMapper.java | 6 +++ .../mapper/AlgorithmParamsMapper.java | 6 +++ .../service/IAlgorithmDeviceService.java | 12 ++++++ .../service/IAlgorithmParamsService.java | 38 +++++++++++++++++++ .../impl/AlgorithmDeviceServiceImpl.java | 12 ++++++ .../impl/AlgorithmParamsServiceImpl.java | 33 ++++++++++++++++ .../patroltask/mapper/TaskResultMapper.java | 27 +++++++++++++ .../patroltask/service/ITaskTodoService.java | 5 +++ .../service/impl/TaskTodoServiceImpl.java | 28 +++----------- 9 files changed, 144 insertions(+), 23 deletions(-) diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/mapper/AlgorithmDeviceMapper.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/mapper/AlgorithmDeviceMapper.java index 6555c74..6337cd5 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/mapper/AlgorithmDeviceMapper.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/mapper/AlgorithmDeviceMapper.java @@ -16,6 +16,12 @@ import java.util.Map; */ public interface AlgorithmDeviceMapper extends BaseMapper { + /********************************** + * 用途说明: 查询算法部件的参数 + * 参数说明 algorithmId 算法分类Id + * 参数说明 componentId 部件id + * 返回值说明: java.util.List> + ***********************************/ List> getAlgorithmDeviceParams(String algorithmId, String componentId); List> getAlgorithmDeviceType(String algorithmId, String componentId); 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 8a1346a..d4a6d79 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 @@ -16,6 +16,12 @@ import java.util.Map; */ public interface AlgorithmParamsMapper extends BaseMapper { + /********************************** + * 用途说明: 查询算法参数 + * 参数说明 algorithmId 算法分类Id + * 参数说明 componentId 部件Id + * 返回值说明: java.util.List> + ***********************************/ List> getAlgorithmParamsList(String algorithmId,String componentId); List> getAlgorithmParamsNameList(String algorithmId,String componentId); 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 b683514..dd1ce58 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 @@ -23,8 +23,20 @@ public interface IAlgorithmDeviceService extends IService { ***********************************/ boolean batchAddAlgorithmDevice(List algorithmDeviceList); + /********************************** + * 用途说明: 查询算法部件的参数 + * 参数说明 algorithmId 算法分类Id + * 参数说明 componentId 部件id + * 返回值说明: java.util.List> + ***********************************/ List> getAlgorithmDeviceParams(String algorithmId, String componentId); + /********************************** + * 用途说明: 查询算法部件的参数曲线 + * 参数说明 algorithmId 算法分类Id + * 参数说明 componentId 部件id + * 返回值说明: java.util.List> + ***********************************/ List> getAlgorithmDeviceCurve(String algorithmId, String componentId); } 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 5fb174e..9817031 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 @@ -17,18 +17,56 @@ import java.util.Map; */ public interface IAlgorithmParamsService extends IService { + /********************************** + * 用途说明: 查询算法参数 + * 参数说明 algorithmId 算法分类Id + * 参数说明 componentId 部件Id + * 返回值说明: java.util.List> + ***********************************/ List> getAlgorithmParamsList(String algorithmId,String componentId); + /********************************** + * 用途说明: 新增算法参数 + * 参数说明 algorithmParams 算法参数 + * 返回值说明: boolean 操作状态 + ***********************************/ boolean addAlgorithmParams(AlgorithmParams algorithmParams); + /********************************** + * 用途说明: 批量新增算法参数 + * 参数说明 algorithmParamsList 算法参数集合 + * 返回值说明: boolean 操作状态 + ***********************************/ boolean batchAddAlgorithmParams(List algorithmParamsList); + /********************************** + * 用途说明: 批量修改算法参数 + * 参数说明 algorithmParamsList 算法参数集合 + * 返回值说明: boolean 操作状态 + ***********************************/ boolean batchUpdateAlgorithmParams(List algorithmParamsList); + /********************************** + * 用途说明: 删除算法参数 + * 参数说明 id 参数id + * 返回值说明: boolean + ***********************************/ boolean deleteAlgorithmParams(String id); + /********************************** + * 用途说明: + * 参数说明 algorithmId 算法分类Id + * 参数说明 componentId 部件Id + * 返回值说明: java.util.List> + ***********************************/ List> getAlgorithmParamsNameList(String algorithmId,String componentId); + /********************************** + * 用途说明: + * 参数说明 id 算法分类Id + * 参数说明 componentId 部件Id + * 返回值说明: com.alibaba.fastjson.JSONObject + ***********************************/ JSONObject callAlgorithmAnalyse(String id, String componentId); } 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 beab2f5..55007ad 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 @@ -65,11 +65,23 @@ public class AlgorithmDeviceServiceImpl extends ServiceImpl> + ***********************************/ @Override public List> getAlgorithmDeviceParams(String algorithmId, String componentId) { return algorithmDeviceMapper.getAlgorithmDeviceParams(algorithmId, componentId); } + /********************************** + * 用途说明: 查询算法部件的参数曲线 + * 参数说明 algorithmId 算法分类Id + * 参数说明 componentId 部件id + * 返回值说明: java.util.List> + ***********************************/ @Override public List> getAlgorithmDeviceCurve(String algorithmId, String componentId) { List> list = algorithmDeviceMapper.getAlgorithmDeviceType(algorithmId, componentId); 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 fe7491e..fed9613 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 @@ -42,11 +42,22 @@ public class AlgorithmParamsServiceImpl extends ServiceImpl> + ***********************************/ @Override public List> getAlgorithmParamsList(String algorithmId, String componentId) { return algorithmParamsMapper.getAlgorithmParamsList(algorithmId, componentId); } + /********************************** + * 用途说明: 新增算法参数 + * 参数说明 algorithmParams 算法参数 + * 返回值说明: boolean 操作状态 + ***********************************/ @Override public boolean addAlgorithmParams(AlgorithmParams algorithmParams) { return this.saveOrUpdate(algorithmParams); @@ -57,11 +68,21 @@ public class AlgorithmParamsServiceImpl extends ServiceImpl algorithmParamsList) { return this.saveOrUpdateBatch(algorithmParamsList); } + /********************************** + * 用途说明: 删除算法参数 + * 参数说明 id 参数id + * 返回值说明: boolean + ***********************************/ @Transactional(rollbackFor = Exception.class) @Override public boolean deleteAlgorithmParams(String id) { @@ -71,11 +92,23 @@ public class AlgorithmParamsServiceImpl extends ServiceImpl> + ***********************************/ @Override public List> getAlgorithmParamsNameList(String algorithmId, String componentId) { return algorithmParamsMapper.getAlgorithmParamsNameList(algorithmId, componentId); } + /********************************** + * 用途说明: + * 参数说明 id 算法分类Id + * 参数说明 componentId 部件Id + * 返回值说明: com.alibaba.fastjson.JSONObject + ***********************************/ @Override public JSONObject callAlgorithmAnalyse(String id, String componentId) { AlgorithmClass algorithmClass = algorithmClassMapper.selectById(id); diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/mapper/TaskResultMapper.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/mapper/TaskResultMapper.java index fbe58af..0253461 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/mapper/TaskResultMapper.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/mapper/TaskResultMapper.java @@ -207,9 +207,36 @@ public interface TaskResultMapper extends BaseMapper { List> getValueByDeviceId(String deviceId); Page> getResultByPatroldevice(Page> page, String internationalId,String mainDeviceId, String taskName, String recognitionType, String valid,String isReport,String startDate,String endDate); + + /********************************** + * 用途说明: 获取到不同相位的最新数据 + * 参数说明 areaId 区域Id + * 参数说明 bayId 间隔Id + * 参数说明 mainDeviceId 主设备Id + * 参数说明 componentId 部件Id + * 参数说明 recognitionTypeList 识别类型 + * 参数说明 meterType 表计类型 + * 参数说明 resultId 结果Id + * 参数说明 taskTodoId 待执行Id + * 参数说明 phase 相位 + * 返回值说明: java.util.List + ***********************************/ List getNonCoherentResult(String areaId,String bayId,String mainDeviceId,String componentId,String recognitionTypeList,String meterType,String resultId,String taskTodoId,String phase); + /********************************** + * 用途说明: 获取历史点位 + * 参数说明 startDate 开始时间 + * 参数说明 endDate 结束时间 + * 参数说明 deviceId 点位id + * 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page> + ***********************************/ Page> getHistoryDevice(Page> page, String startDate, String endDate, String deviceId); + /********************************** + * 用途说明: 获取点位历史数据 + * 参数说明 deviceIdList + * 返回值说明: java.util.List + ***********************************/ List getResultCurveData(List deviceIdList); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/ITaskTodoService.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/ITaskTodoService.java index 955f9bc..772bac3 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/ITaskTodoService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/ITaskTodoService.java @@ -473,6 +473,11 @@ public interface ITaskTodoService extends IService { void sendTaskResultById(String id); + /********************************** + * 用途说明: 单点识别 + * 参数说明 id 点位Id + * 返回值说明: boolean + ***********************************/ boolean onceAnalyse(String id) throws Exception; void exportMeterDataByTaskTodoId(String taskTodoId, HttpServletResponse response); diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/TaskTodoServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/TaskTodoServiceImpl.java index 9724786..3d71ce6 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/TaskTodoServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/TaskTodoServiceImpl.java @@ -1983,29 +1983,6 @@ public class TaskTodoServiceImpl extends ServiceImpl i @Override public Page> getHistoryDevice(Page> page, String startDate, String endDate, String deviceId) { -// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); -// String startFormat = ""; -// queryWrapper.ne(TaskResult::getFlag, "0"); -// if (StrUtil.isNotBlank(startDate)) { -// Date parseStart = DateUtil.parse(startDate); -// //一天的开始 -// Date beginOfDay = DateUtil.beginOfDay(parseStart); -// startFormat = DateUtil.format(beginOfDay, "yyyy-MM-dd HH:mm:ss"); -// queryWrapper.ge(TaskResult::getPatroldeviceDate, startFormat); -// } -// String endFormat = ""; -// if (StrUtil.isNotBlank(startDate)) { -// Date parseEnd = DateUtil.parse(endDate); -// //一天的结束 -// Date endOfDay = DateUtil.endOfDay(parseEnd); -// endFormat = DateUtil.format(endOfDay, "yyyy-MM-dd HH:mm:ss"); -// queryWrapper.le(TaskResult::getPatroldeviceDate, endFormat); -// } -// if (StrUtil.isNotBlank(deviceId)) { -// queryWrapper.eq(TaskResult::getDeviceId, deviceId); -// } -// queryWrapper.orderByAsc(TaskResult::getPatroldeviceDate); - // return taskResultMapper.selectMapsPage(page, queryWrapper); return taskResultMapper.getHistoryDevice(page, startDate, endDate, deviceId); } @@ -2550,6 +2527,11 @@ public class TaskTodoServiceImpl extends ServiceImpl i this.sendTaskResult(taskTodo, taskResult); } + /********************************** + * 用途说明: 单点识别 + * 参数说明 id 点位Id + * 返回值说明: boolean + ***********************************/ @Override public boolean onceAnalyse(String id) throws Exception { SubstationDevice substationDevice = substationDeviceService.getById(id);