算法分析日志模块功能增加注解和返回类型

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;
 
 /**
  * <p>
@@ -30,11 +31,11 @@ public class AlgorithmLogsController {
 
     // 算法分类，区域，间隔，部件
     @GetMapping("/getAlgorithmLogsPage")
-    @ApiOperation("分页查询算法分析日志")
+    @ApiOperation("Page<Map<String,Object>>")
     public ResponseResult getAlgorithmLogsPage(String stationCode, String algorithmId, String areaId, String bayId,
                                                String mainDeviceId, String componentId, String componentName,
                                                Page<AlgorithmLogs> page) {
-        Page<AlgorithmLogs> pageMaps = algorithmLogsService.getAlgorithmLogsPage(stationCode, algorithmId, areaId,
+        Page<Map<String,Object>> pageMaps = algorithmLogsService.getAlgorithmLogsPage(stationCode, algorithmId, areaId,
                 bayId, mainDeviceId, componentId, componentName, page);
         return ResponseResult.successData(pageMaps);
     }

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;
 
     /**

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;
+
 /**
  * <p>
  *  Mapper 接口
@@ -14,5 +16,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface AlgorithmLogsMapper extends BaseMapper<AlgorithmLogs> {
 
-    Page<AlgorithmLogs> getAlgorithmLogsPage(String stationCode,String algorithmId, String areaId, String bayId, String mainDeviceId, String componentId,String componentName, Page<AlgorithmLogs> page);
+    /**********************************
+     * 用途说明: 分页查询算法分析日志
+     * 参数说明 stationCode 变电站编码
+     * 参数说明 algorithmId 算法分类
+     * 参数说明 areaId 区域Id
+     * 参数说明 bayId 间隔Id
+     * 参数说明 mainDeviceId 主设备Id
+     * 参数说明 componentId 部件Id
+     * 参数说明 page 分页参数
+     * 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.yfd.platform.modules.algorithm.domain.AlgorithmLogs>
+     ***********************************/
+    Page<Map<String,Object>> getAlgorithmLogsPage(String stationCode, String algorithmId, String areaId, String bayId, String mainDeviceId, String componentId, String componentName, Page<AlgorithmLogs> page);
 }

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;
+
 /**
  * <p>
  *  服务类
@@ -25,6 +27,6 @@ public interface IAlgorithmLogsService extends IService<AlgorithmLogs> {
     * 参数说明 page 分页参数
     * 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.yfd.platform.modules.algorithm.domain.AlgorithmLogs>
     ***********************************/
-    Page<AlgorithmLogs> getAlgorithmLogsPage(String stationCode,String algorithmId, String areaId, String bayId, String mainDeviceId, String componentId,String componentName, Page<AlgorithmLogs> page);
+    Page<Map<String,Object>> getAlgorithmLogsPage(String stationCode, String algorithmId, String areaId, String bayId, String mainDeviceId, String componentId, String componentName, Page<AlgorithmLogs> page);
 
 }

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;
 
 /**
  * <p>
@@ -23,9 +24,20 @@ public class AlgorithmLogsServiceImpl extends ServiceImpl<AlgorithmLogsMapper, A
     @Resource
     private AlgorithmLogsMapper algorithmLogsMapper;
 
+    /**********************************
+     * 用途说明: 分页查询算法分析日志
+     * 参数说明 stationCode 变电站编码
+     * 参数说明 algorithmId 算法分类
+     * 参数说明 areaId 区域Id
+     * 参数说明 bayId 间隔Id
+     * 参数说明 mainDeviceId 主设备Id
+     * 参数说明 componentId 部件Id
+     * 参数说明 page 分页参数
+     * 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.yfd.platform.modules.algorithm.domain.AlgorithmLogs>
+     ***********************************/
     @Override
-    public Page<AlgorithmLogs> getAlgorithmLogsPage(String stationCode,String algorithmId, String areaId, String bayId,
+    public Page<Map<String,Object>> getAlgorithmLogsPage(String stationCode, String algorithmId, String areaId, String bayId,
-                                                    String mainDeviceId, String componentId,String componentName, Page<AlgorithmLogs> page) {
+                                                         String mainDeviceId, String componentId, String componentName, Page<AlgorithmLogs> page) {
         return algorithmLogsMapper.getAlgorithmLogsPage(stationCode,algorithmId, areaId, bayId,
                 mainDeviceId, componentId,componentName, page);
     }

riis-system/src/main/resources/mapper/algorithm/AlgorithmLogsMapper.xml

@@ -2,7 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yfd.platform.modules.algorithm.mapper.AlgorithmLogsMapper">
 
-    <select id="getAlgorithmLogsPage" resultType="com.yfd.platform.modules.algorithm.domain.AlgorithmLogs">
+    <!--分页查询算法分析日志-->
+    <select id="getAlgorithmLogsPage" resultType="java.util.Map">
         SELECT
             ac.algorithm_class_name,
             al.*