Compare commits

..

No commits in common. "111047e788d0f0e986a0d4a05561f44403fd27dd" and "5c5d8a53dac27c6220401576f2d703e83c0e88c6" have entirely different histories.

5 changed files with 9 additions and 41 deletions

View File

@ -82,7 +82,7 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
public boolean removeById(String id) {
if (id == null || id.trim().isEmpty()) {
this.removeById(id);
moduleService.deleteModulesByAppID(id);
moduleService.deleteAppModules(id);
}
return true;
}

View File

@ -1,7 +1,6 @@
package io.gisbi.application.module.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.gisbi.application.module.domain.Module;
import io.gisbi.application.module.service.IModuleService;
@ -12,7 +11,6 @@ import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
/**
@ -34,10 +32,10 @@ public class ModuleController {
// 分页查询模块列表
@GetMapping("/list")
public ResponseResult page(@RequestParam String appId) {
QueryWrapper<Module> wrapper = new QueryWrapper<>();
wrapper.eq("app_id",appId);
wrapper.orderByAsc("pid","sort"); // 按编码倒序排列
List<Map<String, Object>> list = moduleService.listMaps(wrapper);
LambdaQueryWrapper<Module> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Module::getAppId,appId);
wrapper.orderByAsc(Module::getPid,Module::getSort); // 按编码倒序排列
List<Module> list = moduleService.list(wrapper);
return ResponseResult.successData(list);
}
@ -46,7 +44,7 @@ public class ModuleController {
public ResponseResult save(@RequestBody Module module) {
module.setCreateTime(LocalDateTime.now());
module.setCreateBy(AuthUtils.getUser().getUserId().toString());
return ResponseResult.successData(moduleService.createModule(module));
return ResponseResult.successData(moduleService.save(module));
}
// 修改模块

View File

@ -1,12 +1,10 @@
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;
/**
* <p>
@ -41,7 +39,6 @@ public class Module implements Serializable {
/**
* 父级ID 父级模块
*/
@TableField(value = "pid", jdbcType = JdbcType.VARCHAR)
private String pid;
/**

View File

@ -13,13 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IModuleService extends IService<Module> {
/**
* 创建模块
* @param Module module
* @return 存在返回true
*/
boolean createModule(Module module);
/**
* 检查是否存在子节点
* @param pid 父ID
@ -38,5 +31,5 @@ public interface IModuleService extends IService<Module> {
* @param appId 项目ID
* @return 存在返回true
*/
boolean deleteModulesByAppID(String appId);
boolean deleteAppModules(String appId);
}

View File

@ -7,11 +7,7 @@ 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;
@ -27,23 +23,7 @@ import java.util.List;
*/
@Service
public class ModuleServiceImpl extends ServiceImpl<ModuleMapper, Module> 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) {
@ -85,7 +65,7 @@ public class ModuleServiceImpl extends ServiceImpl<ModuleMapper, Module> impleme
}
@Override
public boolean deleteModulesByAppID(String appId) {
public boolean deleteAppModules(String appId) {
if(this.remove(new LambdaQueryWrapper<Module>().eq(Module::getAppId,appId))){
return true;
}