1

13693261870

2023-05-19 ace9397eabf2bbf409eac07cdd59a661254706ac

1

 src/main/java/com/yssh/dao/SuYuanMapper.java

@@ -34,6 +34,8 @@
    List<SuYuan2d> getWarningAnalyse(@Param("tableName") String tableName, @Param("ids") List<String> ids);
    
    List<SuYuanMonitorData> getMonitorData(@Param("tableNames") List<String> tableNames, @Param("id") String id);

    List<SuYuanMonitorData> getNewMonitorData(String name, String start, String end);
    
    //获取本月指定监测站点监测值对大的数据
    Map<String, Object> getMonthValueDataMax(@Param("tableNames") List<String> tableNames, @Param("id") String id);

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

@@ -1,12 +1,7 @@
package com.yssh.service.impl;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;

@@ -243,7 +238,7 @@
            return null;
        }

        List<DictRecord> recordList = dictRecordMapper.selectDictRecordList(new DictRecord());
        /*List<DictRecord> recordList = dictRecordMapper.selectDictRecordList(new DictRecord());

        List<String> tableNames = new ArrayList<String>();
        for (DictRecord dr : recordList) {
@@ -252,7 +247,17 @@
            }
        }

        return suYuanMapper.getMonitorData(tableNames, checkPoint.getX() + "_" + checkPoint.getY() + "_" + checkPoint.getZ());
        return suYuanMapper.getMonitorData(tableNames, checkPoint.getX() + "_" + checkPoint.getY() + "_" + checkPoint.getZ());*/

        Calendar calendar = Calendar.getInstance();
        calendar.set(Calendar.HOUR_OF_DAY, 23);
        String end = dateFormat.format(calendar.getTime());

        calendar.set(Calendar.HOUR_OF_DAY, 0);
        calendar.add(Calendar.DATE, -7);
        String start = dateFormat.format(calendar.getTime());

        return suYuanMapper.getNewMonitorData(checkPoint.getName(), start, end);
    }

    @Override

 src/main/resources/mapping/SuYuanMapper.xml

@@ -131,6 +131,13 @@
            WHERE id = #{id}
        </foreach>
    </select>

    <select id="getNewMonitorData" resultType="com.yssh.entity.SuYuanMonitorData">
        select id, value, time
        from yssh_qxsh
        where name = #{name} and Cast(time as signed) between ${start} and ${end}
        order by time desc;
    </select>
    
    <select id="getMonthValueDataMax" resultType="java.util.Map">
        <foreach collection="tableNames" item="tableName" separator=" UNION ">