修改本月预警报警统计接口

13693261870

2023-06-09 498718ad129e8a9010e6f2af2fde2f9d4508fd32

修改本月预警报警统计接口

 src/main/java/com/yssh/controller/WarningAnalyseController.java

@@ -98,8 +98,8 @@
    public Result monthTop10() {
        //return Result.OK(warningService.selectThisMonthLocationValueDataTop10());

        String key = dateFormat.format(new Date()) + "_top10";
        Object obj = CacheUtils.get(key);
        //String key = dateFormat.format(new Date()) + "_top10";
        //Object obj = CacheUtils.get(key);
        List<Qxsh> list;

        //if (null != obj) {

 src/main/java/com/yssh/scheduled/ReadCsvTask.java

@@ -80,6 +80,7 @@
            addFileMd5(md5);

            try {
                logger.info("loadVocSync:" + filePath);
                EasyCsv.read(filePath, VocVals.class, new VocParser(vocValsService, calendar.getTime())).doRead();
            } catch (Exception e) {
                logger.error(e.getMessage(), e);
@@ -117,6 +118,8 @@

            suYuanService.createNewTable(newTableName);
            dictRecordService.insertDictRecord(new DictRecord(1L, newTableName, Long.parseLong(time), ""));

            logger.info("loadCsvSync:" + filePath);
            EasyCsv.read(filePath, SuYuan.class, new CsvParser(suYuanService, time)).doRead();

            try {

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

@@ -206,20 +206,23 @@
    public Map<String, Integer> countThisMonthAlarmAndWarning() {
        Map<String, Integer> result = new HashMap<>();
        Map<String, Object> param = new HashMap<>();
        param.put("startTime", ymdhms.format(DateUtils.getMonthStart()));
        param.put("endTime", ymdhms.format(DateUtils.getMonthEnd()));

        param.put("type", 0);
        param.put("startTime", DateUtils.getMonthStart());
        param.put("endTime", DateUtils.getMonthEnd());
        List<WarningVo> alarms = warningDetailMapper.selectWarningDetailByMap(param);
        if (StringUtils.isNull(alarms)) {
            alarms = new ArrayList<>();
        }
        result.put("alarmNumber", alarms.size());

        param.put("type", 1);
        List<WarningVo> warnings = warningDetailMapper.selectWarningDetailByMap(param);
        if (StringUtils.isNull(warnings)) {
            warnings = new ArrayList<>();
        }
        result.put("warningNumber", warnings.size());

        return result;
    }


 src/main/resources/mapping/WarningDetailMapper.xml

@@ -27,7 +27,7 @@
        AND type = #{type}
    </select>
    
    <select id="selectWarningDetailByMap" parameterType="java.util.Map" resultMap="WarningVoResult">
    <select id="selectWarningDetailByMap_old" parameterType="java.util.Map" resultMap="WarningVoResult">
        SELECT location_name, su_yuan_id, value
        FROM warning_detail
        WHERE date_format(create_time, '%Y%m%d%H%I%S') &gt;= date_format(#{startTime}, '%Y%m%d%H%I%S')
@@ -35,6 +35,12 @@
        AND type = #{type}
    </select>

    <select id="selectWarningDetailByMap" parameterType="java.util.Map" resultMap="WarningVoResult">
        select location_name, su_yuan_id, value
        from warning_detail
        where create_time between #{startTime} and #{endTime} and type = #{type};
    </select>

    <select id="selectWarningDayCountByMap_old" parameterType="java.util.Map" resultType="java.util.Map">
        SELECT date_format(create_time,'%Y%m%d') AS createTime, count(id) AS num
        FROM warning_detail

 ˵Ã÷.txt

@@ -1,14 +1,21 @@
-----------------------------------------------------
1.MySQL日志：
show binary logs;
reset master;

2.外网云登录方式：
>1.登录外网云，用户名是maxy628 123.114.233.55，输入验证码
>2.进入云桌面 ï¼Œæµè§ˆå™¨è®¿é—®10.101.3.183 è¿›å…¥å ¡åž’机系统
     ç”¨æˆ·è´¦å·ï¼šmaxy628.yssh  å¯†ç ï¼šyssh1234@#..
>3. å…¨å±€æœç´¢  98、101、102、103

3.客户端地址：
https://vmware-horizon-client.en.softonic.com/
-----------------------------------------------------
1.获取本月监测大数据站点最大值TOP10
/warning/monthTop10 â†’ QxshMapper.xml â†’ selectMonthTop10  â†’ yssh_qxsh

2.本月预警、报警统计
/warning/monthCount â†’ WarningDetailMapper.xml â†’ selectWarningDetailByMap â†’ warning_detail








-----------------------------------------------------