同步

meter-reading-job/src/main/java/com/huaxu/zoniot/service/impl/BuildingSyncServiceImpl.java

@@ -66,8 +66,8 @@ public class BuildingSyncServiceImpl implements BuildingSyncService {
                 // 3,根据推送数据时间进行数据查询
                 List<Integer> cIds = customerMapper.getSubId(customerId);
                 String pushCustomers = StringUtils.join(cIds, ",");
-                log.info("begin query push building list , beginDate={}, endDate={}",
-                        beginDate, endDate);
+                log.info("begin query push building list ,pushCustomers={} beginDate={}, endDate={}",
+                        pushCustomers,beginDate, endDate);
                 List<BuildingData> dataList = buildingMapper.getPushBuildingList(pushCustomers,
                         status,
                         beginDate,
@@ -75,7 +75,7 @@ public class BuildingSyncServiceImpl implements BuildingSyncService {
 
                 log.info("end query push building list , size = {}",dataList.size());
                 if(dataList.size() != 0) {
-                    sendRabbitData(dataList);
+
                     // 4,定义push日志
                     PushLog pushLog = new PushLog();
                     pushLog.setDataSize(dataList.size());
@@ -84,6 +84,8 @@ public class BuildingSyncServiceImpl implements BuildingSyncService {
                     pushLog.setPushTime(endDate);
                     pushLog.setPushContent(5);
                     pushLogMapper.insertSelective(pushLog);
+
+                    sendRabbitData(dataList);
                 }
 
             }

meter-reading-job/src/main/java/com/huaxu/zoniot/service/impl/CommunitySyncServiceImpl.java

@@ -65,8 +65,8 @@ public class CommunitySyncServiceImpl implements CommunitySyncService {
                 // 3,根据推送数据时间进行数据查询
                 List<Integer> cIds = customerMapper.getSubId(customerId);
                 String pushCustomers = StringUtils.join(cIds, ",");
-                log.info("begin query push community list , beginDate={}, endDate={}",
-                        beginDate, endDate);
+                log.info("begin query push community list pushCustomers={}, beginDate={}, endDate={}",
+                        pushCustomers, beginDate, endDate);
                 List<CommunityData> dataList = communityMapper.getPushCommunityList(pushCustomers,
                         status,
                         beginDate,
@@ -74,7 +74,7 @@ public class CommunitySyncServiceImpl implements CommunitySyncService {
 
                 log.info("end query push community list , size = {}",dataList.size());
                 if(dataList.size() != 0) {
-                    sendRabbitData(dataList);
+
                     // 4,定义push日志
                     PushLog pushLog = new PushLog();
                     pushLog.setDataSize(dataList.size());
@@ -83,6 +83,8 @@ public class CommunitySyncServiceImpl implements CommunitySyncService {
                     pushLog.setPushTime(endDate);
                     pushLog.setPushContent(4);
                     pushLogMapper.insertSelective(pushLog);
+
+                    sendRabbitData(dataList);
                 }
 
             }

meter-reading-job/src/main/java/com/huaxu/zoniot/service/impl/MeterFileSyncServiceImpl.java

@@ -308,7 +308,7 @@ public class MeterFileSyncServiceImpl  implements MeterFileSyncService {
 
                 log.info("end query push device list , size = {}",dataList.size());
                 if(dataList.size() != 0) {
-                    sendRabbitData(dataList);
+
                     // 1,定义push日志
                     PushLog pushLog = new PushLog();
                     pushLog.setDataSize(dataList.size());
@@ -317,6 +317,8 @@ public class MeterFileSyncServiceImpl  implements MeterFileSyncService {
                     pushLog.setPushTime(endDate);
                     pushLog.setPushContent(3);
                     pushLogMapper.insertSelective(pushLog);
+
+                    sendRabbitData(dataList);
                 }
 
             }