From 14c739d6505657da8eba7ea7c5dd6121ac7ca572 Mon Sep 17 00:00:00 2001 From: weitang Date: Wed, 21 May 2025 15:52:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=97=E6=B3=95=E5=88=86=E6=9E=90=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=A8=A1=E5=9D=97=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E5=92=8C=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AlgorithmLogsController.java | 5 +++-- .../modules/algorithm/domain/AlgorithmLogs.java | 4 ++++ .../algorithm/mapper/AlgorithmLogsMapper.java | 15 ++++++++++++++- .../algorithm/service/IAlgorithmLogsService.java | 4 +++- .../service/impl/AlgorithmLogsServiceImpl.java | 16 ++++++++++++++-- .../mapper/algorithm/AlgorithmLogsMapper.xml | 3 ++- 6 files changed, 40 insertions(+), 7 deletions(-) diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmLogsController.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmLogsController.java index cfdf206..523acc6 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmLogsController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmLogsController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.Map; /** *

@@ -30,11 +31,11 @@ public class AlgorithmLogsController { // 算法分类，区域，间隔，部件 @GetMapping("/getAlgorithmLogsPage") - @ApiOperation("分页查询算法分析日志") + @ApiOperation("Page>") public ResponseResult getAlgorithmLogsPage(String stationCode, String algorithmId, String areaId, String bayId, String mainDeviceId, String componentId, String componentName, Page page) { - Page pageMaps = algorithmLogsService.getAlgorithmLogsPage(stationCode, algorithmId, areaId, + Page> pageMaps = algorithmLogsService.getAlgorithmLogsPage(stationCode, algorithmId, areaId, bayId, mainDeviceId, componentId, componentName, page); return ResponseResult.successData(pageMaps); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmLogs.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmLogs.java index 9736221..8c9b8a0 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmLogs.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmLogs.java @@ -1,5 +1,8 @@ package com.yfd.platform.modules.algorithm.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.time.LocalDateTime; import java.io.Serializable; @@ -26,6 +29,7 @@ public class AlgorithmLogs implements Serializable { /** * id */ + @TableId(type = IdType.ASSIGN_UUID) private String id; /** diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/mapper/AlgorithmLogsMapper.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/mapper/AlgorithmLogsMapper.java index f3f7e7e..03c27b0 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/mapper/AlgorithmLogsMapper.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/mapper/AlgorithmLogsMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.modules.algorithm.domain.AlgorithmLogs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.Map; + /** *

* Mapper 接口 @@ -14,5 +16,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface AlgorithmLogsMapper extends BaseMapper { - Page getAlgorithmLogsPage(String stationCode,String algorithmId, String areaId, String bayId, String mainDeviceId, String componentId,String componentName, Page page); + /********************************** + * 用途说明: 分页查询算法分析日志 + * 参数说明 stationCode 变电站编码 + * 参数说明 algorithmId 算法分类 + * 参数说明 areaId 区域Id + * 参数说明 bayId 间隔Id + * 参数说明 mainDeviceId 主设备Id + * 参数说明 componentId 部件Id + * 参数说明 page 分页参数 + * 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page + ***********************************/ + Page> getAlgorithmLogsPage(String stationCode, String algorithmId, String areaId, String bayId, String mainDeviceId, String componentId, String componentName, Page page); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmLogsService.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmLogsService.java index 204494d..d58a19b 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmLogsService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmLogsService.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.modules.algorithm.domain.AlgorithmLogs; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Map; + /** *

* 服务类 @@ -25,6 +27,6 @@ public interface IAlgorithmLogsService extends IService { * 参数说明 page 分页参数 * 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page ***********************************/ - Page getAlgorithmLogsPage(String stationCode,String algorithmId, String areaId, String bayId, String mainDeviceId, String componentId,String componentName, Page page); + Page> getAlgorithmLogsPage(String stationCode, String algorithmId, String areaId, String bayId, String mainDeviceId, String componentId, String componentName, Page page); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmLogsServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmLogsServiceImpl.java index 04c3c99..3228050 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmLogsServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmLogsServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Map; /** *

@@ -23,9 +24,20 @@ public class AlgorithmLogsServiceImpl extends ServiceImpl + ***********************************/ @Override - public Page getAlgorithmLogsPage(String stationCode,String algorithmId, String areaId, String bayId, - String mainDeviceId, String componentId,String componentName, Page page) { + public Page> getAlgorithmLogsPage(String stationCode, String algorithmId, String areaId, String bayId, + String mainDeviceId, String componentId, String componentName, Page page) { return algorithmLogsMapper.getAlgorithmLogsPage(stationCode,algorithmId, areaId, bayId, mainDeviceId, componentId,componentName, page); } diff --git a/riis-system/src/main/resources/mapper/algorithm/AlgorithmLogsMapper.xml b/riis-system/src/main/resources/mapper/algorithm/AlgorithmLogsMapper.xml index a523784..c7516d3 100644 --- a/riis-system/src/main/resources/mapper/algorithm/AlgorithmLogsMapper.xml +++ b/riis-system/src/main/resources/mapper/algorithm/AlgorithmLogsMapper.xml @@ -2,7 +2,8 @@ - SELECT ac.algorithm_class_name, al.*