From 016840e83c793a699f9a3e5bf5a2d99a725d8aae Mon Sep 17 00:00:00 2001 From: weitang Date: Wed, 9 Jul 2025 17:32:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=88=A0=E9=99=A4=20=E6=A8=A1=E5=9D=97=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=BF=9E=E5=B8=A6=E5=88=A0=E9=99=A4=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E5=92=8C=E5=BF=AB=E7=85=A7=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/controller/ModuleController.java | 8 +++++++- .../module/service/IModuleService.java | 2 ++ .../module/service/impl/ModuleServiceImpl.java | 16 +++++++++++++++- .../entity/SnapshotDataVisualizationInfo.java | 13 +++++++++++++ .../mybatis/ExtDataVisualizationMapper.xml | 4 ++++ 5 files changed, 41 insertions(+), 2 deletions(-) diff --git a/core/core-backend/src/main/java/io/gisbi/application/module/controller/ModuleController.java b/core/core-backend/src/main/java/io/gisbi/application/module/controller/ModuleController.java index 437a3c0..593f49c 100644 --- a/core/core-backend/src/main/java/io/gisbi/application/module/controller/ModuleController.java +++ b/core/core-backend/src/main/java/io/gisbi/application/module/controller/ModuleController.java @@ -8,7 +8,11 @@ import io.gisbi.application.module.domain.Module; import io.gisbi.application.module.service.IModuleService; import io.gisbi.config.ResponseResult; import io.gisbi.utils.AuthUtils; +import io.gisbi.visualization.dao.auto.entity.DataVisualizationInfo; +import io.gisbi.visualization.dao.auto.mapper.DataVisualizationInfoMapper; +import io.gisbi.visualization.dao.auto.mapper.SnapshotDataVisualizationInfoMapper; import jakarta.annotation.Resource; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.time.LocalDateTime; @@ -87,7 +91,9 @@ public class ModuleController { // 删除模块 @DeleteMapping("/{id}") public ResponseResult remove(@PathVariable String id) { - return ResponseResult.successData(moduleService.removeById(id)); + // 复制更新 新建权限插入 + boolean a = moduleService.removeModule(id); + return ResponseResult.successData(a); } // 获取模块详情 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 a4cfc20..a95db07 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 @@ -39,4 +39,6 @@ public interface IModuleService extends IService { * @return 存在返回true */ boolean deleteModulesByAppID(String appId); + + boolean removeModule(String id); } 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 a11366a..98739b6 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 @@ -8,6 +8,8 @@ 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.dao.auto.mapper.DataVisualizationInfoMapper; +import io.gisbi.visualization.dao.auto.mapper.SnapshotDataVisualizationInfoMapper; import io.gisbi.visualization.manage.CoreVisualizationManage; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; @@ -29,6 +31,10 @@ import java.util.List; public class ModuleServiceImpl extends ServiceImpl implements IModuleService { @Resource private CoreVisualizationManage coreVisualizationManage; + @Resource + private DataVisualizationInfoMapper dataVisualizationInfoMapper; + @Resource + private SnapshotDataVisualizationInfoMapper snapshotDataVisualizationInfoMapper; private DataVisualizationInfo buildDataVisualizationInfo(Module module) { DataVisualizationInfo visualizationInfo = new DataVisualizationInfo(); visualizationInfo.setId(Long.parseLong(module.getId())); @@ -125,4 +131,12 @@ public class ModuleServiceImpl extends ServiceImpl impleme } return false; } -} \ No newline at end of file + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean removeModule(String id) { + dataVisualizationInfoMapper.deleteById(id); + snapshotDataVisualizationInfoMapper.deleteById(id); + return this.removeById(id); + } +} diff --git a/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/SnapshotDataVisualizationInfo.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/SnapshotDataVisualizationInfo.java index dec4811..93e1286 100644 --- a/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/SnapshotDataVisualizationInfo.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/SnapshotDataVisualizationInfo.java @@ -21,6 +21,11 @@ public class SnapshotDataVisualizationInfo implements Serializable { */ private Long id; + /** + * 应用ID + */ + private String appId; + /** * 名称 */ @@ -149,6 +154,14 @@ public class SnapshotDataVisualizationInfo implements Serializable { this.id = id; } + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } + public String getName() { return name; } diff --git a/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml index 7176adf..0775bf5 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml @@ -505,6 +505,7 @@ INSERT into snapshot_data_visualization_info ( `id`, + `app_id`, `name`, `pid`, `org_id`, @@ -531,6 +532,7 @@ `check_version` ) SELECT `id`, + `app_id`, `name`, `pid`, `org_id`, @@ -870,6 +872,7 @@ INSERT INTO data_visualization_info ( `id`, + `app_id`, `name`, `pid`, `org_id`, @@ -896,6 +899,7 @@ `check_version` ) SELECT `id`, + `app_id`, `name`, `pid`, `org_id`,