From 0408315ba1f0d36b3a37fb1901ab52e4babf1ce1 Mon Sep 17 00:00:00 2001 From: root <13910913995@163.com> Date: Wed, 2 Apr 2025 10:21:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=B9=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ApplicationServiceImpl.java | 2 +- .../module/controller/ModuleController.java | 12 ++++++---- .../application/module/domain/Module.java | 3 +++ .../module/service/IModuleService.java | 9 ++++++- .../service/impl/ModuleServiceImpl.java | 24 +++++++++++++++++-- 5 files changed, 41 insertions(+), 9 deletions(-) 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 ee2b8b0..9d49805 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 @@ -82,7 +82,7 @@ public class ApplicationServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Module::getAppId,appId); - wrapper.orderByAsc(Module::getPid,Module::getSort); // 按编码倒序排列 - List list = moduleService.list(wrapper); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("app_id",appId); + wrapper.orderByAsc("pid","sort"); // 按编码倒序排列 + List> list = moduleService.listMaps(wrapper); return ResponseResult.successData(list); } @@ -44,7 +46,7 @@ public class ModuleController { public ResponseResult save(@RequestBody Module module) { module.setCreateTime(LocalDateTime.now()); module.setCreateBy(AuthUtils.getUser().getUserId().toString()); - return ResponseResult.successData(moduleService.save(module)); + return ResponseResult.successData(moduleService.createModule(module)); } // 修改模块 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 0d5943a..b4a7c9b 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 @@ -1,10 +1,12 @@ package io.gisbi.application.module.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; +import org.apache.ibatis.type.JdbcType; /** *

@@ -39,6 +41,7 @@ public class Module implements Serializable { /** * 父级ID 父级模块 */ + @TableField(value = "pid", jdbcType = JdbcType.VARCHAR) private String pid; /** 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 537a5ee..a4cfc20 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 @@ -13,6 +13,13 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IModuleService extends IService { + /** + * 创建模块 + * @param Module module + * @return 存在返回true + */ + boolean createModule(Module module); + /** * 检查是否存在子节点 * @param pid 父ID @@ -31,5 +38,5 @@ public interface IModuleService extends IService { * @param appId 项目ID * @return 存在返回true */ - boolean deleteAppModules(String appId); + boolean deleteModulesByAppID(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 3a42e54..bd64165 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 @@ -7,7 +7,11 @@ import io.gisbi.application.module.service.IModuleService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import io.gisbi.engine.utils.DateUtils; import io.gisbi.utils.AuthUtils; +import io.gisbi.visualization.dao.auto.entity.DataVisualizationInfo; +import io.gisbi.visualization.manage.CoreVisualizationManage; +import jakarta.annotation.Resource; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.ArrayList; @@ -23,7 +27,23 @@ import java.util.List; */ @Service public class ModuleServiceImpl extends ServiceImpl implements IModuleService { - + @Resource + private CoreVisualizationManage coreVisualizationManage; + @Override + @Transactional(rollbackFor = Exception.class) + public boolean createModule(Module module) { + boolean isok=this.save(module); + if(isok){ + if(module.getType().equals("03"))//GIS大屏页面 + { + DataVisualizationInfo visualizationInfo = new DataVisualizationInfo(); + coreVisualizationManage.preInnerSave(visualizationInfo); + return true; + } + } + return false; + } + // 新增existsChildrenByPid实现 @Override public boolean existsChildrenByPid(String appId,String pid) { @@ -65,7 +85,7 @@ public class ModuleServiceImpl extends ServiceImpl impleme } @Override - public boolean deleteAppModules(String appId) { + public boolean deleteModulesByAppID(String appId) { if(this.remove(new LambdaQueryWrapper().eq(Module::getAppId,appId))){ return true; }