wangyangyang 4 роки тому
батько
коміт
bf8448855c

+ 455 - 0
logs/sms-water/smartcity-user.2020-12-10.0.log

@@ -0,0 +1,455 @@
+2020-12-10 14:43:15.880  INFO 1424 --- [main] com.huaxu.SmsWaterApplication            : The following profiles are active: dev
+2020-12-10 14:43:16.978  WARN 1424 --- [main] o.s.boot.actuate.endpoint.EndpointId     : Endpoint ID 'nacos-discovery' contains invalid characters, please migrate to a valid format.
+2020-12-10 14:43:17.195  INFO 1424 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2020-12-10 14:43:17.195  INFO 1424 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data repositories in DEFAULT mode.
+2020-12-10 14:43:17.255  INFO 1424 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 56ms. Found 0 repository interfaces.
+2020-12-10 14:43:17.264  INFO 1424 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2020-12-10 14:43:17.265  INFO 1424 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data repositories in DEFAULT mode.
+2020-12-10 14:43:17.309  INFO 1424 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 37ms. Found 0 repository interfaces.
+2020-12-10 14:43:17.412  WARN 1424 --- [main] o.s.boot.actuate.endpoint.EndpointId     : Endpoint ID 'service-registry' contains invalid characters, please migrate to a valid format.
+2020-12-10 14:43:17.671  INFO 1424 --- [main] o.s.cloud.context.scope.GenericScope     : BeanFactory id=528aca77-4aab-320e-bffd-62b208d3e7e3
+2020-12-10 14:43:17.793  INFO 1424 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$71ddf1cb] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2020-12-10 14:43:17.906  INFO 1424 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$8df7f4c8] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2020-12-10 14:43:18.198  INFO 1424 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 8324 (http)
+2020-12-10 14:43:18.217  INFO 1424 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2020-12-10 14:43:18.218  INFO 1424 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.21]
+2020-12-10 14:43:18.382  INFO 1424 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2020-12-10 14:43:18.383  INFO 1424 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 2489 ms
+2020-12-10 14:43:19.554  INFO 1424 --- [main] org.mongodb.driver.cluster               : Cluster created with settings {hosts=[114.135.61.188:17017], mode=SINGLE, requiredClusterType=UNKNOWN, serverSelectionTimeout='30000 ms', maxWaitQueueSize=500}
+2020-12-10 14:43:19.737  INFO 1424 --- [cluster-ClusterId{value='5fd1c38723695205908d7bdc', description='null'}-114.135.61.188:17017] org.mongodb.driver.connection            : Opened connection [connectionId{localValue:1}] to 114.135.61.188:17017
+2020-12-10 14:43:19.772  INFO 1424 --- [cluster-ClusterId{value='5fd1c38723695205908d7bdc', description='null'}-114.135.61.188:17017] org.mongodb.driver.cluster               : Monitor thread successfully connected to server with description ServerDescription{address=114.135.61.188:17017, type=SHARD_ROUTER, state=CONNECTED, ok=true, version=ServerVersion{versionList=[3, 4, 23]}, minWireVersion=0, maxWireVersion=5, maxDocumentSize=16777216, logicalSessionTimeoutMinutes=null, roundTripTimeNanos=33423400}
+2020-12-10 14:43:19.794 DEBUG 1424 --- [main] .m.c.i.MongoPersistentEntityIndexCreator : Analyzing class class com.huaxu.entity.MonitorDataValueEntity for index information.
+2020-12-10 14:43:19.794 DEBUG 1424 --- [main] .m.c.i.MongoPersistentEntityIndexCreator : Analyzing class class com.huaxu.entity.MonitorDataEntity for index information.
+2020-12-10 14:43:21.101  WARN 1424 --- [Thread-8] com.zaxxer.hikari.HikariConfig           : HikariPool-1 - idleTimeout is close to or more than maxLifetime, disabling it.
+2020-12-10 14:43:21.101  INFO 1424 --- [Thread-8] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
+2020-12-10 14:43:21.758  INFO 1424 --- [Thread-8] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
+2020-12-10 14:43:21.946  INFO 1424 --- [main] org.quartz.impl.StdSchedulerFactory      : Using default implementation for ThreadExecutor
+2020-12-10 14:43:21.948  INFO 1424 --- [main] org.quartz.simpl.SimpleThreadPool        : Job execution threads will use class loader of thread: main
+2020-12-10 14:43:21.957  INFO 1424 --- [main] org.quartz.core.SchedulerSignalerImpl    : Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl
+2020-12-10 14:43:21.958  INFO 1424 --- [main] org.quartz.core.QuartzScheduler          : Quartz Scheduler v.2.3.1 created.
+2020-12-10 14:43:21.961  INFO 1424 --- [main] o.s.s.quartz.LocalDataSourceJobStore     : Using db table-based data access locking (synchronization).
+2020-12-10 14:43:21.963  INFO 1424 --- [main] o.s.s.quartz.LocalDataSourceJobStore     : JobStoreCMT initialized.
+2020-12-10 14:43:21.964  INFO 1424 --- [main] org.quartz.core.QuartzScheduler          : Scheduler meta-data: Quartz Scheduler (v2.3.1) 'smsScheduler' with instanceId 'LAPTOP-ED13E6B01607582601947'
+  Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally.
+  NOT STARTED.
+  Currently in standby mode.
+  Number of jobs executed: 0
+  Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 10 threads.
+  Using job-store 'org.springframework.scheduling.quartz.LocalDataSourceJobStore' - which supports persistence. and is clustered.
+
+2020-12-10 14:43:21.964  INFO 1424 --- [main] org.quartz.impl.StdSchedulerFactory      : Quartz scheduler 'smsScheduler' initialized from an externally provided properties instance.
+2020-12-10 14:43:21.964  INFO 1424 --- [main] org.quartz.impl.StdSchedulerFactory      : Quartz scheduler version: 2.3.1
+2020-12-10 14:43:21.964  INFO 1424 --- [main] org.quartz.core.QuartzScheduler          : JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@77ec9fdb
+2020-12-10 14:43:23.144  INFO 1424 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
+2020-12-10 14:43:23.328  INFO 1424 --- [main] pertySourcedRequestMappingHandlerMapping : Mapped URL path [/v2/api-docs] onto method [public org.springframework.http.ResponseEntity<springfox.documentation.spring.web.json.Json> springfox.documentation.swagger2.web.Swagger2Controller.getDocumentation(java.lang.String,javax.servlet.http.HttpServletRequest)]
+2020-12-10 14:43:23.359  WARN 1424 --- [main] c.n.c.sources.URLConfigurationSource     : No URLs will be polled as dynamic configuration sources.
+2020-12-10 14:43:23.360  INFO 1424 --- [main] c.n.c.sources.URLConfigurationSource     : To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2020-12-10 14:43:23.364  WARN 1424 --- [main] c.n.c.sources.URLConfigurationSource     : No URLs will be polled as dynamic configuration sources.
+2020-12-10 14:43:23.364  INFO 1424 --- [main] c.n.c.sources.URLConfigurationSource     : To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2020-12-10 14:43:23.514  INFO 1424 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
+2020-12-10 14:43:23.606  INFO 1424 --- [main] o.s.s.c.ThreadPoolTaskScheduler          : Initializing ExecutorService
+2020-12-10 14:43:23.813  INFO 1424 --- [main] .s.s.UserDetailsServiceAutoConfiguration : 
+
+Using generated security password: c138262e-fe79-44be-b23e-7f7e7151d022
+
+2020-12-10 14:43:23.968  INFO 1424 --- [main] o.s.s.web.DefaultSecurityFilterChain     : Creating filter chain: OrRequestMatcher [requestMatchers=[Ant [pattern='/**']]], [org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter@3c74d846, org.springframework.security.web.context.SecurityContextPersistenceFilter@5ac53209, org.springframework.security.web.header.HeaderWriterFilter@2dcbf825, org.springframework.security.web.authentication.logout.LogoutFilter@2ec23ec3, org.springframework.security.oauth2.provider.authentication.OAuth2AuthenticationProcessingFilter@d99df7a, org.springframework.security.web.authentication.www.BasicAuthenticationFilter@3c4e23be, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@6fd2acf5, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@23aaa756, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@17fa14a3, org.springframework.security.web.session.SessionManagementFilter@2af3b054, org.springframework.security.web.access.ExceptionTranslationFilter@19c24321, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@66046e7c]
+2020-12-10 14:43:24.526  INFO 1424 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
+2020-12-10 14:43:24.546  INFO 1424 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
+2020-12-10 14:43:24.598  INFO 1424 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
+2020-12-10 14:43:24.882  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_1
+2020-12-10 14:43:24.953  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: addUsingPOST_1
+2020-12-10 14:43:24.957  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: batchDeleteUsingDELETE_1
+2020-12-10 14:43:24.961  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteUsingDELETE_1
+2020-12-10 14:43:24.965  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: editUsingPOST_1
+2020-12-10 14:43:24.974  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getUsingGET_1
+2020-12-10 14:43:24.986  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_2
+2020-12-10 14:43:24.992  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: addUsingPOST_2
+2020-12-10 14:43:24.998  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteUsingDELETE_2
+2020-12-10 14:43:25.001  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: editUsingPOST_2
+2020-12-10 14:43:25.007  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getUsingGET_2
+2020-12-10 14:43:25.014  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_3
+2020-12-10 14:43:25.048  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: addMonitorInfoUsingPOST_1
+2020-12-10 14:43:25.069  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getByDeviceIdUsingGET_1
+2020-12-10 14:43:25.109  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_4
+2020-12-10 14:43:25.112  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_1
+2020-12-10 14:43:25.113  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_2
+2020-12-10 14:43:25.114  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_3
+2020-12-10 14:43:25.158  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: delUsingPOST_1
+2020-12-10 14:43:25.176  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectByIdUsingGET_1
+2020-12-10 14:43:25.191  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_5
+2020-12-10 14:43:25.199  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: addSceneTypeUsingPOST_1
+2020-12-10 14:43:25.202  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: delUsingPOST_2
+2020-12-10 14:43:25.217  INFO 1424 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectByIdUsingGET_2
+2020-12-10 14:43:25.270  INFO 1424 --- [main] o.s.a.r.c.CachingConnectionFactory       : Attempting to connect to: [47.112.217.10:5672]
+2020-12-10 14:43:25.338  INFO 1424 --- [main] o.s.a.r.c.CachingConnectionFactory       : Created new connection: rabbitConnectionFactory#99a8de3:0/SimpleConnection@5f7bd970 [delegate=amqp://huaxu@47.112.217.10:5672/, localPort= 65341]
+2020-12-10 14:43:25.406  INFO 1424 --- [main] o.s.s.quartz.SchedulerFactoryBean        : Will start Quartz Scheduler [smsScheduler] in 2 seconds
+2020-12-10 14:43:25.440  INFO 1424 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 8324 (http) with context path ''
+2020-12-10 14:43:25.579  INFO 1424 --- [main] c.a.c.n.registry.NacosServiceRegistry    : nacos registry, sms-water 192.168.1.122:8324 register finished
+2020-12-10 14:43:25.584  INFO 1424 --- [main] com.huaxu.SmsWaterApplication            : Started SmsWaterApplication in 11.183 seconds (JVM running for 12.186)
+2020-12-10 14:43:27.407  INFO 1424 --- [Quartz Scheduler [smsScheduler]] o.s.s.quartz.SchedulerFactoryBean        : Starting Quartz Scheduler now, after delay of 2 seconds
+2020-12-10 14:43:27.868  INFO 1424 --- [Quartz Scheduler [smsScheduler]] org.quartz.core.QuartzScheduler          : Scheduler smsScheduler_$_LAPTOP-ED13E6B01607582601947 started.
+2020-12-10 14:43:31.118  INFO 1424 --- [http-nio-8324-exec-1] o.apache.tomcat.util.http.parser.Cookie  : A cookie header was received [1605252736; Hm_lvt_d7168b0cef9904be9b675a22e48c5721=1606481427,1606872328,1606909867,1606982992] that contained an invalid cookie. That cookie will be ignored.
+ Note: further occurrences of this error will be logged at DEBUG level.
+2020-12-10 14:43:31.126  INFO 1424 --- [http-nio-8324-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2020-12-10 14:43:31.126  INFO 1424 --- [http-nio-8324-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2020-12-10 14:43:31.135  INFO 1424 --- [http-nio-8324-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 9 ms
+2020-12-10 14:44:11.860 ERROR 1424 --- [http-nio-8324-exec-9] c.h.exception.GloabalExceptionHandle     : 系统错误
+
+org.springframework.jdbc.BadSqlGrammarException: 
+### Error querying database.  Cause: com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Unknown column 'tab.year' in 'field list'
+### The error may exist in file [D:\huaxu\UIMS\Code20201111\sms_water\target\classes\mapper\DayReportMapper.xml]
+### The error may involve defaultParameterMap
+### The error occurred while setting parameters
+### SQL: select         tab.year,tab.month,tab.day,tab.hour,         sum(ifnull(intakeWaterUsage,0))as "intakeWaterUsage",         sum(ifnull(yieldWaterUsage,0))as "yieldWaterUsage",         sum(ifnull(powerUsage,0))as "powerUsage",         sum(ifnull(drugUsage,0))as "drugUsage"         from         (SELECT         case when b.ATTRIBUTE_TYPE=4 then         c.latest_value end as "intakeWaterUsage",         case when b.ATTRIBUTE_TYPE=3 then         c.latest_value end as "yieldWaterUsage",         case when b.ATTRIBUTE_TYPE=5 then         c.latest_value end as "powerUsage",         case when b.ATTRIBUTE_TYPE=6 then         c.latest_value end as "drugUsage"         FROM sms_device_parm a         INNER JOIN sms_device_attribute b on a.ATTRIBUTE_ID=b.ID         INNER JOIN sms_day_report c on a.ATTRIBUTE_ID=c.ATTRIBUTE_ID and a.DEVICE_ID=c.DEVICE_ID         where                    a.DEVICE_ID in              (                   ?              ,                  ?              ,                  ?              )                     and c.`YEAR`=?           and c.`MONTH`=?           and c.`DAY`=?                    and (b.ATTRIBUTE_TYPE =3 or b.ATTRIBUTE_TYPE =4 or b.ATTRIBUTE_TYPE =5 or b.ATTRIBUTE_TYPE =6)) tab         group by tab.year,tab.month,tab.day,tab.HOUR         order by tab.year desc,tab.month desc,tab.day desc,tab.hour desc
+### Cause: com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Unknown column 'tab.year' in 'field list'
+; bad SQL grammar []; nested exception is com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Unknown column 'tab.year' in 'field list'
+	at org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator.doTranslate(SQLErrorCodeSQLExceptionTranslator.java:234) ~[spring-jdbc-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.jdbc.support.AbstractFallbackSQLExceptionTranslator.translate(AbstractFallbackSQLExceptionTranslator.java:72) ~[spring-jdbc-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.mybatis.spring.MyBatisExceptionTranslator.translateExceptionIfPossible(MyBatisExceptionTranslator.java:74) ~[mybatis-spring-2.0.2.jar:2.0.2]
+	at org.mybatis.spring.SqlSessionTemplate$SqlSessionInterceptor.invoke(SqlSessionTemplate.java:440) ~[mybatis-spring-2.0.2.jar:2.0.2]
+	at com.sun.proxy.$Proxy155.selectList(Unknown Source) ~[na:na]
+	at org.mybatis.spring.SqlSessionTemplate.selectList(SqlSessionTemplate.java:223) ~[mybatis-spring-2.0.2.jar:2.0.2]
+	at com.baomidou.mybatisplus.core.override.MybatisMapperMethod.executeForMany(MybatisMapperMethod.java:158) ~[mybatis-plus-core-3.2.0.jar:3.2.0]
+	at com.baomidou.mybatisplus.core.override.MybatisMapperMethod.execute(MybatisMapperMethod.java:76) ~[mybatis-plus-core-3.2.0.jar:3.2.0]
+	at com.baomidou.mybatisplus.core.override.MybatisMapperProxy.invoke(MybatisMapperProxy.java:61) ~[mybatis-plus-core-3.2.0.jar:3.2.0]
+	at com.sun.proxy.$Proxy176.findReport(Unknown Source) ~[na:na]
+	at com.huaxu.service.DayReportService.findPage(DayReportService.java:96) ~[classes/:na]
+	at com.huaxu.service.DayReportService$$FastClassBySpringCGLIB$$c0651d48.invoke(<generated>) ~[classes/:na]
+	at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218) ~[spring-core-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:684) ~[spring-aop-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at com.huaxu.service.DayReportService$$EnhancerBySpringCGLIB$$dc1691e9.findPage(<generated>) ~[classes/:na]
+	at com.huaxu.service.ReportService.getReportBySceneIds(ReportService.java:37) ~[classes/:na]
+	at com.huaxu.controller.DayMonthYearReportController.getReportBySceneIds(DayMonthYearReportController.java:47) ~[classes/:na]
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_271]
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_271]
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_271]
+	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_271]
+	at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:190) ~[spring-web-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:138) ~[spring-web-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:104) ~[spring-webmvc-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:892) ~[spring-webmvc-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:797) ~[spring-webmvc-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87) ~[spring-webmvc-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1039) ~[spring-webmvc-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:942) ~[spring-webmvc-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1005) [spring-webmvc-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:908) [spring-webmvc-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at javax.servlet.http.HttpServlet.service(HttpServlet.java:660) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:882) [spring-webmvc-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at javax.servlet.http.HttpServlet.service(HttpServlet.java:741) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53) [tomcat-embed-websocket-9.0.21.jar:9.0.21]
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.springframework.boot.actuate.web.trace.servlet.HttpTraceFilter.doFilterInternal(HttpTraceFilter.java:88) [spring-boot-actuator-2.1.6.RELEASE.jar:2.1.6.RELEASE]
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:109) [spring-web-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:320) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:127) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:91) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:119) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:137) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:111) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:170) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:63) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.authentication.www.BasicAuthenticationFilter.doFilterInternal(BasicAuthenticationFilter.java:158) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:109) [spring-web-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.oauth2.provider.authentication.OAuth2AuthenticationProcessingFilter.doFilter(OAuth2AuthenticationProcessingFilter.java:176) [spring-security-oauth2-2.3.4.RELEASE.jar:na]
+	at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:116) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.header.HeaderWriterFilter.doFilterInternal(HeaderWriterFilter.java:74) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:109) [spring-web-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:105) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter.doFilterInternal(WebAsyncManagerIntegrationFilter.java:56) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:109) [spring-web-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:215) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:178) [spring-security-web-5.1.5.RELEASE.jar:5.1.5.RELEASE]
+	at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:357) [spring-web-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:270) [spring-web-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:99) [spring-web-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:109) [spring-web-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:92) [spring-web-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:109) [spring-web-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.springframework.web.filter.HiddenHttpMethodFilter.doFilterInternal(HiddenHttpMethodFilter.java:93) [spring-web-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:109) [spring-web-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.springframework.boot.actuate.metrics.web.servlet.WebMvcMetricsFilter.filterAndRecordMetrics(WebMvcMetricsFilter.java:114) [spring-boot-actuator-2.1.6.RELEASE.jar:2.1.6.RELEASE]
+	at org.springframework.boot.actuate.metrics.web.servlet.WebMvcMetricsFilter.doFilterInternal(WebMvcMetricsFilter.java:104) [spring-boot-actuator-2.1.6.RELEASE.jar:2.1.6.RELEASE]
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:109) [spring-web-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:200) [spring-web-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:109) [spring-web-5.1.8.RELEASE.jar:5.1.8.RELEASE]
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:202) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:490) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:139) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:408) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:853) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1587) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) [na:1.8.0_271]
+	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) [na:1.8.0_271]
+	at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) [tomcat-embed-core-9.0.21.jar:9.0.21]
+	at java.lang.Thread.run(Thread.java:748) [na:1.8.0_271]
+Caused by: com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Unknown column 'tab.year' in 'field list'
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_271]
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_271]
+	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_271]
+	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_271]
+	at com.mysql.jdbc.Util.handleNewInstance(Util.java:425) ~[mysql-connector-java-5.1.47.jar:5.1.47]
+	at com.mysql.jdbc.Util.getInstance(Util.java:408) ~[mysql-connector-java-5.1.47.jar:5.1.47]
+	at com.mysql.jdbc.SQLError.createSQLException(SQLError.java:944) ~[mysql-connector-java-5.1.47.jar:5.1.47]
+	at com.mysql.jdbc.MysqlIO.checkErrorPacket(MysqlIO.java:3978) ~[mysql-connector-java-5.1.47.jar:5.1.47]
+	at com.mysql.jdbc.MysqlIO.checkErrorPacket(MysqlIO.java:3914) ~[mysql-connector-java-5.1.47.jar:5.1.47]
+	at com.mysql.jdbc.MysqlIO.sendCommand(MysqlIO.java:2530) ~[mysql-connector-java-5.1.47.jar:5.1.47]
+	at com.mysql.jdbc.MysqlIO.sqlQueryDirect(MysqlIO.java:2683) ~[mysql-connector-java-5.1.47.jar:5.1.47]
+	at com.mysql.jdbc.ConnectionImpl.execSQL(ConnectionImpl.java:2495) ~[mysql-connector-java-5.1.47.jar:5.1.47]
+	at com.mysql.jdbc.PreparedStatement.executeInternal(PreparedStatement.java:1903) ~[mysql-connector-java-5.1.47.jar:5.1.47]
+	at com.mysql.jdbc.PreparedStatement.execute(PreparedStatement.java:1242) ~[mysql-connector-java-5.1.47.jar:5.1.47]
+	at com.zaxxer.hikari.pool.ProxyPreparedStatement.execute(ProxyPreparedStatement.java:44) ~[HikariCP-3.2.0.jar:na]
+	at com.zaxxer.hikari.pool.HikariProxyPreparedStatement.execute(HikariProxyPreparedStatement.java) ~[HikariCP-3.2.0.jar:na]
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_271]
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_271]
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_271]
+	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_271]
+	at org.apache.ibatis.logging.jdbc.PreparedStatementLogger.invoke(PreparedStatementLogger.java:59) ~[mybatis-3.5.2.jar:3.5.2]
+	at com.sun.proxy.$Proxy189.execute(Unknown Source) ~[na:na]
+	at org.apache.ibatis.executor.statement.PreparedStatementHandler.query(PreparedStatementHandler.java:64) ~[mybatis-3.5.2.jar:3.5.2]
+	at org.apache.ibatis.executor.statement.RoutingStatementHandler.query(RoutingStatementHandler.java:79) ~[mybatis-3.5.2.jar:3.5.2]
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_271]
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_271]
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_271]
+	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_271]
+	at org.apache.ibatis.plugin.Plugin.invoke(Plugin.java:63) ~[mybatis-3.5.2.jar:3.5.2]
+	at com.sun.proxy.$Proxy164.query(Unknown Source) ~[na:na]
+	at com.baomidou.mybatisplus.core.executor.MybatisSimpleExecutor.doQuery(MybatisSimpleExecutor.java:67) ~[mybatis-plus-core-3.2.0.jar:3.2.0]
+	at org.apache.ibatis.executor.BaseExecutor.queryFromDatabase(BaseExecutor.java:324) ~[mybatis-3.5.2.jar:3.5.2]
+	at org.apache.ibatis.executor.BaseExecutor.query(BaseExecutor.java:156) ~[mybatis-3.5.2.jar:3.5.2]
+	at org.apache.ibatis.executor.CachingExecutor.query(CachingExecutor.java:109) ~[mybatis-3.5.2.jar:3.5.2]
+	at org.apache.ibatis.executor.CachingExecutor.query(CachingExecutor.java:83) ~[mybatis-3.5.2.jar:3.5.2]
+	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:147) ~[mybatis-3.5.2.jar:3.5.2]
+	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:140) ~[mybatis-3.5.2.jar:3.5.2]
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_271]
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_271]
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_271]
+	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_271]
+	at org.mybatis.spring.SqlSessionTemplate$SqlSessionInterceptor.invoke(SqlSessionTemplate.java:426) ~[mybatis-spring-2.0.2.jar:2.0.2]
+	... 111 common frames omitted
+
+2020-12-10 14:45:23.917  INFO 15912 --- [main] com.huaxu.SmsWaterApplication            : The following profiles are active: dev
+2020-12-10 14:45:24.922  WARN 15912 --- [main] o.s.boot.actuate.endpoint.EndpointId     : Endpoint ID 'nacos-discovery' contains invalid characters, please migrate to a valid format.
+2020-12-10 14:45:25.119  INFO 15912 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2020-12-10 14:45:25.120  INFO 15912 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data repositories in DEFAULT mode.
+2020-12-10 14:45:25.176  INFO 15912 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 53ms. Found 0 repository interfaces.
+2020-12-10 14:45:25.184  INFO 15912 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2020-12-10 14:45:25.185  INFO 15912 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data repositories in DEFAULT mode.
+2020-12-10 14:45:25.228  INFO 15912 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 36ms. Found 0 repository interfaces.
+2020-12-10 14:45:25.320  WARN 15912 --- [main] o.s.boot.actuate.endpoint.EndpointId     : Endpoint ID 'service-registry' contains invalid characters, please migrate to a valid format.
+2020-12-10 14:45:25.563  INFO 15912 --- [main] o.s.cloud.context.scope.GenericScope     : BeanFactory id=528aca77-4aab-320e-bffd-62b208d3e7e3
+2020-12-10 14:45:25.670  INFO 15912 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$c2e587ba] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2020-12-10 14:45:25.763  INFO 15912 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$deff8ab7] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2020-12-10 14:45:26.039  INFO 15912 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 8324 (http)
+2020-12-10 14:45:26.059  INFO 15912 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2020-12-10 14:45:26.059  INFO 15912 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.21]
+2020-12-10 14:45:26.218  INFO 15912 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2020-12-10 14:45:26.218  INFO 15912 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 2290 ms
+2020-12-10 14:45:27.361  INFO 15912 --- [main] org.mongodb.driver.cluster               : Cluster created with settings {hosts=[114.135.61.188:17017], mode=SINGLE, requiredClusterType=UNKNOWN, serverSelectionTimeout='30000 ms', maxWaitQueueSize=500}
+2020-12-10 14:45:27.536  INFO 15912 --- [cluster-ClusterId{value='5fd1c4072369523e283654db', description='null'}-114.135.61.188:17017] org.mongodb.driver.connection            : Opened connection [connectionId{localValue:1}] to 114.135.61.188:17017
+2020-12-10 14:45:27.572  INFO 15912 --- [cluster-ClusterId{value='5fd1c4072369523e283654db', description='null'}-114.135.61.188:17017] org.mongodb.driver.cluster               : Monitor thread successfully connected to server with description ServerDescription{address=114.135.61.188:17017, type=SHARD_ROUTER, state=CONNECTED, ok=true, version=ServerVersion{versionList=[3, 4, 23]}, minWireVersion=0, maxWireVersion=5, maxDocumentSize=16777216, logicalSessionTimeoutMinutes=null, roundTripTimeNanos=33490200}
+2020-12-10 14:45:27.585 DEBUG 15912 --- [main] .m.c.i.MongoPersistentEntityIndexCreator : Analyzing class class com.huaxu.entity.MonitorDataValueEntity for index information.
+2020-12-10 14:45:27.585 DEBUG 15912 --- [main] .m.c.i.MongoPersistentEntityIndexCreator : Analyzing class class com.huaxu.entity.MonitorDataEntity for index information.
+2020-12-10 14:45:28.746  WARN 15912 --- [Thread-8] com.zaxxer.hikari.HikariConfig           : HikariPool-1 - idleTimeout is close to or more than maxLifetime, disabling it.
+2020-12-10 14:45:28.747  INFO 15912 --- [Thread-8] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
+2020-12-10 14:45:29.345  INFO 15912 --- [Thread-8] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
+2020-12-10 14:45:29.491  INFO 15912 --- [main] org.quartz.impl.StdSchedulerFactory      : Using default implementation for ThreadExecutor
+2020-12-10 14:45:29.493  INFO 15912 --- [main] org.quartz.simpl.SimpleThreadPool        : Job execution threads will use class loader of thread: main
+2020-12-10 14:45:29.501  INFO 15912 --- [main] org.quartz.core.SchedulerSignalerImpl    : Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl
+2020-12-10 14:45:29.502  INFO 15912 --- [main] org.quartz.core.QuartzScheduler          : Quartz Scheduler v.2.3.1 created.
+2020-12-10 14:45:29.505  INFO 15912 --- [main] o.s.s.quartz.LocalDataSourceJobStore     : Using db table-based data access locking (synchronization).
+2020-12-10 14:45:29.507  INFO 15912 --- [main] o.s.s.quartz.LocalDataSourceJobStore     : JobStoreCMT initialized.
+2020-12-10 14:45:29.507  INFO 15912 --- [main] org.quartz.core.QuartzScheduler          : Scheduler meta-data: Quartz Scheduler (v2.3.1) 'smsScheduler' with instanceId 'LAPTOP-ED13E6B01607582729492'
+  Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally.
+  NOT STARTED.
+  Currently in standby mode.
+  Number of jobs executed: 0
+  Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 10 threads.
+  Using job-store 'org.springframework.scheduling.quartz.LocalDataSourceJobStore' - which supports persistence. and is clustered.
+
+2020-12-10 14:45:29.508  INFO 15912 --- [main] org.quartz.impl.StdSchedulerFactory      : Quartz scheduler 'smsScheduler' initialized from an externally provided properties instance.
+2020-12-10 14:45:29.508  INFO 15912 --- [main] org.quartz.impl.StdSchedulerFactory      : Quartz scheduler version: 2.3.1
+2020-12-10 14:45:29.508  INFO 15912 --- [main] org.quartz.core.QuartzScheduler          : JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@432eb882
+2020-12-10 14:45:30.567  INFO 15912 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
+2020-12-10 14:45:30.741  INFO 15912 --- [main] pertySourcedRequestMappingHandlerMapping : Mapped URL path [/v2/api-docs] onto method [public org.springframework.http.ResponseEntity<springfox.documentation.spring.web.json.Json> springfox.documentation.swagger2.web.Swagger2Controller.getDocumentation(java.lang.String,javax.servlet.http.HttpServletRequest)]
+2020-12-10 14:45:30.768  WARN 15912 --- [main] c.n.c.sources.URLConfigurationSource     : No URLs will be polled as dynamic configuration sources.
+2020-12-10 14:45:30.768  INFO 15912 --- [main] c.n.c.sources.URLConfigurationSource     : To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2020-12-10 14:45:30.772  WARN 15912 --- [main] c.n.c.sources.URLConfigurationSource     : No URLs will be polled as dynamic configuration sources.
+2020-12-10 14:45:30.772  INFO 15912 --- [main] c.n.c.sources.URLConfigurationSource     : To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2020-12-10 14:45:30.917  INFO 15912 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
+2020-12-10 14:45:31.005  INFO 15912 --- [main] o.s.s.c.ThreadPoolTaskScheduler          : Initializing ExecutorService
+2020-12-10 14:45:31.221  INFO 15912 --- [main] .s.s.UserDetailsServiceAutoConfiguration : 
+
+Using generated security password: 11c09d23-00a3-4194-8c28-4d6d9e2a0a5e
+
+2020-12-10 14:45:31.414  INFO 15912 --- [main] o.s.s.web.DefaultSecurityFilterChain     : Creating filter chain: OrRequestMatcher [requestMatchers=[Ant [pattern='/**']]], [org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter@1ec4fdcf, org.springframework.security.web.context.SecurityContextPersistenceFilter@177302d6, org.springframework.security.web.header.HeaderWriterFilter@19c24321, org.springframework.security.web.authentication.logout.LogoutFilter@17ea3bc0, org.springframework.security.oauth2.provider.authentication.OAuth2AuthenticationProcessingFilter@58647985, org.springframework.security.web.authentication.www.BasicAuthenticationFilter@219db855, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@21046afa, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@30adae45, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@515d615, org.springframework.security.web.session.SessionManagementFilter@d960561, org.springframework.security.web.access.ExceptionTranslationFilter@1b5623b4, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@584fb03d]
+2020-12-10 14:45:31.951  INFO 15912 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
+2020-12-10 14:45:31.970  INFO 15912 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
+2020-12-10 14:45:32.019  INFO 15912 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
+2020-12-10 14:45:32.299  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_1
+2020-12-10 14:45:32.372  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: addUsingPOST_1
+2020-12-10 14:45:32.376  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: batchDeleteUsingDELETE_1
+2020-12-10 14:45:32.380  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteUsingDELETE_1
+2020-12-10 14:45:32.385  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: editUsingPOST_1
+2020-12-10 14:45:32.393  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getUsingGET_1
+2020-12-10 14:45:32.406  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_2
+2020-12-10 14:45:32.412  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: addUsingPOST_2
+2020-12-10 14:45:32.418  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteUsingDELETE_2
+2020-12-10 14:45:32.423  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: editUsingPOST_2
+2020-12-10 14:45:32.428  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getUsingGET_2
+2020-12-10 14:45:32.436  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_3
+2020-12-10 14:45:32.469  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: addMonitorInfoUsingPOST_1
+2020-12-10 14:45:32.492  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getByDeviceIdUsingGET_1
+2020-12-10 14:45:32.527  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_4
+2020-12-10 14:45:32.529  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_1
+2020-12-10 14:45:32.530  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_2
+2020-12-10 14:45:32.531  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_3
+2020-12-10 14:45:32.572  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: delUsingPOST_1
+2020-12-10 14:45:32.589  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectByIdUsingGET_1
+2020-12-10 14:45:32.603  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_5
+2020-12-10 14:45:32.612  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: addSceneTypeUsingPOST_1
+2020-12-10 14:45:32.615  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: delUsingPOST_2
+2020-12-10 14:45:32.632  INFO 15912 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectByIdUsingGET_2
+2020-12-10 14:45:32.677  INFO 15912 --- [main] o.s.a.r.c.CachingConnectionFactory       : Attempting to connect to: [47.112.217.10:5672]
+2020-12-10 14:45:32.743  INFO 15912 --- [main] o.s.a.r.c.CachingConnectionFactory       : Created new connection: rabbitConnectionFactory#935493d:0/SimpleConnection@15a5cc6e [delegate=amqp://huaxu@47.112.217.10:5672/, localPort= 65471]
+2020-12-10 14:45:32.833  INFO 15912 --- [main] o.s.s.quartz.SchedulerFactoryBean        : Will start Quartz Scheduler [smsScheduler] in 2 seconds
+2020-12-10 14:45:32.864  INFO 15912 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 8324 (http) with context path ''
+2020-12-10 14:45:32.943  INFO 15912 --- [main] c.a.c.n.registry.NacosServiceRegistry    : nacos registry, sms-water 192.168.1.122:8324 register finished
+2020-12-10 14:45:32.946  INFO 15912 --- [main] com.huaxu.SmsWaterApplication            : Started SmsWaterApplication in 10.476 seconds (JVM running for 11.398)
+2020-12-10 14:45:34.834  INFO 15912 --- [Quartz Scheduler [smsScheduler]] o.s.s.quartz.SchedulerFactoryBean        : Starting Quartz Scheduler now, after delay of 2 seconds
+2020-12-10 14:45:35.170  INFO 15912 --- [Quartz Scheduler [smsScheduler]] org.quartz.core.QuartzScheduler          : Scheduler smsScheduler_$_LAPTOP-ED13E6B01607582729492 started.
+2020-12-10 14:45:35.538  INFO 15912 --- [http-nio-8324-exec-1] o.apache.tomcat.util.http.parser.Cookie  : A cookie header was received [1605252736; Hm_lvt_d7168b0cef9904be9b675a22e48c5721=1606481427,1606872328,1606909867,1606982992] that contained an invalid cookie. That cookie will be ignored.
+ Note: further occurrences of this error will be logged at DEBUG level.
+2020-12-10 14:45:35.544  INFO 15912 --- [http-nio-8324-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2020-12-10 14:45:35.545  INFO 15912 --- [http-nio-8324-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2020-12-10 14:45:35.555  INFO 15912 --- [http-nio-8324-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 10 ms
+2020-12-10 14:52:02.634  INFO 14552 --- [main] com.huaxu.SmsWaterApplication            : The following profiles are active: dev
+2020-12-10 14:52:03.644  WARN 14552 --- [main] o.s.boot.actuate.endpoint.EndpointId     : Endpoint ID 'nacos-discovery' contains invalid characters, please migrate to a valid format.
+2020-12-10 14:52:03.831  INFO 14552 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2020-12-10 14:52:03.831  INFO 14552 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data repositories in DEFAULT mode.
+2020-12-10 14:52:03.886  INFO 14552 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 52ms. Found 0 repository interfaces.
+2020-12-10 14:52:03.894  INFO 14552 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2020-12-10 14:52:03.895  INFO 14552 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data repositories in DEFAULT mode.
+2020-12-10 14:52:03.939  INFO 14552 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 38ms. Found 0 repository interfaces.
+2020-12-10 14:52:04.026  WARN 14552 --- [main] o.s.boot.actuate.endpoint.EndpointId     : Endpoint ID 'service-registry' contains invalid characters, please migrate to a valid format.
+2020-12-10 14:52:04.268  INFO 14552 --- [main] o.s.cloud.context.scope.GenericScope     : BeanFactory id=528aca77-4aab-320e-bffd-62b208d3e7e3
+2020-12-10 14:52:04.400  INFO 14552 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$11b591c2] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2020-12-10 14:52:04.507  INFO 14552 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$2dcf94bf] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2020-12-10 14:52:04.798  INFO 14552 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 8324 (http)
+2020-12-10 14:52:04.823  INFO 14552 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2020-12-10 14:52:04.823  INFO 14552 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.21]
+2020-12-10 14:52:04.998  INFO 14552 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2020-12-10 14:52:04.999  INFO 14552 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 2354 ms
+2020-12-10 14:52:06.139  INFO 14552 --- [main] org.mongodb.driver.cluster               : Cluster created with settings {hosts=[114.135.61.188:17017], mode=SINGLE, requiredClusterType=UNKNOWN, serverSelectionTimeout='30000 ms', maxWaitQueueSize=500}
+2020-12-10 14:52:06.337  INFO 14552 --- [cluster-ClusterId{value='5fd1c59623695238d804f91d', description='null'}-114.135.61.188:17017] org.mongodb.driver.connection            : Opened connection [connectionId{localValue:1}] to 114.135.61.188:17017
+2020-12-10 14:52:06.360 DEBUG 14552 --- [main] .m.c.i.MongoPersistentEntityIndexCreator : Analyzing class class com.huaxu.entity.MonitorDataEntity for index information.
+2020-12-10 14:52:06.366 DEBUG 14552 --- [main] .m.c.i.MongoPersistentEntityIndexCreator : Analyzing class class com.huaxu.entity.MonitorDataValueEntity for index information.
+2020-12-10 14:52:06.379  INFO 14552 --- [cluster-ClusterId{value='5fd1c59623695238d804f91d', description='null'}-114.135.61.188:17017] org.mongodb.driver.cluster               : Monitor thread successfully connected to server with description ServerDescription{address=114.135.61.188:17017, type=SHARD_ROUTER, state=CONNECTED, ok=true, version=ServerVersion{versionList=[3, 4, 23]}, minWireVersion=0, maxWireVersion=5, maxDocumentSize=16777216, logicalSessionTimeoutMinutes=null, roundTripTimeNanos=39813200}
+2020-12-10 14:52:07.547  WARN 14552 --- [Thread-8] com.zaxxer.hikari.HikariConfig           : HikariPool-1 - idleTimeout is close to or more than maxLifetime, disabling it.
+2020-12-10 14:52:07.547  INFO 14552 --- [Thread-8] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
+2020-12-10 14:52:08.117  INFO 14552 --- [Thread-8] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
+2020-12-10 14:52:08.252  INFO 14552 --- [main] org.quartz.impl.StdSchedulerFactory      : Using default implementation for ThreadExecutor
+2020-12-10 14:52:08.254  INFO 14552 --- [main] org.quartz.simpl.SimpleThreadPool        : Job execution threads will use class loader of thread: main
+2020-12-10 14:52:08.261  INFO 14552 --- [main] org.quartz.core.SchedulerSignalerImpl    : Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl
+2020-12-10 14:52:08.262  INFO 14552 --- [main] org.quartz.core.QuartzScheduler          : Quartz Scheduler v.2.3.1 created.
+2020-12-10 14:52:08.265  INFO 14552 --- [main] o.s.s.quartz.LocalDataSourceJobStore     : Using db table-based data access locking (synchronization).
+2020-12-10 14:52:08.266  INFO 14552 --- [main] o.s.s.quartz.LocalDataSourceJobStore     : JobStoreCMT initialized.
+2020-12-10 14:52:08.267  INFO 14552 --- [main] org.quartz.core.QuartzScheduler          : Scheduler meta-data: Quartz Scheduler (v2.3.1) 'smsScheduler' with instanceId 'LAPTOP-ED13E6B01607583128253'
+  Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally.
+  NOT STARTED.
+  Currently in standby mode.
+  Number of jobs executed: 0
+  Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 10 threads.
+  Using job-store 'org.springframework.scheduling.quartz.LocalDataSourceJobStore' - which supports persistence. and is clustered.
+
+2020-12-10 14:52:08.267  INFO 14552 --- [main] org.quartz.impl.StdSchedulerFactory      : Quartz scheduler 'smsScheduler' initialized from an externally provided properties instance.
+2020-12-10 14:52:08.267  INFO 14552 --- [main] org.quartz.impl.StdSchedulerFactory      : Quartz scheduler version: 2.3.1
+2020-12-10 14:52:08.267  INFO 14552 --- [main] org.quartz.core.QuartzScheduler          : JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@2a4cb8ae
+2020-12-10 14:52:09.228  INFO 14552 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
+2020-12-10 14:52:09.407  INFO 14552 --- [main] pertySourcedRequestMappingHandlerMapping : Mapped URL path [/v2/api-docs] onto method [public org.springframework.http.ResponseEntity<springfox.documentation.spring.web.json.Json> springfox.documentation.swagger2.web.Swagger2Controller.getDocumentation(java.lang.String,javax.servlet.http.HttpServletRequest)]
+2020-12-10 14:52:09.436  WARN 14552 --- [main] c.n.c.sources.URLConfigurationSource     : No URLs will be polled as dynamic configuration sources.
+2020-12-10 14:52:09.436  INFO 14552 --- [main] c.n.c.sources.URLConfigurationSource     : To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2020-12-10 14:52:09.441  WARN 14552 --- [main] c.n.c.sources.URLConfigurationSource     : No URLs will be polled as dynamic configuration sources.
+2020-12-10 14:52:09.441  INFO 14552 --- [main] c.n.c.sources.URLConfigurationSource     : To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2020-12-10 14:52:09.590  INFO 14552 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
+2020-12-10 14:52:09.673  INFO 14552 --- [main] o.s.s.c.ThreadPoolTaskScheduler          : Initializing ExecutorService
+2020-12-10 14:52:09.883  INFO 14552 --- [main] .s.s.UserDetailsServiceAutoConfiguration : 
+
+Using generated security password: 644cb7b2-52ac-4977-9d81-12b2f7723bc6
+
+2020-12-10 14:52:10.024  INFO 14552 --- [main] o.s.s.web.DefaultSecurityFilterChain     : Creating filter chain: OrRequestMatcher [requestMatchers=[Ant [pattern='/**']]], [org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter@279e8bc0, org.springframework.security.web.context.SecurityContextPersistenceFilter@764a3867, org.springframework.security.web.header.HeaderWriterFilter@3db5195, org.springframework.security.web.authentication.logout.LogoutFilter@3adeca1f, org.springframework.security.oauth2.provider.authentication.OAuth2AuthenticationProcessingFilter@728535c6, org.springframework.security.web.authentication.www.BasicAuthenticationFilter@3809f65d, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@67e1a5fd, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@45648e75, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@23ffc910, org.springframework.security.web.session.SessionManagementFilter@58647985, org.springframework.security.web.access.ExceptionTranslationFilter@2ec23ec3, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@782143e8]
+2020-12-10 14:52:10.534  INFO 14552 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
+2020-12-10 14:52:10.554  INFO 14552 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
+2020-12-10 14:52:10.588  INFO 14552 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
+2020-12-10 14:52:10.886  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_1
+2020-12-10 14:52:10.957  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: addUsingPOST_1
+2020-12-10 14:52:10.961  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: batchDeleteUsingDELETE_1
+2020-12-10 14:52:10.964  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteUsingDELETE_1
+2020-12-10 14:52:10.970  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: editUsingPOST_1
+2020-12-10 14:52:10.978  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getUsingGET_1
+2020-12-10 14:52:10.990  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_2
+2020-12-10 14:52:10.996  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: addUsingPOST_2
+2020-12-10 14:52:11.002  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteUsingDELETE_2
+2020-12-10 14:52:11.005  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: editUsingPOST_2
+2020-12-10 14:52:11.011  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getUsingGET_2
+2020-12-10 14:52:11.020  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_3
+2020-12-10 14:52:11.053  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: addMonitorInfoUsingPOST_1
+2020-12-10 14:52:11.074  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getByDeviceIdUsingGET_1
+2020-12-10 14:52:11.109  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_4
+2020-12-10 14:52:11.111  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_1
+2020-12-10 14:52:11.112  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_2
+2020-12-10 14:52:11.113  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_3
+2020-12-10 14:52:11.152  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: delUsingPOST_1
+2020-12-10 14:52:11.170  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectByIdUsingGET_1
+2020-12-10 14:52:11.184  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_5
+2020-12-10 14:52:11.193  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: addSceneTypeUsingPOST_1
+2020-12-10 14:52:11.195  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: delUsingPOST_2
+2020-12-10 14:52:11.210  INFO 14552 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectByIdUsingGET_2
+2020-12-10 14:52:11.253  INFO 14552 --- [main] o.s.a.r.c.CachingConnectionFactory       : Attempting to connect to: [47.112.217.10:5672]
+2020-12-10 14:52:11.329  INFO 14552 --- [main] o.s.a.r.c.CachingConnectionFactory       : Created new connection: rabbitConnectionFactory#1bee0085:0/SimpleConnection@29693b1d [delegate=amqp://huaxu@47.112.217.10:5672/, localPort= 49439]
+2020-12-10 14:52:11.425  INFO 14552 --- [main] o.s.s.quartz.SchedulerFactoryBean        : Will start Quartz Scheduler [smsScheduler] in 2 seconds
+2020-12-10 14:52:11.474  INFO 14552 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 8324 (http) with context path ''
+2020-12-10 14:52:11.556  INFO 14552 --- [main] c.a.c.n.registry.NacosServiceRegistry    : nacos registry, sms-water 192.168.1.122:8324 register finished
+2020-12-10 14:52:11.559  INFO 14552 --- [main] com.huaxu.SmsWaterApplication            : Started SmsWaterApplication in 10.327 seconds (JVM running for 11.29)
+2020-12-10 14:52:13.426  INFO 14552 --- [Quartz Scheduler [smsScheduler]] o.s.s.quartz.SchedulerFactoryBean        : Starting Quartz Scheduler now, after delay of 2 seconds
+2020-12-10 14:52:13.752  INFO 14552 --- [Quartz Scheduler [smsScheduler]] org.quartz.core.QuartzScheduler          : Scheduler smsScheduler_$_LAPTOP-ED13E6B01607583128253 started.
+2020-12-10 14:52:14.665  INFO 14552 --- [http-nio-8324-exec-1] o.apache.tomcat.util.http.parser.Cookie  : A cookie header was received [1605252736; Hm_lvt_d7168b0cef9904be9b675a22e48c5721=1606481427,1606872328,1606909867,1606982992] that contained an invalid cookie. That cookie will be ignored.
+ Note: further occurrences of this error will be logged at DEBUG level.
+2020-12-10 14:52:14.673  INFO 14552 --- [http-nio-8324-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2020-12-10 14:52:14.673  INFO 14552 --- [http-nio-8324-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2020-12-10 14:52:14.682  INFO 14552 --- [http-nio-8324-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 9 ms

+ 25 - 7
sms_water/src/main/java/com/huaxu/service/DayReportService.java

@@ -73,7 +73,7 @@ public class DayReportService extends ServiceImpl<DayReportMapper, DayReportEnti
         Page<ReportDto> reportPage = new Page<>();
         //查询场景下的所有设备信息
         List<DeviceDto> devices = new ArrayList<>();
-                DeviceDto deviceDto = new DeviceDto();
+        DeviceDto deviceDto = new DeviceDto();
         for (Long id : ids) {
             deviceDto.setSceneIds(sceneService.findByParentIdsLike(id));
             devices.addAll(deviceService.selectList(deviceDto));
@@ -87,17 +87,35 @@ public class DayReportService extends ServiceImpl<DayReportMapper, DayReportEnti
         dayReportEntity.setParentSceneIds(ids);
         dayReportEntity.setDeviceIds(devices);
         reportPage = dayReportMapper.findPage(page, dayReportEntity);
+        //固定参数项
+        ReportDto reportDto = new ReportDto();
+        reportDto.setYear(year);
+        reportDto.setMonth(month);
+        reportDto.setDay(day);
+        reportDto.setDeviceIds(devices);
+        List<ReportDto> reportDtos = dayReportMapper.findReport(reportDto);
         //单个属性值
         for (ReportDto item : reportPage.getRecords()) {
             item.setCollectDate(item.getYear() + "-" + String.format("%02d", item.getMonth()) + "-" + String.format("%02d", item.getDay()) + " " + String.format("%02d", item.getHour()) + ":00");
             item.setDeviceIds(devices);
             //固定参数项
-            List<ReportDto> reportDtos = dayReportMapper.findReport(item);
-            if (reportDtos.size() > 0) {
-                item.setYieldWaterUsage(reportDtos.get(0).getYieldWaterUsage());
-                item.setIntakeWaterUsage(reportDtos.get(0).getIntakeWaterUsage());
-                item.setPowerUsage(reportDtos.get(0).getPowerUsage());
-                item.setDrugUsage(reportDtos.get(0).getDrugUsage());
+            int index = -1;
+            for (int i=0;i<reportDtos.size();i++) {
+                if(reportDtos.get(i).getHour().equals(item.getHour()))
+                    index = i;
+            }
+            if(index!=-1) {
+                if ((index + 2) <= reportDtos.size()) {
+                    item.setYieldWaterUsage(reportDtos.get(index).getYieldWaterUsage() - reportDtos.get(index + 1).getYieldWaterUsage());
+                    item.setIntakeWaterUsage(reportDtos.get(index).getIntakeWaterUsage() - reportDtos.get(index + 1).getIntakeWaterUsage());
+                    item.setPowerUsage(reportDtos.get(index).getPowerUsage() - reportDtos.get(index + 1).getPowerUsage());
+                    item.setDrugUsage(reportDtos.get(index).getDrugUsage() - reportDtos.get(index + 1).getDrugUsage());
+                } else {
+                    item.setYieldWaterUsage(0d);
+                    item.setIntakeWaterUsage(0d);
+                    item.setPowerUsage(0d);
+                    item.setDrugUsage(0d);
+                }
             }
             //动态参数项
             List<ReportAttributeDto> reportAttributeDtos = dayReportMapper.findAttributeList(item);

+ 23 - 6
sms_water/src/main/java/com/huaxu/service/MonthReportService.java

@@ -82,17 +82,34 @@ public class MonthReportService extends ServiceImpl<MonthReportMapper, MonthRepo
         monthReportEntity.setParentSceneIds(ids);
         monthReportEntity.setDeviceIds(devices);
         reportPage = monthReportMapper.findPage(page, monthReportEntity);
+        //固定参数项
+        ReportDto reportDto = new ReportDto();
+        reportDto.setYear(year);
+        reportDto.setMonth(month);
+        reportDto.setDeviceIds(devices);
+        List<ReportDto> reportDtos = monthReportMapper.findReport(reportDto);
         //单个属性值
         for (ReportDto item : reportPage.getRecords()) {
             item.setCollectDate(item.getYear() + "-" + String.format("%02d", item.getMonth()) + "-" + String.format("%02d", item.getDay()));
             item.setDeviceIds(devices);
             //固定参数项
-            List<ReportDto> reportDtos = monthReportMapper.findReport(item);
-            if (reportDtos.size() > 0) {
-                item.setYieldWaterUsage(reportDtos.get(0).getYieldWaterUsage());
-                item.setIntakeWaterUsage(reportDtos.get(0).getIntakeWaterUsage());
-                item.setPowerUsage(reportDtos.get(0).getPowerUsage());
-                item.setDrugUsage(reportDtos.get(0).getDrugUsage());
+            int index = -1;
+            for (int i=0;i<reportDtos.size();i++) {
+                if(reportDtos.get(i).getDay().equals(item.getDay()))
+                    index = i;
+            }
+            if(index!=-1) {
+                if ((index + 2) <= reportDtos.size()) {
+                    item.setYieldWaterUsage(reportDtos.get(index).getYieldWaterUsage() - reportDtos.get(index + 1).getYieldWaterUsage());
+                    item.setIntakeWaterUsage(reportDtos.get(index).getIntakeWaterUsage() - reportDtos.get(index + 1).getIntakeWaterUsage());
+                    item.setPowerUsage(reportDtos.get(index).getPowerUsage() - reportDtos.get(index + 1).getPowerUsage());
+                    item.setDrugUsage(reportDtos.get(index).getDrugUsage() - reportDtos.get(index + 1).getDrugUsage());
+                } else {
+                    item.setYieldWaterUsage(0d);
+                    item.setIntakeWaterUsage(0d);
+                    item.setPowerUsage(0d);
+                    item.setDrugUsage(0d);
+                }
             }
             //动态参数项
             List<ReportAttributeDto> reportAttributeDtos = monthReportMapper.findAttributeList(item);

+ 22 - 6
sms_water/src/main/java/com/huaxu/service/YearReportService.java

@@ -82,17 +82,33 @@ public class YearReportService extends ServiceImpl<YearReportMapper, YearReportE
         yearReportEntity.setParentSceneIds(ids);
         yearReportEntity.setDeviceIds(devices);
         reportPage = yearReportMapper.findPage(page, yearReportEntity);
+        //固定参数项
+        ReportDto reportDto = new ReportDto();
+        reportDto.setYear(year);
+        reportDto.setDeviceIds(devices);
+        List<ReportDto> reportDtos = yearReportMapper.findReport(reportDto);
         //单个属性值
         for (ReportDto item : reportPage.getRecords()) {
             item.setCollectDate(item.getYear() + "-" + String.format("%02d", item.getMonth()));
             item.setDeviceIds(devices);
             //固定参数项
-            List<ReportDto> reportDtos = yearReportMapper.findReport(item);
-            if (reportDtos.size() > 0) {
-                item.setYieldWaterUsage(reportDtos.get(0).getYieldWaterUsage());
-                item.setIntakeWaterUsage(reportDtos.get(0).getIntakeWaterUsage());
-                item.setPowerUsage(reportDtos.get(0).getPowerUsage());
-                item.setDrugUsage(reportDtos.get(0).getDrugUsage());
+            int index = -1;
+            for (int i=0;i<reportDtos.size();i++) {
+                if(reportDtos.get(i).getMonth().equals(item.getMonth()))
+                    index = i;
+            }
+            if(index!=-1) {
+                if ((index + 2) <= reportDtos.size()) {
+                    item.setYieldWaterUsage(reportDtos.get(index).getYieldWaterUsage() - reportDtos.get(index + 1).getYieldWaterUsage());
+                    item.setIntakeWaterUsage(reportDtos.get(index).getIntakeWaterUsage() - reportDtos.get(index + 1).getIntakeWaterUsage());
+                    item.setPowerUsage(reportDtos.get(index).getPowerUsage() - reportDtos.get(index + 1).getPowerUsage());
+                    item.setDrugUsage(reportDtos.get(index).getDrugUsage() - reportDtos.get(index + 1).getDrugUsage());
+                } else {
+                    item.setYieldWaterUsage(0d);
+                    item.setIntakeWaterUsage(0d);
+                    item.setPowerUsage(0d);
+                    item.setDrugUsage(0d);
+                }
             }
             //动态参数项
             List<ReportAttributeDto> reportAttributeDtos = yearReportMapper.findAttributeList(item);

+ 6 - 2
sms_water/src/main/resources/mapper/DayReportMapper.xml

@@ -147,12 +147,15 @@
         group by tab.attributeName,tab.ATTRIBUTE_TYPE
     </select>
     <select id="findReport" resultType="com.huaxu.dto.ReportDto">
-        select sum(ifnull(intakeWaterUsage,0))as "intakeWaterUsage",
+        select
+        tab.year,tab.month,tab.day,tab.hour,
+        sum(ifnull(intakeWaterUsage,0))as "intakeWaterUsage",
         sum(ifnull(yieldWaterUsage,0))as "yieldWaterUsage",
         sum(ifnull(powerUsage,0))as "powerUsage",
         sum(ifnull(drugUsage,0))as "drugUsage"
         from
         (SELECT
+        c.year,c.month,c.day,c.hour,
         case when b.ATTRIBUTE_TYPE=4 then
         c.latest_value end as "intakeWaterUsage",
         case when b.ATTRIBUTE_TYPE=3 then
@@ -174,8 +177,9 @@
         <if test="report.year != null ">and c.`YEAR`=#{report.year}</if>
         <if test="report.month != null ">and c.`MONTH`=#{report.month}</if>
         <if test="report.day != null ">and c.`DAY`=#{report.day}</if>
-        <if test="report.hour != null ">and c.`HOUR`=#{report.hour}</if>
         <if test="report.parentSceneId != null ">and c.PARENT_SCENE_ID=#{report.parentSceneId}</if>
         and (b.ATTRIBUTE_TYPE =3 or b.ATTRIBUTE_TYPE =4 or b.ATTRIBUTE_TYPE =5 or b.ATTRIBUTE_TYPE =6)) tab
+        group by tab.year,tab.month,tab.day,tab.HOUR
+        order by tab.year desc,tab.month desc,tab.day desc,tab.hour desc
     </select>
 </mapper>

+ 6 - 2
sms_water/src/main/resources/mapper/MonthReportMapper.xml

@@ -144,12 +144,15 @@
         group by tab.attributeName,tab.ATTRIBUTE_TYPE
     </select>
     <select id="findReport" resultType="com.huaxu.dto.ReportDto">
-        select sum(ifnull(intakeWaterUsage,0))as "intakeWaterUsage",
+        select
+        tab.year,tab.month,tab.day,
+        sum(ifnull(intakeWaterUsage,0))as "intakeWaterUsage",
         sum(ifnull(yieldWaterUsage,0))as "yieldWaterUsage",
         sum(ifnull(powerUsage,0))as "powerUsage",
         sum(ifnull(drugUsage,0))as "drugUsage"
         from
         (SELECT
+        c.year,c.month,c.day,
         case when b.ATTRIBUTE_TYPE=4 then
         c.latest_value end as "intakeWaterUsage",
         case when b.ATTRIBUTE_TYPE=3 then
@@ -170,8 +173,9 @@
         </if>
         <if test="report.year != null ">and c.`YEAR`=#{report.year}</if>
         <if test="report.month != null ">and c.`MONTH`=#{report.month}</if>
-        <if test="report.day != null ">and c.`DAY`=#{report.day}</if>
         <if test="report.parentSceneId != null ">and c.PARENT_SCENE_ID=#{report.parentSceneId}</if>
         and (b.ATTRIBUTE_TYPE =3 or b.ATTRIBUTE_TYPE =4 or b.ATTRIBUTE_TYPE =5 or b.ATTRIBUTE_TYPE =6)) tab
+        group by tab.year,tab.month,tab.day
+        order by tab.year desc,tab.month desc,tab.day desc
     </select>
 </mapper>

+ 6 - 1
sms_water/src/main/resources/mapper/YearReportMapper.xml

@@ -141,12 +141,15 @@
         group by tab.attributeName,tab.ATTRIBUTE_TYPE
     </select>
     <select id="findReport" resultType="com.huaxu.dto.ReportDto">
-        select sum(ifnull(intakeWaterUsage,0))as "intakeWaterUsage",
+        select
+        tab.year,tab.month,
+        sum(ifnull(intakeWaterUsage,0))as "intakeWaterUsage",
         sum(ifnull(yieldWaterUsage,0))as "yieldWaterUsage",
         sum(ifnull(powerUsage,0))as "powerUsage",
         sum(ifnull(drugUsage,0))as "drugUsage"
         from
         (SELECT
+        c.year,c.month,
         case when b.ATTRIBUTE_TYPE=4 then
         c.latest_value end as "intakeWaterUsage",
         case when b.ATTRIBUTE_TYPE=3 then
@@ -169,5 +172,7 @@
         <if test="report.month != null ">and c.`MONTH`=#{report.month}</if>
         <if test="report.parentSceneId != null ">and c.PARENT_SCENE_ID=#{report.parentSceneId}</if>
         and (b.ATTRIBUTE_TYPE =3 or b.ATTRIBUTE_TYPE =4 or b.ATTRIBUTE_TYPE =5 or b.ATTRIBUTE_TYPE =6)) tab
+        group by tab.year,tab.month
+        order by tab.year desc,tab.month desc
     </select>
 </mapper>