Merge remote-tracking branch 'origin/master'

# Conflicts:
#	huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/controller/EartagDataController.java
#	huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/service/impl/EartagDataServiceImpl.java

huimv-goldpig/app-log/log_total.log

@@ -1,303 +1,46 @@
-2022-01-17 13:54:24.441  INFO 22096 --- [main] imvSmartEartagDataAcquisitionApplication : Starting HuimvSmartEartagDataAcquisitionApplication using Java 1.8.0_131 on WIN-309E4E288AM with PID 22096 (G:\idea\huimv\huimv.goldpig\huimv-goldpig\huimv-goldpig-anquisition\target\classes started by Administrator in G:\idea\huimv\huimv.goldpig\huimv-goldpig)
-2022-01-17 13:54:24.446  INFO 22096 --- [main] imvSmartEartagDataAcquisitionApplication : The following profiles are active: dev
-2022-01-17 13:54:25.184  INFO 22096 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data JPA repositories in DEFAULT mode.
-2022-01-17 13:54:25.216  INFO 22096 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 22 ms. Found 0 JPA repository interfaces.
-2022-01-17 13:54:25.746  INFO 22096 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9501 (http)
-2022-01-17 13:54:25.753  INFO 22096 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
-2022-01-17 13:54:25.753  INFO 22096 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.56]
-2022-01-17 13:54:25.833  INFO 22096 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
-2022-01-17 13:54:25.834  INFO 22096 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 1346 ms
-2022-01-17 13:54:25.994  INFO 22096 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
-2022-01-17 13:54:26.090  INFO 22096 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
-2022-01-17 13:54:26.179  INFO 22096 --- [main] o.hibernate.jpa.internal.util.LogHelper  : HHH000204: Processing PersistenceUnitInfo [name: default]
-2022-01-17 13:54:26.222  INFO 22096 --- [main] org.hibernate.Version                    : HHH000412: Hibernate ORM core version 5.6.3.Final
-2022-01-17 13:54:26.402  INFO 22096 --- [main] o.hibernate.annotations.common.Version   : HCANN000001: Hibernate Commons Annotations {5.1.2.Final}
-2022-01-17 13:54:26.498  INFO 22096 --- [main] org.hibernate.dialect.Dialect            : HHH000400: Using dialect: org.hibernate.dialect.MySQL5InnoDBDialect
-2022-01-17 13:54:26.617  INFO 22096 --- [main] o.h.e.t.j.p.i.JtaPlatformInitiator       : HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform]
-2022-01-17 13:54:26.626  INFO 22096 --- [main] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default'
-2022-01-17 13:54:27.515  WARN 22096 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
-2022-01-17 13:54:27.833  INFO 22096 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9501 (http) with context path ''
-2022-01-17 13:54:27.843  INFO 22096 --- [main] imvSmartEartagDataAcquisitionApplication : Started HuimvSmartEartagDataAcquisitionApplication in 3.914 seconds (JVM running for 4.573)
-2022-01-17 15:03:35.933  INFO 22096 --- [http-nio-9501-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
-2022-01-17 15:03:35.936  INFO 22096 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
-2022-01-17 15:03:35.955  INFO 22096 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 19 ms
-2022-01-17 15:10:17.753  INFO 21668 --- [main] imvSmartEartagDataAcquisitionApplication : Starting HuimvSmartEartagDataAcquisitionApplication using Java 1.8.0_131 on WIN-309E4E288AM with PID 21668 (G:\idea\huimv\huimv.goldpig\huimv-goldpig\huimv-goldpig-anquisition\target\classes started by Administrator in G:\idea\huimv\huimv.goldpig\huimv-goldpig)
-2022-01-17 15:10:17.756  INFO 21668 --- [main] imvSmartEartagDataAcquisitionApplication : The following profiles are active: dev
-2022-01-17 15:10:18.380  INFO 21668 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data JPA repositories in DEFAULT mode.
-2022-01-17 15:10:18.403  INFO 21668 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 15 ms. Found 0 JPA repository interfaces.
-2022-01-17 15:10:18.784  INFO 21668 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9501 (http)
-2022-01-17 15:10:18.793  INFO 21668 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
-2022-01-17 15:10:18.793  INFO 21668 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.56]
-2022-01-17 15:10:18.869  INFO 21668 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
-2022-01-17 15:10:18.869  INFO 21668 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 1064 ms
-2022-01-17 15:10:18.967  INFO 21668 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
-2022-01-17 15:10:19.089  INFO 21668 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
-2022-01-17 15:10:19.162  INFO 21668 --- [main] o.hibernate.jpa.internal.util.LogHelper  : HHH000204: Processing PersistenceUnitInfo [name: default]
-2022-01-17 15:10:19.192  INFO 21668 --- [main] org.hibernate.Version                    : HHH000412: Hibernate ORM core version 5.6.3.Final
-2022-01-17 15:10:19.288  INFO 21668 --- [main] o.hibernate.annotations.common.Version   : HCANN000001: Hibernate Commons Annotations {5.1.2.Final}
-2022-01-17 15:10:19.359  INFO 21668 --- [main] org.hibernate.dialect.Dialect            : HHH000400: Using dialect: org.hibernate.dialect.MySQL5InnoDBDialect
-2022-01-17 15:10:19.460  INFO 21668 --- [main] o.h.e.t.j.p.i.JtaPlatformInitiator       : HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform]
-2022-01-17 15:10:19.468  INFO 21668 --- [main] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default'
-2022-01-17 15:10:20.355  WARN 21668 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
-2022-01-17 15:10:20.642  INFO 21668 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9501 (http) with context path ''
-2022-01-17 15:10:20.652  INFO 21668 --- [main] imvSmartEartagDataAcquisitionApplication : Started HuimvSmartEartagDataAcquisitionApplication in 3.43 seconds (JVM running for 4.151)
-2022-01-17 15:33:31.716  INFO 21668 --- [http-nio-9501-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
-2022-01-17 15:33:31.716  INFO 21668 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
-2022-01-17 15:33:31.717  INFO 21668 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 1 ms
-2022-01-17 15:38:04.374  INFO 21036 --- [main] imvSmartEartagDataAcquisitionApplication : Starting HuimvSmartEartagDataAcquisitionApplication using Java 1.8.0_131 on WIN-309E4E288AM with PID 21036 (G:\idea\huimv\huimv.goldpig\huimv-goldpig\huimv-goldpig-anquisition\target\classes started by Administrator in G:\idea\huimv\huimv.goldpig\huimv-goldpig)
-2022-01-17 15:38:04.378  INFO 21036 --- [main] imvSmartEartagDataAcquisitionApplication : The following profiles are active: dev
-2022-01-17 15:38:05.266  INFO 21036 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data JPA repositories in DEFAULT mode.
-2022-01-17 15:38:05.288  INFO 21036 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 15 ms. Found 0 JPA repository interfaces.
-2022-01-17 15:38:05.699  INFO 21036 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9501 (http)
-2022-01-17 15:38:05.706  INFO 21036 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
-2022-01-17 15:38:05.706  INFO 21036 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.56]
-2022-01-17 15:38:05.785  INFO 21036 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
-2022-01-17 15:38:05.785  INFO 21036 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 1364 ms
-2022-01-17 15:38:05.960  INFO 21036 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
-2022-01-17 15:38:06.101  INFO 21036 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
-2022-01-17 15:38:06.185  INFO 21036 --- [main] o.hibernate.jpa.internal.util.LogHelper  : HHH000204: Processing PersistenceUnitInfo [name: default]
-2022-01-17 15:38:06.221  INFO 21036 --- [main] org.hibernate.Version                    : HHH000412: Hibernate ORM core version 5.6.3.Final
-2022-01-17 15:38:06.327  INFO 21036 --- [main] o.hibernate.annotations.common.Version   : HCANN000001: Hibernate Commons Annotations {5.1.2.Final}
-2022-01-17 15:38:06.398  INFO 21036 --- [main] org.hibernate.dialect.Dialect            : HHH000400: Using dialect: org.hibernate.dialect.MySQL5InnoDBDialect
-2022-01-17 15:38:06.497  INFO 21036 --- [main] o.h.e.t.j.p.i.JtaPlatformInitiator       : HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform]
-2022-01-17 15:38:06.504  INFO 21036 --- [main] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default'
-2022-01-17 15:38:07.449  WARN 21036 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
-2022-01-17 15:38:07.747  INFO 21036 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9501 (http) with context path ''
-2022-01-17 15:38:07.756  INFO 21036 --- [main] imvSmartEartagDataAcquisitionApplication : Started HuimvSmartEartagDataAcquisitionApplication in 3.911 seconds (JVM running for 4.574)
-2022-01-17 15:41:08.429  INFO 21036 --- [http-nio-9501-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
-2022-01-17 15:41:08.430  INFO 21036 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
-2022-01-17 15:41:08.431  INFO 21036 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 1 ms
-2022-01-17 17:19:20.254  INFO 19692 --- [main] imvSmartEartagDataAcquisitionApplication : Starting HuimvSmartEartagDataAcquisitionApplication using Java 1.8.0_131 on WIN-309E4E288AM with PID 19692 (G:\idea\huimv\huimv.goldpig\huimv-goldpig\huimv-goldpig-anquisition\target\classes started by Administrator in G:\idea\huimv\huimv.goldpig\huimv-goldpig)
-2022-01-17 17:19:20.258  INFO 19692 --- [main] imvSmartEartagDataAcquisitionApplication : The following profiles are active: dev
-2022-01-17 17:19:20.985  INFO 19692 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data JPA repositories in DEFAULT mode.
-2022-01-17 17:19:21.007  INFO 19692 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 13 ms. Found 0 JPA repository interfaces.
-2022-01-17 17:19:21.406  INFO 19692 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9501 (http)
-2022-01-17 17:19:21.412  INFO 19692 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
-2022-01-17 17:19:21.412  INFO 19692 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.56]
-2022-01-17 17:19:21.479  INFO 19692 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
-2022-01-17 17:19:21.479  INFO 19692 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 1171 ms
-2022-01-17 17:19:21.588  INFO 19692 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
-2022-01-17 17:19:21.685  INFO 19692 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
-2022-01-17 17:19:21.763  INFO 19692 --- [main] o.hibernate.jpa.internal.util.LogHelper  : HHH000204: Processing PersistenceUnitInfo [name: default]
-2022-01-17 17:19:21.798  INFO 19692 --- [main] org.hibernate.Version                    : HHH000412: Hibernate ORM core version 5.6.3.Final
-2022-01-17 17:19:21.897  INFO 19692 --- [main] o.hibernate.annotations.common.Version   : HCANN000001: Hibernate Commons Annotations {5.1.2.Final}
-2022-01-17 17:19:21.965  INFO 19692 --- [main] org.hibernate.dialect.Dialect            : HHH000400: Using dialect: org.hibernate.dialect.MySQL5InnoDBDialect
-2022-01-17 17:19:22.057  INFO 19692 --- [main] o.h.e.t.j.p.i.JtaPlatformInitiator       : HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform]
-2022-01-17 17:19:22.065  INFO 19692 --- [main] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default'
-2022-01-17 17:19:22.991  WARN 19692 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
-2022-01-17 17:19:23.277  INFO 19692 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9501 (http) with context path ''
-2022-01-17 17:19:23.289  INFO 19692 --- [main] imvSmartEartagDataAcquisitionApplication : Started HuimvSmartEartagDataAcquisitionApplication in 3.735 seconds (JVM running for 4.387)
-2022-01-17 17:19:26.343  INFO 19692 --- [http-nio-9501-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
-2022-01-17 17:19:26.343  INFO 19692 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
-2022-01-17 17:19:26.344  INFO 19692 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 1 ms
-2022-01-17 17:20:13.432  INFO 6196 --- [main] imvSmartEartagDataAcquisitionApplication : Starting HuimvSmartEartagDataAcquisitionApplication using Java 1.8.0_131 on WIN-309E4E288AM with PID 6196 (G:\idea\huimv\huimv.goldpig\huimv-goldpig\huimv-goldpig-anquisition\target\classes started by Administrator in G:\idea\huimv\huimv.goldpig\huimv-goldpig)
-2022-01-17 17:20:13.435  INFO 6196 --- [main] imvSmartEartagDataAcquisitionApplication : The following profiles are active: dev
-2022-01-17 17:20:14.149  INFO 6196 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data JPA repositories in DEFAULT mode.
-2022-01-17 17:20:14.170  INFO 6196 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 13 ms. Found 0 JPA repository interfaces.
-2022-01-17 17:20:14.554  INFO 6196 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9501 (http)
-2022-01-17 17:20:14.560  INFO 6196 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
-2022-01-17 17:20:14.560  INFO 6196 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.56]
-2022-01-17 17:20:14.635  INFO 6196 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
-2022-01-17 17:20:14.635  INFO 6196 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 1153 ms
-2022-01-17 17:20:14.737  INFO 6196 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
-2022-01-17 17:20:14.857  INFO 6196 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
-2022-01-17 17:20:14.928  INFO 6196 --- [main] o.hibernate.jpa.internal.util.LogHelper  : HHH000204: Processing PersistenceUnitInfo [name: default]
-2022-01-17 17:20:14.960  INFO 6196 --- [main] org.hibernate.Version                    : HHH000412: Hibernate ORM core version 5.6.3.Final
-2022-01-17 17:20:15.061  INFO 6196 --- [main] o.hibernate.annotations.common.Version   : HCANN000001: Hibernate Commons Annotations {5.1.2.Final}
-2022-01-17 17:20:15.132  INFO 6196 --- [main] org.hibernate.dialect.Dialect            : HHH000400: Using dialect: org.hibernate.dialect.MySQL5InnoDBDialect
-2022-01-17 17:20:15.227  INFO 6196 --- [main] o.h.e.t.j.p.i.JtaPlatformInitiator       : HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform]
-2022-01-17 17:20:15.233  INFO 6196 --- [main] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default'
-2022-01-17 17:20:16.125  WARN 6196 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
-2022-01-17 17:20:16.431  INFO 6196 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9501 (http) with context path ''
-2022-01-17 17:20:16.441  INFO 6196 --- [main] imvSmartEartagDataAcquisitionApplication : Started HuimvSmartEartagDataAcquisitionApplication in 3.671 seconds (JVM running for 4.292)
-2022-01-17 17:22:39.175  INFO 6196 --- [http-nio-9501-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
-2022-01-17 17:22:39.175  INFO 6196 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
-2022-01-17 17:22:39.176  INFO 6196 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 1 ms
-2022-01-17 17:28:29.030 ERROR 6196 --- [http-nio-9501-exec-17] c.h.a.result.RRExceptionHandler          : JSON parse error: Cannot deserialize value of type `java.util.Date` from String "2022-01-12T16:00:00.000Z": expected format "yyyy-MM-dd HH:mm:ss"; nested exception is com.fasterxml.jackson.databind.exc.InvalidFormatException: Cannot deserialize value of type `java.util.Date` from String "2022-01-12T16:00:00.000Z": expected format "yyyy-MM-dd HH:mm:ss"
- at [Source: (PushbackInputStream); line: 1, column: 36] (through reference chain: com.huimv.acquisition.entity.vo.EartagParamVo["starTime"])
-
-org.springframework.http.converter.HttpMessageNotReadableException: JSON parse error: Cannot deserialize value of type `java.util.Date` from String "2022-01-12T16:00:00.000Z": expected format "yyyy-MM-dd HH:mm:ss"; nested exception is com.fasterxml.jackson.databind.exc.InvalidFormatException: Cannot deserialize value of type `java.util.Date` from String "2022-01-12T16:00:00.000Z": expected format "yyyy-MM-dd HH:mm:ss"
- at [Source: (PushbackInputStream); line: 1, column: 36] (through reference chain: com.huimv.acquisition.entity.vo.EartagParamVo["starTime"])
-	at org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter.readJavaType(AbstractJackson2HttpMessageConverter.java:389)
-	at org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter.read(AbstractJackson2HttpMessageConverter.java:342)
-	at org.springframework.web.servlet.mvc.method.annotation.AbstractMessageConverterMethodArgumentResolver.readWithMessageConverters(AbstractMessageConverterMethodArgumentResolver.java:185)
-	at org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor.readWithMessageConverters(RequestResponseBodyMethodProcessor.java:160)
-	at org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor.resolveArgument(RequestResponseBodyMethodProcessor.java:133)
-	at org.springframework.web.method.support.HandlerMethodArgumentResolverComposite.resolveArgument(HandlerMethodArgumentResolverComposite.java:121)
-	at org.springframework.web.method.support.InvocableHandlerMethod.getMethodArgumentValues(InvocableHandlerMethod.java:179)
-	at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:146)
-	at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:117)
-	at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:895)
-	at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:808)
-	at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)
-	at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1067)
-	at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:963)
-	at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006)
-	at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:909)
-	at javax.servlet.http.HttpServlet.service(HttpServlet.java:681)
-	at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883)
-	at javax.servlet.http.HttpServlet.service(HttpServlet.java:764)
-	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:227)
-	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
-	at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)
-	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
-	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
-	at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100)
-	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
-	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
-	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
-	at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93)
-	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
-	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
-	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
-	at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201)
-	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
-	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
-	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
-	at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:197)
-	at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:97)
-	at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:540)
-	at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:135)
-	at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)
-	at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:78)
-	at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:357)
-	at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:382)
-	at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65)
-	at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:895)
-	at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1732)
-	at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
-	at org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1191)
-	at org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659)
-	at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
-	at java.lang.Thread.run(Thread.java:748)
-Caused by: com.fasterxml.jackson.databind.exc.InvalidFormatException: Cannot deserialize value of type `java.util.Date` from String "2022-01-12T16:00:00.000Z": expected format "yyyy-MM-dd HH:mm:ss"
- at [Source: (PushbackInputStream); line: 1, column: 36] (through reference chain: com.huimv.acquisition.entity.vo.EartagParamVo["starTime"])
-	at com.fasterxml.jackson.databind.exc.InvalidFormatException.from(InvalidFormatException.java:67)
-	at com.fasterxml.jackson.databind.DeserializationContext.weirdStringException(DeserializationContext.java:1991)
-	at com.fasterxml.jackson.databind.DeserializationContext.handleWeirdStringValue(DeserializationContext.java:1219)
-	at com.fasterxml.jackson.databind.deser.std.DateDeserializers$DateBasedDeserializer._parseDate(DateDeserializers.java:195)
-	at com.fasterxml.jackson.databind.deser.std.DateDeserializers$DateDeserializer.deserialize(DateDeserializers.java:303)
-	at com.fasterxml.jackson.databind.deser.std.DateDeserializers$DateDeserializer.deserialize(DateDeserializers.java:281)
-	at com.fasterxml.jackson.databind.deser.impl.MethodProperty.deserializeAndSet(MethodProperty.java:129)
-	at com.fasterxml.jackson.databind.deser.BeanDeserializer.deserializeFromObject(BeanDeserializer.java:391)
-	at com.fasterxml.jackson.databind.deser.BeanDeserializer.deserialize(BeanDeserializer.java:184)
-	at com.fasterxml.jackson.databind.deser.DefaultDeserializationContext.readRootValue(DefaultDeserializationContext.java:322)
-	at com.fasterxml.jackson.databind.ObjectMapper._readMapAndClose(ObjectMapper.java:4674)
-	at com.fasterxml.jackson.databind.ObjectMapper.readValue(ObjectMapper.java:3682)
-	at org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter.readJavaType(AbstractJackson2HttpMessageConverter.java:378)
-	... 51 common frames omitted
-
-2022-01-17 17:30:06.076 ERROR 6196 --- [http-nio-9501-exec-12] c.h.a.result.RRExceptionHandler          : JSON parse error: Cannot deserialize value of type `java.util.Date` from String "2022-01-03T16:00:00.000Z": expected format "yyyy-MM-dd HH:mm:ss"; nested exception is com.fasterxml.jackson.databind.exc.InvalidFormatException: Cannot deserialize value of type `java.util.Date` from String "2022-01-03T16:00:00.000Z": expected format "yyyy-MM-dd HH:mm:ss"
- at [Source: (PushbackInputStream); line: 1, column: 36] (through reference chain: com.huimv.acquisition.entity.vo.EartagParamVo["starTime"])
-
-org.springframework.http.converter.HttpMessageNotReadableException: JSON parse error: Cannot deserialize value of type `java.util.Date` from String "2022-01-03T16:00:00.000Z": expected format "yyyy-MM-dd HH:mm:ss"; nested exception is com.fasterxml.jackson.databind.exc.InvalidFormatException: Cannot deserialize value of type `java.util.Date` from String "2022-01-03T16:00:00.000Z": expected format "yyyy-MM-dd HH:mm:ss"
- at [Source: (PushbackInputStream); line: 1, column: 36] (through reference chain: com.huimv.acquisition.entity.vo.EartagParamVo["starTime"])
-	at org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter.readJavaType(AbstractJackson2HttpMessageConverter.java:389)
-	at org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter.read(AbstractJackson2HttpMessageConverter.java:342)
-	at org.springframework.web.servlet.mvc.method.annotation.AbstractMessageConverterMethodArgumentResolver.readWithMessageConverters(AbstractMessageConverterMethodArgumentResolver.java:185)
-	at org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor.readWithMessageConverters(RequestResponseBodyMethodProcessor.java:160)
-	at org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor.resolveArgument(RequestResponseBodyMethodProcessor.java:133)
-	at org.springframework.web.method.support.HandlerMethodArgumentResolverComposite.resolveArgument(HandlerMethodArgumentResolverComposite.java:121)
-	at org.springframework.web.method.support.InvocableHandlerMethod.getMethodArgumentValues(InvocableHandlerMethod.java:179)
-	at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:146)
-	at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:117)
-	at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:895)
-	at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:808)
-	at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)
-	at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1067)
-	at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:963)
-	at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006)
-	at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:909)
-	at javax.servlet.http.HttpServlet.service(HttpServlet.java:681)
-	at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883)
-	at javax.servlet.http.HttpServlet.service(HttpServlet.java:764)
-	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:227)
-	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
-	at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)
-	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
-	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
-	at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100)
-	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
-	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
-	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
-	at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93)
-	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
-	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
-	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
-	at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201)
-	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
-	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
-	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
-	at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:197)
-	at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:97)
-	at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:540)
-	at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:135)
-	at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)
-	at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:78)
-	at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:357)
-	at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:382)
-	at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65)
-	at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:895)
-	at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1732)
-	at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
-	at org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1191)
-	at org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659)
-	at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
-	at java.lang.Thread.run(Thread.java:748)
-Caused by: com.fasterxml.jackson.databind.exc.InvalidFormatException: Cannot deserialize value of type `java.util.Date` from String "2022-01-03T16:00:00.000Z": expected format "yyyy-MM-dd HH:mm:ss"
- at [Source: (PushbackInputStream); line: 1, column: 36] (through reference chain: com.huimv.acquisition.entity.vo.EartagParamVo["starTime"])
-	at com.fasterxml.jackson.databind.exc.InvalidFormatException.from(InvalidFormatException.java:67)
-	at com.fasterxml.jackson.databind.DeserializationContext.weirdStringException(DeserializationContext.java:1991)
-	at com.fasterxml.jackson.databind.DeserializationContext.handleWeirdStringValue(DeserializationContext.java:1219)
-	at com.fasterxml.jackson.databind.deser.std.DateDeserializers$DateBasedDeserializer._parseDate(DateDeserializers.java:195)
-	at com.fasterxml.jackson.databind.deser.std.DateDeserializers$DateDeserializer.deserialize(DateDeserializers.java:303)
-	at com.fasterxml.jackson.databind.deser.std.DateDeserializers$DateDeserializer.deserialize(DateDeserializers.java:281)
-	at com.fasterxml.jackson.databind.deser.impl.MethodProperty.deserializeAndSet(MethodProperty.java:129)
-	at com.fasterxml.jackson.databind.deser.BeanDeserializer.deserializeFromObject(BeanDeserializer.java:391)
-	at com.fasterxml.jackson.databind.deser.BeanDeserializer.deserialize(BeanDeserializer.java:184)
-	at com.fasterxml.jackson.databind.deser.DefaultDeserializationContext.readRootValue(DefaultDeserializationContext.java:322)
-	at com.fasterxml.jackson.databind.ObjectMapper._readMapAndClose(ObjectMapper.java:4674)
-	at com.fasterxml.jackson.databind.ObjectMapper.readValue(ObjectMapper.java:3682)
-	at org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter.readJavaType(AbstractJackson2HttpMessageConverter.java:378)
-	... 51 common frames omitted
-
-2022-01-17 17:47:05.007  INFO 16668 --- [main] imvSmartEartagDataAcquisitionApplication : Starting HuimvSmartEartagDataAcquisitionApplication using Java 1.8.0_131 on WIN-309E4E288AM with PID 16668 (G:\idea\huimv\huimv.goldpig\huimv-goldpig\huimv-goldpig-anquisition\target\classes started by Administrator in G:\idea\huimv\huimv.goldpig\huimv-goldpig)
-2022-01-17 17:47:05.009  INFO 16668 --- [main] imvSmartEartagDataAcquisitionApplication : The following profiles are active: dev
-2022-01-17 17:47:05.656  INFO 16668 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data JPA repositories in DEFAULT mode.
-2022-01-17 17:47:05.677  INFO 16668 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 13 ms. Found 0 JPA repository interfaces.
-2022-01-17 17:47:06.055  INFO 16668 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9501 (http)
-2022-01-17 17:47:06.061  INFO 16668 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
-2022-01-17 17:47:06.062  INFO 16668 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.56]
-2022-01-17 17:47:06.137  INFO 16668 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
-2022-01-17 17:47:06.137  INFO 16668 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 1085 ms
-2022-01-17 17:47:06.235  INFO 16668 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
-2022-01-17 17:47:06.340  INFO 16668 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
-2022-01-17 17:47:06.414  INFO 16668 --- [main] o.hibernate.jpa.internal.util.LogHelper  : HHH000204: Processing PersistenceUnitInfo [name: default]
-2022-01-17 17:47:06.446  INFO 16668 --- [main] org.hibernate.Version                    : HHH000412: Hibernate ORM core version 5.6.3.Final
-2022-01-17 17:47:06.551  INFO 16668 --- [main] o.hibernate.annotations.common.Version   : HCANN000001: Hibernate Commons Annotations {5.1.2.Final}
-2022-01-17 17:47:06.623  INFO 16668 --- [main] org.hibernate.dialect.Dialect            : HHH000400: Using dialect: org.hibernate.dialect.MySQL5InnoDBDialect
-2022-01-17 17:47:06.721  INFO 16668 --- [main] o.h.e.t.j.p.i.JtaPlatformInitiator       : HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform]
-2022-01-17 17:47:06.729  INFO 16668 --- [main] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default'
-2022-01-17 17:47:07.633  WARN 16668 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
-2022-01-17 17:47:07.927  INFO 16668 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9501 (http) with context path ''
-2022-01-17 17:47:07.938  INFO 16668 --- [main] imvSmartEartagDataAcquisitionApplication : Started HuimvSmartEartagDataAcquisitionApplication in 3.506 seconds (JVM running for 4.083)
-2022-01-17 17:47:30.774  INFO 20524 --- [main] imvSmartEartagDataAcquisitionApplication : Starting HuimvSmartEartagDataAcquisitionApplication using Java 1.8.0_131 on WIN-309E4E288AM with PID 20524 (G:\idea\huimv\huimv.goldpig\huimv-goldpig\huimv-goldpig-anquisition\target\classes started by Administrator in G:\idea\huimv\huimv.goldpig\huimv-goldpig)
-2022-01-17 17:47:30.777  INFO 20524 --- [main] imvSmartEartagDataAcquisitionApplication : The following profiles are active: dev
-2022-01-17 17:47:31.431  INFO 20524 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data JPA repositories in DEFAULT mode.
-2022-01-17 17:47:31.452  INFO 20524 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 13 ms. Found 0 JPA repository interfaces.
-2022-01-17 17:47:31.839  INFO 20524 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9501 (http)
-2022-01-17 17:47:31.846  INFO 20524 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
-2022-01-17 17:47:31.846  INFO 20524 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.56]
-2022-01-17 17:47:31.924  INFO 20524 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
-2022-01-17 17:47:31.924  INFO 20524 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 1105 ms
-2022-01-17 17:47:32.026  INFO 20524 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
-2022-01-17 17:47:32.124  INFO 20524 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
-2022-01-17 17:47:32.196  INFO 20524 --- [main] o.hibernate.jpa.internal.util.LogHelper  : HHH000204: Processing PersistenceUnitInfo [name: default]
-2022-01-17 17:47:32.226  INFO 20524 --- [main] org.hibernate.Version                    : HHH000412: Hibernate ORM core version 5.6.3.Final
-2022-01-17 17:47:32.327  INFO 20524 --- [main] o.hibernate.annotations.common.Version   : HCANN000001: Hibernate Commons Annotations {5.1.2.Final}
-2022-01-17 17:47:32.394  INFO 20524 --- [main] org.hibernate.dialect.Dialect            : HHH000400: Using dialect: org.hibernate.dialect.MySQL5InnoDBDialect
-2022-01-17 17:47:32.492  INFO 20524 --- [main] o.h.e.t.j.p.i.JtaPlatformInitiator       : HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform]
-2022-01-17 17:47:32.499  INFO 20524 --- [main] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default'
-2022-01-17 17:47:33.371  WARN 20524 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
-2022-01-17 17:47:33.646  INFO 20524 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9501 (http) with context path ''
-2022-01-17 17:47:33.657  INFO 20524 --- [main] imvSmartEartagDataAcquisitionApplication : Started HuimvSmartEartagDataAcquisitionApplication in 3.383 seconds (JVM running for 3.999)
+2022-01-19 09:17:42.645  INFO 4904 --- [main] imvSmartEartagDataAcquisitionApplication : Starting HuimvSmartEartagDataAcquisitionApplication using Java 1.8.0_131 on WIN-309E4E288AM with PID 4904 (G:\idea\huimv\huimv.goldpig\huimv-goldpig\huimv-goldpig-anquisition\target\classes started by Administrator in G:\idea\huimv\huimv.goldpig\huimv-goldpig)
+2022-01-19 09:17:42.648  INFO 4904 --- [main] imvSmartEartagDataAcquisitionApplication : The following profiles are active: dev
+2022-01-19 09:17:43.987  INFO 4904 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data JPA repositories in DEFAULT mode.
+2022-01-19 09:17:44.018  INFO 4904 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 14 ms. Found 0 JPA repository interfaces.
+2022-01-19 09:17:44.583  INFO 4904 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9501 (http)
+2022-01-19 09:17:44.590  INFO 4904 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2022-01-19 09:17:44.591  INFO 4904 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.56]
+2022-01-19 09:17:44.718  INFO 4904 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2022-01-19 09:17:44.719  INFO 4904 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 2029 ms
+2022-01-19 09:17:44.838  INFO 4904 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
+2022-01-19 09:17:45.074  INFO 4904 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
+2022-01-19 09:17:45.148  INFO 4904 --- [main] o.hibernate.jpa.internal.util.LogHelper  : HHH000204: Processing PersistenceUnitInfo [name: default]
+2022-01-19 09:17:45.195  INFO 4904 --- [main] org.hibernate.Version                    : HHH000412: Hibernate ORM core version 5.6.3.Final
+2022-01-19 09:17:45.361  INFO 4904 --- [main] o.hibernate.annotations.common.Version   : HCANN000001: Hibernate Commons Annotations {5.1.2.Final}
+2022-01-19 09:17:45.448  INFO 4904 --- [main] org.hibernate.dialect.Dialect            : HHH000400: Using dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+2022-01-19 09:17:45.559  INFO 4904 --- [main] o.h.e.t.j.p.i.JtaPlatformInitiator       : HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform]
+2022-01-19 09:17:45.567  INFO 4904 --- [main] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default'
+2022-01-19 09:17:46.557  WARN 4904 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
+2022-01-19 09:17:46.898  INFO 4904 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9501 (http) with context path ''
+2022-01-19 09:17:46.911  INFO 4904 --- [main] imvSmartEartagDataAcquisitionApplication : Started HuimvSmartEartagDataAcquisitionApplication in 4.809 seconds (JVM running for 5.507)
+2022-01-19 09:21:19.407  INFO 4904 --- [http-nio-9501-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2022-01-19 09:21:19.407  INFO 4904 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2022-01-19 09:21:19.408  INFO 4904 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 1 ms
+2022-01-19 14:22:22.012  INFO 24120 --- [main] imvSmartEartagDataAcquisitionApplication : Starting HuimvSmartEartagDataAcquisitionApplication using Java 1.8.0_131 on WIN-309E4E288AM with PID 24120 (G:\idea\huimv\huimv.goldpig\huimv-goldpig\huimv-goldpig-anquisition\target\classes started by Administrator in G:\idea\huimv\huimv.goldpig\huimv-goldpig)
+2022-01-19 14:22:22.015  INFO 24120 --- [main] imvSmartEartagDataAcquisitionApplication : The following profiles are active: dev
+2022-01-19 14:22:23.077  INFO 24120 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data JPA repositories in DEFAULT mode.
+2022-01-19 14:22:23.097  INFO 24120 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 13 ms. Found 0 JPA repository interfaces.
+2022-01-19 14:22:23.492  INFO 24120 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9501 (http)
+2022-01-19 14:22:23.500  INFO 24120 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2022-01-19 14:22:23.501  INFO 24120 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.56]
+2022-01-19 14:22:23.583  INFO 24120 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2022-01-19 14:22:23.584  INFO 24120 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 1500 ms
+2022-01-19 14:22:23.689  INFO 24120 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
+2022-01-19 14:22:23.941  INFO 24120 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
+2022-01-19 14:22:24.041  INFO 24120 --- [main] o.hibernate.jpa.internal.util.LogHelper  : HHH000204: Processing PersistenceUnitInfo [name: default]
+2022-01-19 14:22:24.084  INFO 24120 --- [main] org.hibernate.Version                    : HHH000412: Hibernate ORM core version 5.6.3.Final
+2022-01-19 14:22:24.192  INFO 24120 --- [main] o.hibernate.annotations.common.Version   : HCANN000001: Hibernate Commons Annotations {5.1.2.Final}
+2022-01-19 14:22:24.292  INFO 24120 --- [main] org.hibernate.dialect.Dialect            : HHH000400: Using dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+2022-01-19 14:22:24.416  INFO 24120 --- [main] o.h.e.t.j.p.i.JtaPlatformInitiator       : HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform]
+2022-01-19 14:22:24.426  INFO 24120 --- [main] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default'
+2022-01-19 14:22:25.355  WARN 24120 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
+2022-01-19 14:22:25.631  INFO 24120 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9501 (http) with context path ''
+2022-01-19 14:22:25.642  INFO 24120 --- [main] imvSmartEartagDataAcquisitionApplication : Started HuimvSmartEartagDataAcquisitionApplication in 4.184 seconds (JVM running for 4.757)
+2022-01-19 20:01:11.669  INFO 24120 --- [http-nio-9501-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2022-01-19 20:01:11.686  INFO 24120 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2022-01-19 20:01:11.742  INFO 24120 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 55 ms

huimv-goldpig/app-log/total/log-total-2022-01-18.0.log

@@ -0,0 +1,158 @@
+2022-01-18 09:14:14.614  INFO 6708 --- [main] imvSmartEartagDataAcquisitionApplication : Starting HuimvSmartEartagDataAcquisitionApplication using Java 1.8.0_131 on WIN-309E4E288AM with PID 6708 (G:\idea\huimv\huimv.goldpig\huimv-goldpig\huimv-goldpig-anquisition\target\classes started by Administrator in G:\idea\huimv\huimv.goldpig\huimv-goldpig)
+2022-01-18 09:14:14.620  INFO 6708 --- [main] imvSmartEartagDataAcquisitionApplication : The following profiles are active: dev
+2022-01-18 09:14:15.487  INFO 6708 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data JPA repositories in DEFAULT mode.
+2022-01-18 09:14:15.510  INFO 6708 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 15 ms. Found 0 JPA repository interfaces.
+2022-01-18 09:14:15.899  INFO 6708 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9501 (http)
+2022-01-18 09:14:15.908  INFO 6708 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2022-01-18 09:14:15.908  INFO 6708 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.56]
+2022-01-18 09:14:15.974  INFO 6708 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2022-01-18 09:14:15.974  INFO 6708 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 1307 ms
+2022-01-18 09:14:16.077  INFO 6708 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
+2022-01-18 09:14:16.235  INFO 6708 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
+2022-01-18 09:14:16.312  INFO 6708 --- [main] o.hibernate.jpa.internal.util.LogHelper  : HHH000204: Processing PersistenceUnitInfo [name: default]
+2022-01-18 09:14:16.349  INFO 6708 --- [main] org.hibernate.Version                    : HHH000412: Hibernate ORM core version 5.6.3.Final
+2022-01-18 09:14:16.465  INFO 6708 --- [main] o.hibernate.annotations.common.Version   : HCANN000001: Hibernate Commons Annotations {5.1.2.Final}
+2022-01-18 09:14:16.545  INFO 6708 --- [main] org.hibernate.dialect.Dialect            : HHH000400: Using dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+2022-01-18 09:14:16.639  INFO 6708 --- [main] o.h.e.t.j.p.i.JtaPlatformInitiator       : HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform]
+2022-01-18 09:14:16.646  INFO 6708 --- [main] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default'
+2022-01-18 09:14:17.938  WARN 6708 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
+2022-01-18 09:14:18.238  INFO 6708 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9501 (http) with context path ''
+2022-01-18 09:14:18.248  INFO 6708 --- [main] imvSmartEartagDataAcquisitionApplication : Started HuimvSmartEartagDataAcquisitionApplication in 4.512 seconds (JVM running for 5.162)
+2022-01-18 09:14:26.550  INFO 6708 --- [http-nio-9501-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2022-01-18 09:14:26.550  INFO 6708 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2022-01-18 09:14:26.551  INFO 6708 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 1 ms
+2022-01-18 09:15:08.682  INFO 20936 --- [main] imvSmartEartagDataAcquisitionApplication : Starting HuimvSmartEartagDataAcquisitionApplication using Java 1.8.0_131 on WIN-309E4E288AM with PID 20936 (G:\idea\huimv\huimv.goldpig\huimv-goldpig\huimv-goldpig-anquisition\target\classes started by Administrator in G:\idea\huimv\huimv.goldpig\huimv-goldpig)
+2022-01-18 09:15:08.685  INFO 20936 --- [main] imvSmartEartagDataAcquisitionApplication : The following profiles are active: dev
+2022-01-18 09:15:09.469  INFO 20936 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data JPA repositories in DEFAULT mode.
+2022-01-18 09:15:09.491  INFO 20936 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 14 ms. Found 0 JPA repository interfaces.
+2022-01-18 09:15:09.883  INFO 20936 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9501 (http)
+2022-01-18 09:15:09.890  INFO 20936 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2022-01-18 09:15:09.891  INFO 20936 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.56]
+2022-01-18 09:15:09.961  INFO 20936 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2022-01-18 09:15:09.961  INFO 20936 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 1215 ms
+2022-01-18 09:15:10.067  INFO 20936 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
+2022-01-18 09:15:10.179  INFO 20936 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
+2022-01-18 09:15:10.253  INFO 20936 --- [main] o.hibernate.jpa.internal.util.LogHelper  : HHH000204: Processing PersistenceUnitInfo [name: default]
+2022-01-18 09:15:10.283  INFO 20936 --- [main] org.hibernate.Version                    : HHH000412: Hibernate ORM core version 5.6.3.Final
+2022-01-18 09:15:10.382  INFO 20936 --- [main] o.hibernate.annotations.common.Version   : HCANN000001: Hibernate Commons Annotations {5.1.2.Final}
+2022-01-18 09:15:10.451  INFO 20936 --- [main] org.hibernate.dialect.Dialect            : HHH000400: Using dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+2022-01-18 09:15:10.548  INFO 20936 --- [main] o.h.e.t.j.p.i.JtaPlatformInitiator       : HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform]
+2022-01-18 09:15:10.555  INFO 20936 --- [main] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default'
+2022-01-18 09:15:11.432  WARN 20936 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
+2022-01-18 09:15:11.706  INFO 20936 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9501 (http) with context path ''
+2022-01-18 09:15:11.715  INFO 20936 --- [main] imvSmartEartagDataAcquisitionApplication : Started HuimvSmartEartagDataAcquisitionApplication in 3.785 seconds (JVM running for 4.597)
+2022-01-18 09:15:11.998  INFO 20936 --- [http-nio-9501-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2022-01-18 09:15:11.998  INFO 20936 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2022-01-18 09:15:11.999  INFO 20936 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 1 ms
+2022-01-18 15:04:23.809  INFO 4668 --- [main] imvSmartEartagDataAcquisitionApplication : Starting HuimvSmartEartagDataAcquisitionApplication using Java 1.8.0_131 on WIN-309E4E288AM with PID 4668 (G:\idea\huimv\huimv.goldpig\huimv-goldpig\huimv-goldpig-anquisition\target\classes started by Administrator in G:\idea\huimv\huimv.goldpig\huimv-goldpig)
+2022-01-18 15:04:23.811  INFO 4668 --- [main] imvSmartEartagDataAcquisitionApplication : The following profiles are active: dev
+2022-01-18 15:04:25.236  INFO 4668 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data JPA repositories in DEFAULT mode.
+2022-01-18 15:04:25.268  INFO 4668 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 12 ms. Found 0 JPA repository interfaces.
+2022-01-18 15:04:25.746  INFO 4668 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9501 (http)
+2022-01-18 15:04:25.753  INFO 4668 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2022-01-18 15:04:25.753  INFO 4668 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.56]
+2022-01-18 15:04:25.831  INFO 4668 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2022-01-18 15:04:25.831  INFO 4668 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 1949 ms
+2022-01-18 15:04:26.020  INFO 4668 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
+2022-01-18 15:04:26.142  INFO 4668 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
+2022-01-18 15:04:26.282  INFO 4668 --- [main] o.hibernate.jpa.internal.util.LogHelper  : HHH000204: Processing PersistenceUnitInfo [name: default]
+2022-01-18 15:04:26.373  INFO 4668 --- [main] org.hibernate.Version                    : HHH000412: Hibernate ORM core version 5.6.3.Final
+2022-01-18 15:04:26.484  INFO 4668 --- [main] o.hibernate.annotations.common.Version   : HCANN000001: Hibernate Commons Annotations {5.1.2.Final}
+2022-01-18 15:04:26.570  INFO 4668 --- [main] org.hibernate.dialect.Dialect            : HHH000400: Using dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+2022-01-18 15:04:26.676  INFO 4668 --- [main] o.h.e.t.j.p.i.JtaPlatformInitiator       : HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform]
+2022-01-18 15:04:26.683  INFO 4668 --- [main] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default'
+2022-01-18 15:04:27.586  WARN 4668 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
+2022-01-18 15:04:27.923  INFO 4668 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9501 (http) with context path ''
+2022-01-18 15:04:27.933  INFO 4668 --- [main] imvSmartEartagDataAcquisitionApplication : Started HuimvSmartEartagDataAcquisitionApplication in 5.156 seconds (JVM running for 6.73)
+2022-01-18 15:31:43.685  INFO 4668 --- [http-nio-9501-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2022-01-18 15:31:43.685  INFO 4668 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2022-01-18 15:31:43.687  INFO 4668 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 2 ms
+2022-01-18 15:32:12.265  INFO 17924 --- [main] imvSmartEartagDataAcquisitionApplication : Starting HuimvSmartEartagDataAcquisitionApplication using Java 1.8.0_131 on WIN-309E4E288AM with PID 17924 (G:\idea\huimv\huimv.goldpig\huimv-goldpig\huimv-goldpig-anquisition\target\classes started by Administrator in G:\idea\huimv\huimv.goldpig\huimv-goldpig)
+2022-01-18 15:32:12.270  INFO 17924 --- [main] imvSmartEartagDataAcquisitionApplication : The following profiles are active: dev
+2022-01-18 15:32:13.350  INFO 17924 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data JPA repositories in DEFAULT mode.
+2022-01-18 15:32:13.373  INFO 17924 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 15 ms. Found 0 JPA repository interfaces.
+2022-01-18 15:32:13.975  INFO 17924 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9501 (http)
+2022-01-18 15:32:13.981  INFO 17924 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2022-01-18 15:32:13.982  INFO 17924 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.56]
+2022-01-18 15:32:14.069  INFO 17924 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2022-01-18 15:32:14.070  INFO 17924 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 1745 ms
+2022-01-18 15:32:14.221  INFO 17924 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
+2022-01-18 15:32:14.362  INFO 17924 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
+2022-01-18 15:32:14.492  INFO 17924 --- [main] o.hibernate.jpa.internal.util.LogHelper  : HHH000204: Processing PersistenceUnitInfo [name: default]
+2022-01-18 15:32:14.593  INFO 17924 --- [main] org.hibernate.Version                    : HHH000412: Hibernate ORM core version 5.6.3.Final
+2022-01-18 15:32:14.850  INFO 17924 --- [main] o.hibernate.annotations.common.Version   : HCANN000001: Hibernate Commons Annotations {5.1.2.Final}
+2022-01-18 15:32:15.001  INFO 17924 --- [main] org.hibernate.dialect.Dialect            : HHH000400: Using dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+2022-01-18 15:32:15.154  INFO 17924 --- [main] o.h.e.t.j.p.i.JtaPlatformInitiator       : HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform]
+2022-01-18 15:32:15.165  INFO 17924 --- [main] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default'
+2022-01-18 15:32:16.319  WARN 17924 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
+2022-01-18 15:32:16.661  INFO 17924 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9501 (http) with context path ''
+2022-01-18 15:32:16.673  INFO 17924 --- [main] imvSmartEartagDataAcquisitionApplication : Started HuimvSmartEartagDataAcquisitionApplication in 5.1 seconds (JVM running for 5.912)
+2022-01-18 15:33:02.043  INFO 17924 --- [http-nio-9501-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2022-01-18 15:33:02.043  INFO 17924 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2022-01-18 15:33:02.044  INFO 17924 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 1 ms
+2022-01-18 15:48:34.354  INFO 19792 --- [main] imvSmartEartagDataAcquisitionApplication : Starting HuimvSmartEartagDataAcquisitionApplication using Java 1.8.0_131 on WIN-309E4E288AM with PID 19792 (G:\idea\huimv\huimv.goldpig\huimv-goldpig\huimv-goldpig-anquisition\target\classes started by Administrator in G:\idea\huimv\huimv.goldpig\huimv-goldpig)
+2022-01-18 15:48:34.357  INFO 19792 --- [main] imvSmartEartagDataAcquisitionApplication : The following profiles are active: dev
+2022-01-18 15:48:35.097  INFO 19792 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data JPA repositories in DEFAULT mode.
+2022-01-18 15:48:35.120  INFO 19792 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 14 ms. Found 0 JPA repository interfaces.
+2022-01-18 15:48:35.759  INFO 19792 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9501 (http)
+2022-01-18 15:48:35.770  INFO 19792 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2022-01-18 15:48:35.770  INFO 19792 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.56]
+2022-01-18 15:48:36.075  INFO 19792 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2022-01-18 15:48:36.075  INFO 19792 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 1672 ms
+2022-01-18 15:48:36.462  INFO 19792 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
+2022-01-18 15:48:36.613  INFO 19792 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
+2022-01-18 15:48:36.699  INFO 19792 --- [main] o.hibernate.jpa.internal.util.LogHelper  : HHH000204: Processing PersistenceUnitInfo [name: default]
+2022-01-18 15:48:36.739  INFO 19792 --- [main] org.hibernate.Version                    : HHH000412: Hibernate ORM core version 5.6.3.Final
+2022-01-18 15:48:36.862  INFO 19792 --- [main] o.hibernate.annotations.common.Version   : HCANN000001: Hibernate Commons Annotations {5.1.2.Final}
+2022-01-18 15:48:36.941  INFO 19792 --- [main] org.hibernate.dialect.Dialect            : HHH000400: Using dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+2022-01-18 15:48:37.051  INFO 19792 --- [main] o.h.e.t.j.p.i.JtaPlatformInitiator       : HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform]
+2022-01-18 15:48:37.059  INFO 19792 --- [main] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default'
+2022-01-18 15:48:38.104  WARN 19792 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
+2022-01-18 15:48:38.429  INFO 19792 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9501 (http) with context path ''
+2022-01-18 15:48:38.439  INFO 19792 --- [main] imvSmartEartagDataAcquisitionApplication : Started HuimvSmartEartagDataAcquisitionApplication in 4.759 seconds (JVM running for 5.514)
+2022-01-18 15:48:48.612  INFO 22276 --- [main] imvSmartEartagDataAcquisitionApplication : Starting HuimvSmartEartagDataAcquisitionApplication using Java 1.8.0_131 on WIN-309E4E288AM with PID 22276 (G:\idea\huimv\huimv.goldpig\huimv-goldpig\huimv-goldpig-anquisition\target\classes started by Administrator in G:\idea\huimv\huimv.goldpig\huimv-goldpig)
+2022-01-18 15:48:48.615  INFO 22276 --- [main] imvSmartEartagDataAcquisitionApplication : The following profiles are active: dev
+2022-01-18 15:48:49.314  INFO 22276 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data JPA repositories in DEFAULT mode.
+2022-01-18 15:48:49.341  INFO 22276 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 18 ms. Found 0 JPA repository interfaces.
+2022-01-18 15:48:49.778  INFO 22276 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9501 (http)
+2022-01-18 15:48:49.785  INFO 22276 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2022-01-18 15:48:49.785  INFO 22276 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.56]
+2022-01-18 15:48:49.865  INFO 22276 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2022-01-18 15:48:49.866  INFO 22276 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 1209 ms
+2022-01-18 15:48:49.981  INFO 22276 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
+2022-01-18 15:48:50.114  INFO 22276 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
+2022-01-18 15:48:50.196  INFO 22276 --- [main] o.hibernate.jpa.internal.util.LogHelper  : HHH000204: Processing PersistenceUnitInfo [name: default]
+2022-01-18 15:48:50.231  INFO 22276 --- [main] org.hibernate.Version                    : HHH000412: Hibernate ORM core version 5.6.3.Final
+2022-01-18 15:48:50.336  INFO 22276 --- [main] o.hibernate.annotations.common.Version   : HCANN000001: Hibernate Commons Annotations {5.1.2.Final}
+2022-01-18 15:48:50.420  INFO 22276 --- [main] org.hibernate.dialect.Dialect            : HHH000400: Using dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+2022-01-18 15:48:50.529  INFO 22276 --- [main] o.h.e.t.j.p.i.JtaPlatformInitiator       : HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform]
+2022-01-18 15:48:50.540  INFO 22276 --- [main] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default'
+2022-01-18 15:48:51.599  WARN 22276 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
+2022-01-18 15:48:51.924  INFO 22276 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9501 (http) with context path ''
+2022-01-18 15:48:51.938  INFO 22276 --- [main] imvSmartEartagDataAcquisitionApplication : Started HuimvSmartEartagDataAcquisitionApplication in 3.929 seconds (JVM running for 4.662)
+2022-01-18 15:50:41.218  INFO 22276 --- [http-nio-9501-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2022-01-18 15:50:41.218  INFO 22276 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2022-01-18 15:50:41.219  INFO 22276 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 1 ms
+2022-01-18 16:11:58.564  INFO 10232 --- [main] imvSmartEartagDataAcquisitionApplication : Starting HuimvSmartEartagDataAcquisitionApplication using Java 1.8.0_131 on WIN-309E4E288AM with PID 10232 (G:\idea\huimv\huimv.goldpig\huimv-goldpig\huimv-goldpig-anquisition\target\classes started by Administrator in G:\idea\huimv\huimv.goldpig\huimv-goldpig)
+2022-01-18 16:11:58.566  INFO 10232 --- [main] imvSmartEartagDataAcquisitionApplication : The following profiles are active: dev
+2022-01-18 16:11:59.288  INFO 10232 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data JPA repositories in DEFAULT mode.
+2022-01-18 16:11:59.310  INFO 10232 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 14 ms. Found 0 JPA repository interfaces.
+2022-01-18 16:11:59.744  INFO 10232 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9501 (http)
+2022-01-18 16:11:59.752  INFO 10232 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2022-01-18 16:11:59.752  INFO 10232 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.56]
+2022-01-18 16:11:59.826  INFO 10232 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2022-01-18 16:11:59.827  INFO 10232 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 1205 ms
+2022-01-18 16:11:59.934  INFO 10232 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
+2022-01-18 16:12:00.212  INFO 10232 --- [main] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
+2022-01-18 16:12:00.293  INFO 10232 --- [main] o.hibernate.jpa.internal.util.LogHelper  : HHH000204: Processing PersistenceUnitInfo [name: default]
+2022-01-18 16:12:00.329  INFO 10232 --- [main] org.hibernate.Version                    : HHH000412: Hibernate ORM core version 5.6.3.Final
+2022-01-18 16:12:00.432  INFO 10232 --- [main] o.hibernate.annotations.common.Version   : HCANN000001: Hibernate Commons Annotations {5.1.2.Final}
+2022-01-18 16:12:00.514  INFO 10232 --- [main] org.hibernate.dialect.Dialect            : HHH000400: Using dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+2022-01-18 16:12:00.624  INFO 10232 --- [main] o.h.e.t.j.p.i.JtaPlatformInitiator       : HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform]
+2022-01-18 16:12:00.632  INFO 10232 --- [main] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default'
+2022-01-18 16:12:01.610  WARN 10232 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
+2022-01-18 16:12:01.921  INFO 10232 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9501 (http) with context path ''
+2022-01-18 16:12:01.932  INFO 10232 --- [main] imvSmartEartagDataAcquisitionApplication : Started HuimvSmartEartagDataAcquisitionApplication in 3.899 seconds (JVM running for 4.571)
+2022-01-18 17:52:04.380  INFO 10232 --- [http-nio-9501-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2022-01-18 17:52:04.382  INFO 10232 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2022-01-18 17:52:04.396  INFO 10232 --- [http-nio-9501-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 13 ms

huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/controller/BasePigpenController.java

@@ -20,7 +20,7 @@
  */
 @RestController
 @RequestMapping("management/basepigpen")
-@CrossOrigin
+
 public class BasePigpenController {
     @Autowired
     private BasePigpenService basePigpenService;

huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/controller/CollectorRegisterController.java

@@ -20,7 +20,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("management/collectorregister")
-@CrossOrigin
+
 public class CollectorRegisterController {
     @Autowired
     private CollectorRegisterService collectorRegisterService;

huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/controller/DeviceTempController.java

@@ -19,7 +19,7 @@
  */
 @RestController
 @RequestMapping("management/devicetemp")
-@CrossOrigin
+
 public class DeviceTempController {
     @Autowired
     private DeviceTempService deviceTempService;

huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/controller/EartagDataController.java

@@ -20,6 +20,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("manager/eartagdata")
+
 public class EartagDataController {
     @Autowired
     private EartagDataService eartagDataService;

huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/controller/EartagRegisterController.java

@@ -20,7 +20,7 @@
  */
 @RestController
 @RequestMapping("management/eartagregister")
-@CrossOrigin
+
 public class EartagRegisterController {
     @Autowired
     private EartagRegisterService eartagRegisterService;

huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/controller/MovePigpenController.java

@@ -20,7 +20,7 @@
  */
 @RestController
 @RequestMapping("management/movepigpen")
-@CrossOrigin
+
 public class MovePigpenController {
     @Autowired
     private MovePigpenService movePigpenService;

huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/controller/SowRankTableController.java

@@ -18,7 +18,7 @@
   * @version ${version}
   * @date 2021-08-04 17:47:18
   */
- @CrossOrigin
+
 @RestController
 @RequestMapping("management/sowranktable")
 public class SowRankTableController {

huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/controller/StockRankController.java

@@ -21,7 +21,7 @@ import java.util.Map;
 //存栏排名的接口
 @RestController
 @RequestMapping("manager/rank")
-@CrossOrigin
+
 public class StockRankController {
 
 

huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/service/impl/EartagDataServiceImpl.java

@@ -98,13 +98,15 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
         List<Integer> electricList = new ArrayList<>();
         List<Double> environmentTempList = new ArrayList<>();
         List<Object> averangeTemp = new ArrayList<>();
-        List<Integer> exerciseList = new ArrayList<>();
+        List<Object> exerciseList = new ArrayList<>();
+
         DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         for (EartagDataEntity eartagDataEntity : eartagDataEntities) {
             timeList.add( fmt.format(eartagDataEntity.getTime() ));
             earTempList.add( eartagDataEntity.getEarTemp()  );
-            electricList.add(eartagDataEntity.getExercise());
+            electricList.add(eartagDataEntity.getBat());
+            exerciseList.add(eartagDataEntity.getExercise());
             environmentTempList.add(eartagDataEntity.getEnvTemp());
             sportsList.add(eartagDataEntity.getExercise());
         }
@@ -112,8 +114,9 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
         resultMap.put("earTempList",earTempList);
         resultMap.put("electricList",electricList);
         resultMap.put("environmentTempList",environmentTempList);
-        resultMap.put("sportsList",sportsList);
         resultMap.put("exerciseList",exerciseList);
+
+        resultMap.put("sportsList",sportsList);
         return resultMap;
 
     }

huimv-goldpig/huimv-goldpig-anquisition/src/main/resources/application-dev.yml

@@ -2,7 +2,8 @@ server:
   port: 9501
 spring:
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-goldpig?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://192.168.1.7:3306/huimv-goldpig?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://122.112.224.199:3306/huimv-eartag-cloud?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/service/impl/BasePigpenServiceImpl.java

@@ -13,6 +13,7 @@ import com.huimv.eartag.entity.dto.BasePigpenDto;
 import com.huimv.eartag.mapper.BaseFarmInfoMapper;
 import com.huimv.eartag.mapper.BasePigpenMapper;
 import com.huimv.eartag.service.IBasePigpenService;
+import com.sun.istack.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -79,25 +80,47 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
     @Override
     public Result pageAll(Map map) {
 
-        String searchName = (String) map.get("searchName");
+        String pigpenName = (String) map.get("pigpenName");
         Integer farmId = (Integer)map.get("farmId");
 
         QueryWrapper<BasePigpen> wrapper = new QueryWrapper<>();
 
-        wrapper.like(StringUtils.isNotBlank(searchName),"pigpen_name",searchName);
-        wrapper.eq("farm_id",farmId);
+        wrapper.like(StringUtils.isNotBlank(pigpenName),"pigpen_name",pigpenName);
+        if(farmId != null){
+            wrapper.eq("farm_id",farmId);
+        }else {
+            return new Result(10001,"请选择牧场",false);
+        }
+
 
         List<BasePigpen> list = this.list(wrapper);
 
         List<BasePigpenDto> basePigpenDtos = BeanUtil.copyToList(list, BasePigpenDto.class);
+        List<BasePigpenDto> parentBasePigpenDtos = new ArrayList<>();
+        //拿到顶级id
+        for (BasePigpenDto basePigpenDto : basePigpenDtos) {
+            long count = basePigpenDtos.stream()
+                    .filter(o -> o.getId().equals(basePigpenDto.getParentId())).count();
+            if (count == 0){
+                parentBasePigpenDtos.add(basePigpenDto);
+            }
+        }
+
 
+        //添加爷爷级id
         basePigpenDtos.stream().filter(o -> o.getType().equals(3))
                 .forEach(o -> o.setGrandId(getGrandId(o.getParentId(), basePigpenDtos)));
 
 
-        List<BasePigpenDto> collect = basePigpenDtos.stream().filter(o -> o.getParentId() == 0)
-                .peek(o -> o.setChildren(getChildBasePigpenList(o, basePigpenDtos)))
+        //树形结构
+        List<BasePigpenDto> collect = parentBasePigpenDtos.stream()
+                .peek(o ->o.setChildren(getChildBasePigpenList(o,basePigpenDtos)))
                 .collect(Collectors.toList());
+//        List<BasePigpenDto> collect = basePigpenDtos.stream().filter(o -> o.getParentId() == 0)
+//                .peek(o -> o.setChildren(getChildBasePigpenList(o, basePigpenDtos)))
+//                .collect(Collectors.toList());
+
+
 
 
         Map map1 = new HashMap();
@@ -105,6 +128,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         return new Result(ResultCode.SUCCESS,map1);
     }
 
+    @NotNull
     private Integer getGrandId(Integer parentId, List<BasePigpenDto> basePigpenDtos) {
         List<BasePigpenDto> collect = basePigpenDtos.stream().filter(o -> o.getId().equals(parentId))
                 .collect(Collectors.toList());