1、开发算法场景模块接口

2、修改列表分页total错误

ruoyi-admin/src/main/java/com/ruoyi/algorithm/domain/AlgorithmSceneBase.java

 package com.ruoyi.algorithm.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 算法场景对象 algorithm_scene_base
  * 
@@ -38,70 +39,87 @@ public class AlgorithmSceneBase extends BaseEntity
     @Excel(name = "摄像头id列表")
     private String cameraIdList;
 
-    public void setId(Long id) 
-    {
+    /** 上次在线时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "上次在线时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date live;
+
+    /** 帐号状态（0正常 */
+    @Excel(name = "帐号状态", readConverterExp = "帐号状态（0正常")
+    private String status;
+
+    /** 删除标志（0代表存在 */
+    private String delFlag;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
-        return id;
+    public String getSceneName() {
+        return sceneName;
     }
-    public void setSceneName(String sceneName) 
-    {
+
+    public void setSceneName(String sceneName) {
         this.sceneName = sceneName;
     }
 
-    public String getSceneName() 
-    {
-        return sceneName;
+    public Long getAlgorithmId() {
+        return algorithmId;
     }
-    public void setAlgorithmId(Long algorithmId) 
-    {
+
+    public void setAlgorithmId(Long algorithmId) {
         this.algorithmId = algorithmId;
     }
 
-    public Long getAlgorithmId() 
-    {
-        return algorithmId;
+    public String getAlarmTypes() {
+        return alarmTypes;
     }
-    public void setAlarmTypes(String alarmTypes) 
-    {
+
+    public void setAlarmTypes(String alarmTypes) {
         this.alarmTypes = alarmTypes;
     }
 
-    public String getAlarmTypes() 
-    {
-        return alarmTypes;
+    public Long getFrameSecond() {
+        return frameSecond;
     }
-    public void setFrameSecond(Long frameSecond) 
-    {
+
+    public void setFrameSecond(Long frameSecond) {
         this.frameSecond = frameSecond;
     }
 
-    public Long getFrameSecond() 
-    {
-        return frameSecond;
+    public String getCameraIdList() {
+        return cameraIdList;
     }
-    public void setCameraIdList(String cameraIdList) 
-    {
+
+    public void setCameraIdList(String cameraIdList) {
         this.cameraIdList = cameraIdList;
     }
 
-    public String getCameraIdList() 
-    {
-        return cameraIdList;
+    public Date getLive() {
+        return live;
+    }
+
+    public void setLive(Date live) {
+        this.live = live;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
     }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("sceneName", getSceneName())
-            .append("algorithmId", getAlgorithmId())
-            .append("alarmTypes", getAlarmTypes())
-            .append("frameSecond", getFrameSecond())
-            .append("cameraIdList", getCameraIdList())
-            .toString();
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
     }
 }

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

 package com.ruoyi.algorithm.domain.dto;
 
 import com.ruoyi.algorithm.domain.AlgorithmBaseType;
-import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
 
 import java.util.Date;
@@ -17,6 +16,9 @@ public class AlgorithmSceneListDto {
     /** 场景名 */
     private String sceneName;
 
+    /** 处理的预警类型 */
+    private List<AlgorithmBaseType> alarmTypes;
+
     /** 每秒帧数 */
     private Long frameSecond;
 
@@ -38,6 +40,6 @@ public class AlgorithmSceneListDto {
     /** 帐号状态（0正常 */
     private Boolean status;
 
-    /** 排序 */
-    private Long sort;
+    /** 摄像头id列表字符串 */
+    private String cameraIdList;
 }

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

@@ -26,11 +26,8 @@
         <result property="createTime" column="create_time"/>
         <result property="sort" column="sort"/>
         <result property="status" column="status"/>
-        <collection property="types" ofType="com.ruoyi.algorithm.domain.AlgorithmBaseType">
-            <result property="algorithmId" column="id"/>
-            <result property="typeKey" column="type_key"/>
-            <result property="typeName" column="type_name"/>
-        </collection>
+        <collection property="types" javaType="ArrayList" column="id"
+                    ofType="com.ruoyi.algorithm.domain.AlgorithmBaseType" select="selectAlgorithmBaseType"/>
     </resultMap>
 
     <sql id="selectAlgorithmBaseVo">
@@ -69,15 +66,12 @@
         ab.id,
         ab.algorithm_name,
         ab.algorithm_key,
-        abt.type_name,
-        abt.type_key,
         su.nick_name,
         ab.create_time,
         ab.sort,
         ab.`status`
         FROM
         algorithm_base ab
-        LEFT JOIN algorithm_base_type abt ON abt.algorithm_id = ab.id
         LEFT JOIN sys_user su ON su.user_name = ab.create_by
         AND su.del_flag = '0'
         WHERE
@@ -96,6 +90,15 @@
         ab.sort ASC
     </select>
 
+    <select id="selectAlgorithmBaseType" resultType="com.ruoyi.algorithm.domain.AlgorithmBaseType">
+        select
+            algorithm_id AS algorithmId,
+            type_key AS typeKey,
+            type_name AS typeName
+        from algorithm_base_type
+        where algorithm_id = #{id}
+    </select>
+
     <insert id="insertAlgorithmBase" parameterType="AlgorithmBase">
         insert into algorithm_base
         <trim prefix="(" suffix=")" suffixOverrides=",">

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

@@ -20,9 +20,14 @@
         <result property="algorithmName" column="algorithm_name"/>
         <result property="live" column="live"/>
         <result property="status" column="status"/>
+        <result property="cameraIdList" column="camera_id_list"/>
         <result property="createBy" column="nick_name"/>
-        <result property="sort" column="sort"/>
         <result property="createTime" column="create_time"/>
+        <result property="cameraIdList" column="camera_id_list"/>
+        <collection property="alarmTypes" javaType="ArrayList" column="id"
+                    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"/>
     </resultMap>
 
     <sql id="selectAlgorithmSceneBaseVo">
@@ -45,8 +50,58 @@
         <include refid="selectAlgorithmSceneBaseVo"/>
         where id = #{id}
     </select>
-    <select id="selectAlgorithmSceneListDto" resultMap="AlgorithmSceneBaseResult">
+    <select id="selectAlgorithmSceneListDto" resultMap="AlgorithmSceneListDtoResult">
+        SELECT
+            asb.id,
+            asb.scene_name,
+            asb.frame_second,
+            ab.algorithm_name,
+            su.nick_name,
+            asb.create_time,
+            asb.`status`,
+            asb.camera_id_list
+        FROM
+            algorithm_scene_base asb
+                LEFT JOIN algorithm_base ab ON ab.id = asb.algorithm_id
+                LEFT JOIN sys_user su ON su.user_name = ab.create_by
+        WHERE
+            asb.del_flag = '0'
+        <if test="sceneName != null  and sceneName != ''">and asb.scene_name like concat('%',
+            #{sceneName}, '%')
+        </if>
+        <if test="status != null  and status != ''">and asb.status = #{status}</if>
+        <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+            AND date_format(asb.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+        </if>
+        <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+            AND date_format(asb.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+        </if>
+        <if test="algorithmId != null ">
+            AND asb.algorithm_id = #{algorithmId}
+        </if>
+        ORDER BY
+            asb.create_time DESC
+
+    </select>
+
+    <select id="selectAlgorithmBaseType" resultType="com.ruoyi.algorithm.domain.AlgorithmBaseType">
+        select
+            algorithm_id AS algorithmId,
+            type_key AS typeKey,
+            type_name AS typeName
+        from algorithm_base_type
+        where algorithm_id = #{id}
+    </select>
 
+    <select id="selectAlgorithmCameraListDto" resultType="com.ruoyi.algorithm.domain.dto.AlgorithmCameraListDto">
+        SELECT
+            id,
+            camera_name AS cameraName,
+            rtsp
+        FROM
+            algorithm_camera_base
+        WHERE
+            FIND_IN_SET( id, #{cameraIdList} )
     </select>
 
     <insert id="insertAlgorithmSceneBase" parameterType="AlgorithmSceneBase">