1

13693261870

2023-05-19 3d2350a16eaf71c67d1de4cfa82751e775961aab

 src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java

@@ -10,21 +10,14 @@
import java.util.Map;
import java.util.concurrent.CountDownLatch;

import com.yssh.dao.*;
import com.yssh.entity.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;

import com.google.common.collect.Lists;
import com.yssh.dao.AlertConfigMapper;
import com.yssh.dao.DictRecordMapper;
import com.yssh.dao.SuYuanMapper;
import com.yssh.dao.WarningDetailMapper;
import com.yssh.entity.DictRecord;
import com.yssh.entity.MonitorPointPosition;
import com.yssh.entity.SuYuan2d;
import com.yssh.entity.SuYuanMonitorData;
import com.yssh.entity.WarningDetail;
import com.yssh.entity.vo.WarningVo;
import com.yssh.service.IAsyncService;
import com.yssh.service.ICommonService;
@@ -57,6 +50,11 @@

    @Resource
    private IAsyncService asyncService;

    @Resource
    private QxshMapper qxshMapper;

    private SimpleDateFormat ym = new SimpleDateFormat("yyyyMM%");

    private SimpleDateFormat ymdh = new SimpleDateFormat("yyyyMMddHH");

@@ -366,6 +364,15 @@
    }

    @Override
    public List<Qxsh> selectMonthTop10() {
        String time = ym.format(new Date());

        List<Qxsh> list = qxshMapper.selectMonthTop10(time);

        return list;
    }

    @Override
    public List<WarningVo> getAlarmAndWarnByTime(Date begin, Date end) {
        List<WarningVo> list = new ArrayList<>();
        List<String> ids = CalculateUtils.assembleId(commonService.getCheckPoints3d());