diff --git a/src/main/java/org/springnewfiber/dataadapter/sswj/core/SswjCoreJob.java b/src/main/java/org/springnewfiber/dataadapter/sswj/core/SswjCoreJob.java
index 35a7f3f..a5e06a4 100644
--- a/src/main/java/org/springnewfiber/dataadapter/sswj/core/SswjCoreJob.java
+++ b/src/main/java/org/springnewfiber/dataadapter/sswj/core/SswjCoreJob.java
@@ -17,6 +17,7 @@
 import org.springnewfiber.dataadapter.sswj.service.impl.*;
 import org.springnewfiber.dataadapter.sswj.util.RealTimeSerializer;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -87,6 +88,20 @@
                                 rabbitTemplate.convertAndSend(JSONObject.toJSONString(model));
                             });
                         }
+                    }else {
+                        QueryWrapper<BaseSwjEntity> selectQwId = new QueryWrapper<>();
+                        selectQwId.orderByAsc(baseSwjEntity.getTTFileName());
+                        selectQwId.eq("DATA_UP_UUID", i);
+                        List<BaseSwjEntity> nowList = service.list(selectQwId);
+                        if (CollUtil.isNotEmpty(nowList)) {
+                            nowList.forEach(now -> {
+                                PtReceiveBaseModel model = RealTimeSerializer.objectToRealMap(now);
+                                redis.set(key, now);
+                                //发送mq
+                                log.info("发送数据:{},点位:{},具体数据:{}", name, now.getDataUpUuid(), JSONObject.toJSONString(model));
+                                rabbitTemplate.convertAndSend(JSONObject.toJSONString(model));
+                            });
+                        }
                     }
                 });
             } else {
@@ -133,15 +148,15 @@
                 list.forEach(i -> {
                     String key = name.concat(StringPool.COLON).concat(i.getSTCD());
                     ZgRainData redisObject;
-                    if (redis.exists(key) && (redisObject = redis.get(key)) != null && redisObject.getTM() != null) {
+                    if ((redis.exists(key) && (redisObject = redis.get(key)) != null && redisObject.getTM() != null)) {
                         QueryWrapper<ZgRainData> selectQwId = new QueryWrapper<>();
                         selectQwId.orderByAsc("TM");
-                        selectQwId.eq("STCD", redisObject.getSTCD());
+                        selectQwId.eq("STCD", i.getSTCD());
                         selectQwId.gt("TM", redisObject.getTM());
                         List<ZgRainData> nowList = zgRainDataMapper.selectList(selectQwId);
                         if (CollUtil.isNotEmpty(nowList)) {
                             for (ZgRainData zgRainData : nowList) {
-                                redisObject=redis.get(key);
+                                redisObject = redis.get(key);
                                 zgRainData.setPt(redisObject.getPt().add(zgRainData.getDRP()));
                                 PtReceiveBaseModel model = RealTimeSerializer.objectToRealMap(zgRainData);
                                 redis.set(key, zgRainData);
@@ -150,6 +165,22 @@
                                 rabbitTemplate.convertAndSend(JSONObject.toJSONString(model));
                             }
                         }
+                    } else {
+                        QueryWrapper<ZgRainData> selectQwId = new QueryWrapper<>();
+                        selectQwId.orderByAsc("TM");
+                        selectQwId.eq("STCD", i.getSTCD());
+                        List<ZgRainData> nowList = zgRainDataMapper.selectList(selectQwId);
+                        if (CollUtil.isNotEmpty(nowList)) {
+                            for (ZgRainData zgRainData : nowList) {
+                                redisObject = redis.get(key);
+                                zgRainData.setPt(redisObject==null? BigDecimal.ZERO.add(zgRainData.getDRP()):redisObject.getPt().add(zgRainData.getDRP()));
+                                PtReceiveBaseModel model = RealTimeSerializer.objectToRealMap(zgRainData);
+                                redis.set(key, zgRainData);
+                                //发送mq
+                                log.info("发送数据:{},点位:{},具体数据:{}", name, zgRainData.getSTCD(), JSONObject.toJSONString(model));
+                                rabbitTemplate.convertAndSend(JSONObject.toJSONString(model));
+                            }
+                        }
                     }
                 });
             } else {

diff --git a/src/main/java/org/springnewfiber/dataadapter/sswj/core/SswjCoreJob.java b/src/main/java/org/springnewfiber/dataadapter/sswj/core/SswjCoreJob.java
index 35a7f3f..a5e06a4 100644
--- a/src/main/java/org/springnewfiber/dataadapter/sswj/core/SswjCoreJob.java
+++ b/src/main/java/org/springnewfiber/dataadapter/sswj/core/SswjCoreJob.java
@@ -17,6 +17,7 @@
 import org.springnewfiber.dataadapter.sswj.service.impl.*;
 import org.springnewfiber.dataadapter.sswj.util.RealTimeSerializer;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -87,6 +88,20 @@
                                 rabbitTemplate.convertAndSend(JSONObject.toJSONString(model));
                             });
                         }
+                    }else {
+                        QueryWrapper<BaseSwjEntity> selectQwId = new QueryWrapper<>();
+                        selectQwId.orderByAsc(baseSwjEntity.getTTFileName());
+                        selectQwId.eq("DATA_UP_UUID", i);
+                        List<BaseSwjEntity> nowList = service.list(selectQwId);
+                        if (CollUtil.isNotEmpty(nowList)) {
+                            nowList.forEach(now -> {
+                                PtReceiveBaseModel model = RealTimeSerializer.objectToRealMap(now);
+                                redis.set(key, now);
+                                //发送mq
+                                log.info("发送数据:{},点位:{},具体数据:{}", name, now.getDataUpUuid(), JSONObject.toJSONString(model));
+                                rabbitTemplate.convertAndSend(JSONObject.toJSONString(model));
+                            });
+                        }
                     }
                 });
             } else {
@@ -133,15 +148,15 @@
                 list.forEach(i -> {
                     String key = name.concat(StringPool.COLON).concat(i.getSTCD());
                     ZgRainData redisObject;
-                    if (redis.exists(key) && (redisObject = redis.get(key)) != null && redisObject.getTM() != null) {
+                    if ((redis.exists(key) && (redisObject = redis.get(key)) != null && redisObject.getTM() != null)) {
                         QueryWrapper<ZgRainData> selectQwId = new QueryWrapper<>();
                         selectQwId.orderByAsc("TM");
-                        selectQwId.eq("STCD", redisObject.getSTCD());
+                        selectQwId.eq("STCD", i.getSTCD());
                         selectQwId.gt("TM", redisObject.getTM());
                         List<ZgRainData> nowList = zgRainDataMapper.selectList(selectQwId);
                         if (CollUtil.isNotEmpty(nowList)) {
                             for (ZgRainData zgRainData : nowList) {
-                                redisObject=redis.get(key);
+                                redisObject = redis.get(key);
                                 zgRainData.setPt(redisObject.getPt().add(zgRainData.getDRP()));
                                 PtReceiveBaseModel model = RealTimeSerializer.objectToRealMap(zgRainData);
                                 redis.set(key, zgRainData);
@@ -150,6 +165,22 @@
                                 rabbitTemplate.convertAndSend(JSONObject.toJSONString(model));
                             }
                         }
+                    } else {
+                        QueryWrapper<ZgRainData> selectQwId = new QueryWrapper<>();
+                        selectQwId.orderByAsc("TM");
+                        selectQwId.eq("STCD", i.getSTCD());
+                        List<ZgRainData> nowList = zgRainDataMapper.selectList(selectQwId);
+                        if (CollUtil.isNotEmpty(nowList)) {
+                            for (ZgRainData zgRainData : nowList) {
+                                redisObject = redis.get(key);
+                                zgRainData.setPt(redisObject==null? BigDecimal.ZERO.add(zgRainData.getDRP()):redisObject.getPt().add(zgRainData.getDRP()));
+                                PtReceiveBaseModel model = RealTimeSerializer.objectToRealMap(zgRainData);
+                                redis.set(key, zgRainData);
+                                //发送mq
+                                log.info("发送数据:{},点位:{},具体数据:{}", name, zgRainData.getSTCD(), JSONObject.toJSONString(model));
+                                rabbitTemplate.convertAndSend(JSONObject.toJSONString(model));
+                            }
+                        }
                     }
                 });
             } else {
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 2ac6524..1b2020f 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -79,10 +79,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-service2
-    password: data-service212345678
+    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