diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/TenantAdminApplication.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/TenantAdminApplication.java index 4ddd909..ab99caa 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/TenantAdminApplication.java +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/TenantAdminApplication.java @@ -4,8 +4,10 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.EnableScheduling; /** @@ -26,4 +28,10 @@ public class TenantAdminApplication { } + @EventListener(ApplicationReadyEvent.class) + public void onApplicationReady() { + System.out.println("\n=============================================="); + System.out.println("============= 项目启动成功 SUCCESS ============"); + System.out.println("==============================================\n"); + } } diff --git a/common/common-generator/src/main/java/apelet/common/generator/controller/OnlCgreportHeadController.java b/common/common-generator/src/main/java/apelet/common/generator/controller/OnlCgreportHeadController.java index d3806be..dbf518b 100644 --- a/common/common-generator/src/main/java/apelet/common/generator/controller/OnlCgreportHeadController.java +++ b/common/common-generator/src/main/java/apelet/common/generator/controller/OnlCgreportHeadController.java @@ -2,7 +2,10 @@ package apelet.common.generator.controller; import apelet.common.core.annotation.MyRequestBody; import apelet.common.core.constant.ErrorCodeEnum; -import apelet.common.core.object.*; +import apelet.common.core.object.MyOrderParam; +import apelet.common.core.object.MyPageData; +import apelet.common.core.object.MyPageParam; +import apelet.common.core.object.ResponseResult; import apelet.common.core.util.MyPageUtil; import apelet.common.generator.dto.OnlCgreportHeadDto; import apelet.common.generator.dto.SQLParseDto; @@ -171,11 +174,7 @@ public class OnlCgreportHeadController { */ @GetMapping(value = "/getParamsById") public ResponseResult getParamsById(@RequestParam("id") String id) { - List result = onlCgreportHeadService.getParamsById(id); - if (ObjectUtil.isAllEmpty(result)){ - return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST); - } - return ResponseResult.success(result); + return ResponseResult.success(onlCgreportHeadService.getParamsById(id)); } /** * 保存报表配置+字段+参数 diff --git a/common/common-online/src/main/java/apelet/common/online/controller/OnlineOperationController.java b/common/common-online/src/main/java/apelet/common/online/controller/OnlineOperationController.java index 6c3ddf2..c6d913d 100644 --- a/common/common-online/src/main/java/apelet/common/online/controller/OnlineOperationController.java +++ b/common/common-online/src/main/java/apelet/common/online/controller/OnlineOperationController.java @@ -824,7 +824,7 @@ public class OnlineOperationController { @MyRequestBody TraceParamDto traceParamDto, @MyRequestBody OnlineEventPluginExecuteDto onlineEventPluginExecuteDto, @MyRequestBody String metaCode, - @MyRequestBody(required = true) Long baseFormId + @MyRequestBody Long baseFormId ) { // 1. 验证数据源及其关联 ResponseResult datasourceResult =