Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-18 2da75f7a5c4fee35770b88998dd15f33277a7a88

Merge remote-tracking branch 'origin/master'

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java

@@ -18,7 +18,6 @@
 * @date 2024-03-04
 */
@Data
//TODO:改字典设备状态
public class TMonitorVO extends BaseEntity {
    private static final long serialVersionUID = 1L;


 ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java

@@ -111,9 +111,7 @@
        //设备编号
        List<String> numbers = monitors.stream().map(TMonitorVO::getSerialNumber).collect(Collectors.toList());
        Query query = new Query();
        //TODO:本地测试
        // Date now = new Date()
        Date now = DateUtils.getDay(2024, 7, 13);
        Date now = new Date();
        query.addCriteria(Criteria.where("no").in(numbers)
                .and("mongoCreateTime").gte(DateUtils.getDayStart(now)).lt(DateUtils.getDayEnd(now))
        );
@@ -356,7 +354,6 @@

    @Override
    public List<MonitorRateVO> monitorRate(DashboardQuery dashboardQuery) {
        //TODO:新增dept AreaCode字段
        return baseMapper.monitorRate(dashboardQuery);
    }


 ycl-server/src/main/java/com/ycl/task/CarTask.java

@@ -41,7 +41,6 @@
    private TMonitorMapper monitorMapper;
    @Autowired
    private YwPointMapper pointMapper;
    //TODO：加任务
    public void siteOnlineTask() {
        log.info("开始计算点位在线率");
        List<TMonitorResult> tMonitorResults = monitorMapper.selectMonitorResult(CheckConstants.Rule_Category_Car);
@@ -50,7 +49,6 @@
        log.info("结束计算视图库对接稳定性");
    }

    //TODO：改任务名
    public void viewConnectTask() {
        log.info("开始计算视图库对接稳定性");
        Date yesterday = DateUtils.addDays(new Date(), -1);

 ycl-server/src/main/java/com/ycl/task/FaceTask.java

@@ -37,7 +37,6 @@
    @Autowired
    private TMonitorMapper monitorMapper;

    //TODO：加任务
    public void siteOnlineTask() {
        log.info("开始计算点位在线率");
        List<TMonitorResult> tMonitorResults = monitorMapper.selectMonitorResult(CheckConstants.Rule_Category_Face);
@@ -45,7 +44,6 @@
        calculator.calculate(tMonitorResults);
        log.info("结束计算视图库对接稳定性");
    }
    //TODO：改名字
    public void viewConnectTask() {
        log.info("开始计算视图库对接稳定性");
        Date yesterday = DateUtils.addDays(new Date(), -1);

 ycl-server/src/main/java/com/ycl/task/VideoTask.java

@@ -54,7 +54,7 @@
    private final ImageResourceSecurityMapper imageResourceSecurityMapper;

    private static final BigDecimal NUM = new BigDecimal("0.15");
    //TODO：加任务

    public void siteOnlineTask() {
        log.info("开始计算点位在线率");
        List<TMonitorResult> tMonitorResults = monitorMapper.selectMonitorResult(CheckConstants.Rule_Category_Video);