Merge branch 'develop' into 公司测试环境4.221

# Conflicts:
#	ruoyi-admin/src/main/resources/application.yml

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

@@ -52,7 +52,7 @@ public class AlgorithmBaseController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:algorithmBase:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(algorithmBaseService.selectAlgorithmBaseById(id));
+        return success(algorithmBaseService.selectAlgorithmBaseListDtoById(id));
     }
 
     /**

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/java/com/ruoyi/algorithm/mapper/AlgorithmBaseMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.algorithm.mapper;
 import java.util.List;
 import com.ruoyi.algorithm.domain.AlgorithmBase;
 import com.ruoyi.algorithm.domain.dto.AlgorithmBaseListDto;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 算法Mapper接口
@@ -61,4 +62,6 @@ public interface AlgorithmBaseMapper
     public int deleteAlgorithmBaseByIds(Long[] ids);
 
     public List<AlgorithmBaseListDto> selectAlgorithmBaseListDto(AlgorithmBase algorithmBase);
+
+    public AlgorithmBaseListDto selectAlgorithmBaseListDtoById(@Param("id") Long id);
 }

ruoyi-admin/src/main/java/com/ruoyi/algorithm/service/IAlgorithmBaseService.java

@@ -67,4 +67,6 @@ public interface IAlgorithmBaseService
      * @return 算法集合
      */
     public List<AlgorithmBaseListDto> selectAlgorithmBaseListDto(AlgorithmBase algorithmBase);
+
+    AlgorithmBaseListDto selectAlgorithmBaseListDtoById(Long id);
 }

ruoyi-admin/src/main/java/com/ruoyi/algorithm/service/impl/AlgorithmBaseServiceImpl.java

@@ -100,4 +100,9 @@ public class AlgorithmBaseServiceImpl implements IAlgorithmBaseService
     public List<AlgorithmBaseListDto> selectAlgorithmBaseListDto(AlgorithmBase algorithmBase) {
         return algorithmBaseMapper.selectAlgorithmBaseListDto(algorithmBase);
     }
+
+    @Override
+    public AlgorithmBaseListDto selectAlgorithmBaseListDtoById(Long id) {
+        return algorithmBaseMapper.selectAlgorithmBaseListDtoById(id);
+    }
 }

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

@@ -53,7 +53,7 @@ spring:
   messages:
     # 国际化资源文件路径
     basename: i18n/messages
-  profiles:
+  profiles: 
     active: druid
   # 文件上传
   servlet:
@@ -76,7 +76,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password:
+    password: 
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -98,7 +98,7 @@ token:
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期（默认30分钟）
     expireTime: 30
-
+  
 # MyBatis配置
 mybatis:
     # 搜索指定包别名
@@ -109,10 +109,10 @@ mybatis:
     configLocation: classpath:mybatis/mybatis-config.xml
 
 # PageHelper分页插件
-pagehelper:
+pagehelper: 
   helperDialect: mysql
   supportMethodsArguments: true
-  params: count=countSql
+  params: count=countSql 
 
 # Swagger配置
 swagger:
@@ -122,7 +122,7 @@ swagger:
   pathMapping: /dev-api
 
 # 防止XSS攻击
-xss:
+xss: 
   # 过滤开关
   enabled: true
   # 排除链接（多个用逗号分隔）

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

@@ -99,6 +99,22 @@
         from algorithm_base_type
         where algorithm_id = #{id}
     </select>
+    <select id="selectAlgorithmBaseListDtoById" resultMap="AlgorithmBaseListDtoResult">
+        SELECT
+            ab.id,
+            ab.algorithm_name,
+            ab.algorithm_key,
+            su.nick_name,
+            ab.create_time,
+            ab.sort,
+            ab.`status`
+        FROM
+            algorithm_base ab
+                LEFT JOIN sys_user su ON su.user_name = ab.create_by
+                AND su.del_flag = '0'
+        WHERE
+            ab.id = #{id}
+    </select>
 
     <insert id="insertAlgorithmBase" parameterType="AlgorithmBase">
         insert into algorithm_base

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>