fix: 优化模块删除
模块删除逻辑连带删除大屏和快照数据
This commit is contained in:
parent
ad1fa0ee92
commit
016840e83c
@ -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);
|
||||
}
|
||||
|
||||
// 获取模块详情
|
||||
|
@ -39,4 +39,6 @@ public interface IModuleService extends IService<Module> {
|
||||
* @return 存在返回true
|
||||
*/
|
||||
boolean deleteModulesByAppID(String appId);
|
||||
|
||||
boolean removeModule(String id);
|
||||
}
|
||||
|
@ -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<ModuleMapper, Module> 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<ModuleMapper, Module> impleme
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean removeModule(String id) {
|
||||
dataVisualizationInfoMapper.deleteById(id);
|
||||
snapshotDataVisualizationInfoMapper.deleteById(id);
|
||||
return this.removeById(id);
|
||||
}
|
||||
}
|
@ -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;
|
||||
}
|
||||
|
@ -505,6 +505,7 @@
|
||||
<insert id="snapshotDataV">
|
||||
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 id="restoreDataV">
|
||||
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`,
|
||||
|
Loading…
Reference in New Issue
Block a user