计算电量

electricity/meter/logs/warn.log

@@ -250,3 +250,259 @@
 2023-05-11 14:11:15.286  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
 2023-05-11 14:11:15.286  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
 2023-05-11 14:11:15.286  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 15:29:22.874  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-11 15:29:22.882  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 15:29:22.890  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 15:29:22.897  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-11 15:29:32.275  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 15:29:33.334  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 15:29:33.334  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 15:29:33.335  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 15:29:33.335  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 15:31:00.801  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-11 15:31:00.811  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 15:31:00.818  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 15:31:00.825  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-11 15:31:09.816  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 15:31:13.489  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 15:31:13.489  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 15:31:13.489  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 15:31:13.490  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 15:36:49.829  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-11 15:36:49.839  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 15:36:49.846  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 15:36:49.853  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-11 15:36:58.745  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 15:37:02.037  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 15:37:02.037  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 15:37:02.037  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 15:37:02.038  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 16:02:16.120  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-11 16:02:16.128  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 16:02:16.136  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 16:02:16.142  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-11 16:02:24.928  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 16:02:26.247  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 16:02:26.247  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 16:02:26.247  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 16:02:26.248  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 16:03:03.149  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-11 16:03:03.159  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 16:03:03.167  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 16:03:03.174  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-11 16:03:12.854  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 16:03:14.216  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 16:03:14.216  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 16:03:14.216  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 16:03:14.217  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 16:03:36.852  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-11 16:03:36.863  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 16:03:36.874  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 16:03:36.882  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-11 16:03:45.950  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 16:03:47.198  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 16:03:47.199  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 16:03:47.199  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 16:03:47.199  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 16:05:18.731  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-11 16:05:18.740  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 16:05:18.747  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 16:05:18.755  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-11 16:05:28.164  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 16:05:29.505  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 16:05:29.505  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 16:05:29.506  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 16:05:29.507  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 16:06:02.602  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-11 16:06:02.611  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 16:06:02.620  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 16:06:02.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-11 16:06:12.123  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 16:06:13.545  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 16:06:13.546  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 16:06:13.546  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 16:06:13.547  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 16:12:54.197  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-11 16:12:54.205  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 16:12:54.212  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 16:12:54.219  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-11 16:13:03.281  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 16:13:04.550  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 16:13:04.551  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 16:13:04.551  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 16:13:04.552  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 16:16:02.232  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-11 16:16:02.240  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 16:16:02.249  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 16:16:02.258  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-11 16:16:11.719  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 16:16:13.051  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 16:16:13.051  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 16:16:13.051  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 16:16:13.053  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 16:16:33.355  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-11 16:16:33.364  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 16:16:33.370  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 16:16:33.377  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-11 16:16:42.160  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 16:16:43.422  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 16:16:43.422  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 16:16:43.422  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 16:16:43.423  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 16:18:29.917  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-11 16:18:29.927  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 16:18:29.934  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 16:18:29.945  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-11 16:18:39.581  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 16:18:40.921  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 16:18:40.921  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 16:18:40.922  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 16:18:40.923  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 16:19:06.966  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-11 16:19:06.974  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 16:19:06.981  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 16:19:06.989  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-11 16:19:16.317  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 16:19:17.670  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 16:19:17.670  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 16:19:17.670  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 16:19:17.671  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 16:34:17.330  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-11 16:34:17.338  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 16:34:17.350  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 16:34:17.359  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-11 16:34:26.430  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 16:34:27.755  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 16:34:27.755  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 16:34:27.755  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 16:34:27.756  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 16:51:09.767  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 16:51:09.767  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 16:51:09.767  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 16:51:09.768  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 16:51:35.731  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-11 16:51:35.741  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 16:51:35.749  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 16:51:35.757  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-11 16:51:45.251  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 16:51:46.652  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 16:51:46.652  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 16:51:46.653  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 16:51:46.654  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 17:05:44.298  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-11 17:05:44.306  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 17:05:44.313  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 17:05:44.320  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-11 17:05:53.940  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 17:05:55.110  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 17:05:55.110  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 17:05:55.110  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 17:05:55.111  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 17:09:04.880  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-11 17:09:04.890  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 17:09:04.899  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 17:09:04.907  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-11 17:09:15.679  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 17:13:17.059  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 17:13:17.059  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 17:13:17.060  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 17:13:17.061  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 17:13:32.837  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-11 17:13:32.845  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 17:13:32.852  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 17:13:32.859  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-11 17:13:42.399  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 17:13:51.706  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 17:13:51.705  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 17:13:51.706  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 17:13:51.707  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 17:15:27.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-11 17:15:27.377  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 17:15:27.385  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 17:15:27.392  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-11 17:15:37.740  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 17:20:08.249  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 17:20:08.249  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 17:20:08.250  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 17:20:08.251  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 17:20:25.506  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-11 17:20:25.515  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 17:20:25.522  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 17:20:25.528  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-11 17:20:35.008  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 17:20:36.215  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 17:20:36.215  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 17:20:36.216  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 17:20:36.217  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 17:24:39.217  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-11 17:24:39.225  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 17:24:39.232  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 17:24:39.239  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-11 17:24:50.847  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 17:24:52.775  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 17:24:52.775  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 17:24:52.776  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 17:24:52.777  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 17:27:03.363  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-11 17:27:03.372  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 17:27:03.379  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 17:27:03.386  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-11 17:27:13.911  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 17:30:22.539  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 17:30:22.539  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 17:30:22.539  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 17:30:22.540  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 17:31:47.712  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-11 17:31:47.720  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 17:31:47.727  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 17:31:47.735  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-11 17:31:57.283  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 17:31:58.724  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 17:31:58.724  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 17:31:58.725  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 17:31:58.726  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 17:38:18.990  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-11 17:38:18.998  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 17:38:19.006  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 17:38:19.012  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-11 17:38:28.000  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 17:38:29.299  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 17:38:29.299  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 17:38:29.300  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 17:38:29.301  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 17:44:49.675  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-11 17:44:49.683  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 17:44:49.689  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 17:44:49.695  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-11 17:44:58.362  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 17:44:59.477  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 17:44:59.477  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 17:44:59.477  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 17:44:59.478  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 17:47:26.091  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-11 17:47:26.099  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 17:47:26.106  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 17:47:26.112  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-11 17:47:34.712  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 17:47:36.040  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 17:47:36.040  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 17:47:36.040  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 17:47:36.041  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 17:48:14.140  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-11 17:48:14.148  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 17:48:14.156  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 17:48:14.163  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-11 17:48:22.799  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 17:48:24.176  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 17:48:24.176  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 17:48:24.177  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 17:48:24.177  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end
+2023-05-11 17:49:35.003  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-11 17:49:35.013  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter] & group[DEFAULT_GROUP]
+2023-05-11 17:49:35.020  WARN main loadNacosData(NacosPropertySourceBuilder.java:87) Ignore the empty nacos configuration and get it based on dataId[meter.yml] & group[DEFAULT_GROUP]
+2023-05-11 17:49:35.027  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-11 17:49:44.053  WARN main initEmbedServer(XxlJobExecutor.java:152) >>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.
+2023-05-11 17:49:45.586  WARN Thread-6 shutdown(NotifyCenter.java:136) [NotifyCenter] Start destroying Publisher
+2023-05-11 17:49:45.587  WARN Thread-2 shutdown(HttpClientBeanHolder.java:108) [HttpClientBeanHolder] Start destroying common HttpClient
+2023-05-11 17:49:45.587  WARN Thread-6 shutdown(NotifyCenter.java:153) [NotifyCenter] Destruction of the end
+2023-05-11 17:49:45.588  WARN Thread-2 shutdown(HttpClientBeanHolder.java:114) [HttpClientBeanHolder] Destruction of the end

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

@@ -157,5 +157,9 @@ public class MeterPoint implements Serializable {
     public String getNemCode2() {
         return StringUtil.replace(nemCode,".","_");
     }
+    public String getFormula2() {
+        return StringUtil.replace(formula,".","_");
+    }
+
 
 }

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

@@ -62,7 +62,7 @@ public class SaveMeterInfoBottomcode10Min {
         for (PowerStation powerStation : powerStationList) {
 
             //2,根据场站ID得到场站下所有测点
-            List<MeterPoint> meterPointList = meterPointService.list(new QueryWrapper<MeterPoint>().eq("windpowerstation_id", powerStation.getId()).eq("property","CD"));
+            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
@@ -70,97 +70,59 @@ public class SaveMeterInfoBottomcode10Min {
                 //获取测点code
                 String pointcode = meterPoint.getNemCode();
 
-                if (null == pointcode) {
-
-                    BigDecimal bigDecimal1 = meterPoint.getInitialValue();
-                    bigDecimal1 = bigDecimal1.divide(meterPoint.getXs(), 4, RoundingMode.HALF_EVEN);
-                    BigDecimal bigDecimal2 = meterPoint.getInitialValue();
-                    bigDecimal2 = bigDecimal2.divide(meterPoint.getXs(), 4, RoundingMode.HALF_EVEN);
-                    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(LocalDateTime.now());
-                    //最新值,latest返回的值
-                    meterInfoBottomcode.setEndValue(bigDecimal2);
-                    //日电量
-                    meterInfoBottomcode.setDayValue(rfdl);
-                    //code,meter.getCode
-                    meterInfoBottomcode.setCode(null);
-                    //windpowerstation_id,meter.getWindpowerstationId,
-                    meterInfoBottomcode.setWindpowerstationId(meterPoint.getWindpowerstationId());
-
-                    QueryWrapper<MeterInfoBottomcode> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("start_time", DateUtil.offsetSecond(startDateTime, 1).toLocalDateTime()).eq("name", meterPoint.getName()).eq("windpowerstation_id", meterPoint.getWindpowerstationId());
-                    List<MeterInfoBottomcode> list = meterInfoBottomcodeService.list(queryWrapper);
-                    System.out.println(list.size());
-                    if (list.size() > 0) {
-                        meterInfoBottomcode.update(queryWrapper);
-                    } else {
-                        meterInfoBottomcode.insert();
-                    }
 
-                } else {
-                    //根据测点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返回的时间
+                //根据测点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();
-                    }
-
+                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/SaveMeterInfoBottomcode10MinTest.java

@@ -57,7 +57,7 @@ public class SaveMeterInfoBottomcode10MinTest {
         for (PowerStation powerStation : powerStationList) {
 
             //2,根据场站ID得到场站下所有测点
-            List<MeterPoint> meterPointList = meterPointService.list(new QueryWrapper<MeterPoint>().eq("windpowerstation_id", powerStation.getId()).eq("property","CD"));
+            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
@@ -65,101 +65,63 @@ public class SaveMeterInfoBottomcode10MinTest {
                 //获取测点code
                 String pointcode = meterPoint.getNemCode();
 
-                if (null == pointcode) {
-
-                    BigDecimal bigDecimal1 = meterPoint.getInitialValue();
-                    bigDecimal1 = bigDecimal1.divide(meterPoint.getXs(), 4, RoundingMode.HALF_EVEN);
-                    BigDecimal bigDecimal2 = meterPoint.getInitialValue();
-                    bigDecimal2 = bigDecimal2.divide(meterPoint.getXs(), 4, RoundingMode.HALF_EVEN);
-                    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(LocalDateTime.now());
-                    //最新值,latest返回的值
-                    meterInfoBottomcode.setEndValue(bigDecimal2);
-                    //日电量
-                    meterInfoBottomcode.setDayValue(rfdl);
-                    //code,meter.getCode
-                    meterInfoBottomcode.setCode(null);
-                    //windpowerstation_id,meter.getWindpowerstationId,
-                    meterInfoBottomcode.setWindpowerstationId(meterPoint.getWindpowerstationId());
-
-                    QueryWrapper<MeterInfoBottomcode> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("start_time", DateUtil.offsetSecond(startDateTime, 1).toLocalDateTime()).eq("name", meterPoint.getName()).eq("windpowerstation_id", meterPoint.getWindpowerstationId());
-                    List<MeterInfoBottomcode> list = meterInfoBottomcodeService.list(queryWrapper);
-                    System.out.println(list.size());
-                    if (list.size() > 0) {
-                        meterInfoBottomcode.update(queryWrapper);
-                    } else {
-                        meterInfoBottomcode.insert();
-                    }
-
-                } else {
-                    //根据测点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返回的时间
+                //根据测点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();
-                    }
-
+                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/SaveMeterInfoCalculatingTest.java

@@ -5,17 +5,21 @@ 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.entity.MeterInfoBottomcode;
+import com.gyee.gaia.meter.entity.MeterJSCD;
+import com.gyee.gaia.meter.entity.MeterPoint;
 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;
 
 /**
@@ -64,48 +68,49 @@ public class SaveMeterInfoCalculatingTest {
         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", ""));
+        System.out.println("有公式数量"+meterPointJSDList.size());
 
-        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) {
+        for (MeterPoint meterPoint : meterPointJSDList) {
 
-            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());
+            //得到公式字符串(.已经替换为_)
+            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.isEmpty())
+                    .filter(meterPointCode -> !meterPointCode.equals("10000"))
+                    .filter(meterPointCode -> !meterPointCode.equals("100"))
+                    .toArray(String[]::new);
+            System.out.println("数组长度"+meterPointCodes.length);
+            System.out.println(Arrays.toString(meterPointCodes));
+
+            HashMap<String, Object> map = new HashMap<>();
 
             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();
+                //遍历code数据,拿到每一个code,用code和时间,在meter_info_bottom中拿到dayValue
+                for (String meterPointCode : meterPointCodes) {
+                    String meterPointCode_ = meterPointCode.replaceAll("\\.", "_");
+                    System.out.println("meterPointCode:"+meterPointCode);
+                    MeterInfoBottomcode meterInfoBottomcode = meterInfoBottomcodeService.getOne(new QueryWrapper<MeterInfoBottomcode>().eq("code", meterPointCode).eq("start_time", dateTime1));
+                    System.out.println(meterInfoBottomcode);
+                    map.put(meterPointCode_, meterInfoBottomcode.getDayValue());
                 }
+                Object o = ScriptShell.parseExpr(formula2, map);
+                System.out.println(o);
+
+
             }
         }
+
+
     }
 }