learshaw hai 2 semanas
pai
achega
969ce54867

+ 9 - 9
ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/TaskExecutor.java

@@ -63,17 +63,17 @@ public class TaskExecutor {
      */
     @Scheduled(cron = "0 10 0/1 * * ?")
     public void refreshOnline() {
-        geekOpenCbHandler.refreshOnline(2 * 60 * 60 * 1000);
+        inDoorEnergyHandler.refreshOnline(2 * 60 * 60 * 1000);
     }
 
-    /**
-     * 每小时产出设备计量数据
-     */
-    @Scheduled(cron = "0 0 0/1 * * ?")
-    public void geekOpenMeterHourProd() {
-        int cnt1 = geekOpenCbHandler.meterHourProd();
-        log.debug("产出GeekOpen设备计量数据: {} 条", cnt1);
-    }
+//    /**
+//     * 每小时产出设备计量数据
+//     */
+//    @Scheduled(cron = "0 0 0/1 * * ?")
+//    public void geekOpenMeterHourProd() {
+//        int cnt1 = geekOpenCbHandler.meterHourProd();
+//        log.debug("产出GeekOpen设备计量数据: {} 条", cnt1);
+//    }
 
     /**
      * 每小时产出设备计量数据

+ 1 - 0
ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/core/InDoorEnergyTemplate.java

@@ -87,6 +87,7 @@ public class InDoorEnergyTemplate extends BaseApiTemplate {
         if (StringUtils.isEmpty(accessToken)) {
             InDoorEnergyConfig config = SpringUtils.getBean(InDoorEnergyConfig.class);
             Token token = getAuthToken(config.getAppId());
+            log.info("getAuthToken response:{}", JSONObject.toJSONString(token));
             redisService.setCacheObject("INDOOR_ENERGY_ACCESS_TOKEN", token.getAccessToken(), 5 * 60L,
                 TimeUnit.SECONDS);
             redisService.setCacheObject("INDOOR_ENERGY_REFRESH_TOKEN", token.getRefreshToken());

+ 1 - 1
ems/ems-cloud/ems-dev-adapter/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: ems-dev-adapter
   profiles:
     # 环境配置
-    active: local
+    active: prod
   cloud:
     nacos:
       discovery:

+ 0 - 5
ems/ems-cloud/ems-dev-adapter/src/test/java/com/huashe/test/InDoorEnergyTest.java

@@ -70,9 +70,4 @@ public class InDoorEnergyTest {
         List<CodesVal> retList = template.getCodesVal(new CodesValReq("C_2003_AV_0000", "C_2003_AV_0002"));
         Assert.assertNotNull(retList);
     }
-
-    @Test
-    public void testMeterReading() {
-        handler.meterReading();
-    }
 }