diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java b/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java index fdde7db..04a7b9a 100644 --- a/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java +++ b/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java @@ -27,8 +27,8 @@ public class EngIneController extends BaseController { EngIneService engIneService; @GetMapping("/getMaintenanceList") - public Result> getMaintenanceList(@RequestBody EngineMaintenance engineMaintenanceQueryReq) { - List list = engIneService.list(engineMaintenanceQueryReq); + public Result> getMaintenanceList( ) { + List list = engIneService.list(); return Result.success(list); } } diff --git a/cloud-etl-server/src/main/java/com/muyu/service/EngIneService.java b/cloud-etl-server/src/main/java/com/muyu/service/EngIneService.java index 77d02d2..af9c04c 100644 --- a/cloud-etl-server/src/main/java/com/muyu/service/EngIneService.java +++ b/cloud-etl-server/src/main/java/com/muyu/service/EngIneService.java @@ -14,5 +14,5 @@ import java.util.List; * @Date：2024/8/22 15:37 */ public interface EngIneService extends IService { - List list(EngineMaintenance engineMaintenance); + List list( ); } diff --git a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngIneServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngIneServiceImpl.java index f4374c9..965d650 100644 --- a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngIneServiceImpl.java +++ b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngIneServiceImpl.java @@ -26,33 +26,33 @@ public class EngIneServiceImpl extends ServiceImpl list(EngineMaintenance engineMaintenance) { + public List list( ) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - - if (StringUtils.isNotNull(engineMaintenance.getName())) { - queryWrapper.like(EngineMaintenance::getName, engineMaintenance.getName()); - } - - if (StringUtils.isNotNull(engineMaintenance.getType())) { - queryWrapper.eq(EngineMaintenance::getType, engineMaintenance.getType()); - } - - if (StringUtils.isNotNull(engineMaintenance.getScope())) { - queryWrapper.eq(EngineMaintenance::getScope, engineMaintenance.getScope()); - } - - if (StringUtils.isNotNull(engineMaintenance.getEngineCode())) { - queryWrapper.eq(EngineMaintenance::getEngineCode, engineMaintenance.getEngineCode()); - } - - if (StringUtils.isNotNull(engineMaintenance.getIsActivate())) { - queryWrapper.eq(EngineMaintenance::getIsActivate, engineMaintenance.getIsActivate()); - } - - if (StringUtils.isNotNull(engineMaintenance.getStatus())) { - queryWrapper.eq(EngineMaintenance::getStatus, engineMaintenance.getStatus()); - } +// +// if (StringUtils.isNotNull(engineMaintenance.getName())) { +// queryWrapper.like(EngineMaintenance::getName, engineMaintenance.getName()); +// } +// +// if (StringUtils.isNotNull(engineMaintenance.getType())) { +// queryWrapper.eq(EngineMaintenance::getType, engineMaintenance.getType()); +// } +// +// if (StringUtils.isNotNull(engineMaintenance.getScope())) { +// queryWrapper.eq(EngineMaintenance::getScope, engineMaintenance.getScope()); +// } +// +// if (StringUtils.isNotNull(engineMaintenance.getEngineCode())) { +// queryWrapper.eq(EngineMaintenance::getEngineCode, engineMaintenance.getEngineCode()); +// } +// +// if (StringUtils.isNotNull(engineMaintenance.getIsActivate())) { +// queryWrapper.eq(EngineMaintenance::getIsActivate, engineMaintenance.getIsActivate()); +// } +// +// if (StringUtils.isNotNull(engineMaintenance.getStatus())) { +// queryWrapper.eq(EngineMaintenance::getStatus, engineMaintenance.getStatus()); +// } return list(queryWrapper); } diff --git a/logs/cloud-etl-engine/error.log b/logs/cloud-etl-engine/error.log index 11f5c12..5365922 100644 --- a/logs/cloud-etl-engine/error.log +++ b/logs/cloud-etl-engine/error.log @@ -1592,3 +1592,58 @@ org.springframework.http.converter.HttpMessageNotReadableException: Required req at org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:63) at java.base/java.lang.Thread.run(Thread.java:842) +20:34:50.131 [http-nio-9701-exec-1] ERROR c.m.c.s.h.GlobalExceptionHandler - [handleRuntimeException,98] - 请求地址'/engine/getMaintenanceList',发生未知异常. +org.springframework.http.converter.HttpMessageNotReadableException: Required request body is missing: public com.muyu.common.core.domain.Result> com.muyu.controller.EngIneController.getMaintenanceList(com.muyu.domain.EngineMaintenance) + at org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor.readWithMessageConverters(RequestResponseBodyMethodProcessor.java:164) + at org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor.resolveArgument(RequestResponseBodyMethodProcessor.java:135) + at org.springframework.web.method.support.HandlerMethodArgumentResolverComposite.resolveArgument(HandlerMethodArgumentResolverComposite.java:122) + at org.springframework.web.method.support.InvocableHandlerMethod.getMethodArgumentValues(InvocableHandlerMethod.java:224) + at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:178) + at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:118) + at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:926) + at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:831) + at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87) + at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1089) + at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:979) + at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1014) + at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:903) + at jakarta.servlet.http.HttpServlet.service(HttpServlet.java:633) + at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:885) + at jakarta.servlet.http.HttpServlet.service(HttpServlet.java:723) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:195) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:140) + at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:51) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:164) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:140) + at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:164) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:140) + at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:164) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:140) + at org.springframework.web.filter.ServerHttpObservationFilter.doFilterInternal(ServerHttpObservationFilter.java:109) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:164) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:140) + at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:164) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:140) + at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:167) + at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:90) + at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:482) + at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:115) + at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:93) + at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74) + at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:344) + at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:389) + at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:63) + at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:896) + at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1741) + at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:52) + at org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1190) + at org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659) + at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:63) + at java.base/java.lang.Thread.run(Thread.java:842) diff --git a/logs/cloud-etl-engine/info.log b/logs/cloud-etl-engine/info.log index d374f62..7775863 100644 --- a/logs/cloud-etl-engine/info.log +++ b/logs/cloud-etl-engine/info.log @@ -535,3 +535,44 @@ 19:41:51.552 [SpringApplicationShutdownHook] INFO c.a.d.p.DruidDataSource - [close,2277] - {dataSource-1} closed 19:41:51.552 [SpringApplicationShutdownHook] INFO c.b.d.d.d.DefaultDataSourceDestroyer - [destroy,98] - dynamic-datasource close the datasource named [master] success, 19:41:51.552 [SpringApplicationShutdownHook] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,219] - dynamic-datasource all closed success,bye +20:34:13.539 [main] INFO c.m.EngineApplication - [logStartupProfileInfo,660] - The following 1 profile is active: "dev" +20:34:16.129 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat] +20:34:16.130 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/10.1.24] +20:34:16.212 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext +20:34:18.570 [main] INFO c.a.d.p.DruidDataSource - [init,1002] - {dataSource-1,master} inited +20:34:18.571 [main] INFO c.b.d.d.DynamicRoutingDataSource - [addDataSource,158] - dynamic-datasource - add a datasource named [master] success +20:34:18.571 [main] INFO c.b.d.d.DynamicRoutingDataSource - [afterPropertiesSet,241] - dynamic-datasource initial loaded [1] datasource,primary datasource named [master] +20:34:19.676 [main] INFO c.a.c.s.SentinelWebMvcConfigurer - [addInterceptors,52] - [Sentinel Starter] register SentinelWebInterceptor with urlPatterns: [/**]. +20:34:27.105 [main] INFO c.a.n.client.naming - [initNamespaceForNaming,62] - initializer namespace from ans.namespace attribute : null +20:34:27.106 [main] INFO c.a.n.client.naming - [lambda$initNamespaceForNaming$0,66] - initializer namespace from ALIBABA_ALIWARE_NAMESPACE attribute :null +20:34:27.106 [main] INFO c.a.n.client.naming - [lambda$initNamespaceForNaming$1,73] - initializer namespace from namespace attribute :null +20:34:27.112 [main] INFO c.a.n.client.naming - [,74] - FailoverDataSource type is class com.alibaba.nacos.client.naming.backups.datasource.DiskFailoverDataSource +20:34:27.117 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success. +20:34:27.117 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success. +20:34:27.225 [main] INFO c.a.n.c.r.client - [lambda$createClient$0,118] - [RpcClientFactory] create a new rpc client of fe89ed3e-d0f2-4fe6-ab34-71c8b820678e +20:34:27.228 [main] INFO c.a.n.client.naming - [,109] - Create naming rpc client for uuid->fe89ed3e-d0f2-4fe6-ab34-71c8b820678e +20:34:27.228 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [fe89ed3e-d0f2-4fe6-ab34-71c8b820678e] RpcClient init, ServerListFactory = com.alibaba.nacos.client.naming.core.ServerListManager +20:34:27.228 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [fe89ed3e-d0f2-4fe6-ab34-71c8b820678e] Registry connection listener to current client:com.alibaba.nacos.client.naming.remote.gprc.redo.NamingGrpcRedoService +20:34:27.228 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [fe89ed3e-d0f2-4fe6-ab34-71c8b820678e] Register server push request handler:com.alibaba.nacos.client.naming.remote.gprc.NamingPushRequestHandler +20:34:27.229 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [fe89ed3e-d0f2-4fe6-ab34-71c8b820678e] Try to connect to server on start up, server: {serverIp = '47.116.184.54', server main port = 8848} +20:34:27.229 [main] INFO c.a.n.c.r.c.g.GrpcClient - [createNewManagedChannel,210] - grpc client connection server:47.116.184.54 ip,serverPort:9848,grpcTslConfig:{"sslProvider":"","enableTls":false,"mutualAuthEnable":false,"trustAll":false} +20:34:27.326 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [fe89ed3e-d0f2-4fe6-ab34-71c8b820678e] Success to connect to server [47.116.184.54:8848] on start up, connectionId = 1724330070302_139.224.212.27_62713 +20:34:27.326 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [fe89ed3e-d0f2-4fe6-ab34-71c8b820678e] Register server push request handler:com.alibaba.nacos.common.remote.client.RpcClient$ConnectResetRequestHandler +20:34:27.326 [com.alibaba.nacos.client.remote.worker.0] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [fe89ed3e-d0f2-4fe6-ab34-71c8b820678e] Notify connected event to listeners. +20:34:27.326 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [fe89ed3e-d0f2-4fe6-ab34-71c8b820678e] Register server push request handler:com.alibaba.nacos.common.remote.client.RpcClient$$Lambda$575/0x000001de814e0870 +20:34:27.326 [com.alibaba.nacos.client.remote.worker.0] INFO c.a.n.client.naming - [onConnected,90] - Grpc connection connect +20:34:27.328 [main] INFO c.a.n.client.naming - [registerService,133] - [REGISTER-SERVICE] cloud-2112 registering service cloud-engine with instance Instance{instanceId='null', ip='192.168.52.1', port=9701, weight=1.0, healthy=true, enabled=true, ephemeral=true, clusterName='DEFAULT', serviceName='null', metadata={IPv6=null, preserved.register.source=SPRING_CLOUD}} +20:34:27.353 [main] INFO c.a.c.n.r.NacosServiceRegistry - [register,76] - nacos registry, DEFAULT_GROUP cloud-engine 192.168.52.1:9701 register finished +20:34:28.563 [main] INFO c.m.EngineApplication - [logStarted,56] - Started EngineApplication in 20.338 seconds (process running for 21.289) +20:34:28.574 [main] INFO c.a.n.c.c.i.CacheData - [initNotifyWarnTimeout,72] - config listener notify warn timeout millis use default 60000 millis +20:34:28.574 [main] INFO c.a.n.c.c.i.CacheData - [,99] - nacos.cache.data.init.snapshot = true +20:34:28.575 [main] INFO c.a.n.c.c.i.ClientWorker - [addCacheDataIfAbsent,416] - [fixed-cloud-2112-47.116.184.54_8848] [subscribe] cloud-engine.yml+DEFAULT_GROUP+cloud-2112 +20:34:28.586 [main] INFO c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-cloud-2112-47.116.184.54_8848] [add-listener] ok, tenant=cloud-2112, dataId=cloud-engine.yml, group=DEFAULT_GROUP, cnt=1 +20:34:28.586 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-engine.yml, group=DEFAULT_GROUP +20:34:28.587 [main] INFO c.a.n.c.c.i.ClientWorker - [addCacheDataIfAbsent,416] - [fixed-cloud-2112-47.116.184.54_8848] [subscribe] cloud-engine+DEFAULT_GROUP+cloud-2112 +20:34:28.587 [main] INFO c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-cloud-2112-47.116.184.54_8848] [add-listener] ok, tenant=cloud-2112, dataId=cloud-engine, group=DEFAULT_GROUP, cnt=1 +20:34:28.587 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-engine, group=DEFAULT_GROUP +20:34:28.589 [main] INFO c.a.n.c.c.i.ClientWorker - [addCacheDataIfAbsent,416] - [fixed-cloud-2112-47.116.184.54_8848] [subscribe] cloud-engine-dev.yml+DEFAULT_GROUP+cloud-2112 +20:34:28.589 [main] INFO c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-cloud-2112-47.116.184.54_8848] [add-listener] ok, tenant=cloud-2112, dataId=cloud-engine-dev.yml, group=DEFAULT_GROUP, cnt=1 +20:34:28.589 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-engine-dev.yml, group=DEFAULT_GROUP +20:34:28.679 [RMI TCP Connection(6)-172.16.0.7] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring DispatcherServlet 'dispatcherServlet'