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

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

@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.algorithm.domain.dto.AlgorithmSceneDetailsDto;
 import com.ruoyi.algorithm.domain.dto.AlgorithmSceneListDto;
+import com.ruoyi.algorithm.domain.dto.AlgorithmSceneSaveDto;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -65,10 +66,10 @@ public class AlgorithmSceneBaseController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:algorithmScene:add')")
     @Log(title = "算法场景", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody AlgorithmSceneDetailsDto algorithmSceneDetailsDto)
+    public AjaxResult add(@RequestBody AlgorithmSceneSaveDto algorithmSceneSaveDto)
     {
-        algorithmSceneDetailsDto.setCreateBy(getUsername());
-        return toAjax(algorithmSceneBaseService.insertAlgorithmSceneDetailsDto(algorithmSceneDetailsDto));
+        algorithmSceneSaveDto.setCreateBy(getUsername());
+        return toAjax(algorithmSceneBaseService.insertAlgorithmSceneSaveDto(algorithmSceneSaveDto));
     }
 
     /**
@@ -77,10 +78,10 @@ public class AlgorithmSceneBaseController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:algorithmScene:edit')")
     @Log(title = "算法场景", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody AlgorithmSceneDetailsDto algorithmSceneDetailsDto)
+    public AjaxResult edit(@RequestBody AlgorithmSceneSaveDto algorithmSceneSaveDto)
     {
-        algorithmSceneDetailsDto.setUpdateBy(getUsername());
-        return toAjax(algorithmSceneBaseService.updateAlgorithmSceneDetailsDto(algorithmSceneDetailsDto));
+        algorithmSceneSaveDto.setUpdateBy(getUsername());
+        return toAjax(algorithmSceneBaseService.updateAlgorithmSceneSaveDto(algorithmSceneSaveDto));
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/algorithm/domain/dto/AlgorithmPieceSaveDto.java

+package com.ruoyi.algorithm.domain.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 周昊
+ * @desc ...
+ * @date 2023-05-15 17:35:21
+ */
+@Data
+public class AlgorithmPieceSaveDto {
+
+    /** 主键id */
+    private Long id;
+
+    /** 算法块参数 */
+    private List<AlgorithmPieceVariableDetailsDto> variables;
+
+    /** 排序 */
+    private Long sort;
+}

ruoyi-admin/src/main/java/com/ruoyi/algorithm/domain/dto/AlgorithmSceneListDto.java

@@ -19,6 +19,9 @@ public class AlgorithmSceneListDto {
     /** 处理的预警类型 */
     private List<AlgorithmBaseType> alarmTypes;
 
+    /** 处理的预警类型 */
+    private String alarmTypesString;
+
     /** 每秒帧数 */
     private Long frameSecond;
 

ruoyi-admin/src/main/java/com/ruoyi/algorithm/domain/dto/AlgorithmSceneSaveDto.java

+package com.ruoyi.algorithm.domain.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlgorithmSceneSaveDto {
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 场景名
+     */
+    private String sceneName;
+
+    /**
+     * 算法id
+     */
+    private Long algorithmId;
+
+    /**
+     * 处理的预警类型
+     */
+    private List<String> alarmTypes;
+
+    /**
+     * 每秒帧数（ai算法启动参数）
+     */
+    private Long frameSecond;
+
+    /**
+     * 摄像头id列表
+     */
+    private List<String> cameraIdList;
+
+
+    private List<AlgorithmPieceSaveDto> pieceDtos;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+}

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

@@ -4,6 +4,7 @@ import java.util.List;
 import com.ruoyi.algorithm.domain.AlgorithmSceneBase;
 import com.ruoyi.algorithm.domain.dto.AlgorithmSceneDetailsDto;
 import com.ruoyi.algorithm.domain.dto.AlgorithmSceneListDto;
+import com.ruoyi.algorithm.domain.dto.AlgorithmSceneSaveDto;
 
 /**
  * 算法场景Service接口
@@ -67,7 +68,7 @@ public interface IAlgorithmSceneBaseService
 
     AlgorithmSceneDetailsDto selectAlgorithmSceneDetailsDtoById(Long id);
 
-    int insertAlgorithmSceneDetailsDto(AlgorithmSceneDetailsDto algorithmSceneDetailsDto);
+    int insertAlgorithmSceneSaveDto(AlgorithmSceneSaveDto algorithmSceneSaveDto);
 
-    int updateAlgorithmSceneDetailsDto(AlgorithmSceneDetailsDto algorithmSceneDetailsDto);
+    int updateAlgorithmSceneSaveDto(AlgorithmSceneSaveDto algorithmSceneSaveDto);
 }

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

@@ -11,6 +11,7 @@ import cn.hutool.json.JSONUtil;
 import com.ruoyi.algorithm.domain.AlgorithmScenePiece;
 import com.ruoyi.algorithm.domain.dto.AlgorithmSceneDetailsDto;
 import com.ruoyi.algorithm.domain.dto.AlgorithmSceneListDto;
+import com.ruoyi.algorithm.domain.dto.AlgorithmSceneSaveDto;
 import com.ruoyi.algorithm.service.IAlgorithmScenePieceService;
 import com.ruoyi.algorithm.service.IAlgorithmSceneStatusService;
 import com.ruoyi.algorithm.utils.FlinkRestApiUtil;
@@ -156,17 +157,19 @@ public class AlgorithmSceneBaseServiceImpl implements IAlgorithmSceneBaseService
     }
 
     @Override
-    public int insertAlgorithmSceneDetailsDto(AlgorithmSceneDetailsDto algorithmSceneDetailsDto) {
+    public int insertAlgorithmSceneSaveDto(AlgorithmSceneSaveDto algorithmSceneSaveDto) {
         //新建场景
         AlgorithmSceneBase algorithmSceneBase = new AlgorithmSceneBase();
-        BeanUtils.copyBeanProp(algorithmSceneBase, algorithmSceneDetailsDto);
+        BeanUtils.copyBeanProp(algorithmSceneBase, algorithmSceneSaveDto);
+        algorithmSceneBase.setAlarmTypes(algorithmSceneSaveDto.getAlarmTypes().stream().collect(Collectors.joining(",")));
+        algorithmSceneBase.setCameraIdList(algorithmSceneSaveDto.getCameraIdList().stream().collect(Collectors.joining(",")));
         int i = insertAlgorithmSceneBase(algorithmSceneBase);
 
         //删除场景下算法块及参数数据
         algorithmScenePieceService.deleteAlgorithmScenePieceBySceneId(algorithmSceneBase.getId());
 
         //新建场景下算法块及参数
-        List<AlgorithmScenePiece> algorithmScenePieceList = algorithmSceneDetailsDto
+        List<AlgorithmScenePiece> algorithmScenePieceList = algorithmSceneSaveDto
                 .getPieceDtos()
                 .stream()
                 .flatMap(pieceDto -> pieceDto.getVariables()
@@ -189,17 +192,19 @@ public class AlgorithmSceneBaseServiceImpl implements IAlgorithmSceneBaseService
     }
 
     @Override
-    public int updateAlgorithmSceneDetailsDto(AlgorithmSceneDetailsDto algorithmSceneDetailsDto) {
+    public int updateAlgorithmSceneSaveDto(AlgorithmSceneSaveDto algorithmSceneSaveDto) {
         //更新场景
         AlgorithmSceneBase algorithmSceneBase = new AlgorithmSceneBase();
-        BeanUtils.copyBeanProp(algorithmSceneBase, algorithmSceneDetailsDto);
+        BeanUtils.copyBeanProp(algorithmSceneBase, algorithmSceneSaveDto);
+        algorithmSceneBase.setAlarmTypes(algorithmSceneSaveDto.getAlarmTypes().stream().collect(Collectors.joining(",")));
+        algorithmSceneBase.setCameraIdList(algorithmSceneSaveDto.getCameraIdList().stream().collect(Collectors.joining(",")));
         int i = updateAlgorithmSceneBase(algorithmSceneBase);
 
         //删除场景下算法块及参数数据
         algorithmScenePieceService.deleteAlgorithmScenePieceBySceneId(algorithmSceneBase.getId());
 
         //新建场景下算法块及参数
-        List<AlgorithmScenePiece> algorithmScenePieceList = algorithmSceneDetailsDto
+        List<AlgorithmScenePiece> algorithmScenePieceList = algorithmSceneSaveDto
                 .getPieceDtos()
                 .stream()
                 .flatMap(pieceDto -> pieceDto.getVariables()

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

@@ -33,7 +33,8 @@
         <result property="createBy" column="nick_name"/>
         <result property="createTime" column="create_time"/>
         <result property="cameraIdList" column="camera_id_list"/>
-        <collection property="alarmTypes" javaType="ArrayList" column="id"
+        <result property="alarmTypesString" column="alarm_types"/>
+        <collection property="alarmTypes" javaType="ArrayList" column="alarm_types"
                     ofType="com.ruoyi.algorithm.domain.AlgorithmBaseType" select="selectAlgorithmBaseType"/>
         <collection property="cameras" javaType="ArrayList" column="camera_id_list"
                     ofType="com.ruoyi.algorithm.domain.dto.AlgorithmCameraListDto" select="selectAlgorithmCameraListDto"/>
@@ -67,7 +68,8 @@
             su.nick_name,
             asb.create_time,
             asb.`status`,
-            asb.camera_id_list
+            asb.camera_id_list,
+            asb.alarm_types
         FROM
             algorithm_scene_base asb
                 LEFT JOIN algorithm_base ab ON ab.id = asb.algorithm_id
@@ -98,7 +100,7 @@
             type_key AS typeKey,
             type_name AS typeName
         from algorithm_base_type
-        where algorithm_id = #{id}
+        where FIND_IN_SET( type_key, #{alarmTypesString} )
     </select>
 
     <select id="selectAlgorithmCameraListDto" resultType="com.ruoyi.algorithm.domain.dto.AlgorithmCameraListDto">