Merge remote-tracking branch 'origin/dev' into dev

fuliqi

2025-02-20 a1278f8b1edebde8114ca4add0f32d74495a835b

 ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.excel.TMonitorExp;
import com.ycl.platform.domain.form.VideoExportForm;
import com.ycl.platform.domain.query.DashboardQuery;
import com.ycl.platform.domain.query.DataCenterQuery;
@@ -10,12 +11,13 @@
import com.ycl.platform.domain.result.SYS.TMonitorResult;
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.domain.vo.UpdateOnlineVO;
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.vo.screen.MonitorRateVO;
import com.ycl.platform.domain.vo.screen.MonitorTotalVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.security.core.parameters.P;

import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -93,7 +95,7 @@

    /**
     * 获取恢复异常设备
     * @param time 时间
     * @param monitor 时间
     * @return 数据
     */
    Map<String, String> recoveryException(TMonitorVO monitor);
@@ -165,7 +167,13 @@
     * 根据ip修改点位表的是否在线字段
     * @param onlineList
     */
    void updateOnline(@Param("onlineList") List<UpdateOnlineVO> onlineList);
    void updateOnlineFromUyOrHk(@Param("onlineList") List<UpdateOnlineVO> onlineList);

    /**
     * 根据国标修改
     * @param onlineList
     */
    void updateOnlineFromHk(@Param("onlineList") List<UpdateOnlineVO> onlineList);


    /**
@@ -175,4 +183,19 @@
     * @return 设备资产集合
     */
    public List<TMonitorResult> selectMonitorResult(VideoExportForm exportForm);

    void batchUpdateOnline(@Param("ipList")List<String> ipList,@Param("date") Date date,@Param("online")Integer online);

    List<TMonitor> selectCarOrFace();

    List<TMonitorExp> exportTMonitorList(TMonitorVO tMonitor);

    List<TMonitorResult> getByIp(@Param("ipList")List<String> ips);

    void clearMonitor();

    List<String> getVideoIds();

    Map<String, String> assetManagementCount();

}