diff --git a/model/水量水质监测系统“水位数据下载”用例的顺序图.png b/model/水量水质监测系统“水位数据下载”用例的顺序图.png
new file mode 100644
index 0000000..e536475
Binary files /dev/null and b/model/水量水质监测系统“水位数据下载”用例的顺序图.png differ
diff --git a/model/水量水质监测系统“水质数据下载”用例的顺序图.png b/model/水量水质监测系统“水质数据下载”用例的顺序图.png
new file mode 100644
index 0000000..0a2ae29
Binary files /dev/null and b/model/水量水质监测系统“水质数据下载”用例的顺序图.png differ
diff --git a/model/水量水质监测系统第二次迭代“水位数据下载”用例设计顺序图.png b/model/水量水质监测系统第二次迭代“水位数据下载”用例设计顺序图.png
new file mode 100644
index 0000000..aa583d1
Binary files /dev/null and b/model/水量水质监测系统第二次迭代“水位数据下载”用例设计顺序图.png differ
diff --git a/model/水量水质监测系统第二次迭代“水质数据下载”用例设计顺序图.png b/model/水量水质监测系统第二次迭代“水质数据下载”用例设计顺序图.png
new file mode 100644
index 0000000..e8370d9
Binary files /dev/null and b/model/水量水质监测系统第二次迭代“水质数据下载”用例设计顺序图.png differ
diff --git a/model/水量水质监测系统精化用例模型.png b/model/水量水质监测系统精化用例模型.png
new file mode 100644
index 0000000..767574c
Binary files /dev/null and b/model/水量水质监测系统精化用例模型.png differ
diff --git a/model/管理水位信息第一次迭代uml顺序图.png b/model/管理水位信息第一次迭代uml顺序图.png
new file mode 100644
index 0000000..09b3155
Binary files /dev/null and b/model/管理水位信息第一次迭代uml顺序图.png differ
diff --git a/model/管理水位信息第二次迭代uml顺序图.png b/model/管理水位信息第二次迭代uml顺序图.png
new file mode 100644
index 0000000..08316f1
Binary files /dev/null and b/model/管理水位信息第二次迭代uml顺序图.png differ
diff --git a/model/管理水质信息第一次迭代uml顺序图.png b/model/管理水质信息第一次迭代uml顺序图.png
new file mode 100644
index 0000000..2c99313
Binary files /dev/null and b/model/管理水质信息第一次迭代uml顺序图.png differ
diff --git a/model/管理水质信息第二次迭代uml顺序图.png b/model/管理水质信息第二次迭代uml顺序图.png
new file mode 100644
index 0000000..94848c6
Binary files /dev/null and b/model/管理水质信息第二次迭代uml顺序图.png differ
diff --git a/other/200340011 李浩翔 实践总结报告.docx b/other/200340011 李浩翔 实践总结报告.docx
new file mode 100644
index 0000000..5e1b269
Binary files /dev/null and b/other/200340011 李浩翔 实践总结报告.docx differ
diff --git a/other/200340013 廖启兴 实践总结报告.docx b/other/200340013 廖启兴 实践总结报告.docx
new file mode 100644
index 0000000..ea5cba9
Binary files /dev/null and b/other/200340013 廖启兴 实践总结报告.docx differ
diff --git a/src/src_houduan/dao/WaterLevelDao.java b/src/src_houduan/dao/WaterLevelDao.java
new file mode 100644
index 0000000..68944eb
--- /dev/null
+++ b/src/src_houduan/dao/WaterLevelDao.java
@@ -0,0 +1,20 @@
+package dao;
+
+import domain.PageBean;
+import domain.WaterLevel;
+
+import java.util.List;
+import java.util.Map;
+
+public interface WaterLevelDao
+{
+    public abstract List<WaterLevel> findAllByPage(int start,int pageSize);//从start开始查询pagesize行信息
+    public abstract int findAllCount();//查询水位信息的总量
+    public abstract boolean addWaterLevelInfo(WaterLevel waterLevel);
+    public abstract boolean update(WaterLevel waterLevel);
+    public abstract boolean deleteInfo(int id);
+    public abstract List<WaterLevel> conditionalQueryByPage(int start, int pageSize, Map<String,String[]> condition);//条件查找
+    public abstract int conditionalFindAllCount(Map<String, String[]> condition);//条件查找总数
+    public abstract List<WaterLevel> findBySiteName(String siteName);//通过站点来查询水位信息，查询一个站点的所有水位信息
+    public abstract List<WaterLevel> findWeekData();//返回过去一周的数据，及筛出时间戳在一周以内的数据
+}
diff --git a/src/src_houduan/dao/WaterQualityDao.java b/src/src_houduan/dao/WaterQualityDao.java
new file mode 100644
index 0000000..35362a4
--- /dev/null
+++ b/src/src_houduan/dao/WaterQualityDao.java
@@ -0,0 +1,26 @@
+package dao;
+
+import domain.StationAndQuality;
+import domain.Statistics;
+import domain.WaterQuality;
+
+import java.util.List;
+
+/**
+ * @author laoyingyong
+ * @date: 2020-01-20 15:03
+ */
+public interface WaterQualityDao
+{
+    public abstract boolean add(WaterQuality waterQuality);//添加一条记录
+    public abstract List<WaterQuality> findByName(String stationName);
+    public abstract boolean update(WaterQuality waterQuality);
+    public abstract boolean del(int id);
+    public abstract WaterQuality findNewestRecord(String stationName);
+    public abstract List<WaterQuality> findPollutedWater();
+    public abstract List<WaterQuality> findByNameAndTime(String name,String startTime,String endTime,String level);
+    public abstract List<WaterQuality> findByStationName(String name);
+    public abstract List<WaterQuality> findWeekData();
+
+
+}
diff --git a/src/src_houduan/dao/impl/WaterLevelDaoImpl.java b/src/src_houduan/dao/impl/WaterLevelDaoImpl.java
new file mode 100644
index 0000000..2877aa4
--- /dev/null
+++ b/src/src_houduan/dao/impl/WaterLevelDaoImpl.java
@@ -0,0 +1,252 @@
+package dao.impl;
+//Java DataBase Connectivity Java 数据库连接， Java语言操作数据库
+import dao.WaterLevelDao;
+import domain.PageBean; //分页对象
+import domain.WaterLevel;   //水位信息对象
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+//BeanPropertyRowMapper 是 RowMapper 执行该表的行转换成指定的映射的目标类的一个新实例
+import org.springframework.jdbc.core.JdbcTemplate;
+//JdbcTemplate 是 Spring JDBC 核心包（core）中的核心类，
+// 它可以通过配置文件、注解、Java 配置类等形式获取数据库的相关信息，
+// 实现了对 JDBC 开发过程中的驱动加载、连接的开启和关闭、SQL 语句的创建与执行、异常处理、事务处理、数据类型转换等操作的封装。
+// 我们只要对其传入SQL 语句和必要的参数即可轻松进行 JDBC 编程
+import util.JDBCUtils;
+//JDBCUtils的作用：连接数据库的四大参数是：驱动类、URL、用户名、密码，
+// 这些参数都是与特定数据库关联，如果将来想要更改数据库，那么就要去修改这四大参数，那么为了不去修改代码，
+// 我们需要写一个JDBCUtils类，让它从配置文件中读取到配置参数，然后创建连接对象
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+public class WaterLevelDaoImpl implements WaterLevelDao
+{
+    JdbcTemplate template=new JdbcTemplate(JDBCUtils.getDataSource());
+    @Override
+    public List<WaterLevel> findAllByPage(int start,int pageSize)//查询从start行数为pageSize的水位数据
+    {
+
+        String sql="select * from water_level limit ?,?";
+        List<WaterLevel> list = template.query(sql, new BeanPropertyRowMapper<WaterLevel>(WaterLevel.class),start,pageSize);
+        //获取水位信息，start开始
+        return list;//返回从第start开始的水位信息的列表，所查询信息的行数为pageSize
+    }
+
+    @Override
+    public int findAllCount()//返回水位信息数据总数
+    {
+        String sql="select count(*) from water_level";
+        int integer = template.queryForObject(sql, Integer.class);
+        return integer;
+
+    }
+
+    @Override
+    public boolean addWaterLevelInfo(WaterLevel waterLevel)//添加水位信息
+    {
+        String sq="select * from water_level where siteName=? and collectionDate=?";
+        List<WaterLevel> query=null;
+        try {
+            query = template.query(sq, new BeanPropertyRowMapper<WaterLevel>(WaterLevel.class), waterLevel.getSiteName(), waterLevel.getCollectionDate());
+        } catch (Exception e) {
+            System.out.println(e);
+        }
+        int update=0;
+        if(query==null||query.size()==0)//没有查询到该水位信息信息，则添加该信息
+        {
+            try {
+                String sql="insert into water_level (id,riverName,siteName,collectionDate,waterLevel,flow,over) values(null,?,?,?,?,?,?)";
+                update = template.update(sql, waterLevel.getRiverName(),
+                        waterLevel.getSiteName(),
+                        waterLevel.getCollectionDate(),
+                        waterLevel.getWaterLevel(),
+                        waterLevel.getFlow(),
+                        waterLevel.getOver());
+            } catch (Exception e) {
+                System.out.println(e);
+            }
+
+        }
+
+        if(update!=0)//含有该信息则不添加该水位信息
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+
+    }
+
+    @Override
+    public boolean update(WaterLevel waterLevel)//修改水位信息
+    {
+        int update=0;
+        try {
+            String sql="update water_level set riverName=?,siteName=?,collectionDate=? ,waterLevel=?,flow=?,over=? where id=?";
+            update = template.update(sql,
+                    waterLevel.getRiverName(),
+                    waterLevel.getSiteName(),
+                    waterLevel.getCollectionDate(),
+                    waterLevel.getWaterLevel(),
+                    waterLevel.getFlow(),
+                    waterLevel.getOver(),
+                    waterLevel.getId());
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+        }
+        if(update!=0)
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+
+    }
+
+    @Override
+    public boolean deleteInfo(int id)//根据id来删除相关水位信息
+    {
+        int update=0;
+        try {
+            String sql="delete from water_level where id=?";
+            update = template.update(sql, id);
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+        }
+        if(update!=0)
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+
+    }
+
+    @Override
+    public List<WaterLevel> conditionalQueryByPage(int start, int pageSize, Map<String,String[]> condition)//条件查询
+            //map为映射，condition为该映射的名？
+    {
+
+        StringBuilder builder=new StringBuilder();//代表整个sql语句
+        String starStr="select * from water_level where 1=1 ";
+        builder.append(starStr);
+
+        List<Object> valueList=new ArrayList<>();
+
+        //遍历map集合
+        for(String key:condition.keySet())
+        {
+
+            //排除分页条件参数
+            if("currentPage2".equals(key) || "pageSize2".equals(key))
+            {
+                continue;
+            }
+
+
+            String value = condition.get(key)[0];
+            if(value!=null&&!"".equals(value))
+            {
+                builder.append(" and "+key+" like ? ");
+                valueList.add("%"+value+"%");
+
+            }
+        }
+
+
+        builder.append(" limit ?,? ");
+        //sql = select * from water_level where 1=1 " and "+key+" like ? " limit ?,?
+        valueList.add(start);
+        valueList.add(pageSize);
+        String sql = builder.toString();
+
+        System.out.println(sql);//sql语句
+        System.out.println(Arrays.toString(valueList.toArray()));//查询条件
+
+        //执行sql，条件查询
+        List<WaterLevel> objList = null;
+        try {
+            objList = template.query(sql, new BeanPropertyRowMapper<WaterLevel>(WaterLevel.class), valueList.toArray());
+        } catch (Exception e) {
+            System.out.println(e);
+        }
+
+        return objList;//返回条件查询结果
+    }
+
+    @Override
+    public int conditionalFindAllCount(Map<String, String[]> condition)//条件查询的总记录数，符合条件的总数
+    {
+        StringBuilder builder=new StringBuilder();//代表整个sql语句
+        String starStr="select count(*) from water_level where 1=1 ";
+        builder.append(starStr);
+
+        List<Object> valueList=new ArrayList<>();
+
+        //遍历map集合
+        for(String key:condition.keySet())
+        {
+
+            //排除分页条件参数
+            if("currentPage2".equals(key) || "pageSize2".equals(key))
+            {
+                continue;
+            }
+
+
+            String value = condition.get(key)[0];
+            if(value!=null&&!"".equals(value))
+            {
+                builder.append(" and "+key+" like ? ");
+                valueList.add("%"+value+"%");
+
+            }
+        }
+        String sql = builder.toString();
+        System.out.println(sql);
+        System.out.println(valueList);
+
+        int integer = 0;
+        try {
+            integer = template.queryForObject(sql, Integer.class, valueList.toArray());
+        } catch (Exception e) {
+            System.out.println(e);
+        }
+
+
+        return integer;
+    }
+
+    @Override
+    public List<WaterLevel> findBySiteName(String siteName)//通过站点来查询水位信息，插叙一个站点的所有水位信息
+    {
+        List<WaterLevel> query = null;
+        try {
+            String sql="SELECT *  FROM water_level WHERE siteName=? ORDER BY collectionDate";
+            query = template.query(sql, new BeanPropertyRowMapper<WaterLevel>(WaterLevel.class), siteName);
+        } catch (Exception e) {
+            System.out.println(e);
+        }
+        return query;
+    }
+
+    @Override
+    public List<WaterLevel> findWeekData()//返回过去一周的数据，及筛出时间戳在一种以内的数据
+    {
+        List<WaterLevel> query = null;
+        try {
+            String sql="SELECT * FROM water_level WHERE TO_DAYS(NOW())-TO_DAYS(collectionDate)<=6 ORDER BY collectionDate DESC;";
+            query = template.query(sql, new BeanPropertyRowMapper<WaterLevel>(WaterLevel.class));
+        } catch (Exception e) {
+            System.out.println(e);
+        }
+        return query;
+    }
+}
diff --git a/src/src_houduan/dao/impl/WaterQualityDaoImpl.java b/src/src_houduan/dao/impl/WaterQualityDaoImpl.java
new file mode 100644
index 0000000..0c28a57
--- /dev/null
+++ b/src/src_houduan/dao/impl/WaterQualityDaoImpl.java
@@ -0,0 +1,203 @@
+package dao.impl;
+
+import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
+import dao.WaterQualityDao;
+import domain.StationAndQuality;
+import domain.Statistics;//水质信息对象和水质的站点信息对象
+import domain.WaterQuality;//统计对象
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import util.JDBCUtils;
+
+import java.sql.Timestamp;
+import java.util.LinkedList;
+import java.util.List;
+
+
+public class WaterQualityDaoImpl implements WaterQualityDao
+{
+    private JdbcTemplate template=new JdbcTemplate(JDBCUtils.getDataSource());
+
+    @Override
+    public boolean add(WaterQuality waterQuality)//添加水质信息
+    {
+
+        String sq="select * from water_quality where belongStation=? and datetime =?";
+        List<WaterQuality> query=null;
+        try {
+             query = template.query(sq, new BeanPropertyRowMapper<WaterQuality>(WaterQuality.class),waterQuality.getBelongStation(),waterQuality.getDateTime());
+        } catch (Exception e) {
+            System.out.println(e);
+        }
+        System.out.println(query);
+
+
+        int update=0;
+        if(query==null||query.size()==0)//如果数据不存在，才允许插入数据，保证数据的唯一性
+        {
+            try {
+                String sql="insert into water_quality (belongStation,dateTime,pH,DO,NH4,CODMn,TOC,level) values (?,?,?,?,?,?,?,?)";
+                update = template.update(sql, waterQuality.getBelongStation(),
+                        waterQuality.getDateTime(), waterQuality.getpH(), waterQuality.getdO(), waterQuality.getnH4(),
+                        waterQuality.getcODMn(), waterQuality.gettOC(), waterQuality.getLevel());
+            } catch (Exception e) {
+                System.out.println(e);
+            }
+
+
+        }
+
+        if(update==0)
+        {
+            return false;
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+    @Override
+    public List<WaterQuality> findByName(String stationName)//通过水质信息所属站点名来查询水质信息
+    {
+        List<WaterQuality> list=null;
+        try
+        {
+            String sql="select * from water_quality where belongStation=?";
+            list = template.query(sql, new BeanPropertyRowMapper<WaterQuality>(WaterQuality.class), stationName);
+        } catch (Exception e)
+        {
+            System.out.println(e);
+        }
+        return list;
+    }
+
+    @Override
+    public boolean update(WaterQuality waterQuality)//更新水质信息
+    {
+        int update=0;
+        try
+        {
+            String sql="update water_quality set belongStation=?,dateTime=?,pH=?,DO=?,NH4=?,CODMn=?,TOC=?,level=?  where id=?";
+            update = template.update(sql, waterQuality.getBelongStation(),
+                    waterQuality.getDateTime(), waterQuality.getpH(), waterQuality.getdO(), waterQuality.getnH4(),
+                    waterQuality.getcODMn(), waterQuality.gettOC(), waterQuality.getLevel(), waterQuality.getId());
+        } catch (Exception e)
+        {
+            System.out.println(e);
+        }
+        return update!=0;
+    }
+
+    @Override
+    public boolean del(int id)//通过id删除水质信息
+    {
+        int update=0;
+        try
+        {
+            String sql="delete from water_quality where id=?";
+            update = template.update(sql, id);
+        } catch (Exception e)
+        {
+            System.out.println(e);
+        }
+        return update!=0;
+    }
+
+    @Override
+    public WaterQuality findNewestRecord(String stationName)//返回某站点最新的水质信息
+    {
+        WaterQuality waterQuality = null;
+        try
+        {
+            String sql="SELECT * FROM water_quality WHERE belongStation=? ORDER BY DATETIME DESC LIMIT 1";
+            waterQuality = template.queryForObject(sql, new BeanPropertyRowMapper<WaterQuality>(WaterQuality.class),stationName);
+        } catch (Exception e)
+        {
+            System.out.println(e);
+        }
+        return waterQuality;
+    }
+
+    @Override
+    public List<WaterQuality> findPollutedWater()//查询到有污染的水质信息
+    {
+        List<WaterQuality> list=null;
+        try {
+            String sql="SELECT * FROM water_quality WHERE  \n" +
+                    "(LEVEL='Ⅳ' OR LEVEL='Ⅴ' OR LEVEL='劣Ⅴ') AND TO_DAYS(NOW())- TO_DAYS(DATETIME)<= 1 ORDER BY DATETIME DESC ";
+            list = template.query(sql, new BeanPropertyRowMapper<WaterQuality>(WaterQuality.class));
+        } catch (Exception e) {
+            System.out.println(e);
+        }
+        return list;
+    }
+
+    @Override
+    public List<WaterQuality> findByNameAndTime(String name, String startTime, String endTime,String level)
+            //通过站点名以及某一时间段以及污染级别来查询水质信息
+    {
+        StringBuilder stringBuilder=new StringBuilder("SELECT * FROM water_quality WHERE 1=1 ");
+        LinkedList<String> list=new LinkedList<>();
+        if(name!=null&&!name.equals(""))
+        {
+            stringBuilder.append(" AND belongStation LIKE ? ");
+            list.add("%"+name+"%");
+        }
+        if(startTime!=null&&!startTime.equals("")&&!startTime.equals(":00"))
+        {
+            stringBuilder.append(" AND DATETIME >=? ");
+            list.add(startTime);
+        }
+        if(endTime!=null&&!endTime.equals("")&&!endTime.equals(":00"))
+        {
+            stringBuilder.append(" AND DATETIME <=? ");
+            list.add(endTime);
+        }
+        if(level!=null&&!level.equals("")&&!level.equals("--水质类别--"))
+        {
+            stringBuilder.append(" AND level =? ");
+            list.add(level);
+        }
+        stringBuilder.append(" ORDER BY DATETIME DESC ");
+        String sql=stringBuilder.toString();
+        System.out.println(sql);
+        Object[] objects =list.toArray();
+        List<WaterQuality> query = null;
+        try {
+            query = template.query(sql, new BeanPropertyRowMapper<WaterQuality>(WaterQuality.class), objects);
+        } catch (Exception e) {
+            System.out.println(e);
+        }
+        return query;
+    }
+
+    @Override
+    public List<WaterQuality> findByStationName(String name)//通过水质所属站点查询水质信息，并通过时间排序
+    {
+        List<WaterQuality> query = null;
+        try {
+            String sql="SELECT * FROM water_quality WHERE belongStation=? ORDER BY DATETIME";
+            query = template.query(sql, new BeanPropertyRowMapper<WaterQuality>(WaterQuality.class), name);
+        } catch (Exception e) {
+            System.out.println(e);
+        }
+        return query;
+    }
+
+    @Override
+    public List<WaterQuality> findWeekData()//查询最近一周的水质信息
+    {
+        List<WaterQuality> query = null;
+        try {
+            String sql="SELECT * FROM water_quality WHERE TO_DAYS(NOW())-TO_DAYS(DATETIME)<=6 ORDER BY DATETIME DESC";
+            query = template.query(sql, new BeanPropertyRowMapper<WaterQuality>(WaterQuality.class));
+        } catch (Exception e) {
+            System.out.println(e);
+        }
+        return query;
+    }
+
+
+}
diff --git a/src/src_houduan/service/WaterLevelService.java b/src/src_houduan/service/WaterLevelService.java
new file mode 100644
index 0000000..8b803e3
--- /dev/null
+++ b/src/src_houduan/service/WaterLevelService.java
@@ -0,0 +1,22 @@
+package service;
+
+import domain.PageBean;//分页对象
+import domain.WaterLevel;
+
+import java.util.List;
+import java.util.Map;
+
+public interface WaterLevelService
+{
+    public abstract PageBean<WaterLevel> findAllByPage(int currentPage,int pageSize);
+    public abstract int findAllCount();
+    public abstract boolean addWaterLevelInfo(WaterLevel waterLevel);
+    public abstract int addManyLevel(List<WaterLevel> levelList);
+    public abstract boolean update(WaterLevel waterLevel);
+    public abstract boolean deleteInfo(int id);
+    public abstract PageBean<WaterLevel> conditionalQueryByPage(int currentPage,int pageSize, Map<String, String[]> condition);
+    public abstract int conditionalFindAllCount(Map<String, String[]> condition);
+    public abstract List<WaterLevel> findBySiteName(String siteName);
+    public abstract List<WaterLevel> findWeekData();
+
+}
diff --git a/src/src_houduan/service/WaterQualityService.java b/src/src_houduan/service/WaterQualityService.java
new file mode 100644
index 0000000..782b545
--- /dev/null
+++ b/src/src_houduan/service/WaterQualityService.java
@@ -0,0 +1,30 @@
+package service;
+
+import dao.WaterQualityDao;
+import dao.impl.WaterQualityDaoImpl;
+import domain.Statistics;
+import domain.WaterQuality;
+
+import java.util.List;
+
+/**
+ * @author laoyingyong
+ * @date: 2020-01-20 15:15
+ */
+public interface WaterQualityService
+{
+    public abstract int add(List<WaterQuality> waterQualityList);
+
+    public abstract boolean addOne(WaterQuality waterQuality);
+    public abstract List<WaterQuality> findByName(String stationName);
+    public abstract boolean update(WaterQuality waterQuality);
+    public abstract boolean del(int id);
+    public abstract Statistics count(String stationName);
+    public abstract WaterQuality findNewestRecord(String stationName);
+    public abstract List<WaterQuality> findPollutedWater();
+    public abstract List<WaterQuality> findByNameAndTime(String name,String startTime,String endTime,String level);
+    public abstract List<WaterQuality> findByStationName(String name);
+    public abstract List<WaterQuality> findWeekData();
+
+
+}
diff --git a/src/src_houduan/service/impl/WaterLevelServiceImpl.java b/src/src_houduan/service/impl/WaterLevelServiceImpl.java
new file mode 100644
index 0000000..1878350
--- /dev/null
+++ b/src/src_houduan/service/impl/WaterLevelServiceImpl.java
@@ -0,0 +1,107 @@
+package service.impl;
+
+import dao.WaterLevelDao;
+import dao.impl.WaterLevelDaoImpl;
+import domain.PageBean;
+import domain.WaterLevel;
+import service.WaterLevelService;
+
+import java.util.List;
+import java.util.Map;
+
+public class WaterLevelServiceImpl implements WaterLevelService
+{
+    WaterLevelDao dao=new WaterLevelDaoImpl();
+    @Override
+    public PageBean<WaterLevel> findAllByPage(int currentPage,int pageSize)
+    {
+        PageBean<WaterLevel> pageBean=new PageBean<>();
+        pageBean.setCurrentPage(currentPage);
+        pageBean.setRows(pageSize);
+        int totalCount = dao.findAllCount();
+        pageBean.setTotalCount(totalCount);
+        int start=(currentPage-1)*pageSize;
+        List<WaterLevel> allByPage = dao.findAllByPage(start, pageSize);
+        pageBean.setList(allByPage);
+        int totalPage=totalCount%pageSize==0?totalCount/pageSize:(totalCount/pageSize+1);
+        pageBean.setTotalPage(totalPage);
+        return pageBean;
+    }
+
+    @Override
+    public int findAllCount()
+    {
+        return dao.findAllCount();
+    }
+
+    @Override
+    public boolean addWaterLevelInfo(WaterLevel waterLevel)
+    {
+        boolean b = dao.addWaterLevelInfo(waterLevel);
+        return b;
+    }
+
+    @Override
+    public int addManyLevel(List<WaterLevel> levelList)
+    {
+        int count=0;
+        for (WaterLevel waterLevel : levelList)
+        {
+            boolean b = dao.addWaterLevelInfo(waterLevel);
+            if (b)
+            {
+                count++;
+            }
+
+        }
+        return count;
+    }
+
+    @Override
+    public boolean update(WaterLevel waterLevel)
+    {
+        boolean update = dao.update(waterLevel);
+        return update;
+    }
+
+    @Override
+    public boolean deleteInfo(int id)
+    {
+        boolean b = dao.deleteInfo(id);
+        return b;
+    }
+
+    @Override
+    public PageBean<WaterLevel> conditionalQueryByPage(int currentPage, int pageSize, Map<String, String[]> condition)
+    {
+        PageBean<WaterLevel> pageBean=new PageBean<>();
+        int totalCount= dao.conditionalFindAllCount(condition);
+        pageBean.setTotalCount(totalCount);
+        int totalPage=totalCount%pageSize==0?totalCount/pageSize:(totalCount/pageSize+1);
+        pageBean.setTotalPage(totalPage);
+        pageBean.setCurrentPage(currentPage);
+        pageBean.setRows(pageSize);
+        List<WaterLevel> list = dao.conditionalQueryByPage((currentPage - 1) * pageSize, pageSize, condition);
+        pageBean.setList(list);
+
+
+        return pageBean;
+    }
+
+    @Override
+    public int conditionalFindAllCount(Map<String, String[]> condition)
+    {
+        int i = dao.conditionalFindAllCount(condition);
+        return i;
+    }
+
+    @Override
+    public List<WaterLevel> findBySiteName(String siteName) {
+        return dao.findBySiteName(siteName);
+    }
+
+    @Override
+    public List<WaterLevel> findWeekData() {
+        return dao.findWeekData();
+    }
+}
diff --git a/src/src_houduan/service/impl/WaterQualityServiceImpl.java b/src/src_houduan/service/impl/WaterQualityServiceImpl.java
new file mode 100644
index 0000000..9da9cae
--- /dev/null
+++ b/src/src_houduan/service/impl/WaterQualityServiceImpl.java
@@ -0,0 +1,146 @@
+package service.impl;
+
+import dao.WaterQualityDao;
+import dao.impl.WaterQualityDaoImpl;
+import domain.Statistics;
+import domain.WaterQuality;
+import service.WaterQualityService;
+
+import java.util.List;
+
+/**
+ * @author laoyingyong
+ * @date: 2020-01-20 15:18
+ */
+public class WaterQualityServiceImpl implements WaterQualityService
+{
+    WaterQualityDao dao=new WaterQualityDaoImpl();
+
+    @Override
+    public int add(List<WaterQuality> waterQualityList)
+    {
+        int count=0;
+        for (WaterQuality waterQuality : waterQualityList)
+        {
+            boolean flag = dao.add(waterQuality);
+            if(flag)
+            {
+                count++;
+            }
+
+        }
+        return count;//返回的是添加成功的记录数
+    }
+
+    @Override
+    public boolean addOne(WaterQuality waterQuality)
+    {
+        boolean add = dao.add(waterQuality);
+        return add;
+    }
+
+    @Override
+    public List<WaterQuality> findByName(String stationName)
+    {
+        List<WaterQuality>  list= dao.findByName(stationName);
+        return list;
+    }
+
+    @Override
+    public boolean update(WaterQuality waterQuality)
+    {
+        return dao.update(waterQuality);
+    }
+
+    @Override
+    public boolean del(int id)
+    {
+        return dao.del(id);
+    }
+
+    @Override
+    public Statistics count(String stationName)
+    {
+        int a=0;
+        int b=0;
+        int c=0;
+        int d=0;
+        int e=0;
+        int f=0;
+        int g=0;
+        List<WaterQuality> list = dao.findByName(stationName);
+        for (WaterQuality waterQuality : list)
+        {
+            String level = waterQuality.getLevel();
+            if(level.equals("Ⅰ"))
+            {
+                a++;
+            }
+            else if(level.equals("Ⅱ"))
+            {
+                b++;
+            }
+            else if(level.equals("Ⅲ"))
+            {
+                c++;
+            }
+            else if(level.equals("Ⅳ"))
+            {
+                d++;
+            }
+            else if(level.equals("Ⅴ"))
+            {
+                e++;
+            }
+            else if(level.equals("劣Ⅴ"))
+            {
+                f++;
+            }
+            else
+            {
+                g++;
+            }
+
+        }
+        Statistics statistics=new Statistics();
+        statistics.setA(a);
+        statistics.setB(b);
+        statistics.setC(c);
+        statistics.setD(d);
+        statistics.setE(e);
+        statistics.setF(f);
+        statistics.setG(g);
+
+        return statistics;
+    }
+
+    @Override
+    public WaterQuality findNewestRecord(String stationName)
+    {
+        return dao.findNewestRecord(stationName);
+    }
+
+    @Override
+    public List<WaterQuality> findPollutedWater() {
+        return dao.findPollutedWater();
+    }
+
+    @Override
+    public List<WaterQuality> findByNameAndTime(String name, String startTime, String endTime,String level) {
+        return dao.findByNameAndTime(name,startTime,endTime,level);
+    }
+
+    @Override
+    public List<WaterQuality> findByStationName(String name)
+    {
+        return dao.findByStationName(name);
+    }
+
+    @Override
+    public List<WaterQuality> findWeekData()
+    {
+        return dao.findWeekData();
+    }
+
+
+}
diff --git a/src/src_houduan/web/servlet/waterLevel/AddManyWaterLevelServlet.java b/src/src_houduan/web/servlet/waterLevel/AddManyWaterLevelServlet.java
new file mode 100644
index 0000000..149177d
--- /dev/null
+++ b/src/src_houduan/web/servlet/waterLevel/AddManyWaterLevelServlet.java
@@ -0,0 +1,81 @@
+package web.servlet.waterLevel;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import domain.ResultInfo;
+import domain.WaterLevel;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+import service.WaterLevelService;
+import service.impl.WaterLevelServiceImpl;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URL;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author laoyingyong
+ * @date: 2020-01-20 20:46
+ */
+@WebServlet("/AddManyWaterLevelServlet")
+public class AddManyWaterLevelServlet extends HttpServlet
+{
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+        int i=0;
+        WaterLevelService service=new WaterLevelServiceImpl();
+
+        Document document = Jsoup.parse(new URL("http://www.hrc.gov.cn/swj/"), 5000);
+        Elements elements = document.select("[class=shuiqing_table] tr");
+
+        List<WaterLevel> list=new ArrayList<>();
+        for (Element element : elements)//遍历所有行
+        {
+            System.out.println(element.text());
+            WaterLevel waterLevel=new WaterLevel();
+            Elements tds = element.select("td");
+            waterLevel.setRiverName(tds.get(0).text());
+            waterLevel.setSiteName(tds.get(1).text());
+            try
+            {
+                String str=tds.get(2).text()+":00";
+                waterLevel.setCollectionDate(Timestamp.valueOf(str));
+                waterLevel.setWaterLevel(Double.parseDouble(tds.get(3).text()));
+                String liuliang=tds.get(4).text();
+                if(liuliang.length()!=0&&!liuliang.equals(""))
+                {
+                    waterLevel.setFlow(Double.parseDouble(tds.get(4).text()));
+                }
+                waterLevel.setOver(Double.parseDouble(tds.get(5).text()));
+            } catch (Exception e)
+            {
+                System.out.println(e);
+            }
+            list.add(waterLevel);
+
+        }
+        i = service.addManyLevel(list);
+        System.out.println(list);
+        ObjectMapper mapper=new ObjectMapper();
+        ResultInfo info=new ResultInfo();
+        info.setMsg("总共同步了"+i+"条数据");
+        response.setContentType("application/json;charset=utf-8");
+        mapper.writeValue(response.getOutputStream(),info);
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+
+        this.doPost(request, response);
+
+    }
+}
diff --git a/src/src_houduan/web/servlet/waterLevel/AddWaterLevelDataServlet.java b/src/src_houduan/web/servlet/waterLevel/AddWaterLevelDataServlet.java
new file mode 100644
index 0000000..096f035
--- /dev/null
+++ b/src/src_houduan/web/servlet/waterLevel/AddWaterLevelDataServlet.java
@@ -0,0 +1,83 @@
+package web.servlet.waterLevel;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import domain.ResultInfo;
+import domain.WaterLevel;
+import service.WaterLevelService;
+import service.impl.WaterLevelServiceImpl;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.sql.Date;
+import java.sql.Timestamp;
+
+@WebServlet("/AddWaterLevelDataServlet")
+public class AddWaterLevelDataServlet extends HttpServlet
+{
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+        request.setCharacterEncoding("utf-8");
+        String riverName = request.getParameter("riverName");
+        String siteName = request.getParameter("siteName");
+        String collectionDate = request.getParameter("collectionDate");
+        System.out.println(collectionDate);
+        String waterLevel = request.getParameter("waterLevel");
+        String flow = request.getParameter("flow");
+        String over = request.getParameter("over");
+
+
+        WaterLevel waterLevelObj=new WaterLevel();
+
+        try
+        {
+            if(riverName!=null&&riverName.length()!=0)
+            {waterLevelObj.setRiverName(riverName);}
+            if (siteName!=null&&siteName.length()!=0)
+            {waterLevelObj.setSiteName(siteName);}
+            String date="";
+            if(collectionDate!=null&&collectionDate.length()!=0)
+            {
+                date=collectionDate.replace("T"," ")+":00";//多出来一个T,必须去掉
+                waterLevelObj.setCollectionDate(Timestamp.valueOf(date));
+            }
+            if(waterLevel!=null&&waterLevel.length()!=0)
+            {waterLevelObj.setWaterLevel(Double.parseDouble(waterLevel));}
+            if(flow!=null&&flow.length()!=0)
+            {waterLevelObj.setFlow(Double.parseDouble(flow));}
+            if(over!=null&&over.length()!=0)
+            { waterLevelObj.setOver(Double.parseDouble(over));}
+
+        } catch (Exception e)
+        {
+            System.out.println(e);
+        }
+
+        WaterLevelService service=new WaterLevelServiceImpl();
+        boolean b = service.addWaterLevelInfo(waterLevelObj);
+        ResultInfo info=new ResultInfo();
+        if(b)
+        {
+            info.setMsg("添加成功！");
+        }
+        else
+        {
+            info.setMsg("添加失败，请核对输入数据是否有误！");
+        }
+        ObjectMapper mapper=new ObjectMapper();
+        response.setContentType("application/json;charset=utf-8");
+        mapper.writeValue(response.getOutputStream(),info);
+
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+
+        this.doPost(request, response);
+
+    }
+}
diff --git a/src/src_houduan/web/servlet/waterLevel/ConditionQueryByPageServlet.java b/src/src_houduan/web/servlet/waterLevel/ConditionQueryByPageServlet.java
new file mode 100644
index 0000000..d08268b
--- /dev/null
+++ b/src/src_houduan/web/servlet/waterLevel/ConditionQueryByPageServlet.java
@@ -0,0 +1,62 @@
+package web.servlet.waterLevel;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import domain.PageBean;
+import domain.WaterLevel;
+import service.WaterLevelService;
+import service.impl.WaterLevelServiceImpl;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Map;
+
+@WebServlet("/ConditionQueryByPageServlet")
+public class ConditionQueryByPageServlet extends HttpServlet
+{
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+        request.setCharacterEncoding("utf-8");
+        WaterLevelService service=new WaterLevelServiceImpl();
+        Map<String, String[]> parameterMap = request.getParameterMap();
+        int totalCount = service.conditionalFindAllCount(parameterMap); //总的记录数
+
+        String currentPage = request.getParameter("currentPage2");
+        String pageSize = request.getParameter("pageSize2");
+        int intCurrentPage = 1;
+        int intPageSize = 5;
+        try {
+            intCurrentPage = Integer.parseInt(currentPage);
+            intPageSize = Integer.parseInt(pageSize);
+        } catch (NumberFormatException e) {
+            System.out.println(e);
+        }
+        int totalPage=totalCount%intPageSize==0?totalCount/intPageSize:(totalCount/intPageSize+1);
+        if(intCurrentPage<=0)
+        {
+            intCurrentPage=1;
+        }
+        if(intCurrentPage>totalPage)
+        {
+            intCurrentPage=totalPage;
+
+        }
+
+        PageBean<WaterLevel> bean = service.conditionalQueryByPage(intCurrentPage, intPageSize, parameterMap);
+        ObjectMapper mapper=new ObjectMapper();
+        response.setContentType("application/json;chartset=utf-8");
+        System.out.println(bean);
+        mapper.writeValue(response.getOutputStream(),bean);
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+
+        this.doPost(request, response);
+
+    }
+}
diff --git a/src/src_houduan/web/servlet/waterLevel/CurrentWaterLevelServlet.java b/src/src_houduan/web/servlet/waterLevel/CurrentWaterLevelServlet.java
new file mode 100644
index 0000000..a1d1021
--- /dev/null
+++ b/src/src_houduan/web/servlet/waterLevel/CurrentWaterLevelServlet.java
@@ -0,0 +1,72 @@
+package web.servlet.waterLevel;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import domain.WaterLevel;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URL;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author laoyingyong
+ * @date: 2020-01-13 14:51
+ */
+@WebServlet("/CurrentWaterLevelServlet")
+public class CurrentWaterLevelServlet extends HttpServlet
+{
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+        Document document = Jsoup.parse(new URL("http://www.hrc.gov.cn/swj/"), 5000);
+        Elements elements = document.select("[class=shuiqing_table] tr");
+
+        List<WaterLevel> list=new ArrayList<>();
+        for (Element element : elements)//遍历所有行
+        {
+            System.out.println(element.text());
+            WaterLevel waterLevel=new WaterLevel();
+            Elements tds = element.select("td");
+            waterLevel.setRiverName(tds.get(0).text());
+            waterLevel.setSiteName(tds.get(1).text());
+            try
+            {
+                waterLevel.setCollectionDate(Timestamp.valueOf(tds.get(2).text()+":00"));
+                waterLevel.setWaterLevel(Double.parseDouble(tds.get(3).text()));
+                String liuliang=tds.get(4).text();
+                if(liuliang.length()!=0&&!liuliang.equals(""))//流量比较特殊，可能淮河水文局网站上没有给出数据
+                {
+                    waterLevel.setFlow(Double.parseDouble(tds.get(4).text()));
+                }
+                waterLevel.setOver(Double.parseDouble(tds.get(5).text()));
+            } catch (Exception e)
+            {
+                System.out.println(e);
+            }
+            list.add(waterLevel);
+
+        }
+        System.out.println(list);
+        ObjectMapper mapper=new ObjectMapper();
+        response.setContentType("application/json;charset=utf-8");
+        mapper.writeValue(response.getOutputStream(),list);
+
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+
+        this.doPost(request, response);
+
+    }
+}
diff --git a/src/src_houduan/web/servlet/waterLevel/DeleteInfoServlet.java b/src/src_houduan/web/servlet/waterLevel/DeleteInfoServlet.java
new file mode 100644
index 0000000..9a00177
--- /dev/null
+++ b/src/src_houduan/web/servlet/waterLevel/DeleteInfoServlet.java
@@ -0,0 +1,46 @@
+package web.servlet.waterLevel;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import domain.ResultInfo;
+import service.WaterLevelService;
+import service.impl.WaterLevelServiceImpl;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet("/DeleteInfoServlet")
+public class DeleteInfoServlet extends HttpServlet
+{
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+        String id = request.getParameter("id");
+        WaterLevelService service=new WaterLevelServiceImpl();
+        boolean b = service.deleteInfo(Integer.parseInt(id));
+
+        ResultInfo info=new ResultInfo();
+        if(b)
+        {
+            info.setMsg("删除成功！");
+        }
+        else
+        {
+            info.setMsg("删除失败！");
+        }
+
+        ObjectMapper mapper=new ObjectMapper();
+        response.setContentType("application/json;charset=utf-8");
+        mapper.writeValue(response.getOutputStream(),info);
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+
+        this.doPost(request, response);
+
+    }
+}
diff --git a/src/src_houduan/web/servlet/waterLevel/FindAllByPageServlet.java b/src/src_houduan/web/servlet/waterLevel/FindAllByPageServlet.java
new file mode 100644
index 0000000..ec6ee8e
--- /dev/null
+++ b/src/src_houduan/web/servlet/waterLevel/FindAllByPageServlet.java
@@ -0,0 +1,63 @@
+package web.servlet.waterLevel;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import domain.PageBean;
+import domain.WaterLevel;
+import service.WaterLevelService;
+import service.impl.WaterLevelServiceImpl;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@WebServlet("/FindAllByPageServlet")
+public class FindAllByPageServlet extends HttpServlet
+{
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+        WaterLevelService service=new WaterLevelServiceImpl();
+        int totalCount = service.findAllCount();
+
+
+        String currentPage = request.getParameter("currentPage");
+        String pageSize = request.getParameter("pageSize");
+
+        int intCurrentPage = 1;
+        int intPageSize = 5;
+        try {
+            intCurrentPage = Integer.parseInt(currentPage);
+            intPageSize = Integer.parseInt(pageSize);
+        } catch (NumberFormatException e) {
+            System.out.println(e);
+        }
+        if(intCurrentPage==0)
+        {
+            intCurrentPage = 1;
+        }
+        int totalPage=totalCount%intPageSize==0?totalCount/intPageSize:(totalCount/intPageSize+1);
+        if(intCurrentPage>totalPage)
+        {
+            intCurrentPage=totalPage;
+        }
+
+        PageBean<WaterLevel> pageBean = service.findAllByPage(intCurrentPage, intPageSize);
+        System.out.println(pageBean);
+
+        ObjectMapper mapper=new ObjectMapper();
+        response.setContentType("application/json;charset=utf-8");
+        mapper.writeValue(response.getOutputStream(),pageBean);
+
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+
+        this.doPost(request, response);
+
+    }
+}
diff --git a/src/src_houduan/web/servlet/waterLevel/FindBySiteNameServlet.java b/src/src_houduan/web/servlet/waterLevel/FindBySiteNameServlet.java
new file mode 100644
index 0000000..573bd6d
--- /dev/null
+++ b/src/src_houduan/web/servlet/waterLevel/FindBySiteNameServlet.java
@@ -0,0 +1,41 @@
+package web.servlet.waterLevel;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import domain.WaterLevel;
+import service.WaterLevelService;
+import service.impl.WaterLevelServiceImpl;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author laoyingyong
+ * @date: 2020-02-06 12:43
+ */
+@WebServlet("/FindBySiteNameServlet")
+public class FindBySiteNameServlet extends HttpServlet
+{
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+        request.setCharacterEncoding("utf-8");
+        String siteName = request.getParameter("siteName");
+        WaterLevelService service=new WaterLevelServiceImpl();
+        List<WaterLevel> list = service.findBySiteName(siteName);
+        ObjectMapper mapper=new ObjectMapper();
+        response.setContentType("application/json;chartset=utf-8");
+        mapper.writeValue(response.getOutputStream(),list);
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+
+        this.doPost(request, response);
+
+    }
+}
diff --git a/src/src_houduan/web/servlet/waterLevel/UpdateWaterLevelData.java b/src/src_houduan/web/servlet/waterLevel/UpdateWaterLevelData.java
new file mode 100644
index 0000000..64000cb
--- /dev/null
+++ b/src/src_houduan/web/servlet/waterLevel/UpdateWaterLevelData.java
@@ -0,0 +1,75 @@
+package web.servlet.waterLevel;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import domain.ResultInfo;
+import domain.WaterLevel;
+import service.WaterLevelService;
+import service.impl.WaterLevelServiceImpl;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.sql.Date;
+import java.sql.Timestamp;
+import java.util.Map;
+
+@WebServlet("/UpdateWaterLevelData")
+public class UpdateWaterLevelData extends HttpServlet
+{
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+        request.setCharacterEncoding("utf-8");
+        String id = request.getParameter("id");
+        String waterLevel = request.getParameter("shuiwei");
+        String riverName = request.getParameter("riverName");
+        String siteName = request.getParameter("siteName");
+        String over = request.getParameter("chaoguo");
+        String flow = request.getParameter("flow");
+        String collectionDate = request.getParameter("caijiriqi");
+
+
+        WaterLevel waterLevelObj=new WaterLevel();
+
+        try {
+            waterLevelObj.setId(Integer.parseInt(id));
+            waterLevelObj.setWaterLevel(Double.parseDouble(waterLevel));
+            waterLevelObj.setRiverName(riverName);
+            waterLevelObj.setSiteName(siteName);
+            waterLevelObj.setFlow(Double.parseDouble(flow));
+            waterLevelObj.setOver(Double.parseDouble(over));
+            waterLevelObj.setCollectionDate(Timestamp.valueOf(collectionDate+":00"));
+
+        } catch (Exception e) {
+            System.out.println(e);
+        }
+        System.out.println(waterLevelObj);
+
+        WaterLevelService service=new WaterLevelServiceImpl();
+        boolean update = service.update(waterLevelObj);
+
+        ResultInfo info=new ResultInfo();
+        if(update)
+        {
+            info.setMsg("更新成功！");
+        }
+        else
+        {
+            info.setMsg("更新失败！");
+        }
+        ObjectMapper mapper=new ObjectMapper();
+        response.setContentType("application/json;charset=utf-8");
+        mapper.writeValue(response.getOutputStream(),info);
+
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+
+        this.doPost(request, response);
+
+    }
+}
diff --git a/src/src_houduan/web/servlet/waterQuality/AddOneWaterQualityServlet.java b/src/src_houduan/web/servlet/waterQuality/AddOneWaterQualityServlet.java
new file mode 100644
index 0000000..e0c41a4
--- /dev/null
+++ b/src/src_houduan/web/servlet/waterQuality/AddOneWaterQualityServlet.java
@@ -0,0 +1,88 @@
+package web.servlet.waterQuality;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import domain.ResultInfo;
+import domain.WaterQuality;
+import service.WaterQualityService;
+import service.impl.WaterQualityServiceImpl;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.sql.Timestamp;
+
+/**
+ * @author laoyingyong
+ * @date: 2020-01-20 16:01
+ */
+@WebServlet("/AddOneWaterQualityServlet")
+public class AddOneWaterQualityServlet extends HttpServlet
+{
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+        WaterQualityService service=new WaterQualityServiceImpl();
+        String belongStation = request.getParameter("belongStation");
+        String dateTime = request.getParameter("date");
+        System.out.println(dateTime);
+        String pH = request.getParameter("ph");
+        String oxygen = request.getParameter("oxygen");
+        String nitrogen = request.getParameter("nitrogen");
+        String permangan = request.getParameter("permangan");
+        String orgacarbon = request.getParameter("orgacarbon");
+        String level = request.getParameter("waterQuality");
+
+        WaterQuality waterQuality=new WaterQuality();
+        try
+        {
+            if(belongStation!=null&&!belongStation.equals(""))
+            waterQuality.setBelongStation(belongStation);
+            if(dateTime!=null&&!dateTime.equals(""))
+            {waterQuality.setDateTime(Timestamp.valueOf(dateTime.replace("T"," ")+":00"));}
+            if(pH!=null&&!pH.equals(""))
+            {waterQuality.setpH(Double.parseDouble(pH));}
+            if(oxygen!=null&&!oxygen.equals(""))
+            {waterQuality.setdO(Double.parseDouble(oxygen));}
+            if(nitrogen!=null&&!nitrogen.equals(""))
+            {waterQuality.setnH4(Double.parseDouble(nitrogen));}
+            if(permangan!=null&&!permangan.equals(""))
+            {waterQuality.setcODMn(Double.parseDouble(permangan));}
+            if(orgacarbon!=null&&!orgacarbon.equals(""))
+            {waterQuality.settOC(Double.parseDouble(orgacarbon));}
+            if (level!=null&&!level.equals(""))
+            {waterQuality.setLevel(level);}
+
+        } catch (Exception e)
+        {
+            System.out.println(e);
+        }finally
+        {
+
+            boolean b = service.addOne(waterQuality);
+            ResultInfo info=new ResultInfo();
+            if (b)
+            {
+                info.setMsg("添加成功！");
+            }
+            else
+            {
+                info.setMsg("添加失败！");
+            }
+
+            ObjectMapper mapper=new ObjectMapper();
+            response.setContentType("application/json;charset=utf8");
+            mapper.writeValue(response.getOutputStream(),info);
+
+        }
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+
+        this.doPost(request, response);
+
+    }
+}
diff --git a/src/src_houduan/web/servlet/waterQuality/AddWaterQualityServlet.java b/src/src_houduan/web/servlet/waterQuality/AddWaterQualityServlet.java
new file mode 100644
index 0000000..6a676f0
--- /dev/null
+++ b/src/src_houduan/web/servlet/waterQuality/AddWaterQualityServlet.java
@@ -0,0 +1,188 @@
+package web.servlet.waterQuality;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import domain.ResultInfo;
+import domain.WaterQuality;
+import service.WaterQualityService;
+import service.impl.WaterQualityServiceImpl;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.sql.Timestamp;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * @author laoyingyong
+ * @date: 2020-01-20 15:01
+ */
+@WebServlet("/AddWaterQualityServlet")
+public class AddWaterQualityServlet extends HttpServlet
+{
+    private List<WaterQuality> qualityList;
+    private static String [] siteArray={"沙窝","清河闸","罗庄","密云水库","后城",
+            "土门楼","万家码头","海河大闸","蓟运河防潮闸",
+            "于桥水库库中心","三岔口"};
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+        WaterQualityService service=new WaterQualityServiceImpl();
+
+        //参数字符串，如果拼接在请求链接之后，需要对中文进行 URLEncode   字符集 UTF-8
+        String param = "AreaID=&RiverID=&MNName=&PageIndex=1&PageSize=60&action=getRealDatas";
+        StringBuilder sb = new StringBuilder();
+        InputStream is = null;
+        BufferedReader br = null;
+        PrintWriter out = null;
+        try
+        {
+            //接口地址
+            String url = "https://szzdjc.cnemc.cn:8070/GJZ/Ajax/Publish.ashx";
+            URL uri = new URL(url);
+            HttpURLConnection connection = (HttpURLConnection) uri.openConnection();
+            connection.setRequestMethod("POST");
+            connection.setConnectTimeout(50000);
+            connection.setReadTimeout(12000);
+            connection.setRequestProperty("accept", "*/*");
+            //发送参数
+            connection.setDoOutput(true);
+            out = new PrintWriter(connection.getOutputStream());
+            out.print(param);
+            out.flush();
+            //接收结果
+            is = connection.getInputStream();
+            br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+            String line;
+            //缓冲逐行读取
+            while ((line = br.readLine()) != null)
+            {
+                sb.append(line);
+            }
+            String backStr = sb.toString();
+            String body = backStr;
+            System.out.println(backStr);
+            ScriptEngineManager sem = new ScriptEngineManager();
+
+            ScriptEngine engine = sem.getEngineByExtension("js");
+
+            String traseStr = null;
+            try {
+                traseStr = (String) engine.eval("unescape('" + body + "')");
+            } catch (ScriptException e) {
+                e.printStackTrace();
+
+            }
+            traseStr = traseStr.replaceAll("<br>", "\r\n");
+            traseStr = traseStr.replaceAll("<.*?>", "");
+            String a= "["+traseStr+"]";
+            System.out.println(a);
+            JSONArray jsonArray = JSONObject.parseArray(a);
+            JSONObject jsonObject = jsonArray.getJSONObject(0);
+            String jsonArray0 = jsonObject.getString("tbody");
+            System.out.println(jsonArray0);
+            JSONArray jsonArray1 = JSONObject.parseArray(jsonArray0);
+            qualityList=new LinkedList<>();
+
+            for (int i = 0; i < jsonArray1.size(); i++)
+            {
+                WaterQuality waterQuality=new WaterQuality();
+                JSONArray jsonArray2= (JSONArray) jsonArray1.get(i);
+                String siteName = jsonArray2.getString(2);
+                boolean b = Arrays.asList(siteArray).contains(siteName);
+                String dateTime = jsonArray2.getString(3);
+                String pH = jsonArray2.getString(6);
+                String aDo = jsonArray2.getString(7);
+                String nh4 = jsonArray2.getString(11);
+                String codMn = jsonArray2.getString(10);
+                String toc = jsonArray2.getString(12);
+                String level = jsonArray2.getString(4);
+                if (b)
+                {
+                    System.out.print(siteName+"\t");
+                    System.out.print(dateTime+"\t");
+                    System.out.print(pH+"\t");
+                    System.out.print(aDo+"\t");
+                    System.out.print(nh4+"\t");
+                    System.out.print(codMn+"\t");
+                    System.out.print(toc+"\t");
+                    System.out.println(level);
+
+                    waterQuality.setBelongStation(siteName);
+                    waterQuality.setDateTime(Timestamp.valueOf("2022-"+dateTime+":00"));
+                    if(!pH.equals("--"))
+                        waterQuality.setpH(Double.parseDouble(pH));
+                    if(!aDo.equals("--"))
+                        waterQuality.setdO(Double.parseDouble(aDo));
+                    if(!nh4.equals("--"))
+                        waterQuality.setnH4(Double.parseDouble(nh4));
+                    if(!codMn.equals("--"))
+                        waterQuality.setcODMn(Double.parseDouble(codMn));
+                    if(!toc.equals("--"))
+                        waterQuality.settOC(Double.parseDouble(toc));
+                    if(!level.equals("--"))
+                        waterQuality.setLevel(level);
+                    qualityList.add(waterQuality);
+
+                }
+
+
+            }
+
+
+
+
+
+        } catch (Exception e)
+        {
+            System.out.println(e);
+        } finally
+        {
+            ObjectMapper mapper=new ObjectMapper();
+            response.setContentType("application/json;charset=utf8");
+            System.out.println(qualityList);
+            int add = service.add(qualityList);
+            ResultInfo info=new ResultInfo();
+            info.setMsg("总共同步了"+add+"条记录！");
+            mapper.writeValue(response.getOutputStream(),info);
+
+            //关闭流
+            try {
+                if (is != null)
+                {
+                    is.close();
+                }
+                if (br != null)
+                {
+                    br.close();
+                }
+                if (out != null)
+                {
+                    out.close();
+                }
+            } catch (Exception ignored)
+            {
+                System.out.println(ignored);
+            }
+
+        }
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+
+        this.doPost(request, response);
+
+    }
+}
\ No newline at end of file
diff --git a/src/src_houduan/web/servlet/waterQuality/DeleteWaterQualityInfoServlet.java b/src/src_houduan/web/servlet/waterQuality/DeleteWaterQualityInfoServlet.java
new file mode 100644
index 0000000..c09df09
--- /dev/null
+++ b/src/src_houduan/web/servlet/waterQuality/DeleteWaterQualityInfoServlet.java
@@ -0,0 +1,57 @@
+package web.servlet.waterQuality;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import domain.ResultInfo;
+import service.WaterQualityService;
+import service.impl.WaterQualityServiceImpl;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * @author laoyingyong
+ * @date: 2020-01-29 23:22
+ */
+@WebServlet("/DeleteWaterQualityInfoServlet")
+public class DeleteWaterQualityInfoServlet extends HttpServlet
+{
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+        String id = request.getParameter("id");
+        WaterQualityService service=new WaterQualityServiceImpl();
+        int i=0;
+        try
+        {
+            i = Integer.parseInt(id);
+        } catch (NumberFormatException e)
+        {
+            System.out.println(e);
+        }
+        boolean del = service.del(i);
+        ResultInfo info=new ResultInfo();
+        if(del)
+        {
+            info.setMsg("删除成功！");
+
+        }
+        else
+        {
+            info.setMsg("删除失败！");
+        }
+        ObjectMapper mapper=new ObjectMapper();
+        response.setContentType("application/json;charset=utf-8");
+        mapper.writeValue(response.getOutputStream(),info);
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+
+        this.doPost(request, response);
+
+    }
+}
diff --git a/src/src_houduan/web/servlet/waterQuality/FindLineServlet.java b/src/src_houduan/web/servlet/waterQuality/FindLineServlet.java
new file mode 100644
index 0000000..b878918
--- /dev/null
+++ b/src/src_houduan/web/servlet/waterQuality/FindLineServlet.java
@@ -0,0 +1,41 @@
+package web.servlet.waterQuality;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import domain.WaterQuality;
+import service.WaterQualityService;
+import service.impl.WaterQualityServiceImpl;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author laoyingyong
+ * @date: 2020-02-04 20:19
+ */
+@WebServlet("/FindLineServlet")
+public class FindLineServlet extends HttpServlet
+{
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+        request.setCharacterEncoding("utf-8");
+        String stationName = request.getParameter("stationName");//根据请求参数的名称获取请求参数的值
+
+        WaterQualityService service=new WaterQualityServiceImpl();
+        List<WaterQuality> list = service.findByStationName(stationName);
+        ObjectMapper mapper=new ObjectMapper();
+        response.setContentType("application/json;chartset=utf-8");
+        mapper.writeValue(response.getOutputStream(),list);
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+
+        this.doPost(request, response);
+
+    }
+}
diff --git a/src/src_houduan/web/servlet/waterQuality/FindNewestServlet.java b/src/src_houduan/web/servlet/waterQuality/FindNewestServlet.java
new file mode 100644
index 0000000..0149fcc
--- /dev/null
+++ b/src/src_houduan/web/servlet/waterQuality/FindNewestServlet.java
@@ -0,0 +1,41 @@
+package web.servlet.waterQuality;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import domain.WaterQuality;
+import service.WaterQualityService;
+import service.impl.WaterQualityServiceImpl;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * @author laoyingyong
+ * @date: 2020-01-31 17:44
+ */
+@WebServlet("/FindNewestServlet")
+public class FindNewestServlet extends HttpServlet
+{
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+        request.setCharacterEncoding("utf-8");
+        String stationName = request.getParameter("stationName");
+        WaterQualityService service=new WaterQualityServiceImpl();
+        WaterQuality newestRecord = service.findNewestRecord(stationName);
+        ObjectMapper mapper=new ObjectMapper();
+        response.setContentType("application/json;chartset=utf-8");
+        mapper.writeValue(response.getOutputStream(),newestRecord);
+
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+
+        this.doPost(request, response);
+
+    }
+}
diff --git a/src/src_houduan/web/servlet/waterQuality/FindPollutedWaterServlet.java b/src/src_houduan/web/servlet/waterQuality/FindPollutedWaterServlet.java
new file mode 100644
index 0000000..c1a08d8
--- /dev/null
+++ b/src/src_houduan/web/servlet/waterQuality/FindPollutedWaterServlet.java
@@ -0,0 +1,39 @@
+package web.servlet.waterQuality;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import domain.WaterQuality;
+import service.WaterQualityService;
+import service.impl.WaterQualityServiceImpl;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author laoyingyong
+ * @date: 2020-02-02 14:08
+ */
+@WebServlet("/FindPollutedWaterServlet")
+public class FindPollutedWaterServlet extends HttpServlet
+{
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+        WaterQualityService service=new WaterQualityServiceImpl();
+        List<WaterQuality> pollutedWater = service.findPollutedWater();
+        ObjectMapper mapper=new ObjectMapper();
+        response.setContentType("application/json;chartset=utf-8");
+        mapper.writeValue(response.getOutputStream(),pollutedWater);
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+
+        this.doPost(request, response);
+
+    }
+}
diff --git a/src/src_houduan/web/servlet/waterQuality/StatisticsWaterQualityServlet.java b/src/src_houduan/web/servlet/waterQuality/StatisticsWaterQualityServlet.java
new file mode 100644
index 0000000..abcc608
--- /dev/null
+++ b/src/src_houduan/web/servlet/waterQuality/StatisticsWaterQualityServlet.java
@@ -0,0 +1,40 @@
+package web.servlet.waterQuality;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import domain.Statistics;
+import service.WaterQualityService;
+import service.impl.WaterQualityServiceImpl;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * @author laoyingyong
+ * @date: 2020-01-30 13:03
+ */
+@WebServlet("/StatisticsWaterQualityServlet")
+public class StatisticsWaterQualityServlet extends HttpServlet
+{
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+        request.setCharacterEncoding("utf-8");
+        String stationName = request.getParameter("stationName");
+        WaterQualityService service=new WaterQualityServiceImpl();
+        Statistics count = service.count(stationName);
+        ObjectMapper mapper=new ObjectMapper();
+        response.setContentType("application/json;charset=utf-8");
+        mapper.writeValue(response.getOutputStream(),count);
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+
+        this.doPost(request, response);
+
+    }
+}
diff --git a/src/src_houduan/web/servlet/waterQuality/UpdateWaterQualityInfoServlet.java b/src/src_houduan/web/servlet/waterQuality/UpdateWaterQualityInfoServlet.java
new file mode 100644
index 0000000..8c8874e
--- /dev/null
+++ b/src/src_houduan/web/servlet/waterQuality/UpdateWaterQualityInfoServlet.java
@@ -0,0 +1,78 @@
+package web.servlet.waterQuality;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import domain.ResultInfo;
+import domain.WaterQuality;
+import service.WaterQualityService;
+import service.impl.WaterQualityServiceImpl;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.sql.Timestamp;
+
+/**
+ * @author laoyingyong
+ * @date: 2020-01-29 22:18
+ */
+@WebServlet("/UpdateWaterQualityInfoServlet")
+public class UpdateWaterQualityInfoServlet extends HttpServlet
+{
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+        request.setCharacterEncoding("utf-8");
+        String id = request.getParameter("id");
+        String belongStation = request.getParameter("belongStation");
+        String ph = request.getParameter("ph");
+        String oxygen = request.getParameter("oxygen");
+        String nitrogen = request.getParameter("nitrogen");
+        String permangan = request.getParameter("permangan");
+        String orgacarbon = request.getParameter("orgacarbon");
+        String level = request.getParameter("phquality");
+        String time = request.getParameter("time");
+        WaterQualityService service=new WaterQualityServiceImpl();
+        WaterQuality waterQuality=new WaterQuality();
+
+        try
+        {
+
+            waterQuality.setId(Integer.parseInt(id));
+            waterQuality.setBelongStation(belongStation);
+            waterQuality.setpH(Double.parseDouble(ph));
+            waterQuality.setdO(Double.parseDouble(oxygen));
+            waterQuality.setnH4(Double.parseDouble(nitrogen));
+            waterQuality.setcODMn(Double.parseDouble(permangan));
+            waterQuality.setLevel(level);
+            waterQuality.setDateTime(Timestamp.valueOf(time+":00"));
+            waterQuality.settOC(Double.parseDouble(orgacarbon));
+        } catch (Exception e)
+        {
+            System.out.println(e);
+        }
+
+        boolean update = service.update(waterQuality);
+        ResultInfo info=new ResultInfo();
+        if(update)
+        {
+            info.setMsg("更新成功！");
+        }
+        else
+        {
+            info.setMsg("更新失败！");
+        }
+        ObjectMapper mapper=new ObjectMapper();
+        response.setContentType("application/json;chartset=utf-8");
+        mapper.writeValue(response.getOutputStream(),info);
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+
+        this.doPost(request, response);
+
+    }
+}
diff --git a/src/src_houduan/web/servlet/waterQuality/ViewCurrentWaterQualityServlet.java b/src/src_houduan/web/servlet/waterQuality/ViewCurrentWaterQualityServlet.java
new file mode 100644
index 0000000..5d7fa44
--- /dev/null
+++ b/src/src_houduan/web/servlet/waterQuality/ViewCurrentWaterQualityServlet.java
@@ -0,0 +1,177 @@
+package web.servlet.waterQuality;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import domain.WaterQuality;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.sql.Timestamp;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * @author laoyingyong
+ * @date: 2020-01-19 15:20
+ */
+@WebServlet("/ViewCurrentWaterQualityServlet")
+public class ViewCurrentWaterQualityServlet extends HttpServlet
+{
+    private List<WaterQuality> qualityList;
+    private static String [] siteArray={"沙窝","清河闸","罗庄","密云水库","后城",
+            "土门楼","万家码头","海河大闸","蓟运河防潮闸",
+            "于桥水库库中心","三岔口"};
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+        //参数字符串，如果拼接在请求链接之后，需要对中文进行 URLEncode   字符集 UTF-8
+        String param = "AreaID=&RiverID=&MNName=&PageIndex=1&PageSize=60&action=getRealDatas";
+        StringBuilder sb = new StringBuilder();
+        InputStream is = null;
+        BufferedReader br = null;
+        PrintWriter out = null;
+        try
+        {
+            //接口地址
+            String url = "https://szzdjc.cnemc.cn:8070/GJZ/Ajax/Publish.ashx";
+            URL uri = new URL(url);
+            HttpURLConnection connection = (HttpURLConnection) uri.openConnection();
+            connection.setRequestMethod("POST");
+            connection.setConnectTimeout(50000);
+            connection.setReadTimeout(12000);
+            connection.setRequestProperty("accept", "*/*");
+            //发送参数
+            connection.setDoOutput(true);
+            out = new PrintWriter(connection.getOutputStream());
+            out.print(param);
+            out.flush();
+            //接收结果
+            is = connection.getInputStream();
+            br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+            String line;
+            //缓冲逐行读取
+            while ((line = br.readLine()) != null)
+            {
+                sb.append(line);
+            }
+            String backStr = sb.toString();
+            String body = backStr;
+            System.out.println(backStr);
+            ScriptEngineManager sem = new ScriptEngineManager();
+
+            ScriptEngine engine = sem.getEngineByExtension("js");
+
+            qualityList=new LinkedList<>();
+            String traseStr = null;
+            try {
+                traseStr = (String) engine.eval("unescape('" + body + "')");
+            } catch (ScriptException e) {
+                e.printStackTrace();
+
+            }
+            traseStr = traseStr.replaceAll("<br>", "\r\n");
+            traseStr = traseStr.replaceAll("<.*?>", "");
+            String a= "["+traseStr+"]";
+            System.out.println(a);
+            JSONArray jsonArray = JSONObject.parseArray(a);
+            JSONObject jsonObject = jsonArray.getJSONObject(0);
+            String jsonArray0 = jsonObject.getString("tbody");
+            System.out.println(jsonArray0);
+            JSONArray jsonArray1 = JSONObject.parseArray(jsonArray0);
+
+            for (int i = 0; i < jsonArray1.size(); i++)
+            {
+                WaterQuality waterQuality=new WaterQuality();
+                JSONArray jsonArray2= (JSONArray) jsonArray1.get(i);
+                String siteName = jsonArray2.getString(2);
+                boolean b = Arrays.asList(siteArray).contains(siteName);
+                String dateTime = jsonArray2.getString(3);
+                String pH = jsonArray2.getString(6);
+                String aDo = jsonArray2.getString(7);
+                String nh4 = jsonArray2.getString(11);
+                String codMn = jsonArray2.getString(10);
+                String toc = jsonArray2.getString(12);
+                String level = jsonArray2.getString(4);
+                if (b)
+                {
+                    System.out.print(siteName+"\t");
+                    System.out.print(dateTime+"\t");
+                    System.out.print(pH+"\t");
+                    System.out.print(aDo+"\t");
+                    System.out.print(nh4+"\t");
+                    System.out.print(codMn+"\t");
+                    System.out.print(toc+"\t");
+                    System.out.println(level);
+
+                    waterQuality.setBelongStation(siteName);
+                    if(!dateTime.equals("--"))
+                    waterQuality.setDateTime(Timestamp.valueOf("2022-"+dateTime+":00"));
+                    if(!pH.equals("--"))
+                    waterQuality.setpH(Double.parseDouble(pH));
+                    if(!aDo.equals("--"))
+                    waterQuality.setdO(Double.parseDouble(aDo));
+                    if(!nh4.equals("--"))
+                    waterQuality.setnH4(Double.parseDouble(nh4));
+                    if(!codMn.equals("--"))
+                    waterQuality.setcODMn(Double.parseDouble(codMn));
+                    if(!toc.equals("--"))
+                    waterQuality.settOC(Double.parseDouble(toc));
+                    if(!level.equals("--"))
+                    waterQuality.setLevel(level);
+                    qualityList.add(waterQuality);
+
+                }
+
+
+            }
+
+
+        } catch (Exception e)
+        {
+            System.out.println(e);
+        } finally
+        {
+            ObjectMapper mapper=new ObjectMapper();
+            response.setContentType("application/json;charset=utf8");
+            System.out.println(qualityList);
+            mapper.writeValue(response.getOutputStream(),qualityList);
+
+            //关闭流
+            try {
+                if (is != null)
+                {
+                    is.close();
+                }
+                if (br != null)
+                {
+                    br.close();
+                }
+                if (out != null)
+                {
+                    out.close();
+                }
+            } catch (Exception ignored)
+            {
+                System.out.println(ignored);
+            }
+
+        }
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+
+        this.doPost(request, response);
+
+    }
+}
diff --git a/src/src_houduan/web/servlet/waterQuality/ViewWaterQulityInfoServlet.java b/src/src_houduan/web/servlet/waterQuality/ViewWaterQulityInfoServlet.java
new file mode 100644
index 0000000..7476241
--- /dev/null
+++ b/src/src_houduan/web/servlet/waterQuality/ViewWaterQulityInfoServlet.java
@@ -0,0 +1,42 @@
+package web.servlet.waterQuality;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import domain.WaterQuality;
+import service.WaterQualityService;
+import service.impl.WaterQualityServiceImpl;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author laoyingyong
+ * @date: 2020-01-29 18:25
+ */
+@WebServlet("/ViewWaterQulityInfoServlet")
+public class ViewWaterQulityInfoServlet extends HttpServlet
+{
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+        request.setCharacterEncoding("utf-8");
+        String stationName = request.getParameter("stationName");
+        WaterQualityService service=new WaterQualityServiceImpl();
+        List<WaterQuality> list = service.findByName(stationName);
+
+        ObjectMapper mapper=new ObjectMapper();
+        response.setContentType("application/json;charset=utf-8");
+        mapper.writeValue(response.getOutputStream(),list);
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
+
+        this.doPost(request, response);
+
+    }
+}
diff --git a/src/src_qianduan/WEB-INF/viewMap.jsp b/src/src_qianduan/WEB-INF/viewMap.jsp
new file mode 100644
index 0000000..21296ba
--- /dev/null
+++ b/src/src_qianduan/WEB-INF/viewMap.jsp
@@ -0,0 +1,2057 @@
+<%--
+  Created by Yingyong Lao.
+  User: laoyingyong
+  Date: 2019-12-10
+  Time: 14:04
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>地图浏览</title>
+    <script src="js/jquery-1.11.2.min.js"></script>
+    <!-- 1. 导入CSS的全局样式 -->
+    <script src="js/bootstrap.min.js"></script>
+    <script src="js/ol-debug.js"></script>
+    <script src="js/GoogleMapSource.js"></script>
+    <script src="js/GoogleMapLayer.js"></script>
+    <script src="js/jquery-ui.js"></script>
+    <script src="js/echarts.min.js"></script>
+    <script type="text/javascript" src="js/bootstrap-select.js"></script>
+    <link href="css/bootstrap-3.3.7-dist/css/bootstrap.min.css" rel="stylesheet">
+    <link href="css/ol.css" rel="stylesheet">
+    <link rel="stylesheet" href="css/jquery-ui.min.css"/>
+    <link rel="stylesheet" href="css/bootstrap-select.css">
+    <style>
+
+        #reset{
+            left: 10px;
+            top: 150px;
+            position: absolute;
+            z-index: 2000;
+        }
+
+        .ol-popup {
+            position: absolute;
+            background-color: white;
+            -webkit-filter: drop-shadow(0 1px 4px rgba(0,0,0,0.2));
+            filter: drop-shadow(0 1px 4px rgba(0,0,0,0.2));
+            padding: 15px;
+            border-radius: 10px;
+            border: 1px solid #cccccc;
+            bottom: 12px;
+            left: -50px;
+        }
+        .ol-popup:after, .ol-popup:before {
+            top: 100%;
+            border: solid transparent;
+            content: " ";
+            height: 0;
+            width: 0;
+            position: absolute;
+            pointer-events: none;
+        }
+        .ol-popup:after {
+            border-top-color: white;
+            border-width: 10px;
+            left: 48px;
+            margin-left: -10px;
+        }
+        .ol-popup:before {
+            border-top-color: #cccccc;
+            border-width: 11px;
+            left: 48px;
+            margin-left: -11px;
+        }
+        .ol-popup-closer {
+            text-decoration: none;
+            position: absolute;
+            top: 2px;
+            right: 8px;
+        }
+        .ol-popup-closer:after {
+            content: "✖";
+        }
+        #popup-content{
+            font-size:14px;
+            font-family:"微软雅黑";
+        }
+        #popup-content .markerInfo {
+            font-weight:bold;
+        }
+
+
+        .ui-widget, .ui-widget input, .ui-widget select{font-size:14px;font-family:"微软雅黑";}
+        .ui-widget .ui-widget{font-size:14px; font-family:"微软雅黑"; color: #222222;}
+
+
+
+    </style>
+    <script>
+
+        //查看水位变化曲线图的回调函数
+        function viewLevelChange(siteName)
+        {
+            $.post("./FindBySiteNameServlet",{siteName:siteName},function (data)
+            {
+                var timeArray=new Array();
+                var levelArray=new Array();
+                var flowArray=new Array();
+                for(var i=0;i<data.length;i++)
+                {
+                    var obj=data[i];
+                    //var zhanName=obj.siteName;
+                    var waterLevel=obj.waterLevel;
+                    var flow=obj.flow;
+                    var collectionDate=obj.collectionDate;
+                    var dateStr=dateFormat("YYYY-MM-dd HH:mm",new Date(collectionDate));
+
+                    timeArray.push(dateStr);
+                    levelArray.push(waterLevel);
+                    flowArray.push(flow);
+
+                }
+
+                var myChart = echarts.init(document.getElementById('main'));
+                var option = {
+                    backgroundColor:'rgba(255, 255, 255, 0.7)',
+                    title: {
+                        text:siteName+ "监测站水位变化曲线图",
+                        textStyle:{ fontSize:18},
+                        top:20,
+                        left:"center"
+                    },
+                    tooltip: {
+                        trigger: 'axis'
+                    },
+                    legend: {
+                        data: ['水位', '流量']
+                    },
+                    grid: {
+                        left: '3%',
+                        right: '4%',
+                        bottom: '3%',
+                        containLabel: true
+                    },
+                    toolbox: {
+                        feature: {
+                            saveAsImage: {}
+                        }
+                    },
+                    xAxis: {
+                        type: 'category',
+                        boundaryGap: false,
+                        data: timeArray
+
+                    },
+                    yAxis: {
+                        type: 'value',
+                        name:"水位单位(m)\n     流量单位m^3/s",
+                        nameTextStyle:{ align:"right"}
+                    },
+                    series: [
+                        {
+                            name: '水位',
+                            type: 'line',
+                            stack: '总量',
+                            data: levelArray
+                        },
+                        {
+                            name: '流量',
+                            type: 'line',
+                            stack: '总量',
+                            data: flowArray
+                        },
+
+                    ]
+                };
+
+                myChart.setOption(option,true);
+
+            });
+
+        }
+
+
+        function closeResult()
+        {
+            $("#reslut").css("display","none");
+        }
+
+        $(function ()
+        {
+            $(".ol-zoom-in").attr("title","放大");
+            $(".ol-zoom-out").attr("title","缩小");
+            $(".ol-full-screen-false").attr("title","全屏显示");
+            $("button[title='复位']").mouseover(function ()
+            {
+                $(this).css("background-color","#4873A6");
+
+            });
+            $("button[title='复位']").mouseout(function ()
+            {
+                $(this).css("background-color","#7897BC");
+
+            });
+
+        });
+
+        //根据监测站名称查看最新的一条水质数据
+        function viewNewest(stationName)
+        {
+            $.post("/FindNewestServlet",{stationName:stationName},function (data)
+            {
+                var belongStation=data.belongStation;
+                var dateTime=data.dateTime;
+                var dateStr=dateFormat("YYYY-MM-dd HH:mm",new Date(dateTime));
+                var pH=data.pH;
+                var dO=data.dO;
+                var nH4=data.nH4;
+                var cODMn=data.cODMn;
+                var tOC=data.tOC;
+                var level=data.level;
+
+
+
+                // 基于准备好的dom，初始化echarts实例
+                var myChart = echarts.init(document.getElementById('main'));
+
+                // 指定图表的配置项和数据
+                var option = {
+                    backgroundColor: "rgba(255,255,255,0.7)",
+                    title: {
+                        x:'center',
+                        text: belongStation+"最新水质数据",
+                        subtext:dateStr+"\t"+"水质类别："+level,
+                        subtextStyle:{
+
+                            color: '#000000'
+                        }
+                    },
+                    tooltip: {},
+                    legend:
+                        {
+                            data:[]
+                        },
+                    xAxis: {
+
+                        data: ["溶解氧","高猛酸钾","氨氮","总有机碳","PH"]
+                    },
+                    yAxis:[{
+                        name:"数值单位:mg/L",
+                        min:0,
+                        max:20
+
+                    },{
+                        name:"PH",
+                        min:0,
+                        max:11,
+                        maxInterval:1
+
+                    }] ,
+                    series: [{
+                        name: '数值',
+                        type: 'bar',
+                        data: [dO, cODMn, nH4, tOC,pH],
+                        //配置样式
+                        itemStyle: {
+                            //通常情况下：
+                            normal:{
+                                //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
+                                color: function (params){
+                                    var colorList = ['rgb(164,205,238)','rgb(42,170,227)','rgb(25,46,94)','rgb(195,229,235)','rgb(195,0,235)'];
+                                    return colorList[params.dataIndex];
+                                }
+                            },
+                            //鼠标悬停时：
+                            emphasis: {
+                                shadowBlur: 10,
+                                shadowOffsetX: 0,
+                                shadowColor: 'rgba(0, 0, 0, 0.5)'
+                            }
+                        },
+                    }]
+                };
+
+                // 使用刚指定的配置项和数据显示图表。
+                myChart.setOption(option);
+
+
+            });
+
+
+        }
+
+
+        function searchStation()
+        {
+            $("#reslut").css("display","block");
+            var cezhanName=$("#cezhanName").val();
+            var startTime=$("#startTime").val();
+            var endTime=$("#endTime").val();
+            var water_level=selectLevel();
+            $.post("/FindByNameAndTimeServlet",{cezhanName:cezhanName,startTime:startTime,endTime:endTime,water_level:water_level},function (data)
+            {
+                var count=data.length;
+                var mainStr='<table class="table table-bordered table-hover" id="shuiZhiTable">\n' +
+                    ' <caption style="font-size: 24px;text-align: right;background-color: rgba(255,255,255,0.7)">查询结果(共'+count+'条记录)' +
+                    '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' +
+                    '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<button onclick="closeResult();" class="btn btn-danger btn-sm">关闭</button></caption>\n'+
+                    '                <tr class="success">\n' +
+                    '                    <th>测站名</th>\n' +
+                    '                    <th>测量时间</th>\n' +
+                    '                    <th>pH</th>\n' +
+                    '                    <th>溶解氧</th>\n' +
+                    '                    <th>氨氮</th>\n' +
+                    '                    <th>高猛酸钾盐指数</th>\n' +
+                    '                    <th>总有机碳</th>\n' +
+                    '                    <th>水质类别</th>\n' +
+                    '                </tr>';
+                for(var i=0;i<data.length;i++)
+                {
+                    var obj=data[i];
+                    var belongStation=obj.belongStation;
+                    var dateTime=obj.dateTime;
+                    var dateStr=dateFormat("YYYY-MM-dd HH:mm",new Date(dateTime));
+                    var pH=obj.pH;
+                    var dO=obj.dO;
+                    var nH4=obj.nH4;
+                    var cODMn=obj.cODMn;
+                    var tOC=obj.tOC;
+                    var level=obj.level;
+
+                    var tdStr;
+                    if(level==="III")
+                    {
+                        tdStr=' <td style="background-color: #03ff03">'+level+'</td>';
+                    }
+                    else if(level==="II")
+                    {
+                        tdStr=' <td style="background-color: #34c3f6">'+level+'</td>';
+                    }
+                    else if(level==="IV")
+                    {
+                        tdStr=' <td style="background-color: #faff19">'+level+'</td>';
+                    }
+                    else if(level==="I")
+                    {
+                        tdStr=' <td style="background-color: #c5ffff">'+level+'</td>';
+                    }
+                    else if(level==="V")
+                    {
+                        tdStr=' <td style="background-color: #ff9000">'+level+'</td>';
+                    }
+                    else if(level==="劣V")
+                    {
+                        tdStr=' <td style="background-color: #ff0000">'+level+'</td>';
+                    }
+                    else
+                    {
+                        tdStr=' <td style="background-color: #ffffff">'+level+'</td>';
+                    }
+
+
+                    var itemStr=' <tr class="info">\n' +
+                        '                    <td>'+belongStation+'</td>\n' +
+                        '                    <td>'+dateStr+'</td>\n' +
+                        '                    <td>'+pH+'</td>\n' +
+                        '                    <td>'+dO+'</td>\n' +
+                        '                    <td>'+nH4+'</td>\n' +
+                        '                    <td>'+cODMn+'</td>\n' +
+                        '                    <td>'+tOC+'</td>\n' +
+                        tdStr +
+                        '                </tr>';
+                    mainStr+= itemStr;
+                }
+                var endStr=' </table>';
+                mainStr+=endStr;
+                $("#reslut").html(mainStr);
+
+
+            });
+
+        }
+
+
+        function selectLevel()
+        {
+            var value=$("#water_level_select").val();
+            return value;
+        }
+
+    </script>
+</head>
+<body>
+<div class="container-fluid">
+   <div class="row">
+        <div class="col-sm-12">
+            <ul class="nav nav-pills">
+                <li role="presentation"><a href="javascript:shuiQing();">实时水情</a></li>
+                <li role="presentation"><a href="javascript:findSite();">水质站点列表</a></li>
+                <li role="presentation"><a href="javascript:viewCurrentWaterQuality();">实时水质数据</a></li>
+                <li role="presentation" class="dropdown">
+
+                    <ul class="dropdown-menu">
+                        <li><a href="javascript:void(0)" id="showReg">显示警戒区</a></li>
+                        <li><a href="javascript:void(0)" id="drawReg">绘制警戒区</a></li>
+                        <li><a href="javascript:void(0)" id="deleteReg">删除警戒区</a></li>
+                    </ul>
+                </li>
+               <%-- <li role="presentation">
+                    <a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
+                        地图类型 <span class="caret"></span>
+                    </a>
+                   <%-- <ul class="dropdown-menu">
+                        <li><a href="javascript:terrain();">谷歌地形图</a></li>
+                        <li><a href="javascript:vector();">谷歌矢量图</a></li>
+                        <li><a href="javascript:raster();">谷歌遥感图</a></li>
+                        <li><a href="javascript:road();">谷歌交通</a></li>
+                        <li><a href="javascript:osm();">OSM地图</a></li>
+                    </ul>--%>
+
+                </li>
+
+                <li role="presentation">
+                    <form class="form-inline">
+                        <div class="form-group">
+                            <label class="sr-only" for="cezhanName">Email address</label>
+                            <input type="text" class="form-control" id="cezhanName" name="name2" placeholder="请输入监测站名称" STYLE="width: 140px;height: 28px">
+                        </div>
+                        <div class="form-group">
+                           <input type="datetime-local" id="startTime">
+                        </div>
+                        <div class="form-group">
+                            至
+                        </div>
+                        <div class="form-group">
+                            <input type="datetime-local" id="endTime">
+                        </div>
+                        <div class="form-group">
+                            <select style="height: 28px" id="water_level_select" onchange="selectLevel();">
+                                <option>--水质类别--</option>
+                                <option value="I">I</option>
+                                <option value="II">II</option>
+                                <option value="III">III</option>
+                                <option value="IV">IV</option>
+                                <option value="V">V</option>
+                                <option value="劣V">劣V</option>
+                            </select>
+                        </div>
+                        <button type="button"  onclick="searchStation();" class="btn btn-info btn-sm"><span class="glyphicon glyphicon-search" aria-hidden="true"></span>&nbsp;搜索</button>
+                    </form>
+                </li>
+            </ul>
+
+        </div>
+
+
+    </div><%--row end--%>
+    <div class="row">
+        <div id="dd" title="实时水情">
+            <div id="shuiqingDiv">
+            <table class="table table-bordered" id="shuiQingTable">
+                <tr class="success">
+                    <th>河流</th>
+                    <th>站名</th>
+                    <th>日期</th>
+                    <th>水位</th>
+                    <th>流量</th>
+                    <th>超警戒/汛限水位</th>
+                </tr>
+            </table>
+            </div>
+        </div>
+
+        <div id="wQuality" title="实时水质数据">
+            <table class="table table-bordered" id="shuiZhiTable">
+                <tr class="success">
+                    <th>测站名</th>
+                    <th>测量时间</th>
+                    <th>pH</th>
+                    <th>溶解氧</th>
+                    <th>氨氮</th>
+                    <th>高猛酸钾盐指数</th>
+                    <th>总有机碳</th>
+                    <th>水质类别</th>
+                </tr>
+                <tr class="info">
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                </tr>
+            </table>
+        </div>
+
+
+
+        <div id="site" title="水质站点">
+            <table class="table table-bordered" id="siteTable">
+                <tr class="success">
+                    <th>水质站点名</th>
+                    <th>操作</th>
+                </tr>
+                <tr class="info">
+                    <td></td>
+                    <td></td>
+                </tr>
+            </table>
+
+        </div>
+
+
+        <div id="dialog-confirm" title="图形属性信息设置">
+            <label>信息类别:警戒区域</label><br />
+            <label>热区名称:</label>
+            <input type="text" value="" id="name" />
+            <br />
+            <label>所在城市:</label>
+            <input type="text"  id="city" />
+        </div>
+        <div id="dialog-delete" title="删除热区要素确认">
+            <label>是否删除该要素？</label><br />
+        </div>
+
+        <div id="map" style="height: 650px"><%--地图容器--%>
+
+            <!-- 监测站Popup -->
+            <div id="popup" class="ol-popup" >
+                <a href="#" id="popup-closer" class="ol-popup-closer"></a>
+                <div id="popup-content">
+                </div>
+            </div>
+
+
+            <div id="mypopup"  ></div><%--热区的popup--%>
+
+
+
+            <span id="reset"><button class="btn btn-info btn-xs" data-toggle="tooltip" data-placement="right" title="复位" style="background-color: #7897BC;height:23px;width:23px"><span class="glyphicon glyphicon-repeat" aria-hidden="true"></span></button></span>
+            <!-- 为ECharts准备一个具备大小（宽高）的Dom -->
+            <div id="main" style="width: 500px;height:250px;right: 0px;bottom: 0px;position: absolute;z-index: 2000;"></div>
+            <div id="reslut" style="border-radius:10px;box-shadow:0px 0px 20px 5px gray;width: 700px;height:300px;right: 0px;top: 100px;position: absolute;z-index: 2000;overflow-y: scroll;display: none;background-color: rgba(255,255,255,0.7)"></div>
+
+        </div><%--地图容器end--%>
+
+   </div><%--row end--%>
+
+</div><%--container end--%>
+
+
+
+<script>
+
+    function viewDetails(stationName) //查看水质站点详情的回调函数
+    {
+        $("#site").dialog("close");
+        $.post("FindLocationByNameServlet",{stationName:stationName},function (data)
+        {
+            var longitude=data.longitude;//经度
+            var latitude=data.latitude;//纬度
+            var stationName=data.stationName;
+            var introduction=data.introduction;
+
+
+            var site = ol.proj.fromLonLat([longitude, latitude]);
+            //标注点信息对象
+            var featuerInfo =
+            {
+                geo: site,
+                att:
+                {
+                    title: stationName, //标注信息的标题内容
+                    titleURL: "https://blog.csdn.net/Deep_rooted", //标注详细信息链接
+                    text:introduction, //标注内容简介
+                    imgURL: "img/img_1.png" //标注的图片
+                }
+            }
+
+
+
+            /**
+             * 创建标注样式函数,设置image为图标ol.style.Icon
+             * @param {ol.Feature} feature 要素
+             */
+            var createLabelStyle = function (feature) {
+                return new ol.style.Style({
+                    image: new ol.style.Icon(/** @type {olx.style.IconOptions} */({
+                        anchor: [0.5, 60],
+                        anchorOrigin: 'top-right',
+                        anchorXUnits: 'fraction',
+                        anchorYUnits: 'pixels',
+                        offsetOrigin: 'top-right',
+                        // offset:[0,10],
+                        // scale:0.5,  //图标缩放比例
+                        opacity: 0.75,  //透明度
+                        src: 'img/blueIcon3.png' //图标的url
+                    })),
+                    text: new ol.style.Text({
+                        textAlign: 'center', //位置
+                        textBaseline: 'middle', //基准线
+                        font: 'normal 14px 微软雅黑',  //文字样式
+                        text: feature.get('name'),  //文本内容
+                        fill: new ol.style.Fill({ color: '#aa3300' }), //文本填充样式（即文字颜色）
+                        stroke: new ol.style.Stroke({ color: '#ffcc33', width: 2 })
+                    })
+                });
+            }
+
+            //实例化Vector要素，通过矢量图层添加到地图容器中
+            var iconFeature = new ol.Feature({
+                geometry: new ol.geom.Point(site),
+                name: stationName,  //名称属性
+                population: 2115 //大概人口数（万）
+            });
+            iconFeature.setStyle(createLabelStyle(iconFeature));
+            //矢量标注的数据源
+            var vectorSource = new ol.source.Vector({
+                features: [iconFeature]
+            });
+            //矢量标注图层
+            var vectorLayer = new ol.layer.Vector({
+                source: vectorSource
+            });
+            map.addLayer(vectorLayer);
+
+            /**
+             * 实现popup的html元素
+             */
+            var container = document.getElementById('popup');
+            var content = document.getElementById('popup-content');
+            var closer = document.getElementById('popup-closer');
+
+            /**
+             * 在地图容器中创建一个Overlay
+             */
+            var popup = new ol.Overlay(/** @type {olx.OverlayOptions} */({
+                element: container,
+                autoPan: true,
+                positioning: 'bottom-center',
+                stopEvent: false,
+                autoPanAnimation: {
+                    duration: 250
+                }
+            }));
+            map.addOverlay(popup);
+
+            /**
+             * 添加关闭按钮的单击事件（隐藏popup）
+             * @return {boolean} Don't follow the href.
+             */
+            closer.onclick = function () {
+                popup.setPosition(undefined);  //未定义popup位置
+                closer.blur(); //失去焦点
+                return false;
+            };
+
+            /**
+             * 动态创建popup的具体内容
+             * @param {string} title
+             */
+            function addFeatrueInfo(info)
+            {
+                //新增a元素
+                var elementA = document.createElement('a');
+                elementA.className = "markerInfo";
+                elementA.href = info.att.titleURL;
+                //elementA.innerText = info.att.title;
+                setInnerText(elementA, info.att.title);
+                content.appendChild(elementA); // 新建的div元素添加a子节点
+                //新增div元素
+                var elementDiv = document.createElement('div');
+                elementDiv.className = "markerText";
+                //elementDiv.innerText = info.att.text;
+                setInnerText(elementDiv, info.att.text);
+                content.appendChild(elementDiv); // 为content添加div子节点
+                //新增img元素
+                var elementImg = document.createElement('img');
+                elementImg.className = "markerImg";
+                elementImg.src = info.att.imgURL;
+                content.appendChild(elementImg); // 为content添加img子节点
+            }
+            /**
+             * 动态设置元素文本内容（兼容）
+             */
+            function setInnerText(element, text)
+            {
+                if (typeof element.textContent == "string")
+                {
+                    element.textContent = text;
+                } else
+                {
+                    element.innerText = text;
+                }
+            }
+
+            /**
+             * 为map添加点击事件监听，渲染弹出popup
+             */
+            map.on('click', function (evt)
+            {
+                var coordinate = evt.coordinate;
+                //判断当前单击处是否有要素，捕获到要素时弹出popup
+                var feature = map.forEachFeatureAtPixel(evt.pixel, function (feature, layer) { return feature; });
+                if (feature)
+                {
+                    content.innerHTML = ''; //清空popup的内容容器
+                    addFeatrueInfo(featuerInfo); //在popup中加载当前要素的具体信息
+
+                    viewNewest(stationName);
+
+                    /*if (popup.getPosition() == undefined)
+                    {
+                        popup.setPosition(coordinate); //设置popup的位置
+                    }*/
+                    popup.setPosition(coordinate); //设置popup的位置
+                }
+            });
+            /**
+             * 为map添加鼠标移动事件监听，当指向标注时改变鼠标光标状态
+             */
+            map.on('pointermove', function (e)
+            {
+                var pixel = map.getEventPixel(e.originalEvent);
+                var hit = map.hasFeatureAtPixel(pixel);
+                map.getTargetElement().style.cursor = hit ? 'pointer' : '';
+            });
+
+
+        });
+    }
+
+    function terrain()//地形图
+    {
+        map.removeLayer(googleLayer); //移除Google图层
+        googleLayer = new ol.layer.GoogleMapLayer({
+            layerType: ol.source.GoogleLayerType.TERRAIN
+        });
+        map.addLayer(googleLayer); //添加Google地图图层
+    }
+    function vector()//矢量图
+    {
+        map.removeLayer(googleLayer); //移除Google图层
+        googleLayer = new ol.layer.GoogleMapLayer({
+            layerType: ol.source.GoogleLayerType.VEC
+        });
+        map.addLayer(googleLayer); //添加Google地图图层
+    }
+    function raster()//遥感图
+    {
+        map.removeLayer(googleLayer); //移除Google图层
+        googleLayer = new ol.layer.GoogleMapLayer({
+            layerType: ol.source.GoogleLayerType.RASTER
+        });
+        map.addLayer(googleLayer); //添加Google地图图层
+    }
+    function road()//道路图
+    {
+        map.removeLayer(googleLayer); //移除Google图层
+        googleLayer = new ol.layer.GoogleMapLayer({
+            layerType: ol.source.GoogleLayerType.ROAD
+        });
+        map.addLayer(googleLayer); //添加Google地图图层
+    }
+    function osm()
+    {
+        map.removeLayer(googleLayer); //移除Google图层
+        var osmLayer=new ol.layer.Tile({
+            source: new ol.source.OSM() //图层数据源
+        });
+        map.addLayer(osmLayer); //添加瓦片图层
+
+    }
+
+    function viewCurrentWaterQuality()
+    {
+        $("#wQuality").dialog("open");
+        $.post("/ViewCurrentWaterQualityServlet",function (data)
+        {
+
+
+            var tableStr='<table class="table table-bordered table-hover" id="shuiZhiTable">\n' +
+                '                    <tr class="success">\n' +
+                '                        <th>测站名</th>\n' +
+                '                        <th>测量时间</th>\n' +
+                '                        <th>pH</th>\n' +
+                '                        <th>溶解氧</th>\n' +
+                '                        <th>氨氮</th>\n' +
+                '                        <th>高猛酸钾盐指数</th>\n' +
+                '                        <th>总有机碳</th>\n' +
+                '                        <th>水质类别</th>\n' +
+                '                    </tr>';
+            for (var i = 0; i <data.length ; i++)
+            {
+                var rowStr;
+                var obj=data[i];
+                var belongStation=obj.belongStation;
+                var dateTime=obj.dateTime;
+                var timeStr=dateFormat("YYYY-MM-dd HH:mm",new Date(dateTime));
+                var pH=obj.pH;
+                var dO=obj.dO;
+                var nH4=obj.nH4;
+                var cODMn=obj.cODMn;
+                var tOC=obj.tOC;
+                var level=obj.level;
+
+                var tdStr;
+                if(level==="Ⅲ")
+                {
+                    tdStr=' <td style="background-color: #03ff03">'+level+'</td>';
+                }
+                else if(level==="Ⅱ")
+                {
+                    tdStr=' <td style="background-color: #34c3f6">'+level+'</td>';
+                }
+                else if(level==="Ⅳ")
+                {
+                    tdStr=' <td style="background-color: #faff19">'+level+'</td>';
+                }
+                else if(level==="Ⅰ")
+                {
+                    tdStr=' <td style="background-color: #c5ffff">'+level+'</td>';
+                }
+                else if(level==="Ⅴ")
+                {
+                    tdStr=' <td style="background-color: #ff9000">'+level+'</td>';
+                }
+                else if(level==="劣Ⅴ")
+                {
+                    tdStr=' <td style="background-color: #ff0000">'+level+'</td>';
+                }
+                else
+                {
+                    tdStr=' <td style="background-color: #ffffff">'+level+'</td>';
+                }
+
+                rowStr='<tr class="info">\n' +
+                    '                        <td>'+belongStation+'</td>\n' +
+                    '                        <td>'+timeStr+'</td>\n' +
+                    '                        <td>'+pH+'</td>\n' +
+                    '                        <td>'+dO+'</td>\n' +
+                    '                        <td>'+nH4+'</td>\n' +
+                    '                        <td>'+cODMn+'</td>\n' +
+                    '                        <td>'+tOC+'</td>\n' +
+                                                  tdStr+
+                    '                    </tr>';
+
+
+                tableStr+=rowStr;
+            }
+
+            var endStr=' </table>\n';
+            tableStr+=endStr;
+            $("#wQuality").html(tableStr);
+
+        });
+
+    }
+
+    function viewPie(stationName)
+    {
+
+        $.post("./StatisticsWaterQualityServlet",{stationName:stationName},function (data)
+        {
+            var a=data.a;
+            var b=data.b;
+            var c=data.c;
+            var d=data.d;
+            var e=data.e;
+            var f=data.f;
+            var g=data.g;
+
+            if(a==0&&b==0&&c==0&&d==0&&e==0&&f==0)
+            {
+                alert("数据库中尚未有该站点的数据！");
+            }
+
+            // 基于准备好的dom，初始化echarts实例
+            var myChart = echarts.init(document.getElementById('main'));
+            myChart.setOption({
+                tooltip:{formatter:"{b}:{c}"+"，"+"占比{d}%"},
+                backgroundColor:'rgba(255, 255, 255, 0.7)',
+                legend:{orient:"vertical",left:"70%",y:"center",data:["Ⅰ类水质","Ⅱ类水质","Ⅲ类水质","Ⅳ类水质","Ⅴ类水质","劣Ⅴ类水质"]},
+                toolbox:{feature:{ saveAsImage:{ type:'png'}}},
+                title: {
+                    text: stationName,
+                    left: 'center',//主副标题的水平位置
+                    subtext:"历史水质统计图",
+                    subtextStyle: {//副标题的属性
+                        color: '#000000',
+                        fontSize:15
+                        // 同主标题
+                    },
+
+                },
+                series : [
+                    {
+
+                        center:["30%","50%"],
+                        label:{ formatter:"{b}:{c}({d}%)"},
+                        color: ['#c5ffff','#34c3f6', '#03ff03', '#faff19', '#ff9000','#ff0000'],
+                        name: '水质类别',
+                        type: 'pie',    // 设置图表类型为饼图
+                        radius: '30%',  // 饼图的半径，外半径为可视区尺寸（容器高宽中较小一项）的 55% 长度。
+                        data:[          // 数据数组，name 为数据项名称，value 为数据项值
+                            {value:a, name:'Ⅰ类水质'},
+                            {value:b, name:'Ⅱ类水质'},
+                            {value:c, name:'Ⅲ类水质'},
+                            {value:d, name:'Ⅳ类水质'},
+                            {value:e, name:'Ⅴ类水质'},
+                            {value:f, name:'劣Ⅴ类水质'}
+                        ]
+                    }
+                ]
+            },true)
+
+        });
+
+    }
+
+
+    function viewLine(stationName)
+    {
+        $.post("/FindLineServlet",{stationName:stationName},function (data)
+        {
+            var count=data.length;
+            if(count==0)
+            {
+                alert("数据库中尚未有该站点的监测数据！");
+            }
+            var phArray=new Array();
+            var dOArray=new Array();
+            var nH4Array=new Array();
+            var cODMnArray=new Array();
+            var tOCArray=new Array();
+            var timeArray=new Array();
+            var belongStation;
+            for(var i=0;i<data.length;i++)
+            {
+
+                var obj=data[i];
+                var pH=obj.pH;
+                var dO=obj.dO;
+                var nH4=obj.nH4;
+                var cODMn=obj.cODMn;
+                var tOC=obj.tOC;
+                var dateTime=obj.dateTime;
+                var dateStr=dateFormat("YYYY-MM-dd HH:mm",new Date(dateTime));
+                belongStation=obj.belongStation;
+
+                phArray.push(pH);
+                dOArray.push(dO);
+                nH4Array.push(nH4);
+                cODMnArray.push(cODMn);
+                tOCArray.push(tOC);
+                timeArray.push(dateStr);
+            }
+
+
+            var myChart = echarts.init(document.getElementById('main'));
+            var option = {
+                backgroundColor:'rgba(255, 255, 255, 0.7)',
+                title: {
+                    text: belongStation+"水质变化曲线图",
+                    textStyle:{ fontSize:18},
+                    top:20,
+                    left:"center"
+                },
+                tooltip: {
+                    trigger: 'axis'
+                },
+                legend: {
+                    data: ['PH', '溶解氧', '氨氮', '高猛酸钾', '总有机碳']
+                },
+                grid: {
+                    left: '3%',
+                    right: '4%',
+                    bottom: '3%',
+                    containLabel: true
+                },
+                toolbox: {
+                    feature: {
+                        saveAsImage: {}
+                    }
+                },
+                xAxis: {
+                    type: 'category',
+                    boundaryGap: false,
+                    data: timeArray
+
+                },
+                yAxis: {
+                    type: 'value',
+                    name:"单位mg/L"+"\n"+"(PH除外)"
+                },
+                series: [
+                    {
+                        name: 'PH',
+                        type: 'line',
+                        stack: '总量',
+                        data: phArray
+                    },
+                    {
+                        name: '溶解氧',
+                        type: 'line',
+                        stack: '总量',
+                        data: dOArray
+                    },
+                    {
+                        name: '氨氮',
+                        type: 'line',
+                        stack: '总量',
+                        data: nH4Array
+                    },
+                    {
+                        name: '高猛酸钾',
+                        type: 'line',
+                        stack: '总量',
+                        data: cODMnArray
+                    },
+                    {
+                        name: '总有机碳',
+                        type: 'line',
+                        stack: '总量',
+                        data:tOCArray
+                    }
+                ]
+            };
+
+            myChart.setOption(option,true);
+
+
+        });
+
+    }
+
+    //查看水质监测站按钮的回调函数
+    function findSite()
+    {
+        $("#site").dialog("open");
+        $.post("FindAlllStationServlet",function (data)
+        {
+            var tableStr='<table class="table table-bordered" id="siteTable">\n' +
+                '                    <tr class="success">\n' +
+                '                        <th>水质站点名</th>\n' +
+                '                        <th>操作</th>\n' +
+                '                    </tr>';
+
+            for(var i=0;i<data.length;i++)
+            {
+               var obj= data[i];
+               var stationName=obj.stationName;
+               var hangStr='<tr class="info">\n' +
+                   '                        <td>'+stationName+'</td>\n' +
+                   '                        <td><button class="btn btn-info btn-xs" onclick="viewDetails(\''+stationName+'\');">查看位置</button>' +
+                   '&nbsp;<button onclick="viewPie(\''+stationName+'\');" class="btn btn-info btn-xs">水质饼图</button>&nbsp;' +
+                   '<button onclick="viewLine(\''+stationName+'\');" class="btn btn-info btn-xs">水质折线图</button></td>\n' +
+                   '                    </tr>';
+               tableStr+=hangStr;
+            }
+            var endStr=' </table>\n';
+            tableStr+=endStr;
+            $("#siteTable").html(tableStr);
+
+        });
+
+    }
+
+    //实时水情按钮的回调函数
+    function shuiQing()
+    {
+        $("#dd").dialog("open");
+        $.post("CurrentWaterLevelServlet",function (data)
+        {
+
+            var tableStr=' <table class="table table-bordered table-hover" id="shuiQingTable">\n' +
+                '                   <tr class="success">\n' +
+                '                       <th>河流</th>\n' +
+                '                       <th>站名</th>\n' +
+                '                       <th>日期</th>\n' +
+                '                       <th>水位</th>\n' +
+                '                       <th>流量</th>\n' +
+                '                       <th>超警戒/汛限水位</th>\n' +
+                '                       <th>操作</th>\n' +
+                '                   </tr>';
+
+            for(var i=0;i<data.length;i++)
+            {
+                var obj = data[i];
+                var riverName=obj.riverName;
+                var stationName=obj.siteName;
+                var date=obj.collectionDate;
+                var dateTime=dateFormat("YYYY-MM-dd HH:mm",new Date(date));
+                var waterLevel=obj.waterLevel;
+                var flow=obj.flow;
+                var over=obj.over;
+
+                var hangStr=' <tr class="info">\n' +
+                    '                       <td>'+riverName+'</td>\n' +
+                    '                       <td>'+stationName+'</td>\n' +
+                    '                       <td>'+dateTime+'</td>\n' +
+                    '                       <td>'+waterLevel+'</td>\n' +
+                    '                       <td>'+flow+'</td>\n' +
+                    '                       <td>'+over+'</td>\n' +
+                    '                       <td><button class="btn btn-sm btn-info" onclick="viewLevelChange(\''+stationName+'\');">水位变化曲线图</button></td>\n' +
+                    '                   </tr>';
+                tableStr+=hangStr;
+
+            }
+            var endStr=' </table>\n';
+            tableStr+=endStr;
+            $("#shuiqingDiv").html(tableStr);
+
+
+
+        });
+
+
+    }
+
+
+
+    var flashFeature;  //热区要素
+    var preFeature;  //前一个热区要素
+    var flag = false; //是否是同一个要素的标识
+    var feature; //当前鼠标选中要素
+    var draw; //绘制对象
+    var geoStr = null; // 当前绘制图形的坐标串
+    var currentFeature = null; //当前绘制的几何要素
+
+    //绘制热区的样式
+    var flashStyle = new ol.style.Style({
+        fill: new ol.style.Fill({
+            color: 'rgba(255, 102, 0, 0.2)'
+        }),
+        stroke: new ol.style.Stroke({
+            color: '#cc3300',
+            width: 2
+        }),
+        image: new ol.style.Circle({
+            radius: 7,
+            fill: new ol.style.Fill({
+                color: '#cc3300'
+            })
+        })
+    });
+    //矢量要素（区）的样式
+    var vectStyle = new ol.style.Style({
+        fill: new ol.style.Fill({
+            color: 'rgba(255, 255, 255, 0.5)'
+        }),
+        stroke: new ol.style.Stroke({
+            color: '#0099ff',
+            width: 2
+        }),
+        image: new ol.style.Circle({
+            radius: 7,
+            fill: new ol.style.Fill({
+                color: '#0099ff'
+            })
+        })
+    });
+
+    //矢量数据源
+    var vectSource = new ol.source.Vector({
+    });
+    //矢量图层
+    var vectLayer = new ol.layer.Vector({
+        source: vectSource,
+        style: vectStyle,
+        opacity: 0.5
+    });
+
+    //矢量数据源（热区）
+    var hotSpotsSource = new ol.source.Vector({
+    });
+    //矢量图层（热区）
+    var hotSpotsLayer = new ol.layer.Vector({
+        source: hotSpotsSource,
+        style: flashStyle,
+        opacity: 1
+    });
+
+
+
+    //实例化比例尺控件（ScaleLine）
+    var scaleLineControl = new ol.control.ScaleLine({
+        units: "metric" //设置比例尺单位，degrees、imperial、us、nautical、metric（度量单位）
+    });
+
+
+
+
+
+    var beijing = ol.proj.fromLonLat([116.38,39.87]);
+    //示例标注点北京市的信息对象
+    var featuerInfo = {
+        geo: beijing,
+        att: {
+            title: "北京市(中华人民共和国首都)", //标注信息的标题内容
+            titleURL: "http://www.openlayers.org/", //标注详细信息链接
+            text: "北京（Beijing），简称京，中华人民共和国首都、直辖市，中国的政治、文化和国际交往中心……", //标注内容简介
+            imgURL: "../img/img_1.png" //标注的图片
+        }
+    }
+
+
+
+    /*var layer = new ol.layer.Vector({
+        title: 'add Layer',
+        source: new ol.source.Vector({
+            projection: 'EPSG:3857',
+            url: "huai.json",
+            format: new ol.format.GeoJSON()
+        })
+    });*/
+
+
+    //实例化地图对象加载地图
+    var AMapLayer = new ol.layer.Tile({
+        source: new ol.source.XYZ({
+            url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}'
+        })
+    });
+    var map = new ol.Map({
+        logo: false,
+        layers: [AMapLayer,vectLayer,hotSpotsLayer],
+        target: 'map',
+        view: new ol.View({
+            center:ol.proj.fromLonLat([115.81, 32.89]),
+            zoom: 6,
+            minZoom:4,
+            maxZoom:20
+        }),
+        //加载控件到地图容器中
+        controls: ol.control.defaults().extend([scaleLineControl,new ol.control.FullScreen()])
+    });
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    var initialView = map.getView();//初始视图
+    var initialZoom = initialView.getZoom();
+    var initialCenter = initialView.getCenter();
+    var initialRotation = initialView.getRotation();
+
+    $("#reset").click(function ()//地图复位
+    {
+        initialView.setZoom(initialZoom);
+        initialView.setCenter(initialCenter);
+        initialView.setRotation(initialRotation);
+    });
+
+
+
+
+
+
+
+
+
+
+    var haha={
+        anchor: [0.5, 60],
+        anchorOrigin: 'top-right',
+        anchorXUnits: 'fraction',
+        anchorYUnits: 'pixels',
+        offsetOrigin: 'top-right',
+        // offset:[0,10],
+        // scale:0.5,  //图标缩放比例
+        opacity: 0.75,  //透明度
+        src: '../img/blueIcon.png' //图标的url
+        //src: imgsrc //图标的url
+    };
+
+    /**
+     * 创建标注样式函数,设置image为图标ol.style.Icon
+     * @param {ol.Feature} feature 要素
+     */
+    var createLabelStyle = function createLabelStyle (feature)
+    {
+        return new ol.style.Style(
+        {
+            image: new ol.style.Icon(/** @type {olx.style.IconOptions} */(haha)),
+            text: new ol.style.Text({
+                textAlign: 'center', //位置
+                textBaseline: 'middle', //基准线
+                font: 'normal 14px 微软雅黑',  //文字样式
+                text: feature.get('name'),  //文本内容
+                fill: new ol.style.Fill({ color: '#aa3300' }), //文本填充样式（即文字颜色）
+                stroke: new ol.style.Stroke({ color: '#ffcc33', width: 2 })
+            })
+        });
+    }
+
+
+
+    //实例化Vector要素，通过矢量图层添加到地图容器中
+    var iconFeature = new ol.Feature({
+        geometry: new ol.geom.Point(beijing),
+        name: '北京市',  //名称属性
+        population: 2115 //大概人口数（万）
+    });
+    iconFeature.setStyle(createLabelStyle(iconFeature));
+    //矢量标注的数据源
+    var vectorSource = new ol.source.Vector({
+        features: [iconFeature]
+    });
+
+
+
+    $.post("../IndexingServlet",function (data)
+    {
+        for(var i=0;i<data.length;i++)
+        {
+            var obj=data[i];
+            var station=obj.station;
+            var quality=obj.quality;
+
+            var longitude=station.longitude;
+            var latitude=station.latitude;
+            var stationName=station.stationName;
+
+            var level=null;
+            if(quality!=null)
+            {level=quality.level;}
+
+
+            //实例化Vector要素，通过矢量图层添加到地图容器中
+            var iconFeature2 = new ol.Feature({
+                geometry: new ol.geom.Point(ol.proj.fromLonLat([longitude,latitude])),
+                name: stationName,  //名称属性
+                population: 2115 //大概人口数（万）
+            });
+
+            if(level!=null&&level=="Ⅱ")
+            {haha.src="../img/blueIconTwo.png";}
+            else if(level!=null&&level=="Ⅰ")
+            {haha.src="../img/blueIconOne.png";}
+            else if(level!=null&&level=="Ⅲ")
+            {haha.src="../img/blueIconThree.png";}
+            else if(level!=null&&level=="Ⅳ")
+            {haha.src="../img/blueIconFour.png";}
+            else if(level!=null&&level=="Ⅴ")
+            {haha.src="../img/blueIconWu.png";}
+            else if(level!=null&&level=="劣Ⅴ")
+            {haha.src="../img/blueIconFive.png";}
+            else
+            {haha.src="../img/blueIconNull.png";}
+            iconFeature2.setStyle(createLabelStyle(iconFeature2));
+            //矢量标注的数据源
+            vectorSource.addFeature(iconFeature2)
+
+        }
+
+    });
+
+
+
+    //矢量标注图层
+    var vectorLayer = new ol.layer.Vector({
+        source: vectorSource
+    });
+    map.addLayer(vectorLayer);
+
+    /**
+     * 实现popup的html元素
+     */
+    var container = document.getElementById('popup');
+    var content = document.getElementById('popup-content');
+    var closer = document.getElementById('popup-closer');
+
+    /**
+     * 在地图容器中创建一个Overlay
+     */
+    var popup = new ol.Overlay(/** @type {olx.OverlayOptions} */({
+        element: container,
+        autoPan: true,
+        positioning: 'bottom-center',
+        stopEvent: false,
+        autoPanAnimation: {
+            duration: 250
+        }
+    }));
+    map.addOverlay(popup);
+
+    /**
+     * 添加关闭按钮的单击事件（隐藏popup）
+     * @return {boolean} Don't follow the href.
+     */
+    closer.onclick = function () {
+        popup.setPosition(undefined);  //未定义popup位置
+        closer.blur(); //失去焦点
+        return false;
+    };
+
+    /**
+     * 动态创建popup的具体内容
+     * @param {string} title
+     */
+    function addFeatrueInfo(info) {
+        //新增a元素
+        var elementA = document.createElement('a');
+        elementA.className = "markerInfo";
+        elementA.href = info.att.titleURL;
+        //elementA.innerText = info.att.title;
+        setInnerText(elementA, info.att.title);
+        content.appendChild(elementA); // 新建的div元素添加a子节点
+        //新增div元素
+        var elementDiv = document.createElement('div');
+        elementDiv.className = "markerText";
+        //elementDiv.innerText = info.att.text;
+        setInnerText(elementDiv, info.att.text);
+        content.appendChild(elementDiv); // 为content添加div子节点
+        //新增img元素
+        var elementImg = document.createElement('img');
+        elementImg.className = "markerImg";
+        elementImg.src = info.att.imgURL;
+        content.appendChild(elementImg); // 为content添加img子节点
+    }
+    /**
+     * 动态设置元素文本内容（兼容）
+     */
+    function setInnerText(element, text) {
+        if (typeof element.textContent == "string") {
+            element.textContent = text;
+        } else {
+            element.innerText = text;
+        }
+    }
+
+    /**
+     * 为map添加点击事件监听，渲染弹出popup
+     */
+    map.on('click', function (evt) {
+        var coordinate = evt.coordinate;
+        var zuobiao4326=ol.proj.transform(coordinate, 'EPSG:3857' ,'EPSG:4326');
+        var jingdu=zuobiao4326[0];
+        var weidu=zuobiao4326[1];
+
+        //判断当前单击处是否有要素，捕获到要素时弹出popup
+        var feature = map.forEachFeatureAtPixel(evt.pixel, function (feature, layer) { return feature; });
+        if (feature)
+        {
+
+
+
+            $.post("../FindStationAndQualityServlet",{jingdu:jingdu,weidu:weidu},function (data)
+            {
+                var stationName=data.station.stationName;
+                var introduction=data.station.introduction;
+
+
+                if(data.quality==null)
+                {
+                    alert("尚未有该站点的监测数据！")
+                }
+                var belongStation;
+                var dateTime;
+                var dateStr;
+                var dO;
+                var nH4;
+                var cODMn;
+                var tOC;
+                var level;
+                var pH;
+
+                if(data.quality!=null)
+                {
+                    belongStation=data.quality.belongStation;
+                    dateTime=data.quality.dateTime;
+                    dateStr=dateFormat("YYYY-MM-dd HH:mm",new Date(dateTime));
+                    pH=data.quality.pH;
+                    dO=data.quality.dO;
+                    nH4=data.quality.nH4;
+                    cODMn=data.quality.cODMn;
+                    tOC=data.quality.tOC;
+                    level=data.quality.level;
+
+
+                }
+
+
+
+                // 基于准备好的dom，初始化echarts实例
+                var myChart = echarts.init(document.getElementById('main'));
+
+                // 指定图表的配置项和数据
+                var option = {
+                    toolbox:{
+                        show:true,
+                        feature:
+                            {
+                                saveAsImage:{type:"png"}
+                            }
+                    },
+                    backgroundColor: "rgba(255,255,255,0.7)",
+                    title: {
+                        x:'center',
+                        text: belongStation+"最新水质数据",
+                        subtext:dateStr+"\t"+"水质类别："+level,
+                        subtextStyle:{
+
+                            fontSize:20,
+                            color: '#000000'
+                        }
+                    },
+                    tooltip: {},
+                    legend:
+                        {
+                            data:[]
+                        },
+                    xAxis: [{
+                        data: ["溶解氧","高猛酸钾","氨氮","总有机碳","PH"]
+                    }],
+                    yAxis:[ {
+                        name:"单位:mg/L"+"\n"+"（ph除外）",
+                        min:0,
+                        max:20
+
+                    }],
+                    series: [{
+                        /*name: '数值',*/
+                        type: 'bar',
+                        yAxisIndex: '0',
+                        data: [dO, cODMn, nH4, tOC,pH],
+                        //配置样式
+                        itemStyle: {
+                            //通常情况下：
+                            normal:{
+                                //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
+                                color: function (params){
+                                    var colorList = ['rgb(164,205,238)','rgb(42,170,227)','rgb(25,46,94)','rgb(195,229,235)','rgb(195,0,235)'];
+                                    return colorList[params.dataIndex];
+                                }
+                            },
+                            //鼠标悬停时：
+                            emphasis: {
+                                shadowBlur: 10,
+                                shadowOffsetX: 0,
+                                shadowColor: 'rgba(0, 0, 0, 0.5)'
+                            }
+                        },
+                    }]
+                };
+
+                if(level==="Ⅰ")
+                {
+                    option.title.subtextStyle.color="#c5ffff";
+                }
+
+                if(level==="Ⅱ")
+                {
+                    option.title.subtextStyle.color="#34c3f6";
+                }
+                if(level==="Ⅲ")
+                {
+                    option.title.subtextStyle.color="#03ff03";
+                }
+                if(level==="Ⅳ")
+                {
+                    option.title.subtextStyle.color="#faff19";
+                }
+                if(level==="Ⅴ")
+                {
+                    option.title.subtextStyle.color="#ff9000";
+                }
+                if(level==="劣Ⅴ")
+                {
+                    option.title.subtextStyle.color="#ff0000";
+                }
+                // 使用刚指定的配置项和数据显示图表。
+                myChart.setOption(option,true);
+
+
+                featuerInfo.att.text=introduction;//正文
+                featuerInfo.att.title=stationName;//标题
+
+
+                content.innerHTML = ''; //清空popup的内容容器
+                addFeatrueInfo(featuerInfo); //在popup中加载当前要素的具体信息
+
+                popup.setPosition(coordinate); //设置popup的位置
+
+
+
+
+            });/*post end*/
+
+
+
+        }
+    });
+    /**
+     * 为map添加鼠标移动事件监听，当指向标注时改变鼠标光标状态
+     */
+    map.on('pointermove', function (e) {
+        var pixel = map.getEventPixel(e.originalEvent);
+        var hit = map.hasFeatureAtPixel(pixel);
+        map.getTargetElement().style.cursor = hit ? 'pointer' : '';
+    });
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     * 在地图容器中创建一个Overlay
+     */
+    var element = document.getElementById('mypopup');
+    var mypopup = new ol.Overlay(/** @type {olx.OverlayOptions} */({
+        element: element,
+        positioning: 'bottom-center',
+        stopEvent: false
+    }));
+    map.addOverlay(mypopup);
+
+
+    /**
+     * 通过后台查询热区要素
+     */
+    function selectRegData()
+    {
+
+
+        $.post("../FindAllGraphServlet",function (data)
+        {
+            if(data.length===0)
+            {
+                alert("数据库中没有数据！");
+            }
+            preFeature = null;
+            flag = false;  //还原要素判断标识
+            hotSpotsSource.clear(); //清空绘图层数据源
+            hotSpotsLayer.setVisible(true); //显示绘图层
+            vectSource.clear(); //清空矢量图层数据源
+
+            for(var i=0;i<data.length;i++)
+            {
+
+
+                var obj = data[i];
+
+                var name = obj.name;
+                var id = obj.id;
+
+                var geome=obj.geometry;//坐标的字符串
+
+
+                var pointArray=geome.split(";")//先按分号进行切割
+                var coordinates = new Array();
+                coordinates[0] = new Array();
+                for(var j=0;j<pointArray.length;j++)
+                {
+                    coordinates[0][j] = pointArray[j].split(",");
+
+                }
+
+                //创建一个新的要素，并添加到数据源中
+                var feature = new ol.Feature({
+                    geometry: new ol.geom.Polygon(coordinates),
+                    name:name,
+                    id:id
+                });
+                vectSource.addFeature(feature);
+
+            }
+
+            map.on('pointermove', pointermoveFun,this); //添加鼠标移动事件监听，捕获要素时添加热区功能
+
+        });//ajax请求end
+
+    }
+
+
+    /**
+     * 鼠标移动事件监听处理函数（添加热区功能）
+     */
+    function pointermoveFun(e)
+    {
+        var pixel = map.getEventPixel(e.originalEvent);
+        var hit = map.hasFeatureAtPixel(pixel);
+        map.getTargetElement().style.cursor = hit ? 'pointer' : '';//改变鼠标光标状态
+
+        if (hit) {
+            //当前鼠标位置选中要素
+            var feature = map.forEachFeatureAtPixel(e.pixel,
+                function (feature, layer) {
+                    return feature;
+                });
+            //如果当前存在热区要素
+            if (feature) {
+                //显示热区图层
+                hotSpotsLayer.setVisible(true);
+                //控制添加热区要素的标识（默认为false）
+                if (preFeature != null) {
+                    if (preFeature === feature) {
+                        flag = true; //当前鼠标选中要素与前一个选中要素相同
+                    }
+                    else {
+
+                        flag = false; //当前鼠标选中要素不是前一个选中要素
+                        hotSpotsSource.removeFeature(preFeature); //将前一个热区要素移除
+                        preFeature = feature; //更新前一个热区要素对象
+                    }
+                }
+                //如果当前选中要素与之前选中要素不同，在热区绘制层添加当前要素
+                if (!flag) {
+                    $(element).popover('destroy'); //销毁popup
+                    flashFeature = feature; //当前热区要素
+                    flashFeature.setStyle(flashStyle); //设置要素样式
+                    hotSpotsSource.addFeature(flashFeature); //添加要素
+                    hotSpotsLayer.setVisible(true); //显示热区图层
+                    preFeature = flashFeature; //更新前一个热区要素对象
+                }
+                //弹出popup显示热区信息
+                mypopup.setPosition(e.coordinate); //设置popup的位置
+                $(element).popover({
+                    placement: 'top',
+                    html: true,
+                    content: feature.get('name')
+                });
+                $(element).css("width", "120px");
+                $(element).popover('show'); //显示popup
+
+            }
+            else {
+                hotSpotsSource.clear(); //清空热区图层数据源
+                flashFeature = null; //置空热区要素
+                $(element).popover('destroy'); //销毁popup
+                hotSpotsLayer.setVisible(false); //隐藏热区图层
+            }
+        }
+        else {
+            $(element).popover('destroy'); //销毁popup
+            hotSpotsLayer.setVisible(false); //隐藏热区图层
+        }
+    }
+
+
+    /**
+     * 绘制结束事件的回调函数，
+     * @param {ol.interaction.DrawEvent} evt 绘制结束事件
+     */
+    function drawEndCallBack(evt)
+    {
+        map.removeInteraction(draw); //移除绘制控件
+
+        var geoType = "Polygon"; //绘制图形类型
+        $("#dialog-confirm").dialog("open"); //打开属性信息设置对话框
+        currentFeature = evt.feature; //当前绘制的要素
+        var geo = currentFeature.getGeometry(); //获取要素的几何信息
+        var coordinates = geo.getCoordinates(); //获取几何坐标
+        //将几何坐标拼接为字符串
+        if (geoType == "Polygon")
+        {
+            geoStr = coordinates[0].join(";");
+        }
+        else
+        {
+            geoStr = coordinates.join(";");
+        }
+    }
+
+    /**
+     * 提交数据到后台保存
+     * @param {string} geoData 区几何数据
+     * @param {string} attData 区属性数据
+     */
+    function saveData( geoData, attData)
+    {
+        //通过ajax请求将数据传到后台文件进行保存处理
+        $.post("../AddGraphInfoServlet",{geo: geoData, att: attData},function (data)
+        {
+            alert(data.msg);
+
+        });
+
+    }
+
+    /**
+     * 将绘制的几何数据与对话框设置的属性数据提交到后台处理
+     */
+    function submitData()
+    {
+        var name = $("#name").val(); //名称
+        var city = $("#city").val(); //所属城市
+        var attData = name + "," + city;
+
+        if (geoStr != null)
+        {
+            saveData(geoStr, attData); //将数据提交到后台处理（保存到数据库中）
+            currentFeature = null;  //置空当前绘制的几何要素
+            geoStr = null; //置空当前绘制图形的geoStr
+        }
+        else
+        {
+            alert("未得到绘制图形几何信息！");
+            vector.getSource().removeFeature(currentFeature); //删除当前绘制图形
+        }
+    }
+
+    // 初始化绘制热区要素信息设置对话框
+    $("#dialog-confirm").dialog(
+        {
+            modal: true,  // 创建模式对话框
+            autoOpen: false, //默认隐藏对话框
+            //对话框打开时默认设置
+            open: function (event, ui) {
+                $(".ui-dialog-titlebar-close", $(this).parent()).hide(); //隐藏默认的关闭按钮
+            },
+            //对话框功能按钮
+            buttons:
+             {
+                "提交": function ()
+                {
+                    submitData(); //提交几何与属性信息到后台处理
+                    $(this).dialog('close'); //关闭对话框
+                },
+                "取消": function ()
+                {
+                    $(this).dialog('close'); //关闭对话框
+                    vectLayer.getSource().removeFeature(currentFeature); //删除当前绘制图形
+                }
+            }
+        });
+
+
+    /**
+     * 鼠标单击事件监听处理函数
+     */
+    function singleclickFun(e)
+    {
+        var pixel = map.getEventPixel(e.originalEvent);
+        var hit = map.hasFeatureAtPixel(pixel);
+        map.getTargetElement().style.cursor = hit ? 'pointer' : '';
+        //当前鼠标位置选中要素
+        var feature = map.forEachFeatureAtPixel(e.pixel,
+            function (feature, layer) {
+                return feature;
+            });
+        //如果当前存在热区要素
+        if (feature)
+        {
+            $("#dialog-delete").dialog("open"); //打开删除要素设置对话框
+            currentFeature = feature; //当前绘制的要素
+        }
+    }
+    /**
+     * 通过后台删除热区要素
+     */
+    function deleteData(feature)
+    {
+        var regID = feature.get('id'); //要素的ID
+
+        //通过ajax请求将数据传到后台文件进行删除处理
+        $.post("../DeleGraphServlet",{fID: regID},function (data)
+        {
+            alert(data.msg);
+            vectLayer.getSource().removeFeature(currentFeature); //删除当前选中热区要素
+
+        });
+
+    }
+
+    // 初始化删除要素信息设置对话框
+    $("#dialog-delete").dialog(
+        {
+            modal: true,  // 创建模式对话框
+            autoOpen: false, //默认隐藏对话框
+            //对话框打开时默认设置
+            open: function (event, ui) {
+                $(".ui-dialog-titlebar-close", $(this).parent()).hide(); //隐藏默认的关闭按钮
+            },
+            //对话框功能按钮
+            buttons: {
+                "删除": function () {
+                    deleteData(currentFeature);  //通过后台删除数据库中的热区要素数据并同时删除前端绘图
+                    $(this).dialog('close'); //关闭对话框
+                },
+                "取消": function () {
+                    $(this).dialog('close'); //关闭对话框
+
+                }
+            }
+        });
+
+
+    /**
+     * 【显示热区】功能按钮处理函数
+     */
+    document.getElementById('showReg').onclick = function () {
+        map.un('pointermove', pointermoveFun, this); //移除鼠标移动事件监听
+        selectRegData(); //通过后台查询热区要素显示并实现热区功能
+    };
+
+    /**
+     * 【绘制热区】功能按钮处理函数
+     */
+    document.getElementById('drawReg').onclick = function () {
+        map.removeInteraction(draw); //移除绘制控件
+        map.un('singleclick', singleclickFun, this); //移除鼠标单击事件监听
+
+        //实例化交互绘制类对象并添加到地图容器中
+        draw = new ol.interaction.Draw({
+            source: vectLayer.getSource(), //绘制层数据源
+            type: /** @type {ol.geom.GeometryType} */"Polygon"  //几何图形类型
+        });
+        map.addInteraction(draw);
+        //添加绘制结束事件监听，在绘制结束后保存信息到数据库
+        draw.on('drawend', drawEndCallBack, this);
+    };
+
+    /**
+     * 【删除热区】功能按钮处理函数
+     */
+    document.getElementById('deleteReg').onclick = function () {
+        map.un('pointermove', pointermoveFun, this); //移除鼠标移动事件监听
+
+        map.un('singleclick', singleclickFun, this); //移除鼠标单击事件监听
+        map.on('singleclick', singleclickFun, this); //添加鼠标单击事件监听
+    };
+
+
+
+
+
+
+
+    $("#site").dialog
+    (
+        {
+            closeText:"关闭",
+            height:500,
+            width:500,
+            modal: true,
+            autoOpen:false,//默认隐藏对话框
+            show:
+                {
+                    effect: "blind",
+                    duration: 1000
+                },
+            hide:
+                {
+                    effect: "explode",
+                    duration: 1000
+                }
+
+
+        }
+
+
+    );
+
+
+    $("#wQuality").dialog
+    (
+        {
+            closeText:"关闭",
+            height:500,
+            width:900,
+            modal: true,
+            autoOpen:false,//默认隐藏对话框
+            show:
+                {
+                    effect: "blind",
+                    duration: 1000
+                },
+            hide:
+                {
+                    effect: "explode",
+                    duration: 1000
+                }
+
+
+        }
+
+
+    );
+
+
+
+    $("#dd").dialog
+    (
+        {
+            closeText:"关闭",
+            height:500,
+            width:700,
+            modal: true,
+            autoOpen:false,//默认隐藏对话框
+            show:
+                {
+                    effect: "blind",
+                    duration: 1000
+                },
+            hide:
+                {
+                    effect: "explode",
+                    duration: 1000
+                }
+
+
+        }
+
+
+    );
+
+
+    function dateFormat(fmt, date) //时间格式化
+    {
+        var ret;
+        var opt =
+            {
+                "Y+": date.getFullYear().toString(),        // 年
+                "M+": (date.getMonth() + 1).toString(),     // 月
+                "d+": date.getDate().toString(),            // 日
+                "H+": date.getHours().toString(),           // 时
+                "m+": date.getMinutes().toString(),         // 分
+                "s+": date.getSeconds().toString()       // 秒
+                // 有其他格式化字符需求可以继续添加，必须转化成字符串
+            };
+        for (var k in opt)
+        {
+            ret = new RegExp("(" + k + ")").exec(fmt);
+            if (ret)
+            {
+                fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+            };
+        };
+        return fmt;
+    }
+
+</script>
+</body>
+</html>
diff --git a/src/src_qianduan/WEB-INF/waterLevelPage/addWaterLevelData.jsp b/src/src_qianduan/WEB-INF/waterLevelPage/addWaterLevelData.jsp
new file mode 100644
index 0000000..f50d846
--- /dev/null
+++ b/src/src_qianduan/WEB-INF/waterLevelPage/addWaterLevelData.jsp
@@ -0,0 +1,112 @@
+<%--
+  Created by Yingyong Lao.
+  User: laoyingyong
+  Date: 2019-12-12
+  Time: 16:18
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>添加水位数据</title>
+    <!-- 2. jQuery导入，建议使用1.9以上的版本 -->
+    <script src="../js/jquery-3.2.1.min.js"></script>
+    <!-- 1. 导入CSS的全局样式 -->
+    <link href="../css/bootstrap-3.3.7-dist/css/bootstrap.min.css" rel="stylesheet">
+    <script src="../js/bootstrap.min.js"></script>
+    <script>
+
+        $(function () //入口函数
+        {
+            $("#waterLevelForm").submit(function ()
+            {
+                $.post("../AddWaterLevelDataServlet",$(this).serialize(),function (data)
+                {
+                    alert(data.msg);
+                });
+
+                return false;//阻止页面跳转
+            });
+        });
+
+        function addWaterLevel()
+        {
+            $.post("../AddManyWaterLevelServlet",function (data)
+            {
+                alert(data.msg);
+            });
+
+        }
+
+
+    </script>
+</head>
+<body style="background:url('../img/img01.jpg') repeat-x">
+<div class="container">
+    <div class="row">
+        <div class="col-sm-12">
+            <form id="waterLevelForm" action="AddWaterQualityDataServlet" method="post">
+                <table class="table table-bordered">
+                    <caption style="text-align: center;font-size: 24px">添加水位监测数据</caption>
+                    <tr class="success">
+                        <th  style="text-align: center">河流</th>
+                        <th  style="text-align: center">站名</th>
+                        <th  style="text-align: center">日期</th>
+                        <th  style="text-align: center">水位（m）</th>
+                        <th  style="text-align: center">流量</th>
+                        <th  style="text-align: center">超警戒/汛限水位</th>
+                    </tr>
+                    <tr class="info">
+                        <td><input name="riverName" placeholder="海河"></td>
+                        <td><input name="siteName" placeholder="站名"></td>
+                        <td><input type="datetime-local" name="collectionDate"></td>
+                        <td><input type="number" step="0.01" style="width: 80px" name="waterLevel"></td>
+                        <td><input type="number" step="0.1" style="width: 80px" name="flow"></td>
+                        <td><input type="number" step="0.01" style="width: 80px" name="over"></td>
+
+                    </tr>
+                    <tr class="info">
+                        <td colspan="6" style="text-align: center"><input type="submit" value="添加" class="btn btn-info"></td>
+                    </tr>
+
+                </table>
+
+            </form>
+
+        </div><%--单元格的结尾--%>
+
+    </div><%--row end--%>
+
+    <div class="row">
+        <div class="col-sm-4">
+            <button class="btn btn-info" onclick="addWaterLevel();"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span>&nbsp;从水文局同步数据到数据库</button>
+        </div>
+
+
+    </div>
+    <div class="row" style="margin-top: 50px">
+        <div class="col-sm-5">
+            <form method="post" action="../UploadServlet2" enctype="multipart/form-data">
+                <table class="table table-bordered">
+                    <caption style="text-align: center;font-size: 24px" >文件上传方式</caption>
+                    <tr>
+                        <td>
+                            <input type="file" name="file" class="btn btn-info" >
+
+                        </td>
+                        <td>
+                            <input type="submit" value="开始上传水位数据" class="btn btn-info">
+                        </td>
+                    </tr>
+
+                </table>
+
+
+            </form>
+
+        </div>
+
+    </div>
+</div>
+
+</body>
+</html>
diff --git a/src/src_qianduan/WEB-INF/waterLevelPage/viewWaterLevelInfo.jsp b/src/src_qianduan/WEB-INF/waterLevelPage/viewWaterLevelInfo.jsp
new file mode 100644
index 0000000..7bbb28d
--- /dev/null
+++ b/src/src_qianduan/WEB-INF/waterLevelPage/viewWaterLevelInfo.jsp
@@ -0,0 +1,784 @@
+<%--
+  Created by Yingyong Lao.
+  User: laoyingyong
+  Date: 2019-12-12
+  Time: 18:49
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>查看水位信息</title>
+    <script src="../js/jquery-3.2.1.min.js"></script>
+    <!-- 1. 导入CSS的全局样式 -->
+    <link href="../css/bootstrap-3.3.7-dist/css/bootstrap.min.css" rel="stylesheet">
+    <script src="../js/bootstrap.min.js"></script>
+    <script>
+
+        function dateFormat(fmt, date) //时间格式化
+        {
+            var ret;
+            var opt =
+                {
+                    "y+": date.getFullYear().toString(),        // 年
+                    "M+": (date.getMonth() + 1).toString(),     // 月
+                    "d+": date.getDate().toString(),            // 日
+                    "H+": date.getHours().toString(),           // 时
+                    "m+": date.getMinutes().toString(),         // 分
+                    "s+": date.getSeconds().toString()       // 秒
+                    // 有其他格式化字符需求可以继续添加，必须转化成字符串
+                };
+            for (var k in opt)
+            {
+                ret = new RegExp("(" + k + ")").exec(fmt);
+                if (ret)
+                {
+                    fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+                };
+            };
+            return fmt;
+        }
+
+
+        $(function () //入口函数
+        {
+            $.post("../FindAllByPageServlet",{currentPage:1,pageSize:5},function (data)//页面加载完成后初始化界面
+            {
+                var totalCount = data.totalCount;
+                var totalPage=data.totalPage;
+                var currentPage = data.currentPage;
+                var array = data.list;
+
+                //上一页的图标
+                if(currentPage==1)
+                {
+                    var str='<li class="disabled" onclick="findByPage('+(currentPage-1)+',5);">\n' +
+                        '                        <a href="#" aria-label="Previous">\n' +
+                        '                            <span aria-hidden="true">&laquo;</span>\n' +
+                        '                        </a>\n' +
+                        '                    </li>';
+
+                }
+                else
+                {
+                    var str='<li onclick="findByPage('+(currentPage-1)+',5);">\n' +
+                        '                        <a href="#" aria-label="Previous">\n' +
+                        '                            <span aria-hidden="true">&laquo;</span>\n' +
+                        '                        </a>\n' +
+                        '                    </li>';
+
+                }
+
+
+                var beginNum;//分页条第一个数字
+                var endNum;//分页条最后一个数字
+                if(totalPage<10)//如果总页数小于10页
+                {
+                    beginNum=1;
+                    endNum=totalPage;
+                }
+                else//如果总页数大于等于10页
+                {
+                    beginNum=currentPage-5;
+                    endNum=currentPage+4;
+                    if(beginNum<1)//currentPage-5可能会是一个小于等于0的数，也就是用户在浏览1,2,3,4,5页时的情况
+                    {
+                        beginNum=1;//纠正回来
+                        endNum=beginNum+9;
+                    }
+                    if(endNum>totalPage)//用户在浏览倒数1,2,3,4页时的情况
+                    {
+                        endNum=totalPage;//纠正回来，让分页条最后一个数字为总的页数
+                        beginNum=endNum-9;
+                    }
+
+                }
+
+
+                for(var i=beginNum;i<=endNum;i++)//中间分页栏的部分
+                {
+                    if(i==currentPage)
+                    {
+                        var item=' <li class="active" onclick="findByPage('+i+',5);"><a href="#">'+i+'</a></li>';
+
+                    }
+                    else
+                    {
+                        var item=' <li onclick="findByPage('+i+',5);"><a href="#">'+i+'</a></li>';
+
+                    }
+                    str=str+item;
+                }
+                if(currentPage==totalPage)
+                {
+                    var endStr='<li class="disabled" onclick="findByPage('+(currentPage+1)+',5);">\n' +
+                        '                        <a href="#" aria-label="Next">\n' +
+                        '                            <span aria-hidden="true">&raquo;</span>\n' +
+                        '                        </a>\n' +
+                        '                    </li>\n' +
+                        '                    <span style="font-size: 24px" id="total_sp">共'+totalCount+'条记录，共'+totalPage+'页</span>';
+                }
+                else
+                {
+                    var endStr='<li onclick="findByPage('+(currentPage+1)+',5);">\n' +
+                        '                        <a href="#" aria-label="Next">\n' +
+                        '                            <span aria-hidden="true">&raquo;</span>\n' +
+                        '                        </a>\n' +
+                        '                    </li>\n' +
+                        '                    <span style="font-size: 24px" id="total_sp">共'+totalCount+'条记录，共'+totalPage+'页</span>';
+                }
+
+                str=str+endStr;
+                $("#fenyelan").html(str);//初始化分页栏
+
+
+                var tableStr='<caption style="text-align: center;font-size: 24px">水位信息一览表</caption>\n' +
+                    '                <tr class="success">\n' +
+                    '                    <th style="text-align: center">id</th>\n' +
+                    '                    <th style="text-align: center">河流</th>\n' +
+                    '                    <th style="text-align: center">站名</th>\n' +
+                    '                    <th style="text-align: center">水位（m）</th>\n' +
+                    '                    <th style="text-align: center">超过警戒线（m）</th>\n' +
+                    '                    <th style="text-align: center">流量</th>\n' +
+                    '                    <th style="text-align: center">日期</th>\n' +
+                    '                     <th style="text-align: center">操作</th>\n'+
+                    '                </tr>';
+
+
+                for(var i=0;i<array.length;i++)
+                {
+                    var obj = array[i];
+                    var id = obj.id;
+                    var riverName = obj.riverName;
+                    var siteName = obj.siteName;
+                    var waterLevel = obj.waterLevel;
+                    var over = obj.over;
+                    var flow = obj.flow;
+                    var collectionDate = obj.collectionDate;
+                    var dateTime=dateFormat("yyyy-MM-dd HH:mm",new Date(collectionDate));
+
+                    var tableItem=' <tr class="info">\n' +
+                        '                    <td style="text-align: center">'+id+'</td>\n' +
+                        '                    <td style="text-align: center">'+riverName+'</td>\n' +
+                        '                    <td style="text-align: center">'+siteName+'</td>\n' +
+                        '                    <td style="text-align: center">'+waterLevel+'</td>\n' +
+                        '                    <td style="text-align: center">'+over+'</td>\n' +
+                        '                    <td style="text-align: center">'+flow+'</td>\n' +
+                        '                    <td style="text-align: center">'+dateTime+'</td>\n' +
+                        '<td style="text-align: center"><input type="button" onclick="update('+id+',\''+riverName+'\',\''+siteName+'\',\''+waterLevel+'\',\''+over+'\',\''+flow+'\',\''+dateTime+'\');" value="修改" class="btn btn-info">&nbsp;&nbsp;&nbsp;&nbsp;<input onclick="dele('+id+');" type="button" value="删除" class="btn btn-info"></td>\n'+
+                        '                </tr>';
+
+                    tableStr=tableStr+tableItem;
+
+                }
+                $("#waterLevelTable").html(tableStr);
+
+            });
+
+        });//入口函数end
+
+
+        function findByPage(cuentPage,paSize)//页面按钮被点击时的回调函数
+        {
+            $.post("../FindAllByPageServlet",{currentPage:cuentPage,pageSize:paSize},function (data)//页面加载完成后初始化界面
+            {
+                var totalCount = data.totalCount;
+                var totalPage=data.totalPage;
+                var currentPage = data.currentPage;
+                var array = data.list;
+
+                //上一页的图标
+                if(currentPage==1)
+                {
+                    var str='<li class="disabled" onclick="findByPage('+(currentPage-1)+',5);">\n' +
+                        '                        <a href="#" aria-label="Previous">\n' +
+                        '                            <span aria-hidden="true">&laquo;</span>\n' +
+                        '                        </a>\n' +
+                        '                    </li>';
+
+                }
+                else
+                {
+                    var str='<li onclick="findByPage('+(currentPage-1)+',5);">\n' +
+                        '                        <a href="#" aria-label="Previous">\n' +
+                        '                            <span aria-hidden="true">&laquo;</span>\n' +
+                        '                        </a>\n' +
+                        '                    </li>';
+
+                }
+
+
+                var beginNum;//分页条第一个数字
+                var endNum;//分页条最后一个数字
+                if(totalPage<10)//如果总页数小于10页
+                {
+                    beginNum=1;
+                    endNum=totalPage;
+                }
+                else//如果总页数大于等于10页
+                {
+                    beginNum=currentPage-5;
+                    endNum=currentPage+4;
+                    if(beginNum<1)//currentPage-5可能会是一个小于等于0的数，也就是用户在浏览1,2,3,4,5页时的情况
+                    {
+                        beginNum=1;//纠正回来
+                        endNum=beginNum+9;
+                    }
+                    if(endNum>totalPage)//用户在浏览倒数1,2,3,4页时的情况
+                    {
+                        endNum=totalPage;//纠正回来，让分页条最后一个数字为总的页数
+                        beginNum=endNum-9;
+                    }
+
+                }
+
+                for(var i=beginNum;i<=endNum;i++)
+                {
+                    if(i==currentPage)
+                    {
+                        var item=' <li class="active" onclick="findByPage('+i+',5);"><a href="#">'+i+'</a></li>';
+
+                    }
+                    else
+                    {
+                        var item=' <li onclick="findByPage('+i+',5);"><a href="#">'+i+'</a></li>';
+
+                    }
+
+                    str=str+item;
+                }
+                if(currentPage==totalPage)
+                {
+                    var endStr='<li class="disabled" onclick="findByPage('+(currentPage+1)+',5);">\n' +
+                        '                        <a href="#" aria-label="Next">\n' +
+                        '                            <span aria-hidden="true">&raquo;</span>\n' +
+                        '                        </a>\n' +
+                        '                    </li>\n' +
+                        '                    <span style="font-size: 24px" id="total_sp">共'+totalCount+'条记录，共'+totalPage+'页</span>';
+                }
+                else
+                {
+                    var endStr='<li onclick="findByPage('+(currentPage+1)+',5);">\n' +
+                        '                        <a href="#" aria-label="Next">\n' +
+                        '                            <span aria-hidden="true">&raquo;</span>\n' +
+                        '                        </a>\n' +
+                        '                    </li>\n' +
+                        '                    <span style="font-size: 24px" id="total_sp">共'+totalCount+'条记录，共'+totalPage+'页</span>';
+                }
+                str=str+endStr;
+                $("#fenyelan").html(str);//初始化分页栏
+
+
+                var tableStr='<caption style="text-align: center;font-size: 24px">水位信息一览表</caption>\n' +
+                    '                <tr class="success">\n' +
+                    '                    <th style="text-align: center">id</th>\n' +
+                    '                    <th style="text-align: center">河流</th>\n' +
+                    '                    <th style="text-align: center">站名</th>\n' +
+                    '                    <th style="text-align: center">水位（m）</th>\n' +
+                    '                    <th style="text-align: center">超过警戒线（m）</th>\n' +
+                    '                    <th style="text-align: center">流量</th>\n' +
+                    '                    <th style="text-align: center">日期</th>\n' +
+                    '                     <th style="text-align: center">操作</th>\n'+
+                    '                </tr>';
+
+
+                for(var i=0;i<array.length;i++)
+                {
+                    var obj = array[i];
+                    var id = obj.id;
+                    var riverName = obj.riverName;
+                    var siteName=obj.siteName;
+                    var waterLevel = obj.waterLevel;
+                    var over = obj.over;
+                    var flow = obj.flow;
+                    var collectionDate = obj.collectionDate;
+                    var dateTime=dateFormat("yyyy-MM-dd HH:mm",new Date(collectionDate));
+
+                    var tableItem=' <tr class="info">\n' +
+                        '                    <td style="text-align: center">'+id+'</td>\n' +
+                        '                    <td style="text-align: center">'+riverName+'</td>\n' +
+                        '                    <td style="text-align: center">'+siteName+'</td>\n' +
+                        '                    <td style="text-align: center">'+waterLevel+'</td>\n' +
+                        '                    <td style="text-align: center">'+over+'</td>\n' +
+                        '                    <td style="text-align: center">'+flow+'</td>\n' +
+                        '                    <td style="text-align: center">'+dateTime+'</td>\n' +
+                        '<td style="text-align: center"><input type="button" onclick="update('+id+',\''+riverName+'\',\''+siteName+'\',\''+waterLevel+'\',\''+over+'\',\''+flow+'\',\''+dateTime+'\');" value="修改" class="btn btn-info">&nbsp;&nbsp;&nbsp;&nbsp;<input onclick="dele('+id+');" type="button" value="删除" class="btn btn-info"></td>\n'+
+                        '                </tr>';
+
+                    tableStr=tableStr+tableItem;
+
+                }
+                $("#waterLevelTable").html(tableStr);
+
+            });
+
+        }//回调函数的结尾
+
+        //更新按钮的回调函数
+        function update(id,riverName,siteName,waterLevel,over,flow,collectionDate)
+        {
+            var str=' <form id="confirmUpdateForm">\n' +
+                '            <table class="table table-bordered table-hover">\n' +
+                '                <caption style="text-align: center;font-size: 24px">修改数据</caption>\n' +
+                '                <tr class="success">\n' +
+                '                    <th style="text-align: center">id</th>\n' +
+                '                    <th style="text-align: center">河流</th>\n' +
+                '                    <th style="text-align: center">站名</th>\n' +
+                '                    <th style="text-align: center">水位（m）</th>\n' +
+                '                    <th style="text-align: center">超过警戒线（m）</th>\n' +
+                '                    <th style="text-align: center">流量</th>\n' +
+                '                    <th style="text-align: center">日期</th>\n' +
+                '                    <th style="text-align: center">操作</th>\n' +
+                '                </tr>\n' +
+                '                <tr class="info">\n' +
+                '                    <td style="text-align: center"><input id="id" name="id" style="width:120px" readonly value="'+id+'"></td>\n' +
+                '                    <td style="text-align: center"><input value="'+riverName+'" id="riverName2"  style="width:120px"></td>\n' +
+                '                    <td style="text-align: center"><input value="'+siteName+'" id="siteName2"  style="width:120px"></td>\n' +
+                '                    <td style="text-align: center"><input value="'+waterLevel+'" id="shuiwei" type="number" step="0.01" name="shuiwei" placeholder="21.43" style="width:120px" ></td>\n' +
+                '                    <td style="text-align: center"><input value="'+over+'" id="chaoguo" type="number" step="0.01" name="chaoguo" placeholder="0" style="width:120px"></td>\n' +
+                '                    <td style="text-align: center"><input value="'+flow+'" id="flow" type="number" step="0.1" name="zhuangtai"  style="width:120px"></td>\n' +
+                '                    <td style="text-align: center"><input value="'+collectionDate+'" id="caijiriqi" name="caijiriqi" type="text"></td>\n' +
+                '                    <td style="text-align: center"><input type="button" onclick="updateInfo()" value="确认修改" class="btn btn-info"></td>\n' +
+                '                </tr>\n' +
+                '            </table>\n' +
+                '            </form>';
+           $("#confirmUpdate_div").html(str);
+
+        } //更新按钮的回调函数end
+
+
+        function updateInfo()//确认修改按钮的回调函数
+        {
+            var id=$("#id").val();
+            var riverName=$("#riverName2").val();
+            var siteName=$("#siteName2").val();
+            var shuiwei=$("#shuiwei").val();
+            var chaoguo=$("#chaoguo").val();
+            var flow=$("#flow").val();
+            var caijiriqi=$("#caijiriqi").val();
+            $.get("../UpdateWaterLevelData",{id:id,riverName:riverName,siteName:siteName,shuiwei:shuiwei,chaoguo:chaoguo,flow:flow,caijiriqi:caijiriqi} ,function (data)
+            {
+                alert(data.msg);
+                window.location.href="viewWaterLevelInfo.jsp";
+
+            });
+        }
+
+        //删除按钮的回调函数
+        function dele(id)
+        {
+            var b = confirm("您确定要删除吗？");
+            if(b)
+            {
+                $.post("../DeleteInfoServlet",{id:id},function (data)
+                {
+                    alert(data.msg);
+                    window.location.href="viewWaterLevelInfo.jsp";
+
+                });
+
+            }
+
+        }
+
+        //条件查询按钮的回调函数
+        function searchByCondition()
+        {
+            var riverName=$("#riverName").val();
+            var siteName=$("#siteName").val();
+            var collectionDate=$("#collectionDate").val();
+            $.post("../ConditionQueryByPageServlet",{riverName:riverName,siteName:siteName,collectionDate:collectionDate,currentPage2:1,pageSize2:5},function (data)
+            {
+                //alert(data);
+                var totalCount = data.totalCount;
+
+                if(totalCount==0)
+                {
+                    alert("数据库中没有记录！");
+                }
+                var totalPage = data.totalPage;
+                var currentPage = data.currentPage;
+                var array = data.list;
+
+                var tableStr=' <caption style="text-align: center;font-size: 24px">查询结果</caption>\n' +
+                    '                <tr class="success">\n' +
+                    '                    <th style="text-align: center">id</th>\n' +
+                    '                    <th style="text-align: center">河流</th>\n' +
+                    '                    <th style="text-align: center">站名</th>\n' +
+                    '                    <th style="text-align: center">水位（m）</th>\n' +
+                    '                    <th style="text-align: center">超过警戒线（m）</th>\n' +
+                    '                    <th style="text-align: center">流量</th>\n' +
+                    '                    <th style="text-align: center">日期</th>\n' +
+                    '                    <th style="text-align: center">操作</th>\n' +
+                    '                </tr>';
+
+                for(var i=0;i<array.length;i++)
+                {
+                    var obj = array[i];
+                    var id = obj.id;
+                    var riverName2 = obj.riverName;
+                    var siteName2=obj.siteName;
+                    var waterLevel = obj.waterLevel;
+                    var over = obj.over;
+                    var flow= obj.flow;
+                    var collectionDate2 = obj.collectionDate;
+                    var dateStr=dateFormat("yyyy-MM-dd HH:mm",new Date(collectionDate2));
+
+                    var item=' <tr class="info">\n' +
+                        '                    <td style="text-align: center">'+id+'</td>\n' +
+                        '                    <td style="text-align: center">'+riverName2+'</td>\n' +
+                        '                    <td style="text-align: center">'+siteName2+'</td>\n' +
+                        '                    <td style="text-align: center">'+waterLevel+'</td>\n' +
+                        '                    <td style="text-align: center">'+over+'</td>\n' +
+                        '                    <td style="text-align: center">'+flow+'</td>\n' +
+                        '                    <td style="text-align: center">'+dateStr+'</td>\n' +
+                        '<td style="text-align: center"><input type="button" onclick="update('+id+',\''+riverName2+'\',\''+siteName2+'\',\''+waterLevel+'\',\''+over+'\',\''+flow+'\',\''+dateStr+'\');" value="修改" class="btn btn-info">&nbsp;&nbsp;&nbsp;&nbsp;<input onclick="dele('+id+');" type="button" value="删除" class="btn btn-info"></td>\n'+
+                        '                </tr>';
+
+                    tableStr+=item;
+                }
+
+                var endStr='  </table>';
+                tableStr+=endStr;
+                $("#waterLevelTable").html(tableStr);
+
+
+                if(currentPage==1)
+                {
+                    var fenyelanStr=' <li class="disabled" onclick="findByPage2(\''+riverName+'\',\''+siteName+'\',\''+collectionDate+'\','+(currentPage-1)+',5);">\n' +
+                        '                        <a href="#" aria-label="Previous">\n' +
+                        '                            <span aria-hidden="true">&laquo;</span>\n' +
+                        '                        </a>\n' +
+                        '                    </li>';
+
+                }
+                else
+                {
+                    var fenyelanStr=' <li onclick="findByPage2(\''+riverName+'\',\''+siteName+'\',\''+collectionDate+'\','+(currentPage-1)+',5);">\n' +
+                        '                        <a href="#" aria-label="Previous">\n' +
+                        '                            <span aria-hidden="true">&laquo;</span>\n' +
+                        '                        </a>\n' +
+                        '                    </li>';
+
+                }
+
+
+                var beginNum;//分页条第一个数字
+                var endNum;//分页条最后一个数字
+                if(totalPage<10)//如果总页数小于10页
+                {
+                    beginNum=1;
+                    endNum=totalPage;
+                }
+                else//如果总页数大于等于10页
+                {
+                    beginNum=currentPage-5;
+                    endNum=currentPage+4;
+                    if(beginNum<1)//currentPage-5可能会是一个小于等于0的数，也就是用户在浏览1,2,3,4,5页时的情况
+                    {
+                        beginNum=1;//纠正回来
+                        endNum=beginNum+9;
+                    }
+                    if(endNum>totalPage)//用户在浏览倒数1,2,3,4页时的情况
+                    {
+                        endNum=totalPage;//纠正回来，让分页条最后一个数字为总的页数
+                        beginNum=endNum-9;
+                    }
+
+                }
+
+                for(var i=beginNum;i<=endNum;i++)
+                {
+                    if(i==currentPage)
+                    {
+                        var middleStr='<li class="active" onclick="findByPage2(\''+riverName+'\',\''+siteName+'\',\''+collectionDate+'\','+i+',5);"><a href="#">'+i+'</a></li>';
+                        fenyelanStr+=middleStr;
+
+                    }
+                    else
+                    {
+                        var middleStr='<li onclick="findByPage2(\''+riverName+'\',\''+siteName+'\',\''+collectionDate+'\','+i+',5);"><a href="#">'+i+'</a></li>';
+                        fenyelanStr+=middleStr;
+                    }
+
+
+                }
+
+                if(currentPage==totalPage)
+                {
+                    var lastStr='<li class="disabled" onclick="findByPage2(\''+riverName+'\',\''+siteName+'\',\''+collectionDate+'\','+(currentPage+1)+',5);">\n' +
+                        '                        <a href="#" aria-label="Next">\n' +
+                        '                            <span aria-hidden="true">&raquo;</span>\n' +
+                        '                        </a>\n' +
+                        '                    </li>\n' +
+                        '                    <span style="font-size: 24px" id="total_sp">共'+totalCount+'条记录，共'+totalPage+'页&nbsp;&nbsp;' +
+                        '<input type="button" class="btn btn-info btn-sm" value="返回一览表" onclick="fuwei();"></span>';
+                }
+
+                else
+                {
+                    var lastStr='<li onclick="findByPage2(\''+riverName+'\',\''+siteName+'\',\''+collectionDate+'\','+(currentPage+1)+',5);">\n' +
+                        '                        <a href="#" aria-label="Next">\n' +
+                        '                            <span aria-hidden="true">&raquo;</span>\n' +
+                        '                        </a>\n' +
+                        '                    </li>\n' +
+                        '                    <span style="font-size: 24px" id="total_sp">共'+totalCount+'条记录，共'+totalPage+'页&nbsp;&nbsp;' +
+                        '<input type="button" class="btn btn-info btn-sm" value="返回一览表" onclick="fuwei();"></span>';
+                }
+
+
+                fenyelanStr+=lastStr;
+                $("#fenyelan").html(fenyelanStr);
+
+
+
+            });//异步请求end
+
+
+        }
+
+        function fuwei()
+        {
+            window.location.href='viewWaterLevelInfo.jsp';
+
+        }
+
+        function findByPage2(riverName,siteName,collectionDate,currentPage,pageSize)
+        {
+            $.post("../ConditionQueryByPageServlet",{riverName:riverName,siteName:siteName,collectionDate:collectionDate,currentPage2:currentPage,pageSize2:pageSize},function (data)
+            {
+                var totalCount = data.totalCount;
+
+
+                if(totalCount==0)
+                {
+                    alert("数据库中没有记录！");
+                }
+                var totalPage = data.totalPage;
+                var currentPage = data.currentPage;
+                var array = data.list;
+
+                var tableStr=' <caption style="text-align: center;font-size: 24px">查询结果</caption>\n' +
+                    '                <tr class="success">\n' +
+                    '                    <th style="text-align: center">id</th>\n' +
+                    '                    <th style="text-align: center">河流</th>\n' +
+                    '                    <th style="text-align: center">站名</th>\n' +
+                    '                    <th style="text-align: center">水位（m）</th>\n' +
+                    '                    <th style="text-align: center">超过警戒线（m）</th>\n' +
+                    '                    <th style="text-align: center">流量</th>\n' +
+                    '                    <th style="text-align: center">日期</th>\n' +
+                    '                    <th style="text-align: center">操作</th>\n' +
+                    '                </tr>';
+
+                for(var i=0;i<array.length;i++)
+                {
+                    var obj = array[i];
+                    var id = obj.id;
+                    var riverName2 = obj.riverName;
+                    var siteName2=obj.siteName;
+                    var waterLevel = obj.waterLevel;
+                    var over = obj.over;
+                    var flow= obj.flow;
+                    var collectionDate2 = obj.collectionDate;
+                    var dateStr=dateFormat("yyyy-MM-dd HH:mm",new Date(collectionDate2));
+
+                    var item=' <tr class="info">\n' +
+                        '                    <td style="text-align: center">'+id+'</td>\n' +
+                        '                    <td style="text-align: center">'+riverName2+'</td>\n' +
+                        '                    <td style="text-align: center">'+siteName2+'</td>\n' +
+                        '                    <td style="text-align: center">'+waterLevel+'</td>\n' +
+                        '                    <td style="text-align: center">'+over+'</td>\n' +
+                        '                    <td style="text-align: center">'+flow+'</td>\n' +
+                        '                    <td style="text-align: center">'+dateStr+'</td>\n' +
+                        '<td style="text-align: center"><input type="button" onclick="update('+id+',\''+riverName2+'\',\''+siteName2+'\',\''+waterLevel+'\',\''+over+'\',\''+flow+'\',\''+dateStr+'\');" value="修改" class="btn btn-info">&nbsp;&nbsp;&nbsp;&nbsp;<input onclick="dele('+id+');" type="button" value="删除" class="btn btn-info"></td>\n'+
+                        '                </tr>';
+
+                    tableStr+=item;
+                }
+
+                var endStr='  </table>';
+                tableStr+=endStr;
+                $("#waterLevelTable").html(tableStr);
+
+
+                if(currentPage==1)
+                {
+                    var fenyelanStr=' <li class="disabled" onclick="findByPage2(\''+riverName+'\',\''+siteName+'\',\''+collectionDate+'\','+(currentPage-1)+',5);">\n' +
+                        '                        <a href="#" aria-label="Previous">\n' +
+                        '                            <span aria-hidden="true">&laquo;</span>\n' +
+                        '                        </a>\n' +
+                        '                    </li>';
+
+                }
+                else
+                {
+                    var fenyelanStr=' <li onclick="findByPage2(\''+riverName+'\',\''+siteName+'\',\''+collectionDate+'\','+(currentPage-1)+',5);">\n' +
+                        '                        <a href="#" aria-label="Previous">\n' +
+                        '                            <span aria-hidden="true">&laquo;</span>\n' +
+                        '                        </a>\n' +
+                        '                    </li>';
+
+                }
+
+
+                var beginNum;//分页条第一个数字
+                var endNum;//分页条最后一个数字
+                if(totalPage<10)//如果总页数小于10页
+                {
+                    beginNum=1;
+                    endNum=totalPage;
+                }
+                else//如果总页数大于等于10页
+                {
+                    beginNum=currentPage-5;
+                    endNum=currentPage+4;
+                    if(beginNum<1)//currentPage-5可能会是一个小于等于0的数，也就是用户在浏览1,2,3,4,5页时的情况
+                    {
+                        beginNum=1;//纠正回来
+                        endNum=beginNum+9;
+                    }
+                    if(endNum>totalPage)//用户在浏览倒数1,2,3,4页时的情况
+                    {
+                        endNum=totalPage;//纠正回来，让分页条最后一个数字为总的页数
+                        beginNum=endNum-9;
+                    }
+
+                }
+
+                for(var i=beginNum;i<=endNum;i++)
+                {
+                    if(i==currentPage)
+                    {
+                        var middleStr='<li class="active" onclick="findByPage2(\''+riverName+'\',\''+siteName+'\',\''+collectionDate+'\','+i+',5);"><a href="#">'+i+'</a></li>';
+                        fenyelanStr+=middleStr;
+
+                    }
+                    else
+                    {
+                        var middleStr='<li onclick="findByPage2(\''+riverName+'\',\''+siteName+'\',\''+collectionDate+'\','+i+',5);"><a href="#">'+i+'</a></li>';
+                        fenyelanStr+=middleStr;
+                    }
+
+                }
+
+                if(currentPage==totalPage)
+                {
+                    var lastStr='<li class="disabled" onclick="findByPage2(\''+riverName+'\',\''+siteName+'\',\''+collectionDate+'\','+(currentPage+1)+',5);">\n' +
+                        '                        <a href="#" aria-label="Next">\n' +
+                        '                            <span aria-hidden="true">&raquo;</span>\n' +
+                        '                        </a>\n' +
+                        '                    </li>\n' +
+                        '                    <span style="font-size: 24px" id="total_sp">共'+totalCount+'条记录，共'+totalPage+'页&nbsp;&nbsp;' +
+                        '<input type="button" class="btn btn-info btn-sm" value="返回一览表" onclick="fuwei();"></span>';
+                }
+
+                else
+                {
+                    var lastStr='<li onclick="findByPage2(\''+riverName+'\',\''+siteName+'\',\''+collectionDate+'\','+(currentPage+1)+',5);">\n' +
+                        '                        <a href="#" aria-label="Next">\n' +
+                        '                            <span aria-hidden="true">&raquo;</span>\n' +
+                        '                        </a>\n' +
+                        '                    </li>\n' +
+                        '                    <span style="font-size: 24px" id="total_sp">共'+totalCount+'条记录，共'+totalPage+'页&nbsp;&nbsp;' +
+                        '<input type="button" class="btn btn-info btn-sm" value="返回一览表" onclick="fuwei();"></span>';
+                }
+
+
+
+
+                fenyelanStr+=lastStr;
+                $("#fenyelan").html(fenyelanStr);
+
+            });
+
+
+        }
+
+
+
+    </script>
+</head>
+<body style="background: url('../img/img01.jpg') repeat-x">
+<div class="container">
+    <div class="row">
+        <div class="col-sm-8"  style="margin-top: 20px">
+
+                <form class="form-inline">
+                    <div class="form-group">
+                        <label class="sr-only" for="riverName">Email address</label>
+                        <input type="text" class="form-control" id="riverName" name="name2" placeholder="河流、湖泊">
+                    </div>
+                    <div class="form-group">
+                        <label class="sr-only" for="siteName">Password</label>
+                        <input type="text" class="form-control" id="siteName" name="status2" placeholder="站名">
+                    </div>
+                    <div class="form-group">
+                        <label class="sr-only" for="collectionDate">Password</label>
+                        <input type="text" class="form-control" id="collectionDate" name="status2" placeholder="时间">
+                    </div>
+                    <button type="button" onclick="searchByCondition();" class="btn btn-warning">搜索</button>
+                </form>
+         </div>
+
+    </div><%--row end--%>
+    <div class="row">
+
+        <div class="col-sm-10" id="waterLevelTableDiv">
+
+            <table class="table table-bordered table-hover" id="waterLevelTable">
+                <caption style="text-align: center;font-size: 24px">水位信息一览表</caption>
+                <tr class="success">
+                    <th style="text-align: center">id</th>
+                    <th style="text-align: center">地点名称</th>
+                    <th style="text-align: center">水位（m）</th>
+                    <th style="text-align: center">超过警戒线（m）</th>
+                    <th style="text-align: center">状态</th>
+                    <th style="text-align: center">采集日期</th>
+                    <th style="text-align: center">操作</th>
+                </tr>
+                <tr class="info">
+                    <td style="text-align: center">id</td>
+                    <td style="text-align: center">地点名称</td>
+                    <td style="text-align: center">水位（m）</td>
+                    <td style="text-align: center">超过警戒线（m）</td>
+                    <td style="text-align: center">状态（OK/NO）</td>
+                    <td style="text-align: center">采集日期</td>
+                    <td style="text-align: center"><input type="button" onclick="update(1);" value="修改" class="btn btn-info">&nbsp;&nbsp;&nbsp;&nbsp;<input onclick="dele(1);" type="button" value="删除" class="btn btn-info"></td>
+                </tr>
+            </table>
+
+            <nav aria-label="Page navigation">
+                <ul class="pagination" id="fenyelan">
+                    <li>
+                        <a href="#" aria-label="Previous">
+                            <span aria-hidden="true">&laquo;</span>
+                        </a>
+                    </li>
+                    <li><a href="#">1</a></li>
+                    <li>
+                        <a href="#" aria-label="Next">
+                            <span aria-hidden="true">&raquo;</span>
+                        </a>
+                    </li>
+                    <span style="font-size: 24px" id="total_sp">共2条记录，共1页</span>
+                </ul>
+            </nav>
+
+        </div>
+
+    </div>
+
+    <div class="row">
+        <hr style="background-color: silver;border: none;height: 2px">
+
+    </div>
+
+    <div class="row">
+        <div class="col-sm-10" id="confirmUpdate_div">
+        </div>
+
+    </div>
+
+</div>
+
+</body>
+</html>
diff --git a/src/src_qianduan/WEB-INF/waterQualityPage/addWaterQualityData.jsp b/src/src_qianduan/WEB-INF/waterQualityPage/addWaterQualityData.jsp
new file mode 100644
index 0000000..17fe618
--- /dev/null
+++ b/src/src_qianduan/WEB-INF/waterQualityPage/addWaterQualityData.jsp
@@ -0,0 +1,224 @@
+<%--
+  Created by Yingyong Lao.
+  User: laoyingyong
+  Date: 2019-12-11
+  Time: 18:43
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>添加水质质量数据</title>
+    <script src="../js/jquery-ui.js"></script>
+    <!-- 2. jQuery导入，建议使用1.9以上的版本 -->
+    <script src="../js/jquery-3.2.1.min.js"></script>
+    <!-- 1. 导入CSS的全局样式 -->
+    <link href="../css/bootstrap-3.3.7-dist/css/bootstrap.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="../css/jquery-ui.min.css">
+    <script src="../js/bootstrap.min.js"></script>
+    <script>
+        $(function ()
+        {
+
+            $.post("../FindAlllStationServlet",function (data)
+            {
+                for (var i = 0; i <data.length ; i++)
+                {
+                    var obj=data[i];
+                    var stationName=obj.stationName;
+                    var optionStr='<option value="'+stationName+'">'+stationName+'</option>';
+                    $("#belongStation").append(optionStr);
+                }
+
+            });
+
+            $("#stationForm").submit(function ()
+            {
+                $.get("../AddWaterQualityDataServlet",$("#stationForm").serialize(),function (data)//serialize()千万别少写了括号哦
+                {
+                    var msg=data.msg;
+                    var str='<div class="alert alert-warning alert-dismissible" role="alert">\n' +
+                        '  <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>\n' +
+                        '  <strong>提示：</strong>'+msg+'\n' +
+                        '</div>';
+                    $("#msg_div").html(str);
+                });
+
+                return false;//阻止页面跳转
+            });
+
+
+
+        });
+
+
+        function addSomeWaterQuality()
+        {
+            $.post("../AddWaterQualityServlet",function (data)
+            {
+                var msg=data.msg;
+                alert(msg);
+
+            });
+
+        }
+
+        function getStation()
+        {
+            var belongStation = $("#belongStation").val();
+            return belongStation;
+        }
+        
+        function addOneWaterQuality() 
+        {
+            var belongStation = getStation();
+            var waterQuality=getQualityLevel();
+            var date = $("#date").val();
+            var ph = $("#ph").val();
+            var oxygen = $("#oxygen").val();
+            var nitrogen=$("#nitrogen").val();
+            var permangan = $("#permangan").val();
+            var orgacarbon=$("#orgacarbon").val();
+
+
+            $.post("../AddOneWaterQualityServlet",{belongStation:belongStation,date:date,ph:ph,oxygen:oxygen,nitrogen:nitrogen,permangan:permangan,orgacarbon:orgacarbon,waterQuality:waterQuality},function (data)
+            {
+                alert(data.msg);
+                
+            });
+            
+        }
+
+
+        function getQualityLevel()
+        {
+            var a = $("#qualitySelect").val();
+
+            return a;
+        }
+
+
+
+
+    </script>
+</head>
+<body style="background: url('../img/img01.jpg') repeat-x;">
+<div class="container">
+    <div class="row">
+        <div class="col-sm-8">
+            <form id="stationForm" action="AddWaterQualityDataServlet" method="post">
+            <table class="table table-bordered">
+                <caption style="text-align: center;font-size: 24px">添加水质监测站</caption>
+                <tr class="success">
+                    <th  style="text-align: center">监测站名称</th>
+                    <th  style="text-align: center">经度</th>
+                    <th  style="text-align: center">纬度</th>
+                    <th  style="text-align: center">所属断面</th>
+                    <th  style="text-align: center">简介</th>
+                </tr>
+                <tr class="info">
+                    <td><input name="stationName" placeholder="安徽宿州杨庄"></td>
+                    <td><input name="longitude" placeholder="经度"></td>
+                    <td><input name="latitude" placeholder="纬度"></td>
+                    <td><input name="section" placeholder="苏-皖省界"></td>
+                    <td><textarea rows="5" cols="20" name="introduction" placeholder="安徽宿州杨庄水质自动监测站位于宿州市杨庄乡伊桥村。点位坐标北纬34度03分43秒，东经117度13分12秒。属淮河流域，奎河（苏-皖省界）。由安徽省宿州环境监测站管理。距水站77公里。建于2006年12月。"></textarea></td>
+                </tr>
+                <tr class="info">
+                    <td colspan="2" style="text-align: center"><input id="addStation_Btn" type="submit" value="添加" class="btn btn-info"></td>
+                    <td colspan="3"> <div id="msg_div"></div></td>
+                </tr>
+
+            </table>
+
+            </form>
+
+        </div><%--单元格的结尾--%>
+
+    </div><%--row end--%>
+
+    <div class="row" style="padding-top: 50px"><%--第二行--%>
+
+        <div class="col-md-12">
+                <table class="table table-bordered table-responsive table-condensed">
+                    <caption style="text-align: center;font-size: 24px">手动添加水质监测数据</caption>
+                    <tr class="success">
+                        <th  style="text-align: center">所属测站名</th>
+                        <th  style="text-align: center">PH</th>
+                        <th  style="text-align: center">溶解氧</th>
+                        <th  style="text-align: center">氨氮</th>
+                        <th  style="text-align: center">高猛酸钾指数</th>
+                        <th  style="text-align: center">总有机碳</th>
+                        <th  style="text-align: center">水质类别</th>
+                        <th  style="text-align: center">测量时间</th>
+                    </tr>
+                    <tr class="info">
+                        <td>
+                            <select id="belongStation" onchange="getStation();">
+                                <option>--请选择--</option>
+                            </select>
+                        </td>
+                        <td><input type="number" step="0.01" style="width: 120px" id="ph" name="ph" placeholder="8.02"></td>
+                        <td><input type="number" step="0.01" style="width: 110px" id="oxygen" name="oxygen" placeholder="11.33"></td>
+                        <td><input type="number" step="0.01" style="width: 120px" name="nitrogen" id="nitrogen" placeholder="1.39"></td>
+                        <td><input type="number" step="0.01" style="width: 120px" name="permangan" id="permangan" placeholder="3.5"></td>
+                        <td><input type="number" step="0.01" style="width: 120px" name="orgacarbon" id="orgacarbon" placeholder="0.8"></td>
+                        <td>
+                            <select id="qualitySelect" onchange="getQualityLevel();">
+                                <option>--请选择--</option>
+                                <option value="I">Ⅰ</option>
+                                <option value="II">Ⅱ</option>
+                                <option value="III">Ⅲ</option>
+                                <option value="IV">Ⅳ</option>
+                                <option value="V">Ⅴ</option>
+                                <option value="劣V">劣Ⅴ</option>
+
+                            </select>
+                        </td>
+                        <td><input type="datetime-local" style="width: 180px"  name="date" id="date" placeholder="2019-12-11 12:00"></td>
+                    </tr>
+                    <tr class="info">
+                        <td colspan="4" style="text-align: center"><input  onclick="addOneWaterQuality();" type="button" value="添加" class="btn btn-info"></td>
+                        <td colspan="5"></td>
+                    </tr>
+
+                </table>
+        </div><%--单元格的结尾--%>
+
+
+    </div><%--第二行end--%>
+
+
+    <div class="row" style="padding-top:50px">
+        <div class="col-sm-3 ">
+            <table class="table table-bordered">
+                <caption style="text-align: center;font-size: 24px">一键添加多条水质数据</caption>
+                <tr>
+                    <td><button onclick="addSomeWaterQuality();" class="btn btn-info"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span>&nbsp;从“中国环境监测总站”同步数据到数据库</button></td>
+                </tr>
+            </table>
+
+        </div>
+
+        <div class="col-sm-5 col-sm-offset-3">
+            <form method="post" enctype="multipart/form-data" action="../UploadServlet">
+            <table class="table table-bordered">
+                <caption style="text-align: center;font-size: 24px">文件上传方式</caption>
+                <tr>
+                    <td>
+                        <input type="file" class="btn-info btn" name="file">
+                    </td>
+                    <td>
+                        <input type="submit" value="开始上传水质数据" class="btn btn-info" style="float: left">
+                    </td>
+                </tr>
+            </table>
+            </form>
+
+        </div>
+
+    </div>
+
+</div><%--container容器end--%>
+
+
+</body>
+</html>