1、开发场景新建、更新时算法下分流预警类型接口

1、开发场景新建、更新时算法块列表接口

ruoyi-admin/src/main/java/com/ruoyi/algorithm/controller/AlgorithmBaseTypeController.java

@@ -46,6 +46,18 @@ public class AlgorithmBaseTypeController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询算法预警类型列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:type:list')")
+    @GetMapping("/list/{algorithmId}")
+    public AjaxResult listByAlgorithmBaseId(@PathVariable Long algorithmId)
+    {
+        AlgorithmBaseType algorithmBaseType = new AlgorithmBaseType();
+        algorithmBaseType.setAlgorithmId(algorithmId);
+        return success(algorithmBaseTypeService.selectAlgorithmBaseTypeList(algorithmBaseType));
+    }
+
     /**
      * 导出算法预警类型列表
      */

ruoyi-admin/src/main/java/com/ruoyi/algorithm/controller/AlgorithmPieceBaseController.java

@@ -48,6 +48,16 @@ public class AlgorithmPieceBaseController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询策略算法块列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:algorithmPiece:list')")
+    @GetMapping("/list/all")
+    public AjaxResult listAll(AlgorithmPieceBase algorithmPieceBase)
+    {
+        return success(algorithmPieceBaseService.selectAlgorithmPieceBaseList(algorithmPieceBase));
+    }
+
     /**
      * 获取策略算法块详细信息
      */

ruoyi-admin/src/main/resources/application.yml

@@ -97,7 +97,7 @@ token:
     # 令牌密钥
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期（默认30分钟）
-    expireTime: 30
+    expireTime: 600
   
 # MyBatis配置
 mybatis:

ruoyi-admin/src/main/resources/mapper/system/AlgorithmBaseTypeMapper.xml

@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectAlgorithmBaseTypeList" parameterType="AlgorithmBaseType" resultMap="AlgorithmBaseTypeResult">
         <include refid="selectAlgorithmBaseTypeVo"/>
         <where>  
+            <if test="algorithmId != null"> and algorithm_id = #{algorithmId}</if>
             <if test="typeName != null  and typeName != ''"> and type_name like concat('%', #{typeName}, '%')</if>
         </where>
     </select>

ruoyi-admin/src/main/resources/mapper/system/AlgorithmCameraBaseMapper.xml

@@ -69,6 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
             AND date_format(acb.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
         </if>
+        <if test="params.cameraIdList != null and params.cameraIdList != ''"><!-- 摄像头ids筛选 -->
+            AND FIND_IN_SET( acb.id, #{params.cameraIdList} )
+        </if>
         ORDER BY
         acb.sort ASC
     </select>