From 5ba93d87f1cda64791c7add221c7211ef807983e Mon Sep 17 00:00:00 2001 From: root <13910913995@163.com> Date: Tue, 1 Apr 2025 16:33:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=A8=A1=E5=9D=97=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApplicationController.java | 3 +- .../baseinfo/service/IApplicationService.java | 2 +- .../service/impl/ApplicationServiceImpl.java | 13 ++++++- .../application/module/domain/Module.java | 14 ++++++++ .../module/service/IModuleService.java | 6 ++++ .../service/impl/ModuleServiceImpl.java | 36 +++++++++++++++++++ .../main/java/io/gisbi/doc/SwaggerConfig.java | 17 +++++---- 7 files changed, 82 insertions(+), 9 deletions(-) diff --git a/core/core-backend/src/main/java/io/gisbi/application/baseinfo/controller/ApplicationController.java b/core/core-backend/src/main/java/io/gisbi/application/baseinfo/controller/ApplicationController.java index 9d1567b..634a0d7 100644 --- a/core/core-backend/src/main/java/io/gisbi/application/baseinfo/controller/ApplicationController.java +++ b/core/core-backend/src/main/java/io/gisbi/application/baseinfo/controller/ApplicationController.java @@ -40,7 +40,8 @@ public class ApplicationController { * 新增应用 */ @PostMapping("/save") - public ResponseResult save(@RequestBody Application application) {return ResponseResult.successData(applicationService.save(application)); + public ResponseResult save(@RequestBody Application application) { + return ResponseResult.successData(applicationService.createApplication(application)); } /** diff --git a/core/core-backend/src/main/java/io/gisbi/application/baseinfo/service/IApplicationService.java b/core/core-backend/src/main/java/io/gisbi/application/baseinfo/service/IApplicationService.java index eb28a98..1fcb404 100644 --- a/core/core-backend/src/main/java/io/gisbi/application/baseinfo/service/IApplicationService.java +++ b/core/core-backend/src/main/java/io/gisbi/application/baseinfo/service/IApplicationService.java @@ -12,5 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService; * @since 2025-03-24 */ public interface IApplicationService extends IService { - + public boolean createApplication(Application application); } diff --git a/core/core-backend/src/main/java/io/gisbi/application/baseinfo/service/impl/ApplicationServiceImpl.java b/core/core-backend/src/main/java/io/gisbi/application/baseinfo/service/impl/ApplicationServiceImpl.java index 71c2d35..5d0f9e2 100644 --- a/core/core-backend/src/main/java/io/gisbi/application/baseinfo/service/impl/ApplicationServiceImpl.java +++ b/core/core-backend/src/main/java/io/gisbi/application/baseinfo/service/impl/ApplicationServiceImpl.java @@ -4,7 +4,10 @@ import io.gisbi.application.baseinfo.domain.Application; import io.gisbi.application.baseinfo.mapper.ApplicationMapper; import io.gisbi.application.baseinfo.service.IApplicationService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import io.gisbi.application.module.service.IModuleService; +import jakarta.annotation.Resource; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** *

@@ -16,5 +19,13 @@ import org.springframework.stereotype.Service; */ @Service public class ApplicationServiceImpl extends ServiceImpl implements IApplicationService { - + @Resource + private IModuleService moduleService; + @Override + @Transactional + public boolean createApplication(Application application) { + this.save(application); + moduleService.initAppModules(application.getId()); + return true; + } } diff --git a/core/core-backend/src/main/java/io/gisbi/application/module/domain/Module.java b/core/core-backend/src/main/java/io/gisbi/application/module/domain/Module.java index 6e7f87c..0d5943a 100644 --- a/core/core-backend/src/main/java/io/gisbi/application/module/domain/Module.java +++ b/core/core-backend/src/main/java/io/gisbi/application/module/domain/Module.java @@ -155,4 +155,18 @@ public class Module implements Serializable { * 备用3 */ private String custom3; + + public Module(String appId,String name,String pid,Integer level,String nodeType,String type,Integer status,Integer sort,LocalDateTime createTime,String createBy){ + + this.appId = appId; + this.name = name; + this.pid = pid; + this.level = level; + this.nodeType = nodeType; + this.type = type; + this.status = status; + this.sort = sort; + this.createTime = createTime; + this.createBy = createBy; + }; } diff --git a/core/core-backend/src/main/java/io/gisbi/application/module/service/IModuleService.java b/core/core-backend/src/main/java/io/gisbi/application/module/service/IModuleService.java index 1f71577..0e666e8 100644 --- a/core/core-backend/src/main/java/io/gisbi/application/module/service/IModuleService.java +++ b/core/core-backend/src/main/java/io/gisbi/application/module/service/IModuleService.java @@ -20,4 +20,10 @@ public interface IModuleService extends IService { */ boolean existsChildrenByPid(String appId,String pid); + /** + * 新增项目时，初始化创建项目模块 + * @param appId 项目ID + * @return 存在返回true + */ + boolean initAppModules(String appId); } diff --git a/core/core-backend/src/main/java/io/gisbi/application/module/service/impl/ModuleServiceImpl.java b/core/core-backend/src/main/java/io/gisbi/application/module/service/impl/ModuleServiceImpl.java index c584a72..135ae1a 100644 --- a/core/core-backend/src/main/java/io/gisbi/application/module/service/impl/ModuleServiceImpl.java +++ b/core/core-backend/src/main/java/io/gisbi/application/module/service/impl/ModuleServiceImpl.java @@ -5,8 +5,13 @@ import io.gisbi.application.module.domain.Module; import io.gisbi.application.module.mapper.ModuleMapper; import io.gisbi.application.module.service.IModuleService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import io.gisbi.engine.utils.DateUtils; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + /** *

* 应用_系统模块 服务实现类 @@ -24,4 +29,35 @@ public class ModuleServiceImpl extends ServiceImpl impleme return this.count(new LambdaQueryWrapper() .eq(Module::getAppId, appId).eq(Module::getPid, pid)) > 0; } + + @Override + public boolean initAppModules(String appId) { + // 01:登录页面 02:主框架页面 03:GIS大屏页面 04:二级弹窗页面 05:数据填报页面 06:文档资源页面 09:自定义页面 + List list=new ArrayList<>(); + list.add(createInitModule(appId,"登录页面","01",1)); + list.add(createInitModule(appId,"主框架页面","02",2)); + list.add(createInitModule(appId,"GIS大屏页面","03",3)); + list.add(createInitModule(appId,"二级弹窗页面","04",4)); + list.add(createInitModule(appId,"数据填报页面","05",5)); + list.add(createInitModule(appId,"文档资源页面","06",6)); + list.add(createInitModule(appId,"自定义页面","09",9)); + boolean isok=this.saveBatch(list); + return isok; + } + + private Module createInitModule(String appId,String name,String type,Integer sort){ + Module initModule=new Module( + appId, + name, + "00", + 1, + "01", + type, + 0, + sort, + LocalDateTime.now(), + "初始化" + ); + return initModule; + } } \ No newline at end of file diff --git a/sdk/common/src/main/java/io/gisbi/doc/SwaggerConfig.java b/sdk/common/src/main/java/io/gisbi/doc/SwaggerConfig.java index 0e0cad7..754d5f7 100644 --- a/sdk/common/src/main/java/io/gisbi/doc/SwaggerConfig.java +++ b/sdk/common/src/main/java/io/gisbi/doc/SwaggerConfig.java @@ -35,14 +35,11 @@ public class SwaggerConfig { @Bean public OpenAPI customOpenAPI() { Contact contact = new Contact(); - contact.setName("DataEase"); - contact.setUrl("https://www.fit2cloud.com/dataease/index.html"); - contact.setEmail("dataease@fit2cloud.com"); + contact.setName("GIS-BI"); return new OpenAPI() .info(new Info() - .title("DataEaseAPI") - .description("人人可用的开源 BI 工具") - .termsOfService("https://dataease.io") + .title("GIS-BIAPI") + .description("gis-bi工具") .contact(contact) .version(version)); } @@ -92,5 +89,13 @@ public class SwaggerConfig { return GroupedOpenApi.builder().group("8-xpacksync").displayName("同步管理").packagesToScan("io.dataease.xpack.sync.task").build(); } + @Bean + public GroupedOpenApi applicationApi() { + return GroupedOpenApi.builder() + .group("9-application") + .displayName("应用管理") + .packagesToScan("io.gisbi.application**") + .build(); + } }