diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index c7df2ce..2364ab9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -113,7 +113,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
                              @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
-    @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
+    @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
 
     @Select("SELECT  " +

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index c7df2ce..2364ab9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -113,7 +113,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
                              @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
-    @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
+    @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
 
     @Select("SELECT  " +
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java
index 7d25168..7074e09 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java
@@ -7,6 +7,11 @@
 public class ValveDto {
 
     private String valveCode;
+
     private String longitude;
+
     private String latitude;
+
+    //阀门类型，0：上游阀门，1：下游阀门
+    private String valveType;
 }

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index c7df2ce..2364ab9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -113,7 +113,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
                              @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
-    @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
+    @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
 
     @Select("SELECT  " +
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java
index 7d25168..7074e09 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java
@@ -7,6 +7,11 @@
 public class ValveDto {
 
     private String valveCode;
+
     private String longitude;
+
     private String latitude;
+
+    //阀门类型，0：上游阀门，1：下游阀门
+    private String valveType;
 }
diff --git a/casic-web/src/main/resources/config/application-postgre.yml b/casic-web/src/main/resources/config/application-postgre.yml
index ee026a1..8d923ab 100644
--- a/casic-web/src/main/resources/config/application-postgre.yml
+++ b/casic-web/src/main/resources/config/application-postgre.yml
@@ -34,7 +34,7 @@
   kaptcha-open: false #是否开启登录时验证码 (true/false)
   zjj_id: 1559096734123003906
   #kaptcha-open: false #是否开启登录时验证码 (true/false)
-  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/job/updateSinkJob
+  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/job/updateSinkJob,/dept/tree
   db:
     init:
       enable: false