解决冲突

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/ImasterDataServiceImpl.java

@@ -145,7 +145,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
         String today = DateUtil.today();
         String hour = new Date().getHours() + ":00";
             try {
-                TimeUnit.SECONDS.sleep(1);
+                TimeUnit.MINUTES.sleep(5);
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
@@ -458,7 +458,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
     public void inverterDetail() {
         List<String> inverterSns = imasterInverterListMapper.getCollectIds();
             try {
-                TimeUnit.SECONDS.sleep(1);
+                TimeUnit.MINUTES.sleep(5);
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
@@ -720,7 +720,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
         List<String> inverterSns = imasterInverterListMapper.getCollectIds();
         for (int i = 0; i < inverterSns.size(); i++) {
             try {
-                TimeUnit.SECONDS.sleep(1);
+                TimeUnit.MINUTES.sleep(5);
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }