盖州接口调整

sysdatadocking/gaizhou-datasync/src/main/java/com/hx/gaizhoudatasync/dao/ReadRecordDao.java

@@ -13,5 +13,5 @@ public interface ReadRecordDao {
 
     List<ReadRecord> findRead();
 
-    List<ReadRecord> find();
+    List<ReadRecord> findTest();
 }

sysdatadocking/gaizhou-datasync/src/main/java/com/hx/gaizhoudatasync/server/MyTask.java

@@ -40,11 +40,28 @@ public class MyTask {
     //@Scheduled(fixedDelay = 5000000)
     public void job()
     {
+        final int number=3;
+        for (int i=0;i<number;i++){
+            if(work())
+                break;
+            else {
+                try {
+                    if(i<number-1)
+                        Thread.sleep(60*1000);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+       }
+
+    }
+
+    public boolean work(){
         try {
             List<ReadRecord> readRecords = readRecordMapper.findRead();
             if(readRecords != null){
                 logger.info("查询抄表数据"+readRecords.size());
-               for (int i=0;i<readRecords.size();i++){
+                for (int i=0;i<readRecords.size();i++){
                     ReadDatas readDatas = new ReadDatas();
                     readDatas.setDeviceId(readRecords.get(i).getMetereleno());
                     readDatas.setType("nbxb");
@@ -59,14 +76,19 @@ public class MyTask {
 
                     //fanout广播模式
                     //rabbitTemplate.convertAndSend(exchange,"",jsonText);
-                   rabbitTemplate.convertAndSend(jsonText);
+                    rabbitTemplate.convertAndSend(jsonText);
 
                 }
             }
+            else {
+                logger.info("未找到抄表数据!");
+            }
+            logger.info("数据推送结束!");
+            return true;
         }
         catch (Exception ex){
             logger.error(ex.getMessage());
         }
-
+        return false;
     }
 }

sysdatadocking/gaizhou-datasync/src/main/resources/mappers/ReadRecordMapper.xml

@@ -11,7 +11,7 @@
         and Convert(varchar(10),readdate,120)=Convert(varchar(10),GETDATE(),120) and reading>=0
     </select>
 
-    <select id="find" resultType="com.hx.gaizhoudatasync.entity.ReadRecord">
+    <select id="findTest" resultType="com.hx.gaizhoudatasync.entity.ReadRecord">
                 select convert(varchar(19),getdate(),120) as metereleno,1 as reading,getdate() as readtime
     </select>
 </mapper>