diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
index 340408e..69e1b4c 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
@@ -14,9 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.bz.dto.BzDto;
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
-import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
 
-import javax.annotation.PostConstruct;
 import java.util.List;
 import java.util.Map;
 
@@ -65,15 +63,17 @@
         List<BzDto> list = JSONObject.parseArray(response.body(), BzDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("BZ:" + stcd);
-            BzDto dto = new BzDto();
-            if ((flag && (dto = bladeRedis.get("BZ:" + stcd)) != null && DateUtil.parse(dto.getTM()).before(DateUtil.parse(list.get(0).getTM())))
-                    || !flag) {
-//                log.info("泵站redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(BzDto.convert(list.get(0))));
-                bladeRedis.set("BZ:" + stcd, list.get(0));
-                log.info("发送泵站的数据:code:{},data:{}",stcd,JSONObject.toJSONString(BzDto.convert(list.get(0))));
-                return;
-            }
+            List<BzDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                BzDto dto = new BzDto();
+                if ((flag && (dto = bladeRedis.get("BZ:" + stcd)) != null && DateUtil.parse(dto.getTM()).before(DateUtil.parse(i.getTM()))) || !flag) {
+                    log.info("泵站redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(BzDto.convert(i)));
+                    bladeRedis.set("BZ:" + stcd, i);
+                    log.info("发送泵站的数据:code:{},data:{}", stcd, JSONObject.toJSONString(BzDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }

diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
index 340408e..69e1b4c 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
@@ -14,9 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.bz.dto.BzDto;
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
-import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
 
-import javax.annotation.PostConstruct;
 import java.util.List;
 import java.util.Map;
 
@@ -65,15 +63,17 @@
         List<BzDto> list = JSONObject.parseArray(response.body(), BzDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("BZ:" + stcd);
-            BzDto dto = new BzDto();
-            if ((flag && (dto = bladeRedis.get("BZ:" + stcd)) != null && DateUtil.parse(dto.getTM()).before(DateUtil.parse(list.get(0).getTM())))
-                    || !flag) {
-//                log.info("泵站redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(BzDto.convert(list.get(0))));
-                bladeRedis.set("BZ:" + stcd, list.get(0));
-                log.info("发送泵站的数据:code:{},data:{}",stcd,JSONObject.toJSONString(BzDto.convert(list.get(0))));
-                return;
-            }
+            List<BzDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                BzDto dto = new BzDto();
+                if ((flag && (dto = bladeRedis.get("BZ:" + stcd)) != null && DateUtil.parse(dto.getTM()).before(DateUtil.parse(i.getTM()))) || !flag) {
+                    log.info("泵站redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(BzDto.convert(i)));
+                    bladeRedis.set("BZ:" + stcd, i);
+                    log.info("发送泵站的数据:code:{},data:{}", stcd, JSONObject.toJSONString(BzDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
index 595d298..69b9514 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
@@ -29,11 +29,11 @@
     private final ZsAction zsAction;
     @Scheduled(cron = "0 0/2 * * * ?")
     public void synchronize() {
-        bzAction.list();
-        gqAction.list();
-        hdAction.list();
-        hpAction.list();
+//        bzAction.list();
+//        gqAction.list();
+//        hdAction.list();
+//        hpAction.list();
         ylAction.list();
-//        zsAction.list();
+        zsAction.list();
     }
 }

diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
index 340408e..69e1b4c 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
@@ -14,9 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.bz.dto.BzDto;
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
-import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
 
-import javax.annotation.PostConstruct;
 import java.util.List;
 import java.util.Map;
 
@@ -65,15 +63,17 @@
         List<BzDto> list = JSONObject.parseArray(response.body(), BzDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("BZ:" + stcd);
-            BzDto dto = new BzDto();
-            if ((flag && (dto = bladeRedis.get("BZ:" + stcd)) != null && DateUtil.parse(dto.getTM()).before(DateUtil.parse(list.get(0).getTM())))
-                    || !flag) {
-//                log.info("泵站redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(BzDto.convert(list.get(0))));
-                bladeRedis.set("BZ:" + stcd, list.get(0));
-                log.info("发送泵站的数据:code:{},data:{}",stcd,JSONObject.toJSONString(BzDto.convert(list.get(0))));
-                return;
-            }
+            List<BzDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                BzDto dto = new BzDto();
+                if ((flag && (dto = bladeRedis.get("BZ:" + stcd)) != null && DateUtil.parse(dto.getTM()).before(DateUtil.parse(i.getTM()))) || !flag) {
+                    log.info("泵站redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(BzDto.convert(i)));
+                    bladeRedis.set("BZ:" + stcd, i);
+                    log.info("发送泵站的数据:code:{},data:{}", stcd, JSONObject.toJSONString(BzDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
index 595d298..69b9514 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
@@ -29,11 +29,11 @@
     private final ZsAction zsAction;
     @Scheduled(cron = "0 0/2 * * * ?")
     public void synchronize() {
-        bzAction.list();
-        gqAction.list();
-        hdAction.list();
-        hpAction.list();
+//        bzAction.list();
+//        gqAction.list();
+//        hdAction.list();
+//        hpAction.list();
         ylAction.list();
-//        zsAction.list();
+        zsAction.list();
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java
index dd23f31..768cbc4 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java
@@ -14,6 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
 import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
+import org.springnewfiber.dataadapter.ziguang.hd.dto.HdDto;
 
 import javax.annotation.PostConstruct;
 import java.util.List;
@@ -64,15 +65,18 @@
         List<GqDto> list = JSONObject.parseArray(response.body(), GqDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("gq:" + stcd);
+            List<GqDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
             GqDto dto = new GqDto();
-            if ((flag && (dto = bladeRedis.get("gq:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
+            if ((flag && (dto = bladeRedis.get("gq:" + stcd)) != null && dto.getTM().before(i.getTM()))
                     || !flag) {
-                log.info("港渠redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(GqDto.convert(list.get(0))));
-                bladeRedis.set("gq:" + stcd, list.get(0));
-                log.info("发送港渠的数据:{},数据:{}", stcd, JSONObject.toJSONString(GqDto.convert(list.get(0))));
+                log.info("港渠redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                rabbitTemplate.convertAndSend(JSONObject.toJSONString(GqDto.convert(i)));
+                bladeRedis.set("gq:" + stcd, i);
+                log.info("发送港渠的数据:{},数据:{}", stcd, JSONObject.toJSONString(GqDto.convert(i)));
                 return;
             }
+        });
         }
     }
 }

diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
index 340408e..69e1b4c 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
@@ -14,9 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.bz.dto.BzDto;
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
-import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
 
-import javax.annotation.PostConstruct;
 import java.util.List;
 import java.util.Map;
 
@@ -65,15 +63,17 @@
         List<BzDto> list = JSONObject.parseArray(response.body(), BzDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("BZ:" + stcd);
-            BzDto dto = new BzDto();
-            if ((flag && (dto = bladeRedis.get("BZ:" + stcd)) != null && DateUtil.parse(dto.getTM()).before(DateUtil.parse(list.get(0).getTM())))
-                    || !flag) {
-//                log.info("泵站redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(BzDto.convert(list.get(0))));
-                bladeRedis.set("BZ:" + stcd, list.get(0));
-                log.info("发送泵站的数据:code:{},data:{}",stcd,JSONObject.toJSONString(BzDto.convert(list.get(0))));
-                return;
-            }
+            List<BzDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                BzDto dto = new BzDto();
+                if ((flag && (dto = bladeRedis.get("BZ:" + stcd)) != null && DateUtil.parse(dto.getTM()).before(DateUtil.parse(i.getTM()))) || !flag) {
+                    log.info("泵站redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(BzDto.convert(i)));
+                    bladeRedis.set("BZ:" + stcd, i);
+                    log.info("发送泵站的数据:code:{},data:{}", stcd, JSONObject.toJSONString(BzDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
index 595d298..69b9514 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
@@ -29,11 +29,11 @@
     private final ZsAction zsAction;
     @Scheduled(cron = "0 0/2 * * * ?")
     public void synchronize() {
-        bzAction.list();
-        gqAction.list();
-        hdAction.list();
-        hpAction.list();
+//        bzAction.list();
+//        gqAction.list();
+//        hdAction.list();
+//        hpAction.list();
         ylAction.list();
-//        zsAction.list();
+        zsAction.list();
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java
index dd23f31..768cbc4 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java
@@ -14,6 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
 import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
+import org.springnewfiber.dataadapter.ziguang.hd.dto.HdDto;
 
 import javax.annotation.PostConstruct;
 import java.util.List;
@@ -64,15 +65,18 @@
         List<GqDto> list = JSONObject.parseArray(response.body(), GqDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("gq:" + stcd);
+            List<GqDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
             GqDto dto = new GqDto();
-            if ((flag && (dto = bladeRedis.get("gq:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
+            if ((flag && (dto = bladeRedis.get("gq:" + stcd)) != null && dto.getTM().before(i.getTM()))
                     || !flag) {
-                log.info("港渠redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(GqDto.convert(list.get(0))));
-                bladeRedis.set("gq:" + stcd, list.get(0));
-                log.info("发送港渠的数据:{},数据:{}", stcd, JSONObject.toJSONString(GqDto.convert(list.get(0))));
+                log.info("港渠redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                rabbitTemplate.convertAndSend(JSONObject.toJSONString(GqDto.convert(i)));
+                bladeRedis.set("gq:" + stcd, i);
+                log.info("发送港渠的数据:{},数据:{}", stcd, JSONObject.toJSONString(GqDto.convert(i)));
                 return;
             }
+        });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java
index 68a5d6f..5f9cbd1 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java
@@ -14,6 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
 import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
 import org.springnewfiber.dataadapter.ziguang.hd.dto.HdDto;
+import org.springnewfiber.dataadapter.ziguang.hp.dto.HpDto;
 
 import java.util.List;
 import java.util.Map;
@@ -63,15 +64,18 @@
         List<HdDto> list = JSONObject.parseArray(response.body(), HdDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("hd:" + stcd);
-            HdDto dto = new HdDto();
-            if ((flag && (dto = bladeRedis.get("hd:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
-                    || !flag) {
-                log.info("河道redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(HdDto.convert(list.get(0))));
-                bladeRedis.set("hd:" + stcd, list.get(0));
-                log.info("发送河道的数据:{},数据:{}", stcd, JSONObject.toJSONString(HdDto.convert(list.get(0))));
-                return;
-            }
+            List<HdDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                HdDto dto = new HdDto();
+                if ((flag && (dto = bladeRedis.get("hd:" + stcd)) != null && dto.getTM().before(i.getTM()))
+                        || !flag) {
+                    log.info("河道redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(HdDto.convert(i)));
+                    bladeRedis.set("hd:" + stcd,i);
+                    log.info("发送河道的数据:{},数据:{}", stcd, JSONObject.toJSONString(HdDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }

diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
index 340408e..69e1b4c 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
@@ -14,9 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.bz.dto.BzDto;
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
-import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
 
-import javax.annotation.PostConstruct;
 import java.util.List;
 import java.util.Map;
 
@@ -65,15 +63,17 @@
         List<BzDto> list = JSONObject.parseArray(response.body(), BzDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("BZ:" + stcd);
-            BzDto dto = new BzDto();
-            if ((flag && (dto = bladeRedis.get("BZ:" + stcd)) != null && DateUtil.parse(dto.getTM()).before(DateUtil.parse(list.get(0).getTM())))
-                    || !flag) {
-//                log.info("泵站redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(BzDto.convert(list.get(0))));
-                bladeRedis.set("BZ:" + stcd, list.get(0));
-                log.info("发送泵站的数据:code:{},data:{}",stcd,JSONObject.toJSONString(BzDto.convert(list.get(0))));
-                return;
-            }
+            List<BzDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                BzDto dto = new BzDto();
+                if ((flag && (dto = bladeRedis.get("BZ:" + stcd)) != null && DateUtil.parse(dto.getTM()).before(DateUtil.parse(i.getTM()))) || !flag) {
+                    log.info("泵站redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(BzDto.convert(i)));
+                    bladeRedis.set("BZ:" + stcd, i);
+                    log.info("发送泵站的数据:code:{},data:{}", stcd, JSONObject.toJSONString(BzDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
index 595d298..69b9514 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
@@ -29,11 +29,11 @@
     private final ZsAction zsAction;
     @Scheduled(cron = "0 0/2 * * * ?")
     public void synchronize() {
-        bzAction.list();
-        gqAction.list();
-        hdAction.list();
-        hpAction.list();
+//        bzAction.list();
+//        gqAction.list();
+//        hdAction.list();
+//        hpAction.list();
         ylAction.list();
-//        zsAction.list();
+        zsAction.list();
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java
index dd23f31..768cbc4 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java
@@ -14,6 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
 import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
+import org.springnewfiber.dataadapter.ziguang.hd.dto.HdDto;
 
 import javax.annotation.PostConstruct;
 import java.util.List;
@@ -64,15 +65,18 @@
         List<GqDto> list = JSONObject.parseArray(response.body(), GqDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("gq:" + stcd);
+            List<GqDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
             GqDto dto = new GqDto();
-            if ((flag && (dto = bladeRedis.get("gq:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
+            if ((flag && (dto = bladeRedis.get("gq:" + stcd)) != null && dto.getTM().before(i.getTM()))
                     || !flag) {
-                log.info("港渠redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(GqDto.convert(list.get(0))));
-                bladeRedis.set("gq:" + stcd, list.get(0));
-                log.info("发送港渠的数据:{},数据:{}", stcd, JSONObject.toJSONString(GqDto.convert(list.get(0))));
+                log.info("港渠redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                rabbitTemplate.convertAndSend(JSONObject.toJSONString(GqDto.convert(i)));
+                bladeRedis.set("gq:" + stcd, i);
+                log.info("发送港渠的数据:{},数据:{}", stcd, JSONObject.toJSONString(GqDto.convert(i)));
                 return;
             }
+        });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java
index 68a5d6f..5f9cbd1 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java
@@ -14,6 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
 import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
 import org.springnewfiber.dataadapter.ziguang.hd.dto.HdDto;
+import org.springnewfiber.dataadapter.ziguang.hp.dto.HpDto;
 
 import java.util.List;
 import java.util.Map;
@@ -63,15 +64,18 @@
         List<HdDto> list = JSONObject.parseArray(response.body(), HdDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("hd:" + stcd);
-            HdDto dto = new HdDto();
-            if ((flag && (dto = bladeRedis.get("hd:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
-                    || !flag) {
-                log.info("河道redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(HdDto.convert(list.get(0))));
-                bladeRedis.set("hd:" + stcd, list.get(0));
-                log.info("发送河道的数据:{},数据:{}", stcd, JSONObject.toJSONString(HdDto.convert(list.get(0))));
-                return;
-            }
+            List<HdDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                HdDto dto = new HdDto();
+                if ((flag && (dto = bladeRedis.get("hd:" + stcd)) != null && dto.getTM().before(i.getTM()))
+                        || !flag) {
+                    log.info("河道redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(HdDto.convert(i)));
+                    bladeRedis.set("hd:" + stcd,i);
+                    log.info("发送河道的数据:{},数据:{}", stcd, JSONObject.toJSONString(HdDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/hp/action/HpAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/hp/action/HpAction.java
index bea7b10..558f684 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/hp/action/HpAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/hp/action/HpAction.java
@@ -15,6 +15,7 @@
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
 import org.springnewfiber.dataadapter.ziguang.hd.dto.HdDto;
 import org.springnewfiber.dataadapter.ziguang.hp.dto.HpDto;
+import org.springnewfiber.dataadapter.ziguang.zs.dto.ZsDto;
 
 import javax.annotation.PostConstruct;
 import java.util.List;
@@ -65,15 +66,18 @@
         List<HpDto> list = JSONObject.parseArray(response.body(), HpDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("hp:" + stcd);
-            HpDto dto = new HpDto();
-            if ((flag && (dto = bladeRedis.get("hp:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
-                    || !flag) {
-                log.info("湖泊redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(HpDto.convert(list.get(0))));
-                bladeRedis.set("hp:" + stcd, list.get(0));
-                log.info("发送湖泊的数据:{},数据:{}", stcd, JSONObject.toJSONString(HpDto.convert(list.get(0))));
-                return;
-            }
+            List<HpDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                HpDto dto = new HpDto();
+                if ((flag && (dto = bladeRedis.get("hp:" + stcd)) != null && dto.getTM().before(i.getTM()))
+                        || !flag) {
+                    log.info("湖泊redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(HpDto.convert(i)));
+                    bladeRedis.set("hp:" + stcd, i);
+                    log.info("发送湖泊的数据:{},数据:{}", stcd, JSONObject.toJSONString(HpDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }

diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
index 340408e..69e1b4c 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
@@ -14,9 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.bz.dto.BzDto;
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
-import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
 
-import javax.annotation.PostConstruct;
 import java.util.List;
 import java.util.Map;
 
@@ -65,15 +63,17 @@
         List<BzDto> list = JSONObject.parseArray(response.body(), BzDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("BZ:" + stcd);
-            BzDto dto = new BzDto();
-            if ((flag && (dto = bladeRedis.get("BZ:" + stcd)) != null && DateUtil.parse(dto.getTM()).before(DateUtil.parse(list.get(0).getTM())))
-                    || !flag) {
-//                log.info("泵站redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(BzDto.convert(list.get(0))));
-                bladeRedis.set("BZ:" + stcd, list.get(0));
-                log.info("发送泵站的数据:code:{},data:{}",stcd,JSONObject.toJSONString(BzDto.convert(list.get(0))));
-                return;
-            }
+            List<BzDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                BzDto dto = new BzDto();
+                if ((flag && (dto = bladeRedis.get("BZ:" + stcd)) != null && DateUtil.parse(dto.getTM()).before(DateUtil.parse(i.getTM()))) || !flag) {
+                    log.info("泵站redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(BzDto.convert(i)));
+                    bladeRedis.set("BZ:" + stcd, i);
+                    log.info("发送泵站的数据:code:{},data:{}", stcd, JSONObject.toJSONString(BzDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
index 595d298..69b9514 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
@@ -29,11 +29,11 @@
     private final ZsAction zsAction;
     @Scheduled(cron = "0 0/2 * * * ?")
     public void synchronize() {
-        bzAction.list();
-        gqAction.list();
-        hdAction.list();
-        hpAction.list();
+//        bzAction.list();
+//        gqAction.list();
+//        hdAction.list();
+//        hpAction.list();
         ylAction.list();
-//        zsAction.list();
+        zsAction.list();
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java
index dd23f31..768cbc4 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java
@@ -14,6 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
 import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
+import org.springnewfiber.dataadapter.ziguang.hd.dto.HdDto;
 
 import javax.annotation.PostConstruct;
 import java.util.List;
@@ -64,15 +65,18 @@
         List<GqDto> list = JSONObject.parseArray(response.body(), GqDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("gq:" + stcd);
+            List<GqDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
             GqDto dto = new GqDto();
-            if ((flag && (dto = bladeRedis.get("gq:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
+            if ((flag && (dto = bladeRedis.get("gq:" + stcd)) != null && dto.getTM().before(i.getTM()))
                     || !flag) {
-                log.info("港渠redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(GqDto.convert(list.get(0))));
-                bladeRedis.set("gq:" + stcd, list.get(0));
-                log.info("发送港渠的数据:{},数据:{}", stcd, JSONObject.toJSONString(GqDto.convert(list.get(0))));
+                log.info("港渠redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                rabbitTemplate.convertAndSend(JSONObject.toJSONString(GqDto.convert(i)));
+                bladeRedis.set("gq:" + stcd, i);
+                log.info("发送港渠的数据:{},数据:{}", stcd, JSONObject.toJSONString(GqDto.convert(i)));
                 return;
             }
+        });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java
index 68a5d6f..5f9cbd1 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java
@@ -14,6 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
 import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
 import org.springnewfiber.dataadapter.ziguang.hd.dto.HdDto;
+import org.springnewfiber.dataadapter.ziguang.hp.dto.HpDto;
 
 import java.util.List;
 import java.util.Map;
@@ -63,15 +64,18 @@
         List<HdDto> list = JSONObject.parseArray(response.body(), HdDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("hd:" + stcd);
-            HdDto dto = new HdDto();
-            if ((flag && (dto = bladeRedis.get("hd:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
-                    || !flag) {
-                log.info("河道redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(HdDto.convert(list.get(0))));
-                bladeRedis.set("hd:" + stcd, list.get(0));
-                log.info("发送河道的数据:{},数据:{}", stcd, JSONObject.toJSONString(HdDto.convert(list.get(0))));
-                return;
-            }
+            List<HdDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                HdDto dto = new HdDto();
+                if ((flag && (dto = bladeRedis.get("hd:" + stcd)) != null && dto.getTM().before(i.getTM()))
+                        || !flag) {
+                    log.info("河道redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(HdDto.convert(i)));
+                    bladeRedis.set("hd:" + stcd,i);
+                    log.info("发送河道的数据:{},数据:{}", stcd, JSONObject.toJSONString(HdDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/hp/action/HpAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/hp/action/HpAction.java
index bea7b10..558f684 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/hp/action/HpAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/hp/action/HpAction.java
@@ -15,6 +15,7 @@
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
 import org.springnewfiber.dataadapter.ziguang.hd.dto.HdDto;
 import org.springnewfiber.dataadapter.ziguang.hp.dto.HpDto;
+import org.springnewfiber.dataadapter.ziguang.zs.dto.ZsDto;
 
 import javax.annotation.PostConstruct;
 import java.util.List;
@@ -65,15 +66,18 @@
         List<HpDto> list = JSONObject.parseArray(response.body(), HpDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("hp:" + stcd);
-            HpDto dto = new HpDto();
-            if ((flag && (dto = bladeRedis.get("hp:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
-                    || !flag) {
-                log.info("湖泊redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(HpDto.convert(list.get(0))));
-                bladeRedis.set("hp:" + stcd, list.get(0));
-                log.info("发送湖泊的数据:{},数据:{}", stcd, JSONObject.toJSONString(HpDto.convert(list.get(0))));
-                return;
-            }
+            List<HpDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                HpDto dto = new HpDto();
+                if ((flag && (dto = bladeRedis.get("hp:" + stcd)) != null && dto.getTM().before(i.getTM()))
+                        || !flag) {
+                    log.info("湖泊redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(HpDto.convert(i)));
+                    bladeRedis.set("hp:" + stcd, i);
+                    log.info("发送湖泊的数据:{},数据:{}", stcd, JSONObject.toJSONString(HpDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java
index 3f2d25f..b1afc33 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java
@@ -14,7 +14,6 @@
 import org.springnewfiber.dataadapter.config.BladeRedis;
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
-import org.springnewfiber.dataadapter.ziguang.hp.dto.HpDto;
 import org.springnewfiber.dataadapter.ziguang.yl.dto.YlDto;
 
 import java.util.List;
@@ -33,7 +32,7 @@
     private final BladeRedis bladeRedis;
     private final ZiGuangConfig ziGuangConfig;
     private final LoginAction loginAction;
-    private static Map<String, Object> baseListPramMap ;
+    private static Map<String, Object> baseListPramMap;
     private final RabbitTemplate rabbitTemplate;
 
     {
@@ -77,15 +76,17 @@
         List<YlDto> list = JSONObject.parseArray(response.body(), YlDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("yl:" + stcd);
-            YlDto dto = new YlDto();
-            if ((flag && (dto = bladeRedis.get("yl:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
-                    || !flag) {
-                log.info("雨量redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                log.info("conver:{}",JSONObject.toJSONString(YlDto.convert(list.get(0))));
-//                rabbitTemplate.convertAndSend(JSONObject.toJSONString(YlDto.convert(list.get(0))));
-//                bladeRedis.set("yl:" + stcd, list.get(0));
-                return;
-            }
+            List<YlDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                YlDto dto = new YlDto();
+                if ((flag && (dto = bladeRedis.get("yl:" + stcd)) != null && dto.getTM().before(i.getTM())) || !flag) {
+                    log.info("雨量redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(YlDto.convert(i)));
+                    bladeRedis.set("yl:" + stcd, i);
+                    log.info("发送雨量的数据:{},数据:{}", stcd, JSONObject.toJSONString(YlDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }

diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
index 340408e..69e1b4c 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
@@ -14,9 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.bz.dto.BzDto;
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
-import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
 
-import javax.annotation.PostConstruct;
 import java.util.List;
 import java.util.Map;
 
@@ -65,15 +63,17 @@
         List<BzDto> list = JSONObject.parseArray(response.body(), BzDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("BZ:" + stcd);
-            BzDto dto = new BzDto();
-            if ((flag && (dto = bladeRedis.get("BZ:" + stcd)) != null && DateUtil.parse(dto.getTM()).before(DateUtil.parse(list.get(0).getTM())))
-                    || !flag) {
-//                log.info("泵站redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(BzDto.convert(list.get(0))));
-                bladeRedis.set("BZ:" + stcd, list.get(0));
-                log.info("发送泵站的数据:code:{},data:{}",stcd,JSONObject.toJSONString(BzDto.convert(list.get(0))));
-                return;
-            }
+            List<BzDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                BzDto dto = new BzDto();
+                if ((flag && (dto = bladeRedis.get("BZ:" + stcd)) != null && DateUtil.parse(dto.getTM()).before(DateUtil.parse(i.getTM()))) || !flag) {
+                    log.info("泵站redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(BzDto.convert(i)));
+                    bladeRedis.set("BZ:" + stcd, i);
+                    log.info("发送泵站的数据:code:{},data:{}", stcd, JSONObject.toJSONString(BzDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
index 595d298..69b9514 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
@@ -29,11 +29,11 @@
     private final ZsAction zsAction;
     @Scheduled(cron = "0 0/2 * * * ?")
     public void synchronize() {
-        bzAction.list();
-        gqAction.list();
-        hdAction.list();
-        hpAction.list();
+//        bzAction.list();
+//        gqAction.list();
+//        hdAction.list();
+//        hpAction.list();
         ylAction.list();
-//        zsAction.list();
+        zsAction.list();
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java
index dd23f31..768cbc4 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java
@@ -14,6 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
 import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
+import org.springnewfiber.dataadapter.ziguang.hd.dto.HdDto;
 
 import javax.annotation.PostConstruct;
 import java.util.List;
@@ -64,15 +65,18 @@
         List<GqDto> list = JSONObject.parseArray(response.body(), GqDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("gq:" + stcd);
+            List<GqDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
             GqDto dto = new GqDto();
-            if ((flag && (dto = bladeRedis.get("gq:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
+            if ((flag && (dto = bladeRedis.get("gq:" + stcd)) != null && dto.getTM().before(i.getTM()))
                     || !flag) {
-                log.info("港渠redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(GqDto.convert(list.get(0))));
-                bladeRedis.set("gq:" + stcd, list.get(0));
-                log.info("发送港渠的数据:{},数据:{}", stcd, JSONObject.toJSONString(GqDto.convert(list.get(0))));
+                log.info("港渠redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                rabbitTemplate.convertAndSend(JSONObject.toJSONString(GqDto.convert(i)));
+                bladeRedis.set("gq:" + stcd, i);
+                log.info("发送港渠的数据:{},数据:{}", stcd, JSONObject.toJSONString(GqDto.convert(i)));
                 return;
             }
+        });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java
index 68a5d6f..5f9cbd1 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java
@@ -14,6 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
 import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
 import org.springnewfiber.dataadapter.ziguang.hd.dto.HdDto;
+import org.springnewfiber.dataadapter.ziguang.hp.dto.HpDto;
 
 import java.util.List;
 import java.util.Map;
@@ -63,15 +64,18 @@
         List<HdDto> list = JSONObject.parseArray(response.body(), HdDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("hd:" + stcd);
-            HdDto dto = new HdDto();
-            if ((flag && (dto = bladeRedis.get("hd:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
-                    || !flag) {
-                log.info("河道redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(HdDto.convert(list.get(0))));
-                bladeRedis.set("hd:" + stcd, list.get(0));
-                log.info("发送河道的数据:{},数据:{}", stcd, JSONObject.toJSONString(HdDto.convert(list.get(0))));
-                return;
-            }
+            List<HdDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                HdDto dto = new HdDto();
+                if ((flag && (dto = bladeRedis.get("hd:" + stcd)) != null && dto.getTM().before(i.getTM()))
+                        || !flag) {
+                    log.info("河道redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(HdDto.convert(i)));
+                    bladeRedis.set("hd:" + stcd,i);
+                    log.info("发送河道的数据:{},数据:{}", stcd, JSONObject.toJSONString(HdDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/hp/action/HpAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/hp/action/HpAction.java
index bea7b10..558f684 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/hp/action/HpAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/hp/action/HpAction.java
@@ -15,6 +15,7 @@
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
 import org.springnewfiber.dataadapter.ziguang.hd.dto.HdDto;
 import org.springnewfiber.dataadapter.ziguang.hp.dto.HpDto;
+import org.springnewfiber.dataadapter.ziguang.zs.dto.ZsDto;
 
 import javax.annotation.PostConstruct;
 import java.util.List;
@@ -65,15 +66,18 @@
         List<HpDto> list = JSONObject.parseArray(response.body(), HpDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("hp:" + stcd);
-            HpDto dto = new HpDto();
-            if ((flag && (dto = bladeRedis.get("hp:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
-                    || !flag) {
-                log.info("湖泊redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(HpDto.convert(list.get(0))));
-                bladeRedis.set("hp:" + stcd, list.get(0));
-                log.info("发送湖泊的数据:{},数据:{}", stcd, JSONObject.toJSONString(HpDto.convert(list.get(0))));
-                return;
-            }
+            List<HpDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                HpDto dto = new HpDto();
+                if ((flag && (dto = bladeRedis.get("hp:" + stcd)) != null && dto.getTM().before(i.getTM()))
+                        || !flag) {
+                    log.info("湖泊redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(HpDto.convert(i)));
+                    bladeRedis.set("hp:" + stcd, i);
+                    log.info("发送湖泊的数据:{},数据:{}", stcd, JSONObject.toJSONString(HpDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java
index 3f2d25f..b1afc33 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java
@@ -14,7 +14,6 @@
 import org.springnewfiber.dataadapter.config.BladeRedis;
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
-import org.springnewfiber.dataadapter.ziguang.hp.dto.HpDto;
 import org.springnewfiber.dataadapter.ziguang.yl.dto.YlDto;
 
 import java.util.List;
@@ -33,7 +32,7 @@
     private final BladeRedis bladeRedis;
     private final ZiGuangConfig ziGuangConfig;
     private final LoginAction loginAction;
-    private static Map<String, Object> baseListPramMap ;
+    private static Map<String, Object> baseListPramMap;
     private final RabbitTemplate rabbitTemplate;
 
     {
@@ -77,15 +76,17 @@
         List<YlDto> list = JSONObject.parseArray(response.body(), YlDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("yl:" + stcd);
-            YlDto dto = new YlDto();
-            if ((flag && (dto = bladeRedis.get("yl:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
-                    || !flag) {
-                log.info("雨量redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                log.info("conver:{}",JSONObject.toJSONString(YlDto.convert(list.get(0))));
-//                rabbitTemplate.convertAndSend(JSONObject.toJSONString(YlDto.convert(list.get(0))));
-//                bladeRedis.set("yl:" + stcd, list.get(0));
-                return;
-            }
+            List<YlDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                YlDto dto = new YlDto();
+                if ((flag && (dto = bladeRedis.get("yl:" + stcd)) != null && dto.getTM().before(i.getTM())) || !flag) {
+                    log.info("雨量redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(YlDto.convert(i)));
+                    bladeRedis.set("yl:" + stcd, i);
+                    log.info("发送雨量的数据:{},数据:{}", stcd, JSONObject.toJSONString(YlDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/zs/action/ZsAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/zs/action/ZsAction.java
index 8a8f738..e5168a8 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/zs/action/ZsAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/zs/action/ZsAction.java
@@ -6,6 +6,7 @@
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -14,6 +15,7 @@
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
 import org.springnewfiber.dataadapter.ziguang.hp.dto.HpDto;
+import org.springnewfiber.dataadapter.ziguang.yl.dto.YlDto;
 import org.springnewfiber.dataadapter.ziguang.zs.dto.ZsDto;
 
 import javax.annotation.PostConstruct;
@@ -64,14 +66,28 @@
         List<ZsDto> list = JSONObject.parseArray(response.body(), ZsDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("zs:" + stcd);
-            ZsDto dto = new ZsDto();
-            if ((flag && (dto = bladeRedis.get("zs:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
-                    || !flag) {
-                log.info("渍水redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(ZsDto.convert(list.get(0))));
-                bladeRedis.set("zs:" + stcd, list.get(0));
-                return;
-            }
+            List<ZsDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i->{
+                ZsDto dto = new ZsDto();
+                if ((flag && (dto = bladeRedis.get("zs:" + stcd)) != null && dto.getTM().before(i.getTM()))
+                        || !flag) {
+                    log.info("渍水redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(ZsDto.convert(i)));
+                    bladeRedis.set("zs:" + stcd, i);
+                    log.info("发送渍水的数据:{},数据:{}", stcd, JSONObject.toJSONString(ZsDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
+
+//    public static void main(String[] args) {
+//     List<String> stringList=   Lists.newArrayList("1","2","3");
+//        stringList.forEach(i->{
+//            if(Integer.valueOf(i)==2){
+//                return;
+//            }
+//            System.out.println(i);
+//        });
+//    }
 }

diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
index 340408e..69e1b4c 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/bz/action/BzAction.java
@@ -14,9 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.bz.dto.BzDto;
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
-import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
 
-import javax.annotation.PostConstruct;
 import java.util.List;
 import java.util.Map;
 
@@ -65,15 +63,17 @@
         List<BzDto> list = JSONObject.parseArray(response.body(), BzDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("BZ:" + stcd);
-            BzDto dto = new BzDto();
-            if ((flag && (dto = bladeRedis.get("BZ:" + stcd)) != null && DateUtil.parse(dto.getTM()).before(DateUtil.parse(list.get(0).getTM())))
-                    || !flag) {
-//                log.info("泵站redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(BzDto.convert(list.get(0))));
-                bladeRedis.set("BZ:" + stcd, list.get(0));
-                log.info("发送泵站的数据:code:{},data:{}",stcd,JSONObject.toJSONString(BzDto.convert(list.get(0))));
-                return;
-            }
+            List<BzDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                BzDto dto = new BzDto();
+                if ((flag && (dto = bladeRedis.get("BZ:" + stcd)) != null && DateUtil.parse(dto.getTM()).before(DateUtil.parse(i.getTM()))) || !flag) {
+                    log.info("泵站redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(BzDto.convert(i)));
+                    bladeRedis.set("BZ:" + stcd, i);
+                    log.info("发送泵站的数据:code:{},data:{}", stcd, JSONObject.toJSONString(BzDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
index 595d298..69b9514 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/core/ZiGuangDataJob.java
@@ -29,11 +29,11 @@
     private final ZsAction zsAction;
     @Scheduled(cron = "0 0/2 * * * ?")
     public void synchronize() {
-        bzAction.list();
-        gqAction.list();
-        hdAction.list();
-        hpAction.list();
+//        bzAction.list();
+//        gqAction.list();
+//        hdAction.list();
+//        hpAction.list();
         ylAction.list();
-//        zsAction.list();
+        zsAction.list();
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java
index dd23f31..768cbc4 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/gq/action/GqAction.java
@@ -14,6 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
 import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
+import org.springnewfiber.dataadapter.ziguang.hd.dto.HdDto;
 
 import javax.annotation.PostConstruct;
 import java.util.List;
@@ -64,15 +65,18 @@
         List<GqDto> list = JSONObject.parseArray(response.body(), GqDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("gq:" + stcd);
+            List<GqDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
             GqDto dto = new GqDto();
-            if ((flag && (dto = bladeRedis.get("gq:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
+            if ((flag && (dto = bladeRedis.get("gq:" + stcd)) != null && dto.getTM().before(i.getTM()))
                     || !flag) {
-                log.info("港渠redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(GqDto.convert(list.get(0))));
-                bladeRedis.set("gq:" + stcd, list.get(0));
-                log.info("发送港渠的数据:{},数据:{}", stcd, JSONObject.toJSONString(GqDto.convert(list.get(0))));
+                log.info("港渠redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                rabbitTemplate.convertAndSend(JSONObject.toJSONString(GqDto.convert(i)));
+                bladeRedis.set("gq:" + stcd, i);
+                log.info("发送港渠的数据:{},数据:{}", stcd, JSONObject.toJSONString(GqDto.convert(i)));
                 return;
             }
+        });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java
index 68a5d6f..5f9cbd1 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/hd/action/HdAction.java
@@ -14,6 +14,7 @@
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
 import org.springnewfiber.dataadapter.ziguang.gq.dto.GqDto;
 import org.springnewfiber.dataadapter.ziguang.hd.dto.HdDto;
+import org.springnewfiber.dataadapter.ziguang.hp.dto.HpDto;
 
 import java.util.List;
 import java.util.Map;
@@ -63,15 +64,18 @@
         List<HdDto> list = JSONObject.parseArray(response.body(), HdDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("hd:" + stcd);
-            HdDto dto = new HdDto();
-            if ((flag && (dto = bladeRedis.get("hd:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
-                    || !flag) {
-                log.info("河道redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(HdDto.convert(list.get(0))));
-                bladeRedis.set("hd:" + stcd, list.get(0));
-                log.info("发送河道的数据:{},数据:{}", stcd, JSONObject.toJSONString(HdDto.convert(list.get(0))));
-                return;
-            }
+            List<HdDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                HdDto dto = new HdDto();
+                if ((flag && (dto = bladeRedis.get("hd:" + stcd)) != null && dto.getTM().before(i.getTM()))
+                        || !flag) {
+                    log.info("河道redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(HdDto.convert(i)));
+                    bladeRedis.set("hd:" + stcd,i);
+                    log.info("发送河道的数据:{},数据:{}", stcd, JSONObject.toJSONString(HdDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/hp/action/HpAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/hp/action/HpAction.java
index bea7b10..558f684 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/hp/action/HpAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/hp/action/HpAction.java
@@ -15,6 +15,7 @@
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
 import org.springnewfiber.dataadapter.ziguang.hd.dto.HdDto;
 import org.springnewfiber.dataadapter.ziguang.hp.dto.HpDto;
+import org.springnewfiber.dataadapter.ziguang.zs.dto.ZsDto;
 
 import javax.annotation.PostConstruct;
 import java.util.List;
@@ -65,15 +66,18 @@
         List<HpDto> list = JSONObject.parseArray(response.body(), HpDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("hp:" + stcd);
-            HpDto dto = new HpDto();
-            if ((flag && (dto = bladeRedis.get("hp:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
-                    || !flag) {
-                log.info("湖泊redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(HpDto.convert(list.get(0))));
-                bladeRedis.set("hp:" + stcd, list.get(0));
-                log.info("发送湖泊的数据:{},数据:{}", stcd, JSONObject.toJSONString(HpDto.convert(list.get(0))));
-                return;
-            }
+            List<HpDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                HpDto dto = new HpDto();
+                if ((flag && (dto = bladeRedis.get("hp:" + stcd)) != null && dto.getTM().before(i.getTM()))
+                        || !flag) {
+                    log.info("湖泊redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(HpDto.convert(i)));
+                    bladeRedis.set("hp:" + stcd, i);
+                    log.info("发送湖泊的数据:{},数据:{}", stcd, JSONObject.toJSONString(HpDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java
index 3f2d25f..b1afc33 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java
@@ -14,7 +14,6 @@
 import org.springnewfiber.dataadapter.config.BladeRedis;
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
-import org.springnewfiber.dataadapter.ziguang.hp.dto.HpDto;
 import org.springnewfiber.dataadapter.ziguang.yl.dto.YlDto;
 
 import java.util.List;
@@ -33,7 +32,7 @@
     private final BladeRedis bladeRedis;
     private final ZiGuangConfig ziGuangConfig;
     private final LoginAction loginAction;
-    private static Map<String, Object> baseListPramMap ;
+    private static Map<String, Object> baseListPramMap;
     private final RabbitTemplate rabbitTemplate;
 
     {
@@ -77,15 +76,17 @@
         List<YlDto> list = JSONObject.parseArray(response.body(), YlDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("yl:" + stcd);
-            YlDto dto = new YlDto();
-            if ((flag && (dto = bladeRedis.get("yl:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
-                    || !flag) {
-                log.info("雨量redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                log.info("conver:{}",JSONObject.toJSONString(YlDto.convert(list.get(0))));
-//                rabbitTemplate.convertAndSend(JSONObject.toJSONString(YlDto.convert(list.get(0))));
-//                bladeRedis.set("yl:" + stcd, list.get(0));
-                return;
-            }
+            List<YlDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i -> {
+                YlDto dto = new YlDto();
+                if ((flag && (dto = bladeRedis.get("yl:" + stcd)) != null && dto.getTM().before(i.getTM())) || !flag) {
+                    log.info("雨量redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(YlDto.convert(i)));
+                    bladeRedis.set("yl:" + stcd, i);
+                    log.info("发送雨量的数据:{},数据:{}", stcd, JSONObject.toJSONString(YlDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
 }
diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/zs/action/ZsAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/zs/action/ZsAction.java
index 8a8f738..e5168a8 100644
--- a/src/main/java/org/springnewfiber/dataadapter/ziguang/zs/action/ZsAction.java
+++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/zs/action/ZsAction.java
@@ -6,6 +6,7 @@
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -14,6 +15,7 @@
 import org.springnewfiber.dataadapter.ziguang.common.LoginAction;
 import org.springnewfiber.dataadapter.ziguang.common.ZiGuangConfig;
 import org.springnewfiber.dataadapter.ziguang.hp.dto.HpDto;
+import org.springnewfiber.dataadapter.ziguang.yl.dto.YlDto;
 import org.springnewfiber.dataadapter.ziguang.zs.dto.ZsDto;
 
 import javax.annotation.PostConstruct;
@@ -64,14 +66,28 @@
         List<ZsDto> list = JSONObject.parseArray(response.body(), ZsDto.class);
         if (CollectionUtil.isNotEmpty(list)) {
             Boolean flag = bladeRedis.exists("zs:" + stcd);
-            ZsDto dto = new ZsDto();
-            if ((flag && (dto = bladeRedis.get("zs:" + stcd)) != null && dto.getTM().before(list.get(0).getTM()))
-                    || !flag) {
-                log.info("渍水redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(list.get(0).getTM()));
-                rabbitTemplate.convertAndSend(JSONObject.toJSONString(ZsDto.convert(list.get(0))));
-                bladeRedis.set("zs:" + stcd, list.get(0));
-                return;
-            }
+            List<ZsDto> newList = CollectionUtil.reverseNew(list);
+            newList.forEach(i->{
+                ZsDto dto = new ZsDto();
+                if ((flag && (dto = bladeRedis.get("zs:" + stcd)) != null && dto.getTM().before(i.getTM()))
+                        || !flag) {
+                    log.info("渍水redis的数据:{},请求到的最新数据:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(i.getTM()));
+                    rabbitTemplate.convertAndSend(JSONObject.toJSONString(ZsDto.convert(i)));
+                    bladeRedis.set("zs:" + stcd, i);
+                    log.info("发送渍水的数据:{},数据:{}", stcd, JSONObject.toJSONString(ZsDto.convert(i)));
+                    return;
+                }
+            });
         }
     }
+
+//    public static void main(String[] args) {
+//     List<String> stringList=   Lists.newArrayList("1","2","3");
+//        stringList.forEach(i->{
+//            if(Integer.valueOf(i)==2){
+//                return;
+//            }
+//            System.out.println(i);
+//        });
+//    }
 }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 3b4af46..8d6f43e 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -73,8 +73,10 @@
 #        realurl: http://58.49.51.33:8081/iwp/dynamic/hd/rvnm_order/list
         realurl:  http://58.49.51.33:8081/iwp/dynamic/hd/wh_daylive/list
     login:
-        username: data-service1
-        password: data-service11
+#        username: data-service1
+#        password: data-service11
+        username: data-service2
+        password: data-service212345678
         loginurl: http://58.49.51.33:8081/jkfc/user/login
 #rabbitmq:
 #    exchange: amq.topic