Merge branch 'master' of http://124.70.43.205:3000/GYEE_R.D/gaia

electricity/meter/logs/2023-05/warn-2023-05-12.1.log

@@ -0,0 +1,234 @@
+2023-05-12 08:27:17.669  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 08:27:17.683  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 08:27:17.690  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 08:27:17.698  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 08:27:26.624  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 08:27:28.043  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 08:27:28.043  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 08:27:28.043  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 08:27:28.044  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 08:28:28.699  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 08:28:28.707  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 08:28:28.715  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 08:28:28.722  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 08:28:37.073  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 08:28:38.354  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 08:28:38.354  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 08:28:38.354  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 08:28:38.355  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 08:37:44.636  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 08:37:44.644  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 08:37:44.651  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 08:37:44.659  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 08:37:53.616  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 08:37:54.948  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 08:37:54.948  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 08:37:54.949  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 08:37:54.950  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 09:20:19.181  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 09:20:19.190  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 09:20:19.201  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 09:20:19.213  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 09:20:28.360  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 09:20:38.052  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 09:20:38.052  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 09:20:38.053  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 09:20:38.053  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 09:21:03.840  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 09:21:03.849  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 09:21:03.858  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 09:21:03.866  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 09:21:13.514  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 09:21:16.956  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 09:21:16.956  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 09:21:16.956  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 09:21:16.958  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 10:24:16.520  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 10:24:16.530  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 10:24:16.536  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 10:24:16.543  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 10:24:25.274  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 10:24:26.671  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 10:24:26.671  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 10:24:26.671  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 10:24:26.672  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 10:41:51.772  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 10:41:51.781  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 10:41:51.788  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 10:41:51.795  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 10:42:01.088  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 10:42:03.280  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 10:42:03.280  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 10:42:03.280  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 10:42:03.281  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 10:43:05.703  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 10:43:05.713  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 10:43:05.720  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 10:43:05.727  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 10:43:14.328  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 10:43:16.800  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 10:43:16.800  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 10:43:16.800  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 10:43:16.801  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 11:14:39.407  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 11:14:39.414  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 11:14:39.420  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 11:14:39.427  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 11:14:48.047  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 11:14:50.612  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 11:14:50.612  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 11:14:50.612  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 11:14:50.613  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 13:11:53.996  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:11:54.005  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 13:11:54.013  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:11:54.021  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:12:05.036  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 13:12:06.450  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 13:12:06.451  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 13:12:06.451  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 13:12:06.452  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 13:13:49.081  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:13:49.089  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 13:13:49.096  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:13:49.102  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:13:59.664  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 13:14:00.913  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 13:14:00.914  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 13:14:00.914  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 13:14:00.915  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 13:19:23.364  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:19:23.373  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 13:19:23.388  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:19:23.396  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:19:34.198  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 13:19:35.585  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 13:19:35.585  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 13:19:35.586  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 13:19:35.587  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 13:26:29.246  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:26:29.255  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 13:26:29.261  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:26:29.269  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:26:40.112  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 13:26:41.512  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 13:26:41.513  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 13:26:41.513  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 13:26:41.515  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 13:31:47.601  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:31:47.611  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 13:31:47.617  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:31:47.626  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:31:58.878  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 13:32:00.215  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 13:32:00.215  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 13:32:00.216  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 13:32:00.216  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 13:33:01.044  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:33:01.053  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 13:33:01.060  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:33:01.069  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:33:12.324  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 13:33:22.141  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 13:33:22.142  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 13:33:22.141  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 13:33:22.142  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 13:33:57.791  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:33:57.799  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 13:33:57.806  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:33:57.815  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 13:34:08.774  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 13:34:10.114  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 13:34:10.114  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 13:34:10.115  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 13:34:10.115  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 17:26:52.762  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:26:52.772  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 17:26:52.781  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:26:52.789  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:27:05.079  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 17:27:15.905  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 17:27:15.905  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 17:27:15.906  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 17:27:15.906  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 17:29:43.756  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:29:43.764  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 17:29:43.772  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:29:43.780  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:29:55.343  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 17:29:57.038  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 17:29:57.038  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 17:29:57.038  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 17:29:57.039  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 17:30:54.173  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:30:54.181  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 17:30:54.188  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:30:54.197  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:31:06.083  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 17:31:09.716  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 17:31:09.716  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 17:31:09.717  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 17:31:09.718  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 17:34:18.097  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:34:18.105  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 17:34:18.113  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:34:18.121  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:34:31.891  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 17:34:33.914  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 17:34:33.915  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 17:34:33.915  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 17:34:33.917  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 17:36:09.945  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:36:09.957  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 17:36:09.964  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:36:09.973  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:36:21.362  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 17:36:23.132  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 17:36:23.132  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 17:36:23.132  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 17:36:23.134  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 17:42:53.437  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:42:53.446  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 17:42:53.455  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:42:53.463  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:43:04.516  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 17:43:16.328  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 17:43:16.328  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 17:43:16.328  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 17:43:16.329  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 17:43:44.074  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:43:44.082  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 17:43:44.091  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:43:44.099  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:43:55.223  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 17:44:06.128  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 17:44:06.129  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 17:44:06.129  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 17:44:06.130  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 17:44:32.458  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:44:32.466  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 17:44:32.473  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:44:32.480  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:44:43.649  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 17:44:54.292  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 17:44:54.293  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 17:44:54.293  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 17:44:54.294  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 17:45:15.820  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:45:15.830  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 17:45:15.837  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:45:15.844  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:45:27.067  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 17:45:38.273  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 17:45:38.273  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 17:45:38.274  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-12 17:45:38.274  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 17:58:19.757  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[application-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:58:19.767  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-12 17:58:19.775  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:58:19.781  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter-dev.yml] & group[DEFAULT_GROUP]
+2023-05-12 17:58:31.253  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-12 17:58:42.960  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-12 17:58:42.960  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-12 17:58:42.960  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-12 17:58:42.962  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end

electricity/meter/src/main/java/com/gyee/gaia/meter/entity/MeterJSCD.java

@@ -1,25 +0,0 @@
-package com.gyee.gaia.meter.entity;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-/**
- * Author: malijun
- * Data  : 2023: 05: 10
- * meter计算测点(meter计算点中需要的一些测点)
- **/
-@Data
-@Component
-public class MeterJSCD {
-
-    @Value("${MHS.JDXL1}")
-    public String mhsjdxl1;
-
-    @Value("${MHS.JDXL2}")
-    private String mhsjdxl2;
-
-    @Value("${MHS.JDXL3}")
-    private String mhsjdxl3;
-}
-

electricity/meter/src/main/java/com/gyee/gaia/meter/entity/MeterPoint.java

@@ -154,11 +154,8 @@ public class MeterPoint implements Serializable {
     private String formula;
 
 
-    public String getNemCode2() {
-        return StringUtil.replace(nemCode,".","_");
-    }
     public String getFormula2() {
-        return StringUtil.replace(formula,".","_");
+        return StringUtil.replace(formula,"DL\\.","DL_");
     }
 
 

electricity/meter/src/main/java/com/gyee/gaia/meter/job/MeterJob.java

@@ -0,0 +1,36 @@
+package com.gyee.gaia.meter.job;
+
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * Author: malijun
+ * Data  : 2023: 05: 15
+ **/
+@Component
+public class MeterJob {
+
+    @Resource
+    SaveEquipmentRfdl saveEquipmentRfdl;
+    @Resource
+    SaveCalculatingFJFDL saveCalculatingFJFDL;
+    @Resource
+    SaveBottomcode saveBottomcode;
+    @Resource
+    SaveCalculating saveCalculating;
+
+
+    @XxlJob("MeterJob")
+    void meterJob(){
+        saveEquipmentRfdl.saveEquipmentRfdl();
+        saveCalculatingFJFDL.saveCalculatingFJFDL();
+        saveBottomcode.saveBottomcode();
+        saveCalculating.saveCalculating();
+        saveCalculating.saveCalculating();
+        saveCalculating.saveCalculating();
+
+    }
+
+}

electricity/meter/src/main/java/com/gyee/gaia/meter/job/SaveMeterInfoBottomcode10Min.java

@@ -30,8 +30,8 @@ import java.util.Map;
  **/
 
 @Component
-public class SaveMeterInfoBottomcode10Min {
-    private static final Logger logger = LoggerFactory.getLogger(SaveMeterInfoBottomcode10Min.class);
+public class SaveBottomcode {
+    private static final Logger logger = LoggerFactory.getLogger(SaveBottomcode.class);
 
 
     @Resource
@@ -46,7 +46,7 @@ public class SaveMeterInfoBottomcode10Min {
     @Resource
     Adapter adapter;
 
-    @XxlJob("SaveMeterInfoBottomcode10Min")
+    @XxlJob("SaveBottomcode")
     void saveBottomcode() {
         XxlJobHelper.log("hello,开始执行保存底码信息定时任务");
 

electricity/meter/src/main/java/com/gyee/gaia/meter/job/SaveMeterInfoCalculating10Min.java

@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.gaia.meter.entity.MeterInfoBottomcode;
 import com.gyee.gaia.meter.entity.MeterInfoCalculating;
-import com.gyee.gaia.meter.entity.MeterJSCD;
 import com.gyee.gaia.meter.entity.MeterPoint;
 import com.gyee.gaia.meter.service.impl.MeterInfoBottomcodeServiceImpl;
 import com.gyee.gaia.meter.service.impl.MeterInfoCalculatingServiceImpl;
@@ -26,7 +25,7 @@ import java.util.List;
  * Data  : 2023: 05: 11
  **/
 @Component
-public class SaveMeterInfoCalculating10Min {
+public class SaveCalculating {
 
     @Resource
     MeterPointServiceImpl meterPointService;
@@ -35,10 +34,7 @@ public class SaveMeterInfoCalculating10Min {
     @Resource
     MeterInfoCalculatingServiceImpl meterInfoCalculatingService;
 
-    @Resource
-    MeterJSCD meterJSCD;
-
-    @XxlJob("SaveMeterInfoCalculating10Min")
+    @XxlJob("SaveCalculating")
     void saveCalculating() {
 
         //获取当前日期,当日开始时间
@@ -50,13 +46,11 @@ public class SaveMeterInfoCalculating10Min {
         System.out.println("有公式数量" + meterPointJSDList.size());
 
         for (MeterPoint meterPoint : meterPointJSDList) {
-            System.out.println("测点名:" + meterPoint.getName());
-            System.out.println("测点公式:" + meterPoint.getFormula());
-
-            //得到公式字符串(.已经替换为_)
-            String formula2 = meterPoint.getFormula2();
-
             String formula1 = meterPoint.getFormula();
+            System.out.println("转换前的公式:" + formula1);
+            String formula3 = formula1.replaceAll("DL\\.", "DL_");
+            String formula2 = formula3.replaceAll("DJL.", "DJL_");
+
             //分割公式字符串,得到每一的个ode
 //            String[] meterPointCodes = formula2.split("[+\\-*/]");
 
@@ -76,7 +70,9 @@ public class SaveMeterInfoCalculating10Min {
 
             //遍历code数据,拿到每一个code,用code和时间,在meter_info_bottom中拿到dayValue
             for (String meterPointCode : meterPointCodes) {
-                String meterPointCode_ = meterPointCode.replaceAll("\\.", "_");
+//                String meterPointCode_ = meterPointCode.replace("DL\\.", "DL_");
+                String meterPointCode_1 = meterPointCode.replaceAll("DL.", "DL_");
+                String meterPointCode_ = meterPointCode_1.replaceAll("DJL.", "DJL_");
                 System.out.println("meterPointCode测点:");
 
                 //查询code所在场站
@@ -94,32 +90,32 @@ public class SaveMeterInfoCalculating10Min {
                         System.out.println("测点数据日电量:" + meterInfoBottomcode.getDayValue());
                         map.put(meterPointCode_, meterInfoBottomcode.getDayValue());
                     }
+
+
                 } catch (Exception e) {
                     System.out.println("获取数据异常  :" + e.getMessage());
                 }
-
-            }
-
-            try {
-                BigDecimal bigDecimal1 = (BigDecimal) ScriptShell.parseExpr(formula2, map);
-                System.out.println(bigDecimal1);
-                MeterInfoCalculating meterInfoCalculating = new MeterInfoCalculating();
-                meterInfoCalculating.setName(meterPoint.getName());
-                meterInfoCalculating.setCode(meterPoint.getNemCode());
-                meterInfoCalculating.setDate(dateTime1.toLocalDateTime());
-                meterInfoCalculating.setValue(bigDecimal1);
-                meterInfoCalculating.setWindpowerstationId(meterPoint.getWindpowerstationId());
-                QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("date", dateTime1.toLocalDateTime()).eq("code", meterPoint.getNemCode());
-                List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
-                if (list.size() > 0) {
-                    meterInfoCalculating.update(queryWrapper);
-                } else {
-                    meterInfoCalculating.insert();
+                try {
+                    BigDecimal bigDecimal1 = (BigDecimal) ScriptShell.parseExpr(formula2, map);
+                    System.out.println(bigDecimal1);
+                    MeterInfoCalculating meterInfoCalculating = new MeterInfoCalculating();
+                    meterInfoCalculating.setName(meterPoint.getName());
+                    meterInfoCalculating.setCode(meterPoint.getNemCode());
+                    meterInfoCalculating.setDate(dateTime1.toLocalDateTime());
+                    meterInfoCalculating.setValue(bigDecimal1);
+                    meterInfoCalculating.setWindpowerstationId(meterPoint.getWindpowerstationId());
+                    QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("date", dateTime1.toLocalDateTime()).eq("code", meterPoint.getNemCode());
+                    List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
+                    if (list.size() > 0) {
+                        meterInfoCalculating.update(queryWrapper);
+                    } else {
+                        meterInfoCalculating.insert();
+                    }
+                } catch (Exception e) {
+                    System.out.println(e.getMessage());
                 }
-            } catch (Exception e) {
 
-                System.out.println("存入异常   :" + e.getMessage());
             }
 
 

electricity/meter/src/main/java/com/gyee/gaia/meter/job/SaveMeterInfoBottomEquipmentProjectFDL10Min.java

@@ -3,18 +3,18 @@ package com.gyee.gaia.meter.job;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.gaia.meter.entity.MeterInfoBottomcode;
+import com.gyee.gaia.meter.entity.MeterInfoCalculating;
 import com.gyee.gaia.meter.entity.MeterInfoEquipment;
 import com.gyee.gaia.meter.entity.MeterPoint;
-import com.gyee.gaia.meter.service.impl.MeterInfoBottomcodeServiceImpl;
+import com.gyee.gaia.meter.service.impl.MeterInfoCalculatingServiceImpl;
 import com.gyee.gaia.meter.service.impl.MeterInfoEquipmentServiceImpl;
 import com.gyee.gaia.meter.service.impl.MeterPointServiceImpl;
 import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -22,19 +22,19 @@ import java.util.List;
  * Data  : 2023: 05: 09
  **/
 
-
-public class SaveMeterInfoBottomEquipmentProjectFDL10Min {
+@Component
+public class SaveCalculatingFJFDL {
 
     @Resource
     MeterPointServiceImpl meterPointService;
     @Resource
-    MeterInfoBottomcodeServiceImpl meterInfoBottomcodeService;
+    MeterInfoCalculatingServiceImpl meterInfoCalculatingService;
     @Resource
     MeterInfoEquipmentServiceImpl meterInfoEquipmentService;
 
     //项目期次风机总发电量
-    @XxlJob("SaveMeterInfoBottomEquipmentProjectFDL10Min")
-    void saveCalculatingProjectFDL() {
+    @XxlJob("SaveCalculatingFJFDL")
+    void saveCalculatingFJFDL() {
 
 
         //获取当前日期,当日开始时间
@@ -61,23 +61,22 @@ public class SaveMeterInfoBottomEquipmentProjectFDL10Min {
                     bigDecimal = bigDecimal.add(meterInfoEquipment.getRfdl());
                 }
 
-                MeterInfoBottomcode meterInfoBottomcode = new MeterInfoBottomcode();
-                meterInfoBottomcode.setName(meterPoint.getName());
-                meterInfoBottomcode.setStartTime(dateTime1.toLocalDateTime());
-                meterInfoBottomcode.setEndTime(LocalDateTime.now());
-                meterInfoBottomcode.setDayValue(bigDecimal.divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_EVEN));
-                meterInfoBottomcode.setCode(meterPoint.getNemCode());
-                meterInfoBottomcode.setWindpowerstationId(meterPoint.getWindpowerstationId());
-
-                QueryWrapper<MeterInfoBottomcode> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("start_time", dateTime1.toLocalDateTime()).eq("code", meterPoint.getNemCode());
-                List<MeterInfoBottomcode> list = meterInfoBottomcodeService.list(queryWrapper);
-                System.out.println(list.size());
-                if (list.size() > 0) {
-                    meterInfoBottomcode.update(queryWrapper);
-                } else {
-                    meterInfoBottomcode.insert();
-                }
+            MeterInfoCalculating meterInfoCalculating = new MeterInfoCalculating();
+            meterInfoCalculating.setName(meterPoint.getName());
+            meterInfoCalculating.setDate(dateTime1.toLocalDateTime());
+            meterInfoCalculating.setValue(bigDecimal.divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_EVEN));
+            meterInfoCalculating.setCode(meterPoint.getNemCode());
+            meterInfoCalculating.setWindpowerstationId(meterPoint.getWindpowerstationId());
+
+            QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("date", dateTime1.toLocalDateTime()).eq("code", meterPoint.getNemCode());
+            List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
+            System.out.println(list.size());
+            if (list.size() > 0) {
+                meterInfoCalculating.update(queryWrapper);
+            } else {
+                meterInfoCalculating.insert();
+            }
 
 
             }

electricity/meter/src/main/java/com/gyee/gaia/meter/job/SaveMeterInfoEquipment10Min.java

@@ -28,8 +28,8 @@ import java.util.Map;
  **/
 
 @Component
-public class SaveMeterInfoEquipment10Min {
-    private static final Logger logger = LoggerFactory.getLogger(SaveMeterInfoEquipment10Min.class);
+public class SaveEquipmentRfdl {
+    private static final Logger logger = LoggerFactory.getLogger(SaveEquipmentRfdl.class);
 
     @Resource
     Adapter adapter;
@@ -43,7 +43,7 @@ public class SaveMeterInfoEquipment10Min {
     @Resource
     MeterInfoEquipmentServiceImpl meterInfoEquipmentService;
 
-    @XxlJob("SaveMeterInfoEquipment10Min")
+    @XxlJob("SaveEquipmentRfdl")
     void saveEquipmentRfdl() {
         XxlJobHelper.log("hello,开始执行保存风机设备电量信息定时任务");
         

electricity/meter/src/main/java/com/gyee/gaia/meter/service/SaveMeterInfoBottomEquipmentProjectFDL10MinTest.java

@@ -1,98 +0,0 @@
-package com.gyee.gaia.meter.service;
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.gaia.meter.entity.MeterInfoBottomcode;
-import com.gyee.gaia.meter.entity.MeterInfoEquipment;
-import com.gyee.gaia.meter.entity.MeterPoint;
-import com.gyee.gaia.meter.service.impl.MeterInfoBottomcodeServiceImpl;
-import com.gyee.gaia.meter.service.impl.MeterInfoEquipmentServiceImpl;
-import com.gyee.gaia.meter.service.impl.MeterPointServiceImpl;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * Author: malijun
- * Data  : 2023: 05: 09
- **/
-
-@SpringBootTest
-public class SaveMeterInfoBottomEquipmentProjectFDL10MinTest {
-
-    @Resource
-    MeterPointServiceImpl meterPointService;
-    @Resource
-    MeterInfoBottomcodeServiceImpl meterInfoBottomcodeService;
-    @Resource
-    MeterInfoEquipmentServiceImpl meterInfoEquipmentService;
-
-    //项目期次风机总发电量
-    @Test
-    void saveCalculatingProjectFDL() {
-
-
-        //获取当前日期,当日开始时间
-        String nowString = DateUtil.now();
-        DateTime nowDateTime = DateUtil.parse(nowString);
-        DateTime startDateTime = DateUtil.beginOfDay(nowDateTime);
-
-
-        //1,所有期次发电量测点
-        List<MeterPoint> meterPointList = meterPointService.list(new QueryWrapper<MeterPoint>().eq("property", "JSD_QCFDL"));
-        System.out.println(meterPointList.size());
-
-        //遍历期次发电量测点,拿到场站id,
-        for (MeterPoint meterPoint : meterPointList) {
-            String projectId = meterPoint.getProjectId();
-
-                //开始时间00:00:01
-                DateTime dateTime1 = DateUtil.offsetSecond(startDateTime, 1);
-
-
-                List<MeterInfoEquipment> meterInfoEquipments = meterInfoEquipmentService.list(new QueryWrapper<MeterInfoEquipment>().eq("project_nem_code", projectId).eq("date", dateTime1));
-                BigDecimal bigDecimal = BigDecimal.valueOf(0);
-                for (MeterInfoEquipment meterInfoEquipment : meterInfoEquipments) {
-                    bigDecimal = bigDecimal.add(meterInfoEquipment.getRfdl());
-                }
-
-                MeterInfoBottomcode meterInfoBottomcode = new MeterInfoBottomcode();
-                meterInfoBottomcode.setName(meterPoint.getName());
-                meterInfoBottomcode.setStartTime(dateTime1.toLocalDateTime());
-                meterInfoBottomcode.setEndTime(LocalDateTime.now());
-                meterInfoBottomcode.setDayValue(bigDecimal.divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_EVEN));
-                meterInfoBottomcode.setCode(meterPoint.getNemCode());
-                meterInfoBottomcode.setWindpowerstationId(meterPoint.getWindpowerstationId());
-
-                QueryWrapper<MeterInfoBottomcode> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("start_time", dateTime1.toLocalDateTime()).eq("code", meterPoint.getNemCode());
-                List<MeterInfoBottomcode> list = meterInfoBottomcodeService.list(queryWrapper);
-                System.out.println(list.size());
-                if (list.size() > 0) {
-                    meterInfoBottomcode.update(queryWrapper);
-                } else {
-                    meterInfoBottomcode.insert();
-                }
-
-
-            }
-
-
-        }
-
-
-    }
-
-
-
-
-
-
-
-

electricity/meter/src/main/java/com/gyee/gaia/meter/service/SaveMeterInfoBottomcode10MinTest.java

@@ -1,132 +0,0 @@
-package com.gyee.gaia.meter.service;
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.gaia.meter.adapter.Adapter;
-import com.gyee.gaia.meter.entity.MeterInfoBottomcode;
-import com.gyee.gaia.meter.entity.MeterPoint;
-import com.gyee.gaia.meter.entity.PointData;
-import com.gyee.gaia.meter.entity.PowerStation;
-import com.gyee.gaia.meter.service.impl.MeterInfoBottomcodeServiceImpl;
-import com.gyee.gaia.meter.service.impl.MeterPointServiceImpl;
-import com.gyee.gaia.meter.service.impl.PowerStationServiceImpl;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Author: malijun
- * Data  : 2023: 05: 09
- **/
-
-@SpringBootTest
-public class SaveMeterInfoBottomcode10MinTest {
-
-
-    @Resource
-    PowerStationServiceImpl powerStationService;
-
-    @Resource
-    MeterPointServiceImpl meterPointService;
-
-    @Resource
-    MeterInfoBottomcodeServiceImpl meterInfoBottomcodeService;
-
-    @Resource
-    Adapter adapter;
-
-    @Test
-    void saveBottomcode() {
-
-        //获取当前日期,当日开始时间
-        String nowString = DateUtil.now();
-        DateTime nowDateTime = DateUtil.parse(nowString);
-        DateTime startDateTime = DateUtil.beginOfDay(nowDateTime);
-
-        //类似之前代码,获取场站,遍历场站,根据场站ID获取测点code
-        //1,查询所有风电场
-        List<PowerStation> powerStationList = powerStationService.list(new QueryWrapper<PowerStation>().like("nem_code", "_FDC_"));
-
-        for (PowerStation powerStation : powerStationList) {
-
-            //2,根据场站ID得到场站下所有测点
-            List<MeterPoint> meterPointList = meterPointService.list(new QueryWrapper<MeterPoint>().eq("windpowerstation_id", powerStation.getId()).eq("property", "CD"));
-            System.out.println(powerStation.getNemCode() + "场站测点数量" + meterPointList.size());
-
-            //3,遍历测点,拿到每个测点的nem_code
-            for (MeterPoint meterPoint : meterPointList) {
-                //获取测点code
-                String pointcode = meterPoint.getNemCode();
-
-                //根据测点code,用适配器section接口获取当日00:00:01数据,存入数据库当天开始值
-                Map<String, PointData> historySection1 = adapter.getHistorySection(pointcode, DateUtil.offsetSecond(startDateTime, 1).getTime());
-                double value1 = 0;
-                if (historySection1.size() > 0) {
-                    value1 = historySection1.get(pointcode).getValue();
-                }
-                BigDecimal bigDecimal1 = BigDecimal.valueOf(value1);
-                bigDecimal1 = bigDecimal1.divide(meterPoint.getXs(), 4, RoundingMode.HALF_EVEN);
-
-                //根据测点code,用适配器latest接口获取最新数据和时间,存入数据库结束值
-                Map<String, PointData> historyLatest2 = adapter.getHistoryLatest(pointcode);
-                double value2 = 0;
-                long ts = 0;
-                if (historyLatest2.size() > 0) {
-                    value2 = historyLatest2.get(pointcode).getValue();
-                    ts = historyLatest2.get(pointcode).getTs();
-                }
-                BigDecimal bigDecimal2 = BigDecimal.valueOf(value2);
-                bigDecimal2 = bigDecimal2.divide(meterPoint.getXs(), 4, RoundingMode.HALF_EVEN);
-                DateTime enddateTime = new DateTime(ts);
-                //计算日电量
-                BigDecimal rfdl = bigDecimal2.subtract(bigDecimal1).multiply(meterPoint.getMagnification());
-
-                MeterInfoBottomcode meterInfoBottomcode = new MeterInfoBottomcode();
-
-                //name
-                meterInfoBottomcode.setName(meterPoint.getName());
-                //开始时间,当日开始时间
-                meterInfoBottomcode.setStartTime(DateUtil.offsetSecond(startDateTime, 1).toLocalDateTime());
-                //开始值,section接口获取当日00:00:01数据
-                meterInfoBottomcode.setStartValue(bigDecimal1);
-                //最新时间,latest返回的时间
-//                    meterInfoBottomcode.setEndTime(enddateTime.toLocalDateTime());
-                meterInfoBottomcode.setEndTime(LocalDateTime.now());
-                //最新值,latest返回的值
-                meterInfoBottomcode.setEndValue(bigDecimal2);
-                //日电量
-                meterInfoBottomcode.setDayValue(rfdl);
-                //code,meter.getCode
-                meterInfoBottomcode.setCode(meterPoint.getNemCode());
-                //windpowerstation_id,meter.getWindpowerstationId,
-                meterInfoBottomcode.setWindpowerstationId(meterPoint.getWindpowerstationId());
-
-
-                QueryWrapper<MeterInfoBottomcode> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("start_time", DateUtil.offsetSecond(startDateTime, 1).toLocalDateTime()).eq("code", meterPoint.getNemCode());
-                List<MeterInfoBottomcode> list = meterInfoBottomcodeService.list(queryWrapper);
-                System.out.println(list.size());
-                if (list.size() > 0) {
-                    meterInfoBottomcode.update(queryWrapper);
-                } else {
-                    meterInfoBottomcode.insert();
-                }
-
-            }
-
-
-        }
-    }
-
-
-}
-
-
-

electricity/meter/src/main/java/com/gyee/gaia/meter/service/SaveMeterInfoCalculating10MinTest.java

@@ -1,133 +0,0 @@
-package com.gyee.gaia.meter.service;
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.gaia.meter.entity.MeterInfoBottomcode;
-import com.gyee.gaia.meter.entity.MeterInfoCalculating;
-import com.gyee.gaia.meter.entity.MeterJSCD;
-import com.gyee.gaia.meter.entity.MeterPoint;
-import com.gyee.gaia.meter.service.impl.MeterInfoBottomcodeServiceImpl;
-import com.gyee.gaia.meter.service.impl.MeterInfoCalculatingServiceImpl;
-import com.gyee.gaia.meter.service.impl.MeterPointServiceImpl;
-import com.gyee.gaia.meter.util.ScriptShell;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * Author: malijun
- * Data  : 2023: 05: 11
- **/
-@SpringBootTest
-public class SaveMeterInfoCalculating10MinTest {
-
-    @Resource
-    MeterPointServiceImpl meterPointService;
-    @Resource
-    MeterInfoBottomcodeServiceImpl meterInfoBottomcodeService;
-    @Resource
-    MeterInfoCalculatingServiceImpl meterInfoCalculatingService;
-
-    @Resource
-    MeterJSCD meterJSCD;
-
-    @Test
-    void saveCalculating() {
-
-        //获取当前日期,当日开始时间
-        String nowString = DateUtil.now();
-        DateTime nowDateTime = DateUtil.parse(nowString);
-        DateTime startDateTime = DateUtil.beginOfDay(nowDateTime);
-
-        List<MeterPoint> meterPointJSDList = meterPointService.list(new QueryWrapper<MeterPoint>().eq("property", "JSD").ne("formula", ""));
-        System.out.println("有公式数量" + meterPointJSDList.size());
-
-        for (MeterPoint meterPoint : meterPointJSDList) {
-            System.out.println("测点名:" + meterPoint.getName());
-            System.out.println("测点公式:" + meterPoint.getFormula());
-
-            //得到公式字符串(.已经替换为_)
-            String formula2 = meterPoint.getFormula2();
-
-            String formula1 = meterPoint.getFormula();
-            //分割公式字符串,得到每一的个ode
-//            String[] meterPointCodes = formula2.split("[+\\-*/]");
-
-            String[] meterPointCodes = StringUtils.split(formula1, "[+\\-*/()]");
-            meterPointCodes = Arrays.stream(meterPointCodes)
-                    .filter(meterPointCode -> !(meterPointCode.length() < 10))
-                    .toArray(String[]::new);
-            System.out.println("公式中测点数:" + meterPointCodes.length);
-            System.out.println(Arrays.toString(meterPointCodes));
-
-            HashMap<String, Object> map = new HashMap<>();
-
-            //开始时间
-            DateTime dateTime1 = DateUtil.offsetSecond(startDateTime, 1);
-
-            System.out.println("遍历测点集合");
-
-            //遍历code数据,拿到每一个code,用code和时间,在meter_info_bottom中拿到dayValue
-            for (String meterPointCode : meterPointCodes) {
-                String meterPointCode_ = meterPointCode.replaceAll("\\.", "_");
-                System.out.println("meterPointCode测点:");
-
-                //查询code所在场站
-
-                //如果字符串以DL开头,从meter_info_calclating表中取,否则从meter_info_bottom表中取
-                try {
-                    if (meterPointCode.startsWith("DL")) {
-                        System.out.println("计算测点DL:" + meterPointCode);
-                        MeterInfoCalculating meterInfoCalculating = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().eq("code", meterPointCode).eq("date", dateTime1));
-                        System.out.println("测点数据:" + meterInfoCalculating.getValue());
-                        map.put(meterPointCode_, meterInfoCalculating.getValue());
-                    } else {
-                        System.out.println("计算测点Bottom:" + meterPointCode);
-                        MeterInfoBottomcode meterInfoBottomcode = meterInfoBottomcodeService.getOne(new QueryWrapper<MeterInfoBottomcode>().eq("code", meterPointCode).eq("start_time", dateTime1));
-                        System.out.println("测点数据日电量:" + meterInfoBottomcode.getDayValue());
-                        map.put(meterPointCode_, meterInfoBottomcode.getDayValue());
-                    }
-                } catch (Exception e) {
-                    System.out.println("获取数据异常  :" + e.getMessage());
-                }
-
-            }
-
-            try {
-                BigDecimal bigDecimal1 = (BigDecimal) ScriptShell.parseExpr(formula2, map);
-                System.out.println(bigDecimal1);
-                MeterInfoCalculating meterInfoCalculating = new MeterInfoCalculating();
-                meterInfoCalculating.setName(meterPoint.getName());
-                meterInfoCalculating.setCode(meterPoint.getNemCode());
-                meterInfoCalculating.setDate(dateTime1.toLocalDateTime());
-                meterInfoCalculating.setValue(bigDecimal1);
-                meterInfoCalculating.setWindpowerstationId(meterPoint.getWindpowerstationId());
-                QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("date", dateTime1.toLocalDateTime()).eq("code", meterPoint.getNemCode());
-                List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
-                if (list.size() > 0) {
-                    meterInfoCalculating.update(queryWrapper);
-                } else {
-                    meterInfoCalculating.insert();
-                }
-            } catch (Exception e) {
-
-                System.out.println("存入异常   :" + e.getMessage());
-            }
-
-
-        }
-
-
-    }
-}
-
-
-

electricity/meter/src/main/java/com/gyee/gaia/meter/service/SaveMeterInfoEquipment10MinTest.java

@@ -1,118 +0,0 @@
-package com.gyee.gaia.meter.service;
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.gaia.meter.adapter.Adapter;
-import com.gyee.gaia.meter.entity.Equipment;
-import com.gyee.gaia.meter.entity.MeterInfoEquipment;
-import com.gyee.gaia.meter.entity.PointData;
-import com.gyee.gaia.meter.entity.TestingPoint;
-import com.gyee.gaia.meter.service.impl.EquipmentServiceImpl;
-import com.gyee.gaia.meter.service.impl.MeterInfoEquipmentServiceImpl;
-import com.gyee.gaia.meter.service.impl.TestingPointServiceImpl;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Author: malijun
- * Data  : 2023: 05: 09
- **/
-
-@SpringBootTest
-public class SaveMeterInfoEquipment10MinTest {
-
-    @Resource
-    Adapter adapter;
-
-    @Resource
-    TestingPointServiceImpl testingPointService;
-
-    @Resource
-    EquipmentServiceImpl equipmentService;
-
-    @Resource
-    MeterInfoEquipmentServiceImpl meterInfoEquipmentService;
-
-    @Test
-    void saveEquipmentRfdl() {
-
-
-        //1,在testingpoint中根据 uniform_code=AI064 和code like "%_FJ_%" 取出所有风机的电量测点code
-        List<TestingPoint> testingPointList = testingPointService.list(new QueryWrapper<TestingPoint>().eq("uniform_code", "AI064").like("code", "%_FJ_%"));
-
-        //所有风机总共407个电量测点code
-        System.out.println(testingPointList.size());
-
-        //获取当前日期,当日开始时间
-        String nowString = DateUtil.now();
-        DateTime nowDateTime = DateUtil.parse(nowString);
-        DateTime startDateTime = DateUtil.beginOfDay(nowDateTime);
-
-        //2,遍历list,每次取出一个code
-        for (TestingPoint testingPoint : testingPointList) {
-            //获取测点code
-            String pointcode = testingPoint.getCode();
-            //获取设备ID
-            String thingId = testingPoint.getThingId();
-
-            //6,根据code和日期开始时间00:00:00获取日期开始点发电量
-            Map<String, PointData> historySection1 = adapter.getHistorySection(pointcode, DateUtil.offsetSecond(startDateTime, 1).getTime());
-            double value1 = 0;
-            if (historySection1.size() > 0) {
-                value1 = historySection1.get(pointcode).getValue();
-            }
-            BigDecimal bigDecimal1 = BigDecimal.valueOf(value1);
-
-            //7,根据code和日期结束时间23:59:59获取日期结束点发电量
-            Map<String, PointData> historyLatest2 = adapter.getHistoryLatest(pointcode);
-            double value2 = 0;
-            long ts = 0;
-            if (historyLatest2.size() > 0) {
-                value2 = historyLatest2.get(pointcode).getValue();
-                ts = historyLatest2.get(pointcode).getTs();
-            }
-            BigDecimal bigDecimal2 = BigDecimal.valueOf(value2);
-            DateTime enddateTime = new DateTime(ts);
-
-            //8,结束点发电量减去开始点发电量得到日发电量(单位Kwh)
-            BigDecimal rfdl = bigDecimal2.subtract(bigDecimal1);
-
-            //9,company_nem_code   (powerstation_nem_code project_nem_code line_nem_code equipment_nem_code )都在basic equipment中叫project_id    name date rfdl 存入meterInfo表中
-            Equipment thingId1 = equipmentService.getOne(new QueryWrapper<Equipment>().eq("nem_code", thingId));
-
-            MeterInfoEquipment meterInfoEquipment = new MeterInfoEquipment();
-            meterInfoEquipment.setCompanyNemCode("NX_GDDL_ZGS");
-            meterInfoEquipment.setPowerstationNemCode(thingId1.getWindpowerstationId());
-            meterInfoEquipment.setProjectNemCode(thingId1.getProjectId());
-            meterInfoEquipment.setLineNemCode(thingId1.getLineId());
-            meterInfoEquipment.setEquipmentNemCode(thingId1.getNemCode());
-            meterInfoEquipment.setName(thingId1.getName());
-            meterInfoEquipment.setDate(DateUtil.offsetSecond(startDateTime, 1).toLocalDateTime());
-            meterInfoEquipment.setRfdl(rfdl);
-
-
-            QueryWrapper<MeterInfoEquipment> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("equipment_nem_code", thingId1.getNemCode()).eq("date",startDateTime.toLocalDateTime());
-            List<MeterInfoEquipment> list = meterInfoEquipmentService.list(queryWrapper);
-            System.out.println(list.size());
-            if (list.size() > 0) {
-                meterInfoEquipment.update(queryWrapper);
-            } else {
-                meterInfoEquipment.insert();
-            }
-
-
-        }
-    }
-
-
-}
-
-
-

electricity/meter/src/main/java/com/gyee/gaia/meter/service/SaveMeterInfoHistoryByMonthTest.java

@@ -0,0 +1,394 @@
+package com.gyee.gaia.meter.service;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.gaia.meter.adapter.Adapter;
+import com.gyee.gaia.meter.entity.*;
+import com.gyee.gaia.meter.service.impl.*;
+import com.gyee.gaia.meter.util.ScriptShell;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Author: malijun
+ * Data  : 2023: 04: 27
+ **/
+@SpringBootTest
+class SaveMeterInfoHistoryByMonthTest {
+
+
+    @Resource
+    Adapter adapter;
+    @Resource
+    TestingPointServiceImpl testingPointService;
+    @Resource
+    EquipmentServiceImpl equipmentService;
+    @Resource
+    PowerStationServiceImpl powerStationService;
+    @Resource
+    MeterPointServiceImpl meterPointService;
+    @Resource
+    MeterInfoBottomcodeServiceImpl meterInfoBottomcodeService;
+    @Resource
+    MeterInfoEquipmentServiceImpl meterInfoEquipmentService;
+    @Resource
+    MeterInfoCalculatingServiceImpl meterInfoCalculatingService;
+
+
+    @Value("${start.time}")
+    private String startTimeString;
+    @Value("${end.time}")
+    private String endTimeString;
+
+    //读取时间段内设备发电量计算肉发电量写入pg数据库
+    @Test
+    void saveEquipmentRfdl() {
+
+
+        //1,在testingpoint中根据 uniform_code=AI064 和code like "%_FJ_%" 取出所有风机的电量测点code
+        List<TestingPoint> testingPointList = testingPointService.list(new QueryWrapper<TestingPoint>().eq("uniform_code", "AI064").like("code", "%_FJ_%"));
+
+        //所有风机总共407个电量测点code
+
+        //2,遍历list,每次取出一个code
+        for (TestingPoint testingPoint : testingPointList) {
+            //获取测点code
+            String pointcode = testingPoint.getCode();
+            //获取设备ID
+            String thingId = testingPoint.getThingId();
+
+            //设置取值开始时间
+            String startString = startTimeString;
+            DateTime startDateTime = DateUtil.parse(startString);
+
+            //设置取值结束时间
+            String endDateString = endTimeString;
+            DateTime endDateTime = DateUtil.parse(endDateString);
+
+            //指定开始日期到结束日期的天数
+            LocalDateTime day1 = LocalDateTimeUtil.of(startDateTime);
+            LocalDateTime day2 = LocalDateTimeUtil.of(endDateTime);
+            long between = ChronoUnit.DAYS.between(day1, day2);
+
+
+            //开始时间00:00:01
+            DateTime dateTime1 = DateUtil.offsetSecond(startDateTime, 1);
+            //结束时间第二天00:00:01
+            DateTime dateTime2 = DateUtil.offsetSecond(endDateTime, 1);
+
+            //6,根据code和日期开始时间00:00:00获取日期开始点发电量
+            Map<String, PointData> historySection1 = adapter.getHistorySection(pointcode, dateTime1.getTime());
+            double value1 = historySection1.get(pointcode).getValue();
+
+            //7,根据code和日期结束时间获取日期结束点发电量
+            Map<String, PointData> historySection2 = adapter.getHistorySection(pointcode, dateTime2.getTime());
+            double value2 = historySection2.get(pointcode).getValue();
+
+            //8,结束点发电量减去开始点发电量得到日发电量(单位Kwh)
+            BigDecimal bigDecimal1 = new BigDecimal(Double.toString(value1));
+            BigDecimal bigDecimal2 = new BigDecimal(Double.toString(value2));
+            BigDecimal rfdl = bigDecimal2.subtract(bigDecimal1);
+
+
+            //9,company_nem_code   (powerstation_nem_code project_nem_code line_nem_code equipment_nem_code )都在basic equipment中叫project_id    name date rfdl 存入meterInfo表中
+            Equipment thingId1 = equipmentService.getOne(new QueryWrapper<Equipment>().eq("nem_code", thingId));
+
+
+            MeterInfoEquipment meterInfoEquipment = new MeterInfoEquipment();
+            meterInfoEquipment.setCompanyNemCode("NX_GDDL_ZGS");
+            meterInfoEquipment.setPowerstationNemCode(thingId1.getWindpowerstationId());
+            meterInfoEquipment.setProjectNemCode(thingId1.getProjectId());
+            meterInfoEquipment.setLineNemCode(thingId1.getLineId());
+            meterInfoEquipment.setEquipmentNemCode(thingId1.getNemCode());
+            meterInfoEquipment.setName(thingId1.getName());
+            meterInfoEquipment.setDate(dateTime1.toLocalDateTime());
+            meterInfoEquipment.setRfdl(rfdl);
+            QueryWrapper<MeterInfoEquipment> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("equipment_nem_code", thingId1.getNemCode()).eq("date", dateTime1.toLocalDateTime());
+            List<MeterInfoEquipment> list = meterInfoEquipmentService.list(queryWrapper);
+            if (list.size() > 0) {
+                meterInfoEquipment.update(queryWrapper);
+            } else {
+                meterInfoEquipment.insert();
+            }
+
+
+        }
+
+    }
+
+    //读取时间段内meter_point表中所有电计量测点数据存入pg数据库
+    @Test
+    void saveBottomCode() {
+
+        //1,查询所有风电场
+        List<PowerStation> powerStationList = powerStationService.list(new QueryWrapper<PowerStation>().like("nem_code", "_FDC_"));
+
+        for (PowerStation powerStation : powerStationList) {
+
+            //2,根据场站ID得到场站下所有测点
+            List<MeterPoint> meterPointList = meterPointService.list(new QueryWrapper<MeterPoint>().eq("windpowerstation_id", powerStation.getId()).eq("property", "CD"));
+
+            //3,遍历测点,拿到每个测点的nem_code
+            for (MeterPoint meterPoint : meterPointList) {
+                System.out.println(meterPoint);
+                //获取测点code
+                String pointcode = meterPoint.getNemCode();
+
+                //设置取值开始时间
+                String startString = startTimeString;
+                DateTime startDateTime = DateUtil.parse(startString);
+
+                //设置取值结束时间
+                String endDateString = endTimeString;
+                DateTime endDateTime = DateUtil.parse(endDateString);
+
+                //指定开始日期到结束日期的天数
+                LocalDateTime day1 = LocalDateTimeUtil.of(startDateTime);
+                LocalDateTime day2 = LocalDateTimeUtil.of(endDateTime);
+                long between = ChronoUnit.DAYS.between(day1, day2);
+
+
+                //开始时间00:00:01
+                DateTime dateTime1 = DateUtil.offsetSecond(startDateTime, 1);
+                //结束时间第二天00:00:01
+                DateTime dateTime2 = DateUtil.offsetSecond(endDateTime, 1);
+
+                //6,根据测点code和日期开始时间00:00:01获取日期开始点发电量
+                Map<String, PointData> historySection1 = adapter.getHistorySection(pointcode, dateTime1.getTime());
+
+                //7,根据测点code和日期结束时间第二点00:00:01获取日期结束点发电量
+                Map<String, PointData> historySection2 = adapter.getHistorySection(pointcode, dateTime2.getTime());
+
+                BigDecimal bigDecimal1 = meterPoint.getInitialValue();
+                BigDecimal bigDecimal2 = meterPoint.getInitialValue();
+
+
+                if (historySection1.size() > 0 && historySection2.size() > 0) {
+                    double value1 = historySection1.get(pointcode).getValue();
+                    double value2 = historySection2.get(pointcode).getValue();
+                    bigDecimal1 = new BigDecimal(Double.toString(value1));
+                    bigDecimal2 = new BigDecimal(Double.toString(value2));
+                }
+                bigDecimal1 = bigDecimal1.divide(meterPoint.getXs(), 4, RoundingMode.HALF_EVEN);
+                bigDecimal2 = bigDecimal2.divide(meterPoint.getXs(), 4, RoundingMode.HALF_EVEN);
+                BigDecimal rfdl = bigDecimal2.subtract(bigDecimal1).multiply(meterPoint.getMagnification());
+
+                MeterInfoBottomcode meterInfoBottomcode = new MeterInfoBottomcode();
+                meterInfoBottomcode.setName(meterPoint.getName());
+                meterInfoBottomcode.setStartTime(dateTime1.toLocalDateTime());
+                meterInfoBottomcode.setStartValue(bigDecimal1);
+                meterInfoBottomcode.setEndTime(dateTime2.toLocalDateTime());
+                meterInfoBottomcode.setEndValue(bigDecimal2);
+                meterInfoBottomcode.setDayValue(rfdl);
+                meterInfoBottomcode.setCode(pointcode);
+                meterInfoBottomcode.setWindpowerstationId(meterPoint.getWindpowerstationId());
+
+                QueryWrapper<MeterInfoBottomcode> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("start_time", dateTime1.toLocalDateTime()).eq("code", meterPoint.getNemCode());
+                List<MeterInfoBottomcode> list = meterInfoBottomcodeService.list(queryWrapper);
+                if (list.size() > 0) {
+                    meterInfoBottomcode.update(queryWrapper);
+                } else {
+                    meterInfoBottomcode.insert();
+                }
+            }
+        }
+
+
+    }
+
+    //项目期期风机总发电量
+    @Test
+    void saveCalculatingProjectFDL() {
+
+
+        //设置取值开始时间
+        String startString = startTimeString;
+        DateTime startDateTime = DateUtil.parse(startString);
+
+        //设置取值结束时间
+        String endDateString = endTimeString;
+        DateTime endDateTime = DateUtil.parse(endDateString);
+
+        //指定开始日期到结束日期的天数
+        LocalDateTime day1 = LocalDateTimeUtil.of(startDateTime);
+        LocalDateTime day2 = LocalDateTimeUtil.of(endDateTime);
+        long between = ChronoUnit.DAYS.between(day1, day2);
+
+
+        //1,所有期次发电量测点
+        List<MeterPoint> meterPointList = meterPointService.list(new QueryWrapper<MeterPoint>().eq("property", "JSD_QCFDL"));
+
+        //遍历期次发电量测点,拿到场站id,
+        for (MeterPoint meterPoint : meterPointList) {
+            String projectId = meterPoint.getProjectId();
+
+
+            //开始时间00:00:01
+            DateTime dateTime1 = DateUtil.offsetSecond(startDateTime, 1);
+            //结束时间第二天00:00:01
+            DateTime dateTime2 = DateUtil.offsetSecond(startDateTime, 1);
+
+            List<MeterInfoEquipment> meterInfoEquipments = meterInfoEquipmentService.list(new QueryWrapper<MeterInfoEquipment>().eq("project_nem_code", projectId).eq("date", dateTime1));
+            BigDecimal bigDecimal = BigDecimal.valueOf(0);
+            for (MeterInfoEquipment meterInfoEquipment : meterInfoEquipments) {
+                bigDecimal = bigDecimal.add(meterInfoEquipment.getRfdl());
+            }
+
+            MeterInfoCalculating meterInfoCalculating = new MeterInfoCalculating();
+            meterInfoCalculating.setName(meterPoint.getName());
+            meterInfoCalculating.setDate(dateTime1.toLocalDateTime());
+            meterInfoCalculating.setValue(bigDecimal.divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_EVEN));
+            meterInfoCalculating.setCode(meterPoint.getNemCode());
+            meterInfoCalculating.setWindpowerstationId(meterPoint.getWindpowerstationId());
+
+            QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("date", dateTime1.toLocalDateTime()).eq("code", meterPoint.getNemCode());
+            List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
+            if (list.size() > 0) {
+                meterInfoCalculating.update(queryWrapper);
+            } else {
+                meterInfoCalculating.insert();
+            }
+
+        }
+
+
+    }
+
+    //用公式计算
+    @Test
+    void saveCalculating() {
+
+        //设置取值开始时间
+        String startString = startTimeString;
+        DateTime startDateTime = DateUtil.parse(startString);
+
+        //设置取值结束时间
+        String endDateString = endTimeString;
+        DateTime endDateTime = DateUtil.parse(endDateString);
+
+        //指定开始日期到结束日期的天数
+        LocalDateTime day1 = LocalDateTimeUtil.of(startDateTime);
+        LocalDateTime day2 = LocalDateTimeUtil.of(endDateTime);
+        long between = ChronoUnit.DAYS.between(day1, day2);
+
+        List<MeterPoint> meterPointJSDList = meterPointService.list(new QueryWrapper<MeterPoint>().eq("property", "JSD").ne("formula", ""));
+
+        for (MeterPoint meterPoint : meterPointJSDList) {
+            String formula1 = meterPoint.getFormula();
+            System.out.println("转换前的公式:" + formula1);
+            String formula3 = formula1.replaceAll("DL\\.", "DL_");
+            String formula2 = formula3.replaceAll("DJL\\.", "DJL_");
+
+            //得到公式字符串(DL.已经替换为DL_)
+//            String formula2 = meterPoint.getFormula2();
+            System.out.println("转换后的公式字符串:" + formula2);
+
+            //分割公式字符串,得到每一的个ode
+            String[] meterPointCodes = StringUtils.split(formula1, "[+\\-*/()]");
+            meterPointCodes = Arrays.stream(meterPointCodes)
+                    .filter(meterPointCode -> !(meterPointCode.length() < 8))
+                    .toArray(String[]::new);
+            System.out.println("过滤后公式中的测点数:" + meterPointCodes.length);
+            System.out.println(Arrays.toString(meterPointCodes));
+
+
+            HashMap<String, Object> map = new HashMap<>();
+            //开始时间
+            DateTime dateTime1 = DateUtil.offsetSecond(startDateTime,1);
+            //遍历code数据,拿到每一个code,用code和时间,在meter_info_bottom中拿到dayValue
+            for (String meterPointCode : meterPointCodes) {
+//                    String meterPointCode_ = meterPointCode.replaceAll("\\.", "_");
+                String meterPointCode_1 = meterPointCode.replaceAll("DL\\.", "DL_");
+                String meterPointCode_ = meterPointCode_1.replaceAll("DJL\\.", "DJL_");
+                System.out.println("要查询的点code:" + meterPointCode);
+                System.out.println("替换后的点code:" + meterPointCode_);
+//
+                try {
+                    if (meterPointCode.startsWith("DL")) {
+                        System.out.println("计算测点DL:" + meterPointCode);
+                        MeterInfoCalculating meterInfoCalculating = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().eq("code", meterPointCode).eq("date", dateTime1));
+                        System.out.println("测点数据:" + meterInfoCalculating.getValue());
+                        map.put(meterPointCode_, meterInfoCalculating.getValue());
+                    } else {
+                        System.out.println("计算测点Bottom:" + meterPointCode);
+                        MeterInfoBottomcode meterInfoBottomcode = meterInfoBottomcodeService.getOne(new QueryWrapper<MeterInfoBottomcode>().eq("code", meterPointCode).eq("start_time", dateTime1));
+                        System.out.println("测点数据日电量:" + meterInfoBottomcode.getDayValue());
+                        map.put(meterPointCode_, meterInfoBottomcode.getDayValue());
+                    }
+
+                } catch (Exception e) {
+                    System.out.println("获取数据异常:" + e.getMessage());
+
+                }
+                try {
+                    BigDecimal bigDecimal1 = (BigDecimal) ScriptShell.parseExpr(formula2, map);
+                    System.out.println(bigDecimal1);
+                    MeterInfoCalculating meterInfoCalculating = new MeterInfoCalculating();
+                    meterInfoCalculating.setName(meterPoint.getName());
+                    meterInfoCalculating.setCode(meterPoint.getNemCode());
+                    meterInfoCalculating.setDate(dateTime1.toLocalDateTime());
+                    meterInfoCalculating.setValue(bigDecimal1);
+                    meterInfoCalculating.setWindpowerstationId(meterPoint.getWindpowerstationId());
+                    QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("date", dateTime1.toLocalDateTime()).eq("code", meterPoint.getNemCode());
+                    List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
+                    if (list.size() > 0) {
+                        meterInfoCalculating.update(queryWrapper);
+                    } else {
+                        meterInfoCalculating.insert();
+                    }
+                } catch (Exception e) {
+                    System.out.println("存入异常  :" + e.getMessage());
+                }
+
+
+            }
+
+
+        }
+
+
+    }
+
+
+    //调用所有
+    @Test
+    void saveCalculating3() {
+        this.saveEquipmentRfdl();
+        this.saveBottomCode();
+        this.saveCalculatingProjectFDL();
+        this.saveCalculating();
+        this.saveCalculating();
+        this.saveCalculating();
+
+
+    }
+
+
+}
+
+
+
+
+
+
+
+
+

electricity/meter/src/main/java/com/gyee/gaia/meter/service/SaveMeterInfoHistoryTest.java

@@ -49,14 +49,12 @@ class SaveMeterInfoHistoryTest {
     MeterInfoCalculatingServiceImpl meterInfoCalculatingService;
 
 
+
     @Value("${start.time}")
     private String startTimeString;
     @Value("${end.time}")
     private String endTimeString;
 
-    @Resource
-    MeterJSCD meterJSCD;
-
     //读取时间段内设备发电量计算肉发电量写入pg数据库
     @Test
     void saveEquipmentRfdl() {
@@ -66,7 +64,6 @@ class SaveMeterInfoHistoryTest {
         List<TestingPoint> testingPointList = testingPointService.list(new QueryWrapper<TestingPoint>().eq("uniform_code", "AI064").like("code", "%_FJ_%"));
 
         //所有风机总共407个电量测点code
-        System.out.println(testingPointList.size());
 
         //2,遍历list,每次取出一个code
         for (TestingPoint testingPoint : testingPointList) {
@@ -87,7 +84,6 @@ class SaveMeterInfoHistoryTest {
             LocalDateTime day1 = LocalDateTimeUtil.of(startDateTime);
             LocalDateTime day2 = LocalDateTimeUtil.of(endDateTime);
             long between = ChronoUnit.DAYS.between(day1, day2);
-            System.out.println("相差天数" + between);
 
             for (int i = 0; i <= between; i++) {
 
@@ -109,7 +105,6 @@ class SaveMeterInfoHistoryTest {
                 BigDecimal bigDecimal1 = new BigDecimal(Double.toString(value1));
                 BigDecimal bigDecimal2 = new BigDecimal(Double.toString(value2));
                 BigDecimal rfdl = bigDecimal2.subtract(bigDecimal1);
-                System.out.println(rfdl + "Kwh");
 
 
                 //9,company_nem_code   (powerstation_nem_code project_nem_code line_nem_code equipment_nem_code )都在basic equipment中叫project_id    name date rfdl 存入meterInfo表中
@@ -125,11 +120,9 @@ class SaveMeterInfoHistoryTest {
                 meterInfoEquipment.setName(thingId1.getName());
                 meterInfoEquipment.setDate(dateTime1.toLocalDateTime());
                 meterInfoEquipment.setRfdl(rfdl);
-//                meterInfoEquipment.insert();
                 QueryWrapper<MeterInfoEquipment> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("equipment_nem_code", thingId1.getNemCode()).eq("date", dateTime1.toLocalDateTime());
                 List<MeterInfoEquipment> list = meterInfoEquipmentService.list(queryWrapper);
-                System.out.println("有无数据集合数" + list.size());
                 if (list.size() > 0) {
                     meterInfoEquipment.update(queryWrapper);
                 } else {
@@ -153,7 +146,6 @@ class SaveMeterInfoHistoryTest {
 
             //2,根据场站ID得到场站下所有测点
             List<MeterPoint> meterPointList = meterPointService.list(new QueryWrapper<MeterPoint>().eq("windpowerstation_id", powerStation.getId()).eq("property", "CD"));
-            System.out.println(meterPointList.size());
 
             //3,遍历测点,拿到每个测点的nem_code
             for (MeterPoint meterPoint : meterPointList) {
@@ -173,7 +165,6 @@ class SaveMeterInfoHistoryTest {
                 LocalDateTime day1 = LocalDateTimeUtil.of(startDateTime);
                 LocalDateTime day2 = LocalDateTimeUtil.of(endDateTime);
                 long between = ChronoUnit.DAYS.between(day1, day2);
-                System.out.println("相差天数" + between);
 
                 for (int i = 0; i <= between; i++) {
 
@@ -215,7 +206,6 @@ class SaveMeterInfoHistoryTest {
                     QueryWrapper<MeterInfoBottomcode> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("start_time", dateTime1.toLocalDateTime()).eq("code", meterPoint.getNemCode());
                     List<MeterInfoBottomcode> list = meterInfoBottomcodeService.list(queryWrapper);
-                    System.out.println(list.size());
                     if (list.size() > 0) {
                         meterInfoBottomcode.update(queryWrapper);
                     } else {
@@ -245,12 +235,10 @@ class SaveMeterInfoHistoryTest {
         LocalDateTime day1 = LocalDateTimeUtil.of(startDateTime);
         LocalDateTime day2 = LocalDateTimeUtil.of(endDateTime);
         long between = ChronoUnit.DAYS.between(day1, day2);
-        System.out.println("相差天数" + between);
 
 
         //1,所有期次发电量测点
         List<MeterPoint> meterPointList = meterPointService.list(new QueryWrapper<MeterPoint>().eq("property", "JSD_QCFDL"));
-        System.out.println(meterPointList.size());
 
         //遍历期次发电量测点,拿到场站id,
         for (MeterPoint meterPoint : meterPointList) {
@@ -268,25 +256,22 @@ class SaveMeterInfoHistoryTest {
                     bigDecimal = bigDecimal.add(meterInfoEquipment.getRfdl());
                 }
 
-                MeterInfoBottomcode meterInfoBottomcode = new MeterInfoBottomcode();
-                meterInfoBottomcode.setName(meterPoint.getName());
-                meterInfoBottomcode.setStartTime(dateTime1.toLocalDateTime());
-                meterInfoBottomcode.setEndTime(dateTime2.toLocalDateTime());
-                meterInfoBottomcode.setDayValue(bigDecimal.divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_EVEN));
-                meterInfoBottomcode.setCode(meterPoint.getNemCode());
-                meterInfoBottomcode.setWindpowerstationId(meterPoint.getWindpowerstationId());
-
-                QueryWrapper<MeterInfoBottomcode> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("start_time", dateTime1.toLocalDateTime()).eq("code", meterPoint.getNemCode());
-                List<MeterInfoBottomcode> list = meterInfoBottomcodeService.list(queryWrapper);
-                System.out.println(list.size());
+                MeterInfoCalculating meterInfoCalculating = new MeterInfoCalculating();
+                meterInfoCalculating.setName(meterPoint.getName());
+                meterInfoCalculating.setDate(dateTime1.toLocalDateTime());
+                meterInfoCalculating.setValue(bigDecimal.divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_EVEN));
+                meterInfoCalculating.setCode(meterPoint.getNemCode());
+                meterInfoCalculating.setWindpowerstationId(meterPoint.getWindpowerstationId());
+
+                QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("date", dateTime1.toLocalDateTime()).eq("code", meterPoint.getNemCode());
+                List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
                 if (list.size() > 0) {
-                    meterInfoBottomcode.update(queryWrapper);
+                    meterInfoCalculating.update(queryWrapper);
                 } else {
-                    meterInfoBottomcode.insert();
+                    meterInfoCalculating.insert();
                 }
 
-
             }
 
 
@@ -313,140 +298,105 @@ class SaveMeterInfoHistoryTest {
         long between = ChronoUnit.DAYS.between(day1, day2);
 
         List<MeterPoint> meterPointJSDList = meterPointService.list(new QueryWrapper<MeterPoint>().eq("property", "JSD").ne("formula", ""));
-        System.out.println("有公式数量" + meterPointJSDList.size());
 
         for (MeterPoint meterPoint : meterPointJSDList) {
+            String formula1 = meterPoint.getFormula();
+            System.out.println("转换前的公式:" + formula1);
+            String formula3 = formula1.replaceAll("DL\\.", "DL_");
+            String formula2 = formula3.replaceAll("DJL\\.", "DJL_");
 
-            //得到公式字符串(.已经替换为_)
-            String formula2 = meterPoint.getFormula2();
+            //得到公式字符串(DL.已经替换为DL_)
+//            String formula2 = meterPoint.getFormula2();
+            System.out.println("转换后的公式字符串:" + formula2);
 
-            String formula1 = meterPoint.getFormula();
             //分割公式字符串,得到每一的个ode
-//            String[] meterPointCodes = formula2.split("[+\\-*/]");
-
             String[] meterPointCodes = StringUtils.split(formula1, "[+\\-*/()]");
             meterPointCodes = Arrays.stream(meterPointCodes)
-                    .filter(meterPointCode -> !(meterPointCode.length() < 10))
+                    .filter(meterPointCode -> !(meterPointCode.length() < 8))
                     .toArray(String[]::new);
-            System.out.println("数组长度" + meterPointCodes.length);
+            System.out.println("过滤后公式中的测点数:" + meterPointCodes.length);
             System.out.println(Arrays.toString(meterPointCodes));
 
-            HashMap<String, Object> map = new HashMap<>();
 
             for (int i = 0; i <= between; i++) {
-
+                HashMap<String, Object> map = new HashMap<>();
                 //开始时间
                 DateTime dateTime1 = DateUtil.offsetSecond(DateUtil.offsetDay(startDateTime, i), 1);
-
                 //遍历code数据,拿到每一个code,用code和时间,在meter_info_bottom中拿到dayValue
                 for (String meterPointCode : meterPointCodes) {
-                    String meterPointCode_ = meterPointCode.replaceAll("\\.", "_");
-                    System.out.println("meterPointCode:" + meterPointCode);
+//                    String meterPointCode_ = meterPointCode.replaceAll("\\.", "_");
+                    String meterPointCode_1 = meterPointCode.replaceAll("DL\\.", "DL_");
+                    String meterPointCode_ = meterPointCode_1.replaceAll("DJL\\.", "DJL_");
+                    System.out.println("要查询的点code:" + meterPointCode);
+                    System.out.println("替换后的点code:" + meterPointCode_);
+//
+                    try {
+                        if (meterPointCode.startsWith("DL")) {
+                            System.out.println("计算测点DL:" + meterPointCode);
+                            MeterInfoCalculating meterInfoCalculating = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().eq("code", meterPointCode).eq("date", dateTime1));
+                            System.out.println("测点数据:" + meterInfoCalculating.getValue());
+                            map.put(meterPointCode_, meterInfoCalculating.getValue());
+                        } else {
+                            System.out.println("计算测点Bottom:" + meterPointCode);
+                            MeterInfoBottomcode meterInfoBottomcode = meterInfoBottomcodeService.getOne(new QueryWrapper<MeterInfoBottomcode>().eq("code", meterPointCode).eq("start_time", dateTime1));
+                            System.out.println("测点数据日电量:" + meterInfoBottomcode.getDayValue());
+                            map.put(meterPointCode_, meterInfoBottomcode.getDayValue());
+                        }
+
+                    } catch (Exception e) {
+                        System.out.println("获取数据异常:"+e.getMessage());
+
+                    }
+                    try {
+                        BigDecimal bigDecimal1 = (BigDecimal) ScriptShell.parseExpr(formula2, map);
+                        System.out.println(bigDecimal1);
+                        MeterInfoCalculating meterInfoCalculating = new MeterInfoCalculating();
+                        meterInfoCalculating.setName(meterPoint.getName());
+                        meterInfoCalculating.setCode(meterPoint.getNemCode());
+                        meterInfoCalculating.setDate(dateTime1.toLocalDateTime());
+                        meterInfoCalculating.setValue(bigDecimal1);
+                        meterInfoCalculating.setWindpowerstationId(meterPoint.getWindpowerstationId());
+                        QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
+                        queryWrapper.eq("date", dateTime1.toLocalDateTime()).eq("code", meterPoint.getNemCode());
+                        List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
+                        if (list.size() > 0) {
+                            meterInfoCalculating.update(queryWrapper);
+                        } else {
+                            meterInfoCalculating.insert();
+                        }
+                    }catch (Exception e) {
+                        System.out.println("存入异常  :" + e.getMessage());
+                    }
 
-                    //查询code所在场站
 
 
-                    //如果字符串以DL开头,从meter_info_calclating表中取,否则从meter_info_bottom表中取
 
-                    if (meterPointCode.startsWith("DL")) {
-                        MeterInfoCalculating meterInfoCalculating = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().eq("code", meterPointCode).eq("date", dateTime1));
-                        map.put(meterPointCode_, meterInfoCalculating.getValue());
-                    }else {
-                        MeterInfoBottomcode meterInfoBottomcode = meterInfoBottomcodeService.getOne(new QueryWrapper<MeterInfoBottomcode>().eq("code", meterPointCode).eq("start_time", dateTime1));
-                        map.put(meterPointCode_, meterInfoBottomcode.getDayValue());
-                    }
-                }
 
-                try {
-                    BigDecimal bigDecimal1 = (BigDecimal) ScriptShell.parseExpr(formula2, map);
-                    System.out.println(bigDecimal1);
-                    MeterInfoCalculating meterInfoCalculating = new MeterInfoCalculating();
-                    meterInfoCalculating.setName(meterPoint.getName());
-                    meterInfoCalculating.setCode(meterPoint.getNemCode());
-                    meterInfoCalculating.setDate(dateTime1.toLocalDateTime());
-                    meterInfoCalculating.setValue(bigDecimal1);
-                    meterInfoCalculating.setWindpowerstationId(meterPoint.getWindpowerstationId());
-                    QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("date", dateTime1.toLocalDateTime()).eq("code", meterPoint.getNemCode());
-                    List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
-                    if (list.size() > 0) {
-                        meterInfoCalculating.update(queryWrapper);
-                    } else {
-                        meterInfoCalculating.insert();
-                    }
-                } catch (Exception e) {
-                    System.out.println(e.getMessage());
                 }
+            }
 
 
-            }
         }
 
 
     }
 
 
-    //这个不用公式计算,不用了
+    //调用所有
     @Test
-    void saveCalculating1() {
-
-        //设置取值开始时间
-        String startString = startTimeString;
-        DateTime startDateTime = DateUtil.parse(startString);
+    void saveCalculating3(){
+        this.saveEquipmentRfdl();
+        this.saveBottomCode();
+        this.saveCalculatingProjectFDL();
+        this.saveCalculating();
+        this.saveCalculating();
+        this.saveCalculating();
 
-        //设置取值结束时间
-        String endDateString = endTimeString;
-        DateTime endDateTime = DateUtil.parse(endDateString);
 
-        //指定开始日期到结束日期的天数
-        LocalDateTime day1 = LocalDateTimeUtil.of(startDateTime);
-        LocalDateTime day2 = LocalDateTimeUtil.of(endDateTime);
-        long between = ChronoUnit.DAYS.between(day1, day2);
 
+    }
 
-        List<MeterPoint> meterPointList = meterPointService.list(new QueryWrapper<MeterPoint>().eq("property", "JSD").eq("meter_type", "集电线路发电量").ne("meter_class", "总"));
-        System.out.println(meterPointList.size());
-        //遍历所有集电线路发电量计算点
-        for (MeterPoint meterPoint : meterPointList) {
-
-            List<MeterPoint> meterPointJDXLCD = meterPointService.list(new QueryWrapper<MeterPoint>().eq("windpowerstation_id", meterPoint.getWindpowerstationId()).eq("meter_class", "集电线路" + meterPoint.getMeterClass()));
-            System.out.println(meterPoint.getWindpowerstationId());
-            System.out.println("meterPointJDXLCD          " + meterPointJDXLCD.size());
-
-            for (int i = 0; i <= between; i++) {
-                //开始时间00:00:01
-                DateTime dateTime1 = DateUtil.offsetSecond(DateUtil.offsetDay(startDateTime, i), 1);
-
-                List<MeterInfoBottomcode> meterInfoBottomcodeList = null;
-                if (meterPointJDXLCD.size() == 2) {
-                    meterInfoBottomcodeList = meterInfoBottomcodeService.list(new QueryWrapper<MeterInfoBottomcode>().eq("start_time", dateTime1).in("code", meterPointJDXLCD.get(0).getNemCode(), meterPointJDXLCD.get(1).getNemCode()));
-                } else if (meterPointJDXLCD.size() == 1) {
-                    meterInfoBottomcodeList = meterInfoBottomcodeService.list(new QueryWrapper<MeterInfoBottomcode>().eq("start_time", dateTime1).in("code", meterPointJDXLCD.get(0).getNemCode()));
-                }
-                meterInfoBottomcodeList = meterInfoBottomcodeService.list(new QueryWrapper<MeterInfoBottomcode>().eq("start_time", dateTime1).in("code", meterPointJDXLCD.get(0).getNemCode(), meterPointJDXLCD.get(1).getNemCode(), meterPointJDXLCD.get(2).getNemCode()));
-                BigDecimal bigDecimal1 = BigDecimal.valueOf(0);
-                for (MeterInfoBottomcode meterInfoBottomcode : meterInfoBottomcodeList) {
-                    bigDecimal1 = bigDecimal1.add(meterInfoBottomcode.getDayValue());
-                }
-                MeterInfoCalculating meterInfoCalculating = new MeterInfoCalculating();
-                meterInfoCalculating.setName(meterPoint.getName());
-                meterInfoCalculating.setCode(meterPoint.getNemCode());
-                meterInfoCalculating.setDate(dateTime1.toLocalDateTime());
-                meterInfoCalculating.setValue(bigDecimal1.divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_EVEN));
-                meterInfoCalculating.setWindpowerstationId(meterPoint.getWindpowerstationId());
-
-                QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("date", dateTime1.toLocalDateTime()).eq("code", meterPoint.getNemCode());
-                List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
-                if (list.size() > 0) {
-                    meterInfoCalculating.update(queryWrapper);
-                } else {
-                    meterInfoCalculating.insert();
-                }
-            }
-        }
 
-    }
 
 
 

electricity/meter/src/main/resources/application.properties

@@ -10,14 +10,11 @@
 adapter.url=http://192.168.1.67:8011/ts
 
 #动态配置开始日期
-start.time=2023-05-11
+start.time=2023-04-01
 #动态配置结束日期
-end.time=2023-05-11
+end.time=2023-04-30
 
 meter.stations=MHS_FDC,NSS_FDC
 
 test.abcd=123456
 
-MHS.JDXL1=MHSDJL.NX_GD_MHSF_DD_P1_L1_001_ZXYG033
-MHS.JDXL2=MHSDJL.NX_GD_MHSF_DD_P1_L1_001_ZXYG029
-MHS.JDXL3=MHSDJL.NX_GD_MHSF_DD_P1_L1_001_ZXYG025