设备异步导出

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

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

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

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

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

@@ -309,15 +309,16 @@ 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());
+                    pushLog.setCustomerId(customerId);
+                    pushLog.setDateCreate(new Date());
+                    pushLog.setPushTime(endDate);
+                    pushLog.setPushContent(3);
+                    pushLogMapper.insertSelective(pushLog);
                 }
-                // 1,定义push日志
-                PushLog pushLog = new PushLog();
-                pushLog.setDataSize(dataList.size());
-                pushLog.setCustomerId(customerId);
-                pushLog.setDateCreate(new Date());
-                pushLog.setPushTime(endDate);
-                pushLog.setPushContent(3);
-                pushLogMapper.insertSelective(pushLog);
+
             }
         }
 

meter-reading-job/src/main/resources/application-job-prd.properties

@@ -34,4 +34,4 @@ spring.rabbitmq.device.queue=sync-device-handler-queue
 spring.rabbitmq.community.queue=sync-community-handler-queue
 spring.rabbitmq.building.queue=sync-building-handler-queue
 
-ccrc.url=http://10.0.0.153:8099
+ccrc.url=http://114.135.61.188:33334

meter-reading-job/src/main/resources/application-job-sit.properties

@@ -3,7 +3,7 @@ server.servlet.context-path=/meter/reading/job
 logging.level.root=info
 logging.file.path=./logs
 #########################################XXL Job����#################################################
-xxl.job.admin.addresses=http://10.0.0.156:8081/xxl-job-admin
+xxl.job.admin.addresses=http://10.0.0.153:8082/xxl-job-admin
 xxl.job.accessToken=
 xxl.job.executor.appname=meter-reading-executor
 xxl.job.executor.address=
@@ -34,4 +34,4 @@ spring.rabbitmq.device.queue=sync-device-handler-queue
 spring.rabbitmq.community.queue=sync-community-handler-queue
 spring.rabbitmq.building.queue=sync-building-handler-queue
 
-ccrc.url=http://10.0.0.153:8099
+ccrc.url=http://10.0.0.153:8327