Bladeren bron

Merge branch 'master' of http://114.135.61.188:53000/UIMS/Code

wangli 4 jaren geleden
bovenliggende
commit
cf974e7545
23 gewijzigde bestanden met toevoegingen van 595 en 156 verwijderingen
  1. 246 0
      logs/sms-water/smartcity-user.2021-01-20.0.log
  2. 80 0
      logs/user-auth/smartcity-user.2021-01-20.0.log
  3. 95 0
      logs/user-center/smartcity-user.2021-01-20.0.log
  4. 53 23
      operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java
  5. 1 1
      operation_manager/src/main/java/com/huaxu/order/dao/WorkOrderManageMapper.java
  6. 13 6
      operation_manager/src/main/java/com/huaxu/order/dto/WorkOrderManageDto.java
  7. 5 5
      operation_manager/src/main/java/com/huaxu/order/entity/WorkOrderInfo.java
  8. 1 1
      operation_manager/src/main/java/com/huaxu/order/service/WorkOrderManageService.java
  9. 1 1
      operation_manager/src/main/java/com/huaxu/order/service/impl/WorkOrderManageServiceImpl.java
  10. 52 77
      operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java
  11. 1 1
      operation_manager/src/main/java/com/huaxu/task/dao/PlanManageMapper.java
  12. 15 2
      operation_manager/src/main/java/com/huaxu/task/dto/PlanManageDto.java
  13. 5 5
      operation_manager/src/main/java/com/huaxu/task/entity/TaskManage.java
  14. 1 1
      operation_manager/src/main/java/com/huaxu/task/service/PlanManageService.java
  15. 1 1
      operation_manager/src/main/java/com/huaxu/task/service/impl/PlanManageServiceImpl.java
  16. 1 1
      operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml
  17. 1 1
      operation_manager/src/main/resources/mapper/task/PlanManageMapper.xml
  18. 6 14
      sms_water/src/main/java/com/huaxu/service/SecSupplyService.java
  19. 4 4
      sms_water/src/main/resources/mapper/DayReportMapper.xml
  20. 1 1
      sms_water/src/main/resources/mapper/DeviceParmMapper.xml
  21. 7 6
      sms_water/src/main/resources/mapper/MonthReportMapper.xml
  22. 4 4
      sms_water/src/main/resources/mapper/YearReportMapper.xml
  23. 1 1
      user_center/src/main/resources/mapper/MenuMapper.xml

+ 246 - 0
logs/sms-water/smartcity-user.2021-01-20.0.log

@@ -0,0 +1,246 @@
+2021-01-20 11:10:50.239  INFO 18092 --- [main] com.huaxu.SmsWaterApplication            : The following profiles are active: dev
+2021-01-20 11:10:51.444  WARN 18092 --- [main] o.s.boot.actuate.endpoint.EndpointId     : Endpoint ID 'nacos-discovery' contains invalid characters, please migrate to a valid format.
+2021-01-20 11:10:51.652  INFO 18092 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2021-01-20 11:10:51.653  INFO 18092 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data repositories in DEFAULT mode.
+2021-01-20 11:10:51.726  INFO 18092 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 68ms. Found 0 repository interfaces.
+2021-01-20 11:10:51.735  INFO 18092 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2021-01-20 11:10:51.736  INFO 18092 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data repositories in DEFAULT mode.
+2021-01-20 11:10:51.790  INFO 18092 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 47ms. Found 0 repository interfaces.
+2021-01-20 11:10:51.888  WARN 18092 --- [main] o.s.boot.actuate.endpoint.EndpointId     : Endpoint ID 'service-registry' contains invalid characters, please migrate to a valid format.
+2021-01-20 11:10:52.154  INFO 18092 --- [main] o.s.cloud.context.scope.GenericScope     : BeanFactory id=ea188dde-1fed-3be0-b936-45ee41bf824f
+2021-01-20 11:10:52.274  INFO 18092 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$f7374912] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2021-01-20 11:10:52.439  INFO 18092 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$13514c0f] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2021-01-20 11:10:52.708  INFO 18092 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 8324 (http)
+2021-01-20 11:10:52.729  INFO 18092 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2021-01-20 11:10:52.729  INFO 18092 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.21]
+2021-01-20 11:10:52.908  INFO 18092 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2021-01-20 11:10:52.909  INFO 18092 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 2658 ms
+2021-01-20 11:10:54.180  INFO 18092 --- [main] org.mongodb.driver.cluster               : Cluster created with settings {hosts=[114.135.61.188:17017], mode=SINGLE, requiredClusterType=UNKNOWN, serverSelectionTimeout='30000 ms', maxWaitQueueSize=500}
+2021-01-20 11:10:54.373  INFO 18092 --- [cluster-ClusterId{value='60079f3e23695246ac47bbf5', description='null'}-114.135.61.188:17017] org.mongodb.driver.connection            : Opened connection [connectionId{localValue:1}] to 114.135.61.188:17017
+2021-01-20 11:10:54.410  INFO 18092 --- [cluster-ClusterId{value='60079f3e23695246ac47bbf5', 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=35706700}
+2021-01-20 11:10:54.449 DEBUG 18092 --- [main] .m.c.i.MongoPersistentEntityIndexCreator : Analyzing class class com.huaxu.entity.MonitorDataValueEntity for index information.
+2021-01-20 11:10:54.449 DEBUG 18092 --- [main] .m.c.i.MongoPersistentEntityIndexCreator : Analyzing class class com.huaxu.entity.MonitorDataEntity for index information.
+2021-01-20 11:10:56.022  WARN 18092 --- [Thread-9] com.zaxxer.hikari.HikariConfig           : HikariPool-1 - idleTimeout is close to or more than maxLifetime, disabling it.
+2021-01-20 11:10:56.023  INFO 18092 --- [Thread-9] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
+2021-01-20 11:10:56.731  INFO 18092 --- [Thread-9] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
+2021-01-20 11:10:57.022  INFO 18092 --- [main] org.quartz.impl.StdSchedulerFactory      : Using default implementation for ThreadExecutor
+2021-01-20 11:10:57.025  INFO 18092 --- [main] org.quartz.simpl.SimpleThreadPool        : Job execution threads will use class loader of thread: main
+2021-01-20 11:10:57.034  INFO 18092 --- [main] org.quartz.core.SchedulerSignalerImpl    : Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl
+2021-01-20 11:10:57.034  INFO 18092 --- [main] org.quartz.core.QuartzScheduler          : Quartz Scheduler v.2.3.1 created.
+2021-01-20 11:10:57.038  INFO 18092 --- [main] o.s.s.quartz.LocalDataSourceJobStore     : Using db table-based data access locking (synchronization).
+2021-01-20 11:10:57.040  INFO 18092 --- [main] o.s.s.quartz.LocalDataSourceJobStore     : JobStoreCMT initialized.
+2021-01-20 11:10:57.041  INFO 18092 --- [main] org.quartz.core.QuartzScheduler          : Scheduler meta-data: Quartz Scheduler (v2.3.1) 'smsScheduler' with instanceId 'LAPTOP-ED13E6B01611112257024'
+  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.
+
+2021-01-20 11:10:57.041  INFO 18092 --- [main] org.quartz.impl.StdSchedulerFactory      : Quartz scheduler 'smsScheduler' initialized from an externally provided properties instance.
+2021-01-20 11:10:57.041  INFO 18092 --- [main] org.quartz.impl.StdSchedulerFactory      : Quartz scheduler version: 2.3.1
+2021-01-20 11:10:57.041  INFO 18092 --- [main] org.quartz.core.QuartzScheduler          : JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@2aac6fa7
+2021-01-20 11:10:58.117  INFO 18092 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
+2021-01-20 11:10:58.303  INFO 18092 --- [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)]
+2021-01-20 11:10:58.332  WARN 18092 --- [main] c.n.c.sources.URLConfigurationSource     : No URLs will be polled as dynamic configuration sources.
+2021-01-20 11:10:58.332  INFO 18092 --- [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.
+2021-01-20 11:10:58.337  WARN 18092 --- [main] c.n.c.sources.URLConfigurationSource     : No URLs will be polled as dynamic configuration sources.
+2021-01-20 11:10:58.337  INFO 18092 --- [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.
+2021-01-20 11:10:58.499  INFO 18092 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
+2021-01-20 11:10:58.604  INFO 18092 --- [main] o.s.s.c.ThreadPoolTaskScheduler          : Initializing ExecutorService
+2021-01-20 11:10:58.850  INFO 18092 --- [main] .s.s.UserDetailsServiceAutoConfiguration : 
+
+Using generated security password: 1395414e-62b2-40a5-b057-daf2c7ead65a
+
+2021-01-20 11:10:59.011  INFO 18092 --- [main] o.s.s.web.DefaultSecurityFilterChain     : Creating filter chain: OrRequestMatcher [requestMatchers=[Ant [pattern='/**']]], [org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter@7a600e21, org.springframework.security.web.context.SecurityContextPersistenceFilter@e296794, org.springframework.security.web.header.HeaderWriterFilter@5f877009, org.springframework.security.web.authentication.logout.LogoutFilter@346690d6, org.springframework.security.oauth2.provider.authentication.OAuth2AuthenticationProcessingFilter@638d624a, org.springframework.security.web.authentication.www.BasicAuthenticationFilter@408d12fc, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@3fda8dae, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@28e24663, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@69d1ad64, org.springframework.security.web.session.SessionManagementFilter@4a29a1e6, org.springframework.security.web.access.ExceptionTranslationFilter@4a3383dc, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@39fb5ddf]
+2021-01-20 11:10:59.565  INFO 18092 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
+2021-01-20 11:10:59.588  INFO 18092 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
+2021-01-20 11:10:59.630  INFO 18092 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
+2021-01-20 11:10:59.959  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_1
+2021-01-20 11:11:00.059  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: addUsingPOST_1
+2021-01-20 11:11:00.064  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: batchDeleteUsingDELETE_1
+2021-01-20 11:11:00.069  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteUsingDELETE_1
+2021-01-20 11:11:00.075  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: editUsingPOST_1
+2021-01-20 11:11:00.085  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getUsingGET_1
+2021-01-20 11:11:00.110  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_2
+2021-01-20 11:11:00.119  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: addUsingPOST_2
+2021-01-20 11:11:00.134  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteUsingDELETE_2
+2021-01-20 11:11:00.138  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: editUsingPOST_2
+2021-01-20 11:11:00.145  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getUsingGET_2
+2021-01-20 11:11:00.161  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_3
+2021-01-20 11:11:00.270  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: addMonitorInfoUsingPOST_1
+2021-01-20 11:11:00.367  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_4
+2021-01-20 11:11:00.418  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_1
+2021-01-20 11:11:00.418  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_2
+2021-01-20 11:11:00.420  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_3
+2021-01-20 11:11:00.461  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: batchEditUsingPOST_1
+2021-01-20 11:11:00.465  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: delUsingPOST_1
+2021-01-20 11:11:00.486  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectByIdUsingGET_1
+2021-01-20 11:11:00.502  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingGET_5
+2021-01-20 11:11:00.517  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: addSceneTypeUsingPOST_1
+2021-01-20 11:11:00.524  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: delUsingPOST_2
+2021-01-20 11:11:00.543  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectByIdUsingGET_2
+2021-01-20 11:11:00.556  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: sceneWaterPressureUsingGET_1
+2021-01-20 11:11:00.562  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: waterSupplyChartsUsingGET_1
+2021-01-20 11:11:00.602  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: delUsingPOST_3
+2021-01-20 11:11:00.620  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectByIdUsingGET_3
+2021-01-20 11:11:00.626  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: delUsingPOST_4
+2021-01-20 11:11:00.631  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: findListUsingGET_1
+2021-01-20 11:11:00.635  INFO 18092 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectByIdUsingGET_4
+2021-01-20 11:11:00.659  INFO 18092 --- [main] o.s.a.r.c.CachingConnectionFactory       : Attempting to connect to: [114.135.61.188:55672]
+2021-01-20 11:11:00.841  INFO 18092 --- [main] o.s.a.r.c.CachingConnectionFactory       : Created new connection: rabbitConnectionFactory#79cb8ffa:0/SimpleConnection@68312b85 [delegate=amqp://huaxu@114.135.61.188:55672/, localPort= 55493]
+2021-01-20 11:11:01.029  INFO 18092 --- [main] o.s.s.quartz.SchedulerFactoryBean        : Will start Quartz Scheduler [smsScheduler] in 2 seconds
+2021-01-20 11:11:01.083  INFO 18092 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 8324 (http) with context path ''
+2021-01-20 11:11:01.229  INFO 18092 --- [main] c.a.c.n.registry.NacosServiceRegistry    : nacos registry, sms-water 192.168.1.122:8324 register finished
+2021-01-20 11:11:01.232  INFO 18092 --- [main] com.huaxu.SmsWaterApplication            : Started SmsWaterApplication in 12.633 seconds (JVM running for 13.816)
+2021-01-20 11:11:03.032  INFO 18092 --- [Quartz Scheduler [smsScheduler]] o.s.s.quartz.SchedulerFactoryBean        : Starting Quartz Scheduler now, after delay of 2 seconds
+2021-01-20 11:11:03.463  INFO 18092 --- [Quartz Scheduler [smsScheduler]] org.quartz.core.QuartzScheduler          : Scheduler smsScheduler_$_LAPTOP-ED13E6B01611112257024 started.
+2021-01-20 11:11:10.733  INFO 18092 --- [http-nio-8324-exec-1] o.apache.tomcat.util.http.parser.Cookie  : A cookie header was received [1610615698,1610676800,1610681695; Hm_lvt_d7168b0cef9904be9b675a22e48c5721=1608688443,1609139332,1609933046,1610008612] that contained an invalid cookie. That cookie will be ignored.
+ Note: further occurrences of this error will be logged at DEBUG level.
+2021-01-20 11:11:10.740  INFO 18092 --- [http-nio-8324-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2021-01-20 11:11:10.740  INFO 18092 --- [http-nio-8324-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2021-01-20 11:11:10.749  INFO 18092 --- [http-nio-8324-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 9 ms
+2021-01-20 11:46:01.240  INFO 18092 --- [Thread-9] c.netflix.config.ChainedDynamicProperty  : Flipping property: user-center.ribbon.ActiveConnectionsLimit to use NEXT property: niws.loadbalancer.availabilityFilteringRule.activeConnectionsLimit = 2147483647
+2021-01-20 11:46:01.269  INFO 18092 --- [Thread-9] c.netflix.loadbalancer.BaseLoadBalancer  : Client: user-center instantiated a LoadBalancer: DynamicServerListLoadBalancer:{NFLoadBalancer:name=user-center,current list of Servers=[],Load balancer stats=Zone stats: {},Server stats: []}ServerList:null
+2021-01-20 11:46:01.275  INFO 18092 --- [Thread-9] c.n.l.DynamicServerListLoadBalancer      : Using serverListUpdater PollingServerListUpdater
+2021-01-20 11:46:01.299  INFO 18092 --- [Thread-9] c.n.l.DynamicServerListLoadBalancer      : DynamicServerListLoadBalancer for client user-center initialized: DynamicServerListLoadBalancer:{NFLoadBalancer:name=user-center,current list of Servers=[],Load balancer stats=Zone stats: {},Server stats: []}ServerList:com.alibaba.cloud.nacos.ribbon.NacosServerList@4b3e99e2
+2021-01-20 11:46:01.384  INFO 18092 --- [Thread-9] c.netflix.config.ChainedDynamicProperty  : Flipping property: operation-manager.ribbon.ActiveConnectionsLimit to use NEXT property: niws.loadbalancer.availabilityFilteringRule.activeConnectionsLimit = 2147483647
+2021-01-20 11:46:01.385  INFO 18092 --- [Thread-9] c.netflix.loadbalancer.BaseLoadBalancer  : Client: operation-manager instantiated a LoadBalancer: DynamicServerListLoadBalancer:{NFLoadBalancer:name=operation-manager,current list of Servers=[],Load balancer stats=Zone stats: {},Server stats: []}ServerList:null
+2021-01-20 11:46:01.385  INFO 18092 --- [Thread-9] c.n.l.DynamicServerListLoadBalancer      : Using serverListUpdater PollingServerListUpdater
+2021-01-20 11:46:01.388  INFO 18092 --- [Thread-9] c.n.l.DynamicServerListLoadBalancer      : DynamicServerListLoadBalancer for client operation-manager initialized: DynamicServerListLoadBalancer:{NFLoadBalancer:name=operation-manager,current list of Servers=[],Load balancer stats=Zone stats: {},Server stats: []}ServerList:com.alibaba.cloud.nacos.ribbon.NacosServerList@1caa7718
+2021-01-20 11:46:01.394 ERROR 18092 --- [Thread-9] com.huaxu.async.CheckDeviceStateAsync    : 报警生成工单信息异常:com.netflix.client.ClientException: Load balancer does not have available server for client: operation-manager
+2021-01-20 11:46:32.308  INFO 18092 --- [PollingServerListUpdater-0] c.netflix.config.ChainedDynamicProperty  : Flipping property: user-center.ribbon.ActiveConnectionsLimit to use NEXT property: niws.loadbalancer.availabilityFilteringRule.activeConnectionsLimit = 2147483647
+2021-01-20 11:50:02.833 ERROR 18092 --- [Thread-9] com.huaxu.async.CheckDeviceStateAsync    : 报警生成工单信息异常:com.netflix.client.ClientException: Load balancer does not have available server for client: operation-manager
+2021-01-20 11:54:03.341 ERROR 18092 --- [Thread-9] com.huaxu.async.CheckDeviceStateAsync    : 报警生成工单信息异常:com.netflix.client.ClientException: Load balancer does not have available server for client: operation-manager
+2021-01-20 12:09:05.037 ERROR 18092 --- [Thread-9] com.huaxu.async.CheckDeviceStateAsync    : 报警生成工单信息异常:com.netflix.client.ClientException: Load balancer does not have available server for client: operation-manager
+2021-01-20 12:21:06.597 ERROR 18092 --- [Thread-9] com.huaxu.async.CheckDeviceStateAsync    : 报警生成工单信息异常:com.netflix.client.ClientException: Load balancer does not have available server for client: operation-manager
+2021-01-20 12:25:07.340 ERROR 18092 --- [Thread-9] com.huaxu.async.CheckDeviceStateAsync    : 报警生成工单信息异常:com.netflix.client.ClientException: Load balancer does not have available server for client: operation-manager
+2021-01-20 12:26:08.064 ERROR 18092 --- [Thread-9] com.huaxu.async.CheckDeviceStateAsync    : 报警生成工单信息异常:com.netflix.client.ClientException: Load balancer does not have available server for client: operation-manager
+2021-01-20 12:29:09.120 ERROR 18092 --- [Thread-9] com.huaxu.async.CheckDeviceStateAsync    : 报警生成工单信息异常:com.netflix.client.ClientException: Load balancer does not have available server for client: operation-manager
+2021-01-20 12:41:10.676 ERROR 18092 --- [Thread-9] com.huaxu.async.CheckDeviceStateAsync    : 报警生成工单信息异常:com.netflix.client.ClientException: Load balancer does not have available server for client: operation-manager
+2021-01-20 12:46:12.420 ERROR 18092 --- [Thread-9] com.huaxu.async.CheckDeviceStateAsync    : 报警生成工单信息异常:com.netflix.client.ClientException: Load balancer does not have available server for client: operation-manager
+2021-01-20 12:56:13.988 ERROR 18092 --- [Thread-9] com.huaxu.async.CheckDeviceStateAsync    : 报警生成工单信息异常:com.netflix.client.ClientException: Load balancer does not have available server for client: operation-manager
+2021-01-20 13:28:39.650  WARN 18092 --- [HikariPool-1 housekeeper] com.zaxxer.hikari.pool.HikariPool        : HikariPool-1 - Thread starvation or clock leap detected (housekeeper delta=26m42s601ms494µs100ns).
+2021-01-20 13:28:44.218  WARN 18092 --- [QuartzScheduler_smsScheduler-LAPTOP-ED13E6B01611112257024_ClusterManager] o.s.s.quartz.LocalDataSourceJobStore     : This scheduler instance (LAPTOP-ED13E6B01611112257024) is still active but was recovered by another instance in the cluster.  This may cause inconsistent behavior.
+2021-01-20 13:29:02.547  INFO 18092 --- [cluster-ClusterId{value='60079f3e23695246ac47bbf5', description='null'}-114.135.61.188:17017] org.mongodb.driver.connection            : Opened connection [connectionId{localValue:2}] to 114.135.61.188:17017
+2021-01-20 13:29:06.143  WARN 18092 --- [AMQP Connection 114.135.61.188:55672] c.r.c.impl.ForgivingExceptionHandler     : An unexpected connection driver error occured (Exception message: Connection reset)
+2021-01-20 13:29:06.146 ERROR 18092 --- [AMQP Connection 114.135.61.188:55672] o.s.a.r.c.CachingConnectionFactory       : Channel shutdown: connection error
+2021-01-20 13:29:06.146 ERROR 18092 --- [AMQP Connection 114.135.61.188:55672] o.s.a.r.c.CachingConnectionFactory       : Channel shutdown: connection error
+2021-01-20 13:29:06.309  INFO 18092 --- [org.springframework.amqp.rabbit.RabbitListenerEndpointContainer#0-1] o.s.a.r.l.SimpleMessageListenerContainer : Restarting Consumer@4e301795: tags=[[amq.ctag-GklDc_vldVeZFO9V0gOAvA]], channel=Cached Rabbit Channel: PublisherCallbackChannelImpl: AMQChannel(amqp://huaxu@114.135.61.188:55672/,1), conn: Proxy@49e54217 Shared Rabbit Connection: SimpleConnection@68312b85 [delegate=amqp://huaxu@114.135.61.188:55672/, localPort= 55493], acknowledgeMode=NONE local queue size=0
+2021-01-20 13:29:06.311  INFO 18092 --- [org.springframework.amqp.rabbit.RabbitListenerEndpointContainer#0-2] o.s.a.r.c.CachingConnectionFactory       : Attempting to connect to: [114.135.61.188:55672]
+2021-01-20 13:29:06.775  INFO 18092 --- [org.springframework.amqp.rabbit.RabbitListenerEndpointContainer#0-2] o.s.a.r.c.CachingConnectionFactory       : Created new connection: rabbitConnectionFactory#79cb8ffa:1/SimpleConnection@5deadc8e [delegate=amqp://huaxu@114.135.61.188:55672/, localPort= 8230]
+2021-01-20 13:30:31.254 ERROR 18092 --- [Thread-9] com.huaxu.async.CheckDeviceStateAsync    : 报警生成工单信息异常:com.netflix.client.ClientException: Load balancer does not have available server for client: operation-manager
+2021-01-20 13:35:26.556  WARN 18092 --- [smsScheduler_QuartzSchedulerThread] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@124b2709 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:35:26.560  WARN 18092 --- [smsScheduler_QuartzSchedulerThread] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@3a936d2d (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:35:26.564  WARN 18092 --- [smsScheduler_QuartzSchedulerThread] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@601ee46b (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:35:26.567  WARN 18092 --- [smsScheduler_QuartzSchedulerThread] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@2ba6e40e (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:35:26.571  WARN 18092 --- [smsScheduler_QuartzSchedulerThread] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@149467c1 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:35:26.575  WARN 18092 --- [smsScheduler_QuartzSchedulerThread] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@354f8a7b (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:35:26.577  WARN 18092 --- [smsScheduler_QuartzSchedulerThread] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@22651d05 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:35:26.581  WARN 18092 --- [smsScheduler_QuartzSchedulerThread] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@3eff1bd3 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:35:26.582  WARN 18092 --- [smsScheduler_QuartzSchedulerThread] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@962c9a2 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:35:26.583  WARN 18092 --- [smsScheduler_QuartzSchedulerThread] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@40b796a7 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:36:55.889  WARN 18092 --- [AMQP Connection 114.135.61.188:55672] c.r.c.impl.ForgivingExceptionHandler     : An unexpected connection driver error occured (Exception message: Connection reset)
+2021-01-20 13:36:55.890 ERROR 18092 --- [AMQP Connection 114.135.61.188:55672] o.s.a.r.c.CachingConnectionFactory       : Channel shutdown: connection error
+2021-01-20 13:36:55.890 ERROR 18092 --- [AMQP Connection 114.135.61.188:55672] o.s.a.r.c.CachingConnectionFactory       : Channel shutdown: connection error
+2021-01-20 13:36:55.899  WARN 18092 --- [Thread-8] com.zaxxer.hikari.pool.ProxyConnection   : HikariPool-1 - Connection com.mysql.jdbc.JDBC4Connection@32c2947a marked as broken because of SQLSTATE(08S01), ErrorCode(0)
+
+com.mysql.jdbc.exceptions.jdbc4.CommunicationsException: Communications link failure
+
+The last packet successfully received from the server was 1,091 milliseconds ago.  The last packet sent successfully to the server was 1,091 milliseconds ago.
+	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.SQLError.createCommunicationsException(SQLError.java:990) ~[mysql-connector-java-5.1.47.jar:5.1.47]
+	at com.mysql.jdbc.MysqlIO.reuseAndReadPacket(MysqlIO.java:3562) ~[mysql-connector-java-5.1.47.jar:5.1.47]
+	at com.mysql.jdbc.MysqlIO.reuseAndReadPacket(MysqlIO.java:3462) ~[mysql-connector-java-5.1.47.jar:5.1.47]
+	at com.mysql.jdbc.MysqlIO.checkErrorPacket(MysqlIO.java:3905) ~[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.GeneratedMethodAccessor136.invoke(Unknown Source) ~[na:na]
+	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.$Proxy203.execute(Unknown Source) [na:na]
+	at org.apache.ibatis.executor.statement.PreparedStatementHandler.update(PreparedStatementHandler.java:47) [mybatis-3.5.2.jar:3.5.2]
+	at org.apache.ibatis.executor.statement.RoutingStatementHandler.update(RoutingStatementHandler.java:74) [mybatis-3.5.2.jar:3.5.2]
+	at sun.reflect.GeneratedMethodAccessor157.invoke(Unknown Source) ~[na:na]
+	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.$Proxy173.update(Unknown Source) [na:na]
+	at com.baomidou.mybatisplus.core.executor.MybatisSimpleExecutor.doUpdate(MybatisSimpleExecutor.java:54) [mybatis-plus-core-3.2.0.jar:3.2.0]
+	at org.apache.ibatis.executor.BaseExecutor.update(BaseExecutor.java:117) [mybatis-3.5.2.jar:3.5.2]
+	at org.apache.ibatis.executor.CachingExecutor.update(CachingExecutor.java:76) [mybatis-3.5.2.jar:3.5.2]
+	at org.apache.ibatis.session.defaults.DefaultSqlSession.update(DefaultSqlSession.java:197) [mybatis-3.5.2.jar:3.5.2]
+	at sun.reflect.GeneratedMethodAccessor141.invoke(Unknown Source) ~[na:na]
+	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]
+	at com.sun.proxy.$Proxy155.update(Unknown Source) [na:na]
+	at org.mybatis.spring.SqlSessionTemplate.update(SqlSessionTemplate.java:287) [mybatis-spring-2.0.2.jar:2.0.2]
+	at com.baomidou.mybatisplus.core.override.MybatisMapperMethod.execute(MybatisMapperMethod.java:63) [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.$Proxy156.update(Unknown Source) [na:na]
+	at com.huaxu.service.impl.AlarmDetailsServiceImpl.lambda$checkStateAlarm$7(AlarmDetailsServiceImpl.java:238) [classes/:na]
+	at java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:193) ~[na:1.8.0_271]
+	at java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:175) ~[na:1.8.0_271]
+	at java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1384) ~[na:1.8.0_271]
+	at java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:482) ~[na:1.8.0_271]
+	at java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:472) ~[na:1.8.0_271]
+	at java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:708) ~[na:1.8.0_271]
+	at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234) ~[na:1.8.0_271]
+	at java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:499) ~[na:1.8.0_271]
+	at com.huaxu.service.impl.AlarmDetailsServiceImpl.checkStateAlarm(AlarmDetailsServiceImpl.java:242) [classes/:na]
+	at com.huaxu.async.CheckDeviceStateAsync.lambda$afterPropertiesSet$0(CheckDeviceStateAsync.java:27) ~[classes/:na]
+	at java.lang.Thread.run(Thread.java:748) ~[na:1.8.0_271]
+Caused by: java.net.SocketException: Software caused connection abort: recv failed
+	at java.net.SocketInputStream.socketRead0(Native Method) ~[na:1.8.0_271]
+	at java.net.SocketInputStream.socketRead(SocketInputStream.java:116) ~[na:1.8.0_271]
+	at java.net.SocketInputStream.read(SocketInputStream.java:171) ~[na:1.8.0_271]
+	at java.net.SocketInputStream.read(SocketInputStream.java:141) ~[na:1.8.0_271]
+	at com.mysql.jdbc.util.ReadAheadInputStream.fill(ReadAheadInputStream.java:101) ~[mysql-connector-java-5.1.47.jar:5.1.47]
+	at com.mysql.jdbc.util.ReadAheadInputStream.readFromUnderlyingStreamIfNecessary(ReadAheadInputStream.java:144) ~[mysql-connector-java-5.1.47.jar:5.1.47]
+	at com.mysql.jdbc.util.ReadAheadInputStream.read(ReadAheadInputStream.java:174) ~[mysql-connector-java-5.1.47.jar:5.1.47]
+	at com.mysql.jdbc.MysqlIO.readFully(MysqlIO.java:3011) ~[mysql-connector-java-5.1.47.jar:5.1.47]
+	at com.mysql.jdbc.MysqlIO.reuseAndReadPacket(MysqlIO.java:3472) ~[mysql-connector-java-5.1.47.jar:5.1.47]
+	... 46 common frames omitted
+
+2021-01-20 13:36:55.959  WARN 18092 --- [Thread-8] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@4f665ef0 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:36:55.960  WARN 18092 --- [Thread-8] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@4d4d585e (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:36:55.960  WARN 18092 --- [Thread-8] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@32e3b098 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:36:55.961  WARN 18092 --- [Thread-8] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@24f2cbcd (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:36:55.962  WARN 18092 --- [Thread-8] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@591e807d (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:36:55.963  WARN 18092 --- [Thread-8] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@517ea486 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:36:55.964  WARN 18092 --- [Thread-8] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@6360b1c7 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:36:55.965  WARN 18092 --- [Thread-8] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@4ed0c8be (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:36:55.965  WARN 18092 --- [Thread-8] com.zaxxer.hikari.pool.PoolBase          : HikariPool-1 - Failed to validate connection com.mysql.jdbc.JDBC4Connection@5c86e20 (No operations allowed after connection closed.). Possibly consider using a shorter maxLifetime value.
+2021-01-20 13:36:56.539  INFO 18092 --- [org.springframework.amqp.rabbit.RabbitListenerEndpointContainer#0-2] o.s.a.r.l.SimpleMessageListenerContainer : Restarting Consumer@2388fd55: tags=[[amq.ctag-W48TcMeaYa5A3uqCi9Dz4Q]], channel=Cached Rabbit Channel: PublisherCallbackChannelImpl: AMQChannel(amqp://huaxu@114.135.61.188:55672/,1), conn: Proxy@49e54217 Shared Rabbit Connection: SimpleConnection@5deadc8e [delegate=amqp://huaxu@114.135.61.188:55672/, localPort= 8230], acknowledgeMode=NONE local queue size=0
+2021-01-20 13:36:56.541  INFO 18092 --- [org.springframework.amqp.rabbit.RabbitListenerEndpointContainer#0-3] o.s.a.r.c.CachingConnectionFactory       : Attempting to connect to: [114.135.61.188:55672]
+2021-01-20 13:36:59.869 ERROR 18092 --- [Thread-8] com.huaxu.async.CheckDeviceStateAsync    : 巡检设备状态异常:
+### Error updating database.  Cause: com.mysql.jdbc.exceptions.jdbc4.CommunicationsException: Communications link failure
+
+The last packet successfully received from the server was 1,091 milliseconds ago.  The last packet sent successfully to the server was 1,091 milliseconds ago.
+### The error may exist in file [D:\huaxu\Code20210116\sms_water\target\classes\mapper\AlarmDetailMapper.xml]
+### The error may involve defaultParameterMap
+### The error occurred while setting parameters
+### SQL: UPDATE  sms_alarm_details          SET DEVICE_ID  = ?,                                                                                               ALARM_VALUE  = ?,                                           ALARM_CONTENT  = ?,                                           ALARM_START_TIME  = ?,                                           ALARM_START_TIME  = ?,                                                                                                             DATE_UPDATE  = ?,                                                                                  ALARM_SETTING_ID  = ?          WHERE ID  = ?;
+### Cause: com.mysql.jdbc.exceptions.jdbc4.CommunicationsException: Communications link failure
+
+The last packet successfully received from the server was 1,091 milliseconds ago.  The last packet sent successfully to the server was 1,091 milliseconds ago.
+; Communications link failure
+
+The last packet successfully received from the server was 1,091 milliseconds ago.  The last packet sent successfully to the server was 1,091 milliseconds ago.; nested exception is com.mysql.jdbc.exceptions.jdbc4.CommunicationsException: Communications link failure
+
+The last packet successfully received from the server was 1,091 milliseconds ago.  The last packet sent successfully to the server was 1,091 milliseconds ago.
+2021-01-20 13:37:01.574  INFO 18092 --- [org.springframework.amqp.rabbit.RabbitListenerEndpointContainer#0-3] o.s.a.r.l.SimpleMessageListenerContainer : Restarting Consumer@1cd7d6b5: tags=[[]], channel=null, acknowledgeMode=NONE local queue size=0
+2021-01-20 13:37:01.577  INFO 18092 --- [org.springframework.amqp.rabbit.RabbitListenerEndpointContainer#0-4] o.s.a.r.c.CachingConnectionFactory       : Attempting to connect to: [114.135.61.188:55672]
+2021-01-20 13:37:01.885  INFO 18092 --- [org.springframework.amqp.rabbit.RabbitListenerEndpointContainer#0-4] o.s.a.r.c.CachingConnectionFactory       : Created new connection: rabbitConnectionFactory#79cb8ffa:3/SimpleConnection@1cc84967 [delegate=amqp://huaxu@114.135.61.188:55672/, localPort= 9971]
+2021-01-20 13:37:04.813  INFO 18092 --- [cluster-ClusterId{value='60079f3e23695246ac47bbf5', description='null'}-114.135.61.188:17017] org.mongodb.driver.connection            : Opened connection [connectionId{localValue:3}] to 114.135.61.188:17017

+ 80 - 0
logs/user-auth/smartcity-user.2021-01-20.0.log

@@ -0,0 +1,80 @@
+2021-01-20 11:46:11.816  INFO 10160 --- [main] com.huaxu.UserAuthMain                   : The following profiles are active: dev
+2021-01-20 11:46:12.975  WARN 10160 --- [main] o.s.boot.actuate.endpoint.EndpointId     : Endpoint ID 'nacos-discovery' contains invalid characters, please migrate to a valid format.
+2021-01-20 11:46:13.185  INFO 10160 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2021-01-20 11:46:13.187  INFO 10160 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data repositories in DEFAULT mode.
+2021-01-20 11:46:13.240  INFO 10160 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 32ms. Found 0 repository interfaces.
+2021-01-20 11:46:13.326  WARN 10160 --- [main] o.s.boot.actuate.endpoint.EndpointId     : Endpoint ID 'service-registry' contains invalid characters, please migrate to a valid format.
+2021-01-20 11:46:13.529  INFO 10160 --- [main] o.s.cloud.context.scope.GenericScope     : BeanFactory id=436d710c-de4c-39cb-9bcf-bc7b2cc9eeff
+2021-01-20 11:46:13.662  INFO 10160 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$ad53637a] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2021-01-20 11:46:13.695  INFO 10160 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$c96d6677] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2021-01-20 11:46:14.004  INFO 10160 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 8321 (http)
+2021-01-20 11:46:14.121  INFO 10160 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2021-01-20 11:46:14.121  INFO 10160 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.21]
+2021-01-20 11:46:14.326  INFO 10160 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2021-01-20 11:46:14.326  INFO 10160 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 2495 ms
+2021-01-20 11:46:17.073  INFO 10160 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
+2021-01-20 11:46:17.237  INFO 10160 --- [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)]
+2021-01-20 11:46:17.264  WARN 10160 --- [main] c.n.c.sources.URLConfigurationSource     : No URLs will be polled as dynamic configuration sources.
+2021-01-20 11:46:17.265  INFO 10160 --- [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.
+2021-01-20 11:46:17.269  WARN 10160 --- [main] c.n.c.sources.URLConfigurationSource     : No URLs will be polled as dynamic configuration sources.
+2021-01-20 11:46:17.269  INFO 10160 --- [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.
+2021-01-20 11:46:17.378  INFO 10160 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
+2021-01-20 11:46:17.495  INFO 10160 --- [main] o.s.s.c.ThreadPoolTaskScheduler          : Initializing ExecutorService
+2021-01-20 11:46:17.992  INFO 10160 --- [main] o.s.s.web.DefaultSecurityFilterChain     : Creating filter chain: OrRequestMatcher [requestMatchers=[Ant [pattern='/oauth/token'], Ant [pattern='/oauth/token_key'], Ant [pattern='/oauth/check_token']]], [org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter@42edde25, org.springframework.security.web.context.SecurityContextPersistenceFilter@4cef0747, org.springframework.security.web.header.HeaderWriterFilter@236b4a44, org.springframework.security.web.authentication.logout.LogoutFilter@44485db, org.springframework.security.web.authentication.www.BasicAuthenticationFilter@420b55ed, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@6aaa678d, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@5d68954d, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@6fe5da76, org.springframework.security.web.session.SessionManagementFilter@2ac05a33, org.springframework.security.web.access.ExceptionTranslationFilter@54496c2d, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@5876bed9]
+2021-01-20 11:46:18.008  INFO 10160 --- [main] o.s.s.web.DefaultSecurityFilterChain     : Creating filter chain: OrRequestMatcher [requestMatchers=[Ant [pattern='/**']]], [org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter@49a06087, org.springframework.security.web.context.SecurityContextPersistenceFilter@af9dd34, org.springframework.security.web.header.HeaderWriterFilter@4f525e13, org.springframework.security.web.authentication.logout.LogoutFilter@4a58e0e9, org.springframework.security.oauth2.provider.authentication.OAuth2AuthenticationProcessingFilter@7497a554, com.huaxu.security.mobile.MobileLoginAuthenticationFilter@2c15034f, com.huaxu.security.smsCode.SmsCodeCheckUserFilter@9729a97, com.huaxu.security.smsCode.SmsCodeLoginAuthenticationFilter@43b4ec0c, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@48692405, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@151659dd, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@148b6f95, org.springframework.security.web.session.SessionManagementFilter@5d404a3c, org.springframework.security.web.access.ExceptionTranslationFilter@66048ac4, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@77f4038c]
+2021-01-20 11:46:18.652  INFO 10160 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
+2021-01-20 11:46:18.670  INFO 10160 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
+2021-01-20 11:46:18.731  INFO 10160 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
+2021-01-20 11:46:18.959  INFO 10160 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_1
+2021-01-20 11:46:18.960  INFO 10160 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_2
+2021-01-20 11:46:18.962  INFO 10160 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_3
+2021-01-20 11:46:18.978  INFO 10160 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getCodeUsingPOST_1
+2021-01-20 11:46:19.119  INFO 10160 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 8321 (http) with context path ''
+2021-01-20 11:46:19.398  INFO 10160 --- [main] c.a.c.n.registry.NacosServiceRegistry    : nacos registry, user-auth 192.168.1.122:8321 register finished
+2021-01-20 11:46:19.402  INFO 10160 --- [main] com.huaxu.UserAuthMain                   : Started UserAuthMain in 9.701 seconds (JVM running for 10.708)
+2021-01-20 11:47:19.696  INFO 10160 --- [http-nio-8321-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2021-01-20 11:47:19.696  INFO 10160 --- [http-nio-8321-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2021-01-20 11:47:19.704  INFO 10160 --- [http-nio-8321-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 8 ms
+2021-01-20 11:47:19.800  INFO 10160 --- [http-nio-8321-exec-1] io.lettuce.core.EpollProvider            : Starting without optional epoll library
+2021-01-20 11:47:19.802  INFO 10160 --- [http-nio-8321-exec-1] io.lettuce.core.KqueueProvider           : Starting without optional kqueue library
+2021-01-20 13:36:55.895  INFO 10160 --- [lettuce-nioEventLoop-4-1] io.lettuce.core.protocol.CommandHandler  : null Unexpected exception during request: java.io.IOException: 远程主机强迫关闭了一个现有的连接。
+
+java.io.IOException: 远程主机强迫关闭了一个现有的连接。
+	at sun.nio.ch.SocketDispatcher.read0(Native Method) ~[na:1.8.0_271]
+	at sun.nio.ch.SocketDispatcher.read(SocketDispatcher.java:43) ~[na:1.8.0_271]
+	at sun.nio.ch.IOUtil.readIntoNativeBuffer(IOUtil.java:223) ~[na:1.8.0_271]
+	at sun.nio.ch.IOUtil.read(IOUtil.java:192) ~[na:1.8.0_271]
+	at sun.nio.ch.SocketChannelImpl.read(SocketChannelImpl.java:378) ~[na:1.8.0_271]
+	at io.netty.buffer.PooledUnsafeDirectByteBuf.setBytes(PooledUnsafeDirectByteBuf.java:288) ~[netty-buffer-4.1.36.Final.jar:4.1.36.Final]
+	at io.netty.buffer.AbstractByteBuf.writeBytes(AbstractByteBuf.java:1125) ~[netty-buffer-4.1.36.Final.jar:4.1.36.Final]
+	at io.netty.channel.socket.nio.NioSocketChannel.doReadBytes(NioSocketChannel.java:347) ~[netty-transport-4.1.36.Final.jar:4.1.36.Final]
+	at io.netty.channel.nio.AbstractNioByteChannel$NioByteUnsafe.read(AbstractNioByteChannel.java:148) ~[netty-transport-4.1.36.Final.jar:4.1.36.Final]
+	at io.netty.channel.nio.NioEventLoop.processSelectedKey(NioEventLoop.java:682) [netty-transport-4.1.36.Final.jar:4.1.36.Final]
+	at io.netty.channel.nio.NioEventLoop.processSelectedKeysOptimized(NioEventLoop.java:617) [netty-transport-4.1.36.Final.jar:4.1.36.Final]
+	at io.netty.channel.nio.NioEventLoop.processSelectedKeys(NioEventLoop.java:534) [netty-transport-4.1.36.Final.jar:4.1.36.Final]
+	at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:496) [netty-transport-4.1.36.Final.jar:4.1.36.Final]
+	at io.netty.util.concurrent.SingleThreadEventExecutor$5.run(SingleThreadEventExecutor.java:906) [netty-common-4.1.36.Final.jar:4.1.36.Final]
+	at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74) [netty-common-4.1.36.Final.jar:4.1.36.Final]
+	at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) [netty-common-4.1.36.Final.jar:4.1.36.Final]
+	at java.lang.Thread.run(Thread.java:748) [na:1.8.0_271]
+
+2021-01-20 13:36:56.038  INFO 10160 --- [lettuce-eventExecutorLoop-1-1] i.l.core.protocol.ConnectionWatchdog     : Reconnecting, last destination was /114.135.61.188:26379
+2021-01-20 13:36:56.046  WARN 10160 --- [lettuce-nioEventLoop-4-2] i.l.core.protocol.ConnectionWatchdog     : Cannot reconnect: io.netty.channel.AbstractChannel$AnnotatedNoRouteToHostException: No route to host: no further information: /114.135.61.188:26379
+
+io.netty.channel.AbstractChannel$AnnotatedNoRouteToHostException: No route to host: no further information: /114.135.61.188:26379
+	at sun.nio.ch.SocketChannelImpl.checkConnect(Native Method) ~[na:1.8.0_271]
+	at sun.nio.ch.SocketChannelImpl.finishConnect(SocketChannelImpl.java:715) ~[na:1.8.0_271]
+	at io.netty.channel.socket.nio.NioSocketChannel.doFinishConnect(NioSocketChannel.java:327) ~[netty-transport-4.1.36.Final.jar:4.1.36.Final]
+	at io.netty.channel.nio.AbstractNioChannel$AbstractNioUnsafe.finishConnect(AbstractNioChannel.java:340) ~[netty-transport-4.1.36.Final.jar:4.1.36.Final]
+	at io.netty.channel.nio.NioEventLoop.processSelectedKey(NioEventLoop.java:670) ~[netty-transport-4.1.36.Final.jar:4.1.36.Final]
+	at io.netty.channel.nio.NioEventLoop.processSelectedKeysOptimized(NioEventLoop.java:617) ~[netty-transport-4.1.36.Final.jar:4.1.36.Final]
+	at io.netty.channel.nio.NioEventLoop.processSelectedKeys(NioEventLoop.java:534) ~[netty-transport-4.1.36.Final.jar:4.1.36.Final]
+	at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:496) ~[netty-transport-4.1.36.Final.jar:4.1.36.Final]
+	at io.netty.util.concurrent.SingleThreadEventExecutor$5.run(SingleThreadEventExecutor.java:906) ~[netty-common-4.1.36.Final.jar:4.1.36.Final]
+	at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74) ~[netty-common-4.1.36.Final.jar:4.1.36.Final]
+	at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) ~[netty-common-4.1.36.Final.jar:4.1.36.Final]
+	at java.lang.Thread.run(Thread.java:748) ~[na:1.8.0_271]
+Caused by: java.net.NoRouteToHostException: No route to host: no further information
+	... 12 common frames omitted
+
+2021-01-20 13:36:58.915  INFO 10160 --- [lettuce-nioEventLoop-4-4] i.l.core.protocol.ReconnectionHandler    : Reconnected to 114.135.61.188:26379

+ 95 - 0
logs/user-center/smartcity-user.2021-01-20.0.log

@@ -0,0 +1,95 @@
+2021-01-20 11:46:17.455  INFO 21368 --- [main] com.huaxu.UserCenterApplication          : The following profiles are active: dev
+2021-01-20 11:46:18.639  WARN 21368 --- [main] o.s.boot.actuate.endpoint.EndpointId     : Endpoint ID 'nacos-discovery' contains invalid characters, please migrate to a valid format.
+2021-01-20 11:46:18.849  INFO 21368 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2021-01-20 11:46:18.851  INFO 21368 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data repositories in DEFAULT mode.
+2021-01-20 11:46:18.922  INFO 21368 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 49ms. Found 0 repository interfaces.
+2021-01-20 11:46:19.017  WARN 21368 --- [main] o.s.boot.actuate.endpoint.EndpointId     : Endpoint ID 'service-registry' contains invalid characters, please migrate to a valid format.
+2021-01-20 11:46:19.266  INFO 21368 --- [main] o.s.cloud.context.scope.GenericScope     : BeanFactory id=3f605fe0-03a3-3136-be2d-a5b95f1cdd4b
+2021-01-20 11:46:19.443  INFO 21368 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$f7374912] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2021-01-20 11:46:19.550  INFO 21368 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$13514c0f] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2021-01-20 11:46:19.883  INFO 21368 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 8322 (http)
+2021-01-20 11:46:19.903  INFO 21368 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2021-01-20 11:46:19.903  INFO 21368 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.21]
+2021-01-20 11:46:20.060  INFO 21368 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2021-01-20 11:46:20.060  INFO 21368 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 2593 ms
+2021-01-20 11:46:22.001  INFO 21368 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
+2021-01-20 11:46:22.177  INFO 21368 --- [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)]
+2021-01-20 11:46:22.207  WARN 21368 --- [main] c.n.c.sources.URLConfigurationSource     : No URLs will be polled as dynamic configuration sources.
+2021-01-20 11:46:22.207  INFO 21368 --- [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.
+2021-01-20 11:46:22.211  WARN 21368 --- [main] c.n.c.sources.URLConfigurationSource     : No URLs will be polled as dynamic configuration sources.
+2021-01-20 11:46:22.211  INFO 21368 --- [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.
+2021-01-20 11:46:22.372  INFO 21368 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
+2021-01-20 11:46:22.485  INFO 21368 --- [main] o.s.s.c.ThreadPoolTaskScheduler          : Initializing ExecutorService
+2021-01-20 11:46:22.690  INFO 21368 --- [main] .s.s.UserDetailsServiceAutoConfiguration : 
+
+Using generated security password: e4bb9b73-2e39-4fcb-83d7-ef3432be9d06
+
+2021-01-20 11:46:22.825  INFO 21368 --- [main] o.s.s.web.DefaultSecurityFilterChain     : Creating filter chain: OrRequestMatcher [requestMatchers=[Ant [pattern='/**']]], [org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter@126af200, org.springframework.security.web.context.SecurityContextPersistenceFilter@1e23ee0e, org.springframework.security.web.header.HeaderWriterFilter@7109b603, org.springframework.security.web.authentication.logout.LogoutFilter@3ba5c4dd, org.springframework.security.oauth2.provider.authentication.OAuth2AuthenticationProcessingFilter@1c610f, org.springframework.security.web.authentication.www.BasicAuthenticationFilter@1dc9f5ad, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@38923cfe, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@67784537, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@1e000a17, org.springframework.security.web.session.SessionManagementFilter@299786b1, org.springframework.security.web.access.ExceptionTranslationFilter@14993306, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@517bdce0]
+2021-01-20 11:46:23.363  INFO 21368 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
+2021-01-20 11:46:23.378  INFO 21368 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
+2021-01-20 11:46:23.409  INFO 21368 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
+2021-01-20 11:46:23.696  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteUsingPOST_1
+2021-01-20 11:46:23.699  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: insertUsingPOST_1
+2021-01-20 11:46:23.711  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectOneUsingPOST_1
+2021-01-20 11:46:23.716  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingPOST_1
+2021-01-20 11:46:23.719  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: updateUsingPOST_1
+2021-01-20 11:46:23.753  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteUsingPOST_2
+2021-01-20 11:46:23.760  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: insertUsingPOST_2
+2021-01-20 11:46:23.775  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectOneUsingPOST_2
+2021-01-20 11:46:23.782  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingPOST_2
+2021-01-20 11:46:23.791  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: updateUsingPOST_2
+2021-01-20 11:46:23.796  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteUsingPOST_3
+2021-01-20 11:46:23.809  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: insertUsingPOST_3
+2021-01-20 11:46:23.818  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectListUsingPOST_1
+2021-01-20 11:46:23.823  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectOneUsingPOST_3
+2021-01-20 11:46:23.830  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingPOST_3
+2021-01-20 11:46:23.834  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: updateUsingPOST_3
+2021-01-20 11:46:23.863  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: allListUsingPOST_1
+2021-01-20 11:46:23.889  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteUsingPOST_4
+2021-01-20 11:46:23.892  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: exportExcelUsingPOST_1
+2021-01-20 11:46:23.897  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: insertUsingPOST_4
+2021-01-20 11:46:23.907  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectListUsingPOST_2
+2021-01-20 11:46:23.914  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectOneUsingPOST_4
+2021-01-20 11:46:23.922  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingPOST_4
+2021-01-20 11:46:23.926  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: updateUsingPOST_4
+2021-01-20 11:46:23.930  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_1
+2021-01-20 11:46:23.932  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_2
+2021-01-20 11:46:23.934  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_3
+2021-01-20 11:46:23.959  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: insertUsingPOST_5
+2021-01-20 11:46:23.963  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectOneUsingPOST_5
+2021-01-20 11:46:23.966  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: updateUsingPOST_5
+2021-01-20 11:46:23.978  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAllUsingPOST_1
+2021-01-20 11:46:24.004  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: insertUsingPOST_6
+2021-01-20 11:46:24.009  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectAllUsingPOST_1
+2021-01-20 11:46:24.012  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectOneUsingPOST_6
+2021-01-20 11:46:24.018  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingPOST_5
+2021-01-20 11:46:24.022  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: updateUsingPOST_6
+2021-01-20 11:46:24.027  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: addUserPhotoUsingPOST_1
+2021-01-20 11:46:24.031  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteUsingPOST_5
+2021-01-20 11:46:24.037  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: insertUsingPOST_7
+2021-01-20 11:46:24.044  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectListUsingPOST_3
+2021-01-20 11:46:24.049  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectOneUsingPOST_7
+2021-01-20 11:46:24.058  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingPOST_6
+2021-01-20 11:46:24.062  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: updateUsingPOST_7
+2021-01-20 11:46:24.076  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: addUserPhotoUsingPOST_2
+2021-01-20 11:46:24.127  WARN 21368 --- [main] s.d.s.w.r.p.ParameterDataTypeReader      : Trying to infer dataType java.lang.Long[]
+2021-01-20 11:46:24.157  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: listUsingPOST_1
+2021-01-20 11:46:24.166  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAllUsingPOST_2
+2021-01-20 11:46:24.174  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: insertUsingPOST_8
+2021-01-20 11:46:24.179  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectOneUsingPOST_8
+2021-01-20 11:46:24.184  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingPOST_7
+2021-01-20 11:46:24.186  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: updateUsingPOST_8
+2021-01-20 11:46:24.193  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteUsingPOST_6
+2021-01-20 11:46:24.196  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: exportExcelUsingPOST_2
+2021-01-20 11:46:24.199  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: insertUsingPOST_9
+2021-01-20 11:46:24.204  INFO 21368 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: selectPageUsingPOST_8
+2021-01-20 11:46:24.245  INFO 21368 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 8322 (http) with context path ''
+2021-01-20 11:46:24.323  INFO 21368 --- [main] c.a.c.n.registry.NacosServiceRegistry    : nacos registry, user-center 192.168.1.122:8322 register finished
+2021-01-20 11:46:24.326  INFO 21368 --- [main] com.huaxu.UserCenterApplication          : Started UserCenterApplication in 8.783 seconds (JVM running for 9.897)
+2021-01-20 11:50:01.917  INFO 21368 --- [http-nio-8322-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2021-01-20 11:50:01.917  INFO 21368 --- [http-nio-8322-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2021-01-20 11:50:01.926  INFO 21368 --- [http-nio-8322-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 9 ms
+2021-01-20 11:50:01.994  WARN 21368 --- [http-nio-8322-exec-1] com.zaxxer.hikari.HikariConfig           : HikariPool-1 - idleTimeout is close to or more than maxLifetime, disabling it.
+2021-01-20 11:50:01.994  INFO 21368 --- [http-nio-8322-exec-1] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
+2021-01-20 11:50:02.552  INFO 21368 --- [http-nio-8322-exec-1] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
+2021-01-20 13:28:43.005  WARN 21368 --- [HikariPool-1 housekeeper] com.zaxxer.hikari.pool.HikariPool        : HikariPool-1 - Thread starvation or clock leap detected (housekeeper delta=26m40s210ms229µs).

+ 53 - 23
operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -314,7 +314,7 @@ public class WorkOrderManageController {
 
     @GetMapping("/event/select")
     @ApiOperation(value = "查询事件隐患/所有工单")
-    public AjaxMessage<Pagination<WorkOrderInfo>> selectEvent(
+    public AjaxMessage<Pagination<WorkOrderManageDto>> selectEvent(
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "状态(0:事件隐患;null:所有工单;1:执行中;2:完成)", required = false) @RequestParam(required = false) Integer orderStatus,
@@ -337,16 +337,16 @@ public class WorkOrderManageController {
         workOrderManageDto.setUserType(loginUser.getType());
         //1是公司,2是公司及以下,3部门,4部门及以下,5自定义
         workOrderManageDto.setPermissonType(loginUser.getPermissonType());
-        IPage<WorkOrderInfo> iPage = new Page<>(pageNum, pageSize);
+        IPage<WorkOrderManageDto> iPage = new Page<>(pageNum, pageSize);
         iPage = workOrderManageService.selectPage(iPage, workOrderManageDto);
-        Pagination<WorkOrderInfo> pages = new Pagination<>(iPage);
-        //setUserName(pages);
+        Pagination<WorkOrderManageDto> pages = new Pagination<>(iPage);
+        setName(pages.getList());
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
 
     @GetMapping("/pending")
     @ApiOperation(value = "查询待处理工单")
-    public AjaxMessage<Pagination<WorkOrderInfo>> selectPendingOrder(
+    public AjaxMessage<Pagination<WorkOrderManageDto>> selectPendingOrder(
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "工单类型(1表务、2停通水、3抢修、4漏点定位、5测漏、6违章跑水)", required = false) @RequestParam(required = false) Integer orderTypeId,
@@ -364,10 +364,10 @@ public class WorkOrderManageController {
         if(loginUser.getId() != null) {
             workOrderManageDto.setCurrentUsers(String.format("%s,", loginUser.getId()));
         }
-        IPage<WorkOrderInfo> iPage = new Page<>(pageNum, pageSize);
+        IPage<WorkOrderManageDto> iPage = new Page<>(pageNum, pageSize);
         iPage = workOrderManageService.selectPage(iPage, workOrderManageDto);
-        Pagination<WorkOrderInfo> pages = new Pagination<>(iPage);
-        //setUserName(pages);
+        Pagination<WorkOrderManageDto> pages = new Pagination<>(iPage);
+        setName(pages.getList());
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
 
@@ -407,6 +407,7 @@ public class WorkOrderManageController {
         for (String str : taskParticipator) {
             currentUsers += String.format("%s,",str);
         }
+        currentUsers+="235,";
         //更新计划表的流程相关字段值。
         workOrderManage.setOrderStatus(1);//已执行
         workOrderManage.setOrderTypeId(orderTypeId);//工单类型ID
@@ -527,21 +528,50 @@ public class WorkOrderManageController {
                 Long[] ids = idList.toArray(new Long[0]);
                 Map<Long,String> userMap = userCenterClient.findUserIdsByUserIds(ids).stream().collect(Collectors.toMap(UserEntity::getId, UserEntity::getUsername));
                 Map<String,String> dictMap=userCenterClient.selectListByPCodes("SC_WORK_ORDER_TYPE,SC_TASK_TYPE");
-                for(WorkOrderManageDto workOrder:result) {
-                    if(workOrder.getOrderTypeId()!=null) {
-                        workOrder.setTypeName(dictMap.get(workOrder.getOrderTypeId().toString()));
-                    }
-                    if(workOrder.getSendBy()!=null) {
-                        workOrder.setSendByName(userMap.get(Long.valueOf(workOrder.getSendBy())));
-                    }
-                    if(workOrder.getOrderUserId()!=null) {
-                        workOrder.setOrderUserName(userMap.get(Long.valueOf(workOrder.getOrderUserId())));
-                    }
-                    if(workOrder.getCreateBy()!=null) {
-                        workOrder.setCreateByName(userMap.get(Long.valueOf(workOrder.getCreateBy())));
-                    }
-                    if(workOrder.getUpdateBy()!=null) {
-                        workOrder.setUpdateByName(userMap.get(Long.valueOf(workOrder.getUpdateBy())));
+                for(int i = 0; i < result.size(); i++) {
+                    WorkOrderManageDto workOrder = result.get(i);
+                    try {
+                        if (workOrder.getOrderTypeId() != null) {
+                            workOrder.setTypeName(dictMap.get(workOrder.getOrderTypeId().toString()));
+                        }
+                        if (workOrder.getSendBy() != null) {
+                            workOrder.setSendByName(userMap.get(Long.valueOf(workOrder.getSendBy())));
+                        }
+                        if (workOrder.getOrderUserId() != null) {
+                            workOrder.setOrderUserName(userMap.get(Long.valueOf(workOrder.getOrderUserId())));
+                        }
+                        if (workOrder.getCreateBy() != null) {
+                            workOrder.setCreateByName(userMap.get(Long.valueOf(workOrder.getCreateBy())));
+                        }
+                        if (workOrder.getUpdateBy() != null) {
+                            workOrder.setUpdateByName(userMap.get(Long.valueOf(workOrder.getUpdateBy())));
+                        }
+
+                        if (workOrder.getWorkFlowDetail() != null) {
+                            WorkFlowDetail workFlowDetail = workOrder.getWorkFlowDetail();
+                            if (workFlowDetail.getCreateBy() != null) {
+                                workFlowDetail.setCreateByName(userMap.get(Long.valueOf(workFlowDetail.getCreateBy())));
+                            }
+                            if (workFlowDetail.getUpdateBy() != null) {
+                                workFlowDetail.setUpdateByName(userMap.get(Long.valueOf(workFlowDetail.getUpdateBy())));
+                            }
+                        }
+                        if (workOrder.getWorkFlowLogList() != null) {
+                            for (WorkFlowLog workFlowLog : workOrder.getWorkFlowLogList()) {
+                                try {
+                                    if (workFlowLog.getCreateBy() != null) {
+                                        workFlowLog.setCreateByName(userMap.get(Long.valueOf(workFlowLog.getCreateBy())));
+                                    }
+                                    if (workFlowLog.getUpdateBy() != null) {
+                                        workFlowLog.setUpdateByName(userMap.get(Long.valueOf(workFlowLog.getUpdateBy())));
+                                    }
+                                }catch (Exception e){
+
+                                }
+                            }
+                        }
+                    }catch (Exception e){
+
                     }
                 }
             }catch (Exception e){

+ 1 - 1
operation_manager/src/main/java/com/huaxu/order/dao/WorkOrderManageMapper.java

@@ -37,7 +37,7 @@ public interface WorkOrderManageMapper {
 
     int batchInsertByAlarms(@Param("workOrderManages")List<WorkOrderManageByAlarmDto> workOrderManages);
 
-    Page<WorkOrderInfo> findPage(IPage<WorkOrderInfo> page, @Param("order") WorkOrderManageDto workOrderManageDto);
+    Page<WorkOrderManageDto> findPage(IPage<WorkOrderManageDto> page, @Param("order") WorkOrderManageDto workOrderManageDto);
 
     List<WorkOrderManage> selectByPId(Map<String,Object> map);
 }

+ 13 - 6
operation_manager/src/main/java/com/huaxu/order/dto/WorkOrderManageDto.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.huaxu.model.ProgramItem;
 import com.huaxu.order.entity.WorkFlowDetail;
+import com.huaxu.order.entity.WorkFlowLog;
 import com.huaxu.order.entity.WorkOrderManage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,12 +18,6 @@ import java.util.List;
 @Data
 public class WorkOrderManageDto extends WorkOrderManage {
 
-    @ApiModelProperty(value = "json格式存储对应任务详情")
-    private String flowDetail;
-
-    @ApiModelProperty(value = "任务工单类型")
-    private String typeName;
-
     /**
      * 所属公司名称
      */
@@ -76,4 +71,16 @@ public class WorkOrderManageDto extends WorkOrderManage {
 
     @ApiModelProperty(value = "修改人名称")
     private String updateByName;
+
+    @ApiModelProperty(value = "json格式存储对应任务详情")
+    private String flowDetail;
+
+    @ApiModelProperty(value = "任务工单类型")
+    private String typeName;
+
+    @ApiModelProperty(value = "工作流详情")
+    WorkFlowDetail workFlowDetail;
+
+    @ApiModelProperty(value = "工作流日志集合")
+    List<WorkFlowLog> workFlowLogList;
 }

+ 5 - 5
operation_manager/src/main/java/com/huaxu/order/entity/WorkOrderInfo.java

@@ -11,9 +11,9 @@ import java.util.List;
 @Data
 public class WorkOrderInfo extends WorkOrderManageDto implements Serializable {
 
-    @ApiModelProperty(value = "工作流详情")
-    WorkFlowDetail workFlowDetail;
-
-    @ApiModelProperty(value = "工作流日志集合")
-    List<WorkFlowDetail> workFlowLogList;
+//    @ApiModelProperty(value = "工作流详情")
+//    WorkFlowDetail workFlowDetail;
+//
+//    @ApiModelProperty(value = "工作流日志集合")
+//    List<WorkFlowLog> workFlowLogList;
 }

+ 1 - 1
operation_manager/src/main/java/com/huaxu/order/service/WorkOrderManageService.java

@@ -60,7 +60,7 @@ public interface WorkOrderManageService {
     /**
      * 分页查询
      */
-    Page<WorkOrderInfo> selectPage(IPage<WorkOrderInfo> page, @Param("order") WorkOrderManageDto workOrderManageDto);
+    Page<WorkOrderManageDto> selectPage(IPage<WorkOrderManageDto> page, @Param("order") WorkOrderManageDto workOrderManageDto);
 
 
     /**

+ 1 - 1
operation_manager/src/main/java/com/huaxu/order/service/impl/WorkOrderManageServiceImpl.java

@@ -90,7 +90,7 @@ public class WorkOrderManageServiceImpl implements WorkOrderManageService {
     }
 
     @Override
-    public Page<WorkOrderInfo> selectPage(IPage<WorkOrderInfo> page, WorkOrderManageDto workOrderManageDto) {
+    public Page<WorkOrderManageDto> selectPage(IPage<WorkOrderManageDto> page, WorkOrderManageDto workOrderManageDto) {
         return workOrderManageMapper.findPage(page,workOrderManageDto);
     }
 

+ 52 - 77
operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -7,6 +7,7 @@ import com.huaxu.model.AjaxMessage;
 import com.huaxu.model.LoginUser;
 import com.huaxu.model.Pagination;
 import com.huaxu.model.ResultStatus;
+import com.huaxu.order.entity.WorkFlowDetail;
 import com.huaxu.order.entity.WorkFlowLog;
 import com.huaxu.order.service.WorkFlowLogService;
 import com.huaxu.process.entity.ProcessDefinition;
@@ -100,7 +101,7 @@ public class PlanManageController {
 
     @GetMapping("/plan/select")
     @ApiOperation(value = "查询巡检计划")
-    public AjaxMessage<Pagination<TaskManage>> selectPlan(
+    public AjaxMessage<Pagination<PlanManageDto>> selectPlan(
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "任务类型(巡检:7,侧漏:8,养护:9)", required = false) @RequestParam(required = false) Integer taskType,
@@ -123,16 +124,16 @@ public class PlanManageController {
         planManageDto.setUserType(loginUser.getType());
         //1是公司,2是公司及以下,3部门,4部门及以下,5自定义
         planManageDto.setPermissonType(loginUser.getPermissonType());
-        IPage<TaskManage> iPage = new Page<>(pageNum, pageSize);
+        IPage<PlanManageDto> iPage = new Page<>(pageNum, pageSize);
         iPage = planManageService.selectPage(iPage, planManageDto);
-        Pagination<TaskManage> pages = new Pagination<>(iPage);
-        setUserName(pages);
+        Pagination<PlanManageDto> pages = new Pagination<>(iPage);
+        setName(pages.getList());
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
 
     @GetMapping("/plan/pending")
     @ApiOperation(value = "查询待处理任务")
-    public AjaxMessage<Pagination<TaskManage>> selectPendingTask(
+    public AjaxMessage<Pagination<PlanManageDto>> selectPendingTask(
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "任务类型(巡检:7,侧漏:8,养护:9)", required = false) @RequestParam(required = false) Integer taskType,
@@ -151,10 +152,10 @@ public class PlanManageController {
         if(loginUser.getId() != null) {
             planManageDto.setCurrentUsers(String.format("%s,", loginUser.getId()));
         }
-        IPage<TaskManage> iPage = new Page<>(pageNum, pageSize);
+        IPage<PlanManageDto> iPage = new Page<>(pageNum, pageSize);
         iPage = planManageService.selectPage(iPage, planManageDto);
-        Pagination<TaskManage> pages = new Pagination<>(iPage);
-        setUserName(pages);
+        Pagination<PlanManageDto> pages = new Pagination<>(iPage);
+        setName(pages.getList());
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
 
@@ -308,60 +309,6 @@ public class PlanManageController {
         return new AjaxMessage<>(ResultStatus.ERROR);
     }
 
-    /**
-     * 获取并设置用户名称
-     * @param pages
-     */
-    private void setUserName(Pagination<TaskManage> pages){
-        if(pages.getTotal()>0) {
-            int total = (int) pages.getTotal();
-            List<Long> idList = new ArrayList<Long>();
-            for (PlanManage plan : pages.getList()) {
-                if(plan.getUserId() != null) {
-                    idList.add(Long.parseLong(plan.getUserId()));
-                }
-                if(plan.getPlanUserId() != null){
-                    idList.add(Long.parseLong(plan.getPlanUserId()));
-                }
-                if(plan.getCreateBy() != null){
-                    idList.add(Long.parseLong(plan.getCreateBy()));
-                }
-//                if(plan.getUpdateBy() != null){
-//                    idList.add(Long.parseLong(plan.getUpdateBy()));
-//                }
-            }
-            Long [] ids = new Long[idList.size()];
-            for( int i =0 ;i<idList.size(); i++){
-                ids[i] = idList.get(i);
-            }
-            List<UserEntity> userList = userCenterClient.findUserIdsByUserIds(ids);
-            for (PlanManage plan : pages.getList()) {
-                for(UserEntity userEntity : userList){
-                    if(plan.getUserId() != null) {
-                        if(userEntity.getId()== Long.parseLong(plan.getUserId())){
-                            plan.setUserName(userEntity.getUsername());
-                        }
-                    }
-                    if(plan.getPlanUserId() != null){
-                        if(userEntity.getId()== Long.parseLong(plan.getPlanUserId())){
-                            plan.setPlanUserName(userEntity.getUsername());
-                        }
-                    }
-                    if(plan.getCreateBy() != null){
-                        if(userEntity.getId()== Long.parseLong(plan.getCreateBy())){
-                            plan.setCreateByName(userEntity.getUsername());
-                        }
-                    }
-//                    if(plan.getUpdateBy() != null) {
-//                        if(userEntity.getId()== Long.parseLong(plan.getUpdateBy())){
-//                            plan.setUpdateByName(userEntity.getUsername());
-//                        }
-//                    }
-                }
-            }
-        }
-    }
-
     /**
      * 获取并设置用户、任务工单类型名称
      * @param
@@ -387,21 +334,49 @@ public class PlanManageController {
                 Long[] ids = idList.toArray(new Long[0]);
                 Map<Long,String> userMap = userCenterClient.findUserIdsByUserIds(ids).stream().collect(Collectors.toMap(UserEntity::getId, UserEntity::getUsername));
                 Map<String,String> dictMap=userCenterClient.selectListByPCodes("SC_WORK_ORDER_TYPE,SC_TASK_TYPE");
-                for (PlanManageDto plan : planManageDtoList) {
-                    if(plan.getTaskType() != null){
-                        plan.setTypeName(dictMap.get(plan.getTaskType().toString()));
-                    }
-                    if(plan.getUserId() != null) {
-                        plan.setUserName(userMap.get(Long.valueOf(plan.getUserId())));
-                    }
-                    if(plan.getPlanUserId() != null){
-                        plan.setPlanUserName(userMap.get(Long.valueOf(plan.getPlanUserId())));
-                    }
-                    if(plan.getCreateBy() != null){
-                        plan.setCreateByName(userMap.get(Long.valueOf(plan.getCreateBy())));
-                    }
-                    if(plan.getUpdateBy() != null){
-                        plan.setUpdateByName(userMap.get(Long.valueOf(plan.getUpdateBy())));
+                for(int i=0; i<planManageDtoList.size();i++){
+                    PlanManageDto plan = planManageDtoList.get(i);
+                    try {
+                        if (plan.getTaskType() != null) {
+                            plan.setTypeName(dictMap.get(plan.getTaskType().toString()));
+                        }
+                        if (plan.getUserId() != null) {
+                            plan.setUserName(userMap.get(Long.valueOf(plan.getUserId())));
+                        }
+                        if (plan.getPlanUserId() != null) {
+                            plan.setPlanUserName(userMap.get(Long.valueOf(plan.getPlanUserId())));
+                        }
+                        if (plan.getCreateBy() != null) {
+                            plan.setCreateByName(userMap.get(Long.valueOf(plan.getCreateBy())));
+                        }
+                        if (plan.getUpdateBy() != null) {
+                            plan.setUpdateByName(userMap.get(Long.valueOf(plan.getUpdateBy())));
+                        }
+                        if (plan.getWorkFlowDetail() != null) {
+                            WorkFlowDetail workFlowDetail = plan.getWorkFlowDetail();
+                            if (workFlowDetail.getCreateBy() != null) {
+                                workFlowDetail.setCreateByName(userMap.get(Long.valueOf(workFlowDetail.getCreateBy())));
+                            }
+                            if (workFlowDetail.getUpdateBy() != null) {
+                                workFlowDetail.setUpdateByName(userMap.get(Long.valueOf(workFlowDetail.getUpdateBy())));
+                            }
+                        }
+                        if (plan.getWorkFlowLogList() != null) {
+                            for (WorkFlowLog workFlowLog : plan.getWorkFlowLogList()) {
+                                try {
+                                    if (workFlowLog.getCreateBy() != null) {
+                                        workFlowLog.setCreateByName(userMap.get(Long.valueOf(workFlowLog.getCreateBy())));
+                                    }
+                                    if (workFlowLog.getUpdateBy() != null) {
+                                        workFlowLog.setUpdateByName(userMap.get(Long.valueOf(workFlowLog.getUpdateBy())));
+                                    }
+                                }catch (Exception e){
+
+                                }
+                            }
+                        }
+                    }catch(Exception e){
+
                     }
                 }
             }

+ 1 - 1
operation_manager/src/main/java/com/huaxu/task/dao/PlanManageMapper.java

@@ -28,7 +28,7 @@ public interface PlanManageMapper {
 
     Integer batchDelete(@Param("ids") List<Integer> ids);
 
-    Page<TaskManage> findPage(IPage<TaskManage> page, @Param("plan") PlanManageDto planManageDto);
+    Page<PlanManageDto> findPage(IPage<PlanManageDto> page, @Param("plan") PlanManageDto planManageDto);
 
     PlanManageDto selectPlanDetail(Integer id);
 

+ 15 - 2
operation_manager/src/main/java/com/huaxu/task/dto/PlanManageDto.java

@@ -2,6 +2,8 @@ package com.huaxu.task.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.huaxu.model.ProgramItem;
+import com.huaxu.order.entity.WorkFlowDetail;
+import com.huaxu.order.entity.WorkFlowLog;
 import com.huaxu.task.entity.PlanManage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,11 +15,18 @@ import java.util.List;
 @ApiModel("计划管理")
 public class PlanManageDto extends PlanManage {
 
+    @ApiModelProperty(value = "任务工单类型")
+    private String typeName;
+
     @ApiModelProperty(value = "json格式存储对应任务详情")
     private String flowDetail;
 
-    @ApiModelProperty(value = "任务工单类型")
-    private String typeName;
+    @ApiModelProperty(value = "工作流详情")
+    WorkFlowDetail workFlowDetail;
+
+    @ApiModelProperty(value = "工作流日志集合")
+    List<WorkFlowLog> workFlowLogList;
+
     /**
      * 所属公司名称
      */
@@ -63,4 +72,8 @@ public class PlanManageDto extends PlanManage {
     @ApiModelProperty(value = "用户类型(-9999 超管 -999普通用户 2普通用户)",hidden = true)
     @JsonIgnore
     private String userType;
+
+
+
+
 }

+ 5 - 5
operation_manager/src/main/java/com/huaxu/task/entity/TaskManage.java

@@ -14,9 +14,9 @@ import java.util.List;
 @ApiModel
 public class TaskManage extends PlanManageDto implements Serializable {
 
-    @ApiModelProperty(value = "工作流详情")
-    WorkFlowDetail workFlowDetail;
-
-    @ApiModelProperty(value = "工作流日志集合")
-    List<WorkFlowLog> workFlowLogList;
+//    @ApiModelProperty(value = "工作流详情")
+//    WorkFlowDetail workFlowDetail;
+//
+//    @ApiModelProperty(value = "工作流日志集合")
+//    List<WorkFlowLog> workFlowLogList;
 }

+ 1 - 1
operation_manager/src/main/java/com/huaxu/task/service/PlanManageService.java

@@ -24,7 +24,7 @@ public interface PlanManageService {
     /**
      *分页查询巡检计划单
      */
-    IPage<TaskManage> selectPage(IPage<TaskManage> page, PlanManageDto planManageDto);
+    IPage<PlanManageDto> selectPage(IPage<PlanManageDto> page, PlanManageDto planManageDto);
 
 
     /**

+ 1 - 1
operation_manager/src/main/java/com/huaxu/task/service/impl/PlanManageServiceImpl.java

@@ -29,7 +29,7 @@ public class PlanManageServiceImpl implements PlanManageService {
     }
 
     @Override
-    public IPage<TaskManage> selectPage(IPage<TaskManage> page, PlanManageDto planManageDto){
+    public IPage<PlanManageDto> selectPage(IPage<PlanManageDto> page, PlanManageDto planManageDto){
         return planManageMapper.findPage(page,planManageDto);
     }
 

+ 1 - 1
operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -53,7 +53,7 @@
     <result column="log_date_update" property="dateUpdate" jdbcType="TIMESTAMP" />
   </resultMap>
 
-  <resultMap id="OrderResultMap" type="com.huaxu.order.entity.WorkOrderInfo" extends="BaseResultMap">
+  <resultMap id="OrderResultMap" type="com.huaxu.order.dto.WorkOrderManageDto" extends="BaseResultMap">
     <association property="workFlowDetail" javaType="com.huaxu.order.entity.WorkFlowDetail">
       <id column="id" property="id" jdbcType="INTEGER" />
       <result column="flow_id" property="flowId" jdbcType="INTEGER" />

+ 1 - 1
operation_manager/src/main/resources/mapper/task/PlanManageMapper.xml

@@ -46,7 +46,7 @@
     <result column="log_date_update" property="dateUpdate" jdbcType="TIMESTAMP" />
   </resultMap>
 
-  <resultMap id="TaskResultMap" type="com.huaxu.task.entity.TaskManage" extends="BaseResultMap">
+  <resultMap id="TaskResultMap" type="com.huaxu.task.dto.PlanManageDto" extends="BaseResultMap">
     <association property="workFlowDetail" javaType="com.huaxu.order.entity.WorkFlowDetail">
       <id column="id" property="id" jdbcType="INTEGER" />
       <result column="flow_id" property="flowId" jdbcType="INTEGER" />

+ 6 - 14
sms_water/src/main/java/com/huaxu/service/SecSupplyService.java

@@ -41,35 +41,27 @@ public class SecSupplyService {
         List<MonthReportEntity> monthReportEntities = monthReportService.findAmountBySceneIds(monthReportEntity);
         Map<String, Double> maps = new LinkedHashMap<>();
         for (MonthReportEntity item : monthReportEntities) {
-            maps.put(item.getYear() + "-" + String.format("%02d", item.getMonth()) + "-" + String.format("%02d", item.getDay()), item.getLatestValue());
+            maps.put(item.getYear() + "-" + String.format("%02d", item.getMonth()) + "-" + String.format("%02d", item.getDay()), item.getSumValue());
         }
         Calendar begin = Calendar.getInstance();// 得到一个Calendar的实例
         begin.setTime(new Date()); // 设置时间为当前时间
         List<AmountDayThirtyDto> listC = new ArrayList<>();
-        for (int i = 1; i <= 31; i++) {
+        for (int i = 1; i <= 30; i++) {
             begin.add(Calendar.DATE, -1);// 日期加1
             Date d = new Date(begin.getTimeInMillis());
             DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
             AmountDayThirtyDto amountDayThirtyDto = new AmountDayThirtyDto();
             if (maps.containsKey(df.format(d).toString())) {
                 amountDayThirtyDto.setAmountTime(d);
-                amountDayThirtyDto.setAmount(maps.get(df.format(d)));
+                amountDayThirtyDto.setAmount((double)Math.round(maps.get(df.format(d))*1000)/1000);
             } else {
                 amountDayThirtyDto.setAmountTime(d);
+                amountDayThirtyDto.setAmount(0d);
             }
             listC.add(amountDayThirtyDto);
         }
-        List<AmountDayThirtyDto> listD = new ArrayList<>();
-        for (int m = 0; m < 30; m++) {
-            AmountDayThirtyDto amountDayThirtyDto = new AmountDayThirtyDto();
-            amountDayThirtyDto.setAmountTime(listC.get(m).getAmountTime());
-            if (listC.get(m + 1).getAmount() != null && listC.get(m).getAmount() != null)
-                amountDayThirtyDto.setAmount((double) Math.round((listC.get(m).getAmount() - listC.get(m + 1).getAmount()) * 1000) / 1000);
-            else
-                amountDayThirtyDto.setAmount(0d);
-            listD.add(amountDayThirtyDto);
-        }
-        return listD;
+
+        return listC;
     }
 
     /**

+ 4 - 4
sms_water/src/main/resources/mapper/DayReportMapper.xml

@@ -160,13 +160,13 @@
         (SELECT
         c.year,c.month,c.day,c.hour,
         case when a.PARM_TYPE=4 then
-        c.latest_value end as "intakeWaterUsage",
+        c.SUM_VALUE end as "intakeWaterUsage",
         case when a.PARM_TYPE=3 then
-        c.latest_value end as "yieldWaterUsage",
+        c.SUM_VALUE end as "yieldWaterUsage",
         case when a.PARM_TYPE=5 then
-        c.latest_value end as "powerUsage",
+        c.SUM_VALUE end as "powerUsage",
         case when a.PARM_TYPE=6 then
-        c.latest_value end as "drugUsage"
+        c.SUM_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

+ 1 - 1
sms_water/src/main/resources/mapper/DeviceParmMapper.xml

@@ -216,7 +216,7 @@
         <foreach collection="report.parentSceneIds" item="dramaId" open="(" close=")" separator=",">
             #{dramaId}
         </foreach>
-        ORDER BY a.SEQ
+        ORDER BY a.SEQ asc
         ) as tab
     </select>
     <select id="findBySceneDeviceId" resultType="com.huaxu.dto.DeviceParmInfoDto">

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

@@ -157,13 +157,13 @@
         (SELECT
         c.year,c.month,c.day,
         case when a.PARM_TYPE=4 then
-        c.latest_value end as "intakeWaterUsage",
+        c.SUM_VALUE end as "intakeWaterUsage",
         case when a.PARM_TYPE=3 then
-        c.latest_value end as "yieldWaterUsage",
+        c.SUM_VALUE end as "yieldWaterUsage",
         case when a.PARM_TYPE=5 then
-        c.latest_value end as "powerUsage",
+        c.SUM_VALUE end as "powerUsage",
         case when a.PARM_TYPE=6 then
-        c.latest_value end as "drugUsage"
+        c.SUM_VALUE end as "drugUsage"
         FROM sms_device_parm a
         INNER JOIN sms_device_attribute b on a.ATTRIBUTE_ID=b.ID
         INNER JOIN sms_month_report c on a.ATTRIBUTE_ID=c.ATTRIBUTE_ID and a.DEVICE_ID=c.DEVICE_ID
@@ -255,10 +255,11 @@
         order by tab.DEVICE_ID,tab.year,tab.month,tab.day
     </select>
     <select id="findAmountBySceneIds" resultType="com.huaxu.entity.MonthReportEntity">
-        SELECT a.year as "year",a.`MONTH` as "month",a.`DAY` as "day",sum(a.LATEST_VALUE) as "latestValue"
+        SELECT a.year as "year",a.`MONTH` as "month",a.`DAY` as "day",sum(a.LATEST_VALUE) as "latestValue",
+        sum(a.SUM_VALUE) as "sumValue"
         FROM  sms_month_report a
         INNER JOIN sms_device_parm b on a.DEVICE_ID=b.DEVICE_ID and a.ATTRIBUTE_ID=b.ATTRIBUTE_ID and b.`STATUS`=1
-        where DATE_SUB(CURDATE(), INTERVAL 31 DAY) &lt;= date(a.COLLECT_DATE)
+        where DATE_SUB(CURDATE(), INTERVAL 30 DAY) &lt;= date(a.COLLECT_DATE)
         and b.PARM_TYPE=3 and b.PARENT_SCENE_ID in
         <foreach collection="monthReport.parentSceneLists" item="dramaId" open="(" close=")" separator=",">
             #{dramaId.id}

+ 4 - 4
sms_water/src/main/resources/mapper/YearReportMapper.xml

@@ -154,13 +154,13 @@
         (SELECT
         c.year,c.month,
         case when a.PARM_TYPE=4 then
-        c.latest_value end as "intakeWaterUsage",
+        c.SUM_VALUE end as "intakeWaterUsage",
         case when a.PARM_TYPE=3 then
-        c.latest_value end as "yieldWaterUsage",
+        c.SUM_VALUE end as "yieldWaterUsage",
         case when a.PARM_TYPE=5 then
-        c.latest_value end as "powerUsage",
+        c.SUM_VALUE end as "powerUsage",
         case when a.PARM_TYPE=6 then
-        c.latest_value end as "drugUsage"
+        c.SUM_VALUE end as "drugUsage"
         FROM sms_device_parm a
         INNER JOIN sms_device_attribute b on a.ATTRIBUTE_ID=b.ID
         INNER JOIN sms_year_report c on a.ATTRIBUTE_ID=c.ATTRIBUTE_ID and a.DEVICE_ID=c.DEVICE_ID

+ 1 - 1
user_center/src/main/resources/mapper/MenuMapper.xml

@@ -369,7 +369,7 @@
         <include refid="menuColumns"/>
         FROM uims_menu a
         <where>
-            a.status=1 and  a.SHOW_STATE=1 and is_tenant =1
+            a.status=1  and is_tenant =1
         </where>
         order by a.seq
     </select>