diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenDatabaseTypeController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenDatabaseTypeController.java index eb38daa7..04643843 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenDatabaseTypeController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenDatabaseTypeController.java @@ -50,8 +50,10 @@ public class GenDatabaseTypeController { @GetMapping("/{id:\\w+}") public R getById(@PathVariable("id") String id) { GenDatabaseType genDatabaseType = iGenDatabaseTypeService.getById(id); - genDatabaseType.setGenTableFieldTypeList(iGenTableFieldTypeService - .list(Wrappers.lambdaQuery().eq(GenTableFieldType::getTypeId, genDatabaseType.getId()))); + genDatabaseType.setGenTableFieldTypeList(iGenTableFieldTypeService.list(Wrappers.lambdaQuery() + .eq(GenTableFieldType::getTypeId, genDatabaseType.getId()) + .orderByAsc(GenTableFieldType::getSort) + )); return R.ok(genDatabaseType); } @@ -73,12 +75,11 @@ public class GenDatabaseTypeController { return R.ok(); } - @DeleteMapping("/remove/{id:[\\w,]+}") - public R remove(@PathVariable String[] id) { - iGenDatabaseTypeService.removeByIds(Arrays.asList(id)); + @DeleteMapping("/remove/{ids:[\\w,]+}") + public R remove(@PathVariable String[] ids) { + iGenDatabaseTypeService.removeByIdsAndGenTableFieldType(Arrays.asList(ids)); return R.ok(); } - } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenTableFieldTypeController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenTableFieldTypeController.java index dede9a61..813c6a4c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenTableFieldTypeController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenTableFieldTypeController.java @@ -32,7 +32,8 @@ public class GenTableFieldTypeController { private LambdaQueryWrapper getQueryWrapper(GenTableFieldType genTableFieldType) { return new LambdaQueryWrapper() .eq(StrUtil.isNotBlank(genTableFieldType.getTypeId()), GenTableFieldType::getTypeId, genTableFieldType.getTypeId()) - .like(StrUtil.isNotBlank(genTableFieldType.getLabel()), GenTableFieldType::getLabel, genTableFieldType.getLabel()); + .like(StrUtil.isNotBlank(genTableFieldType.getLabel()), GenTableFieldType::getLabel, genTableFieldType.getLabel()) + .orderByAsc(GenTableFieldType::getSort); } @GetMapping("/list") @@ -58,9 +59,9 @@ public class GenTableFieldTypeController { return R.ok(); } - @DeleteMapping("/remove/{id:[\\w,]+}") - public R remove(@PathVariable String[] id) { - iGenTableFieldTypeService.removeByIds(Arrays.asList(id)); + @DeleteMapping("/remove/{ids:[\\w,]+}") + public R remove(@PathVariable String[] ids) { + iGenTableFieldTypeService.removeByIds(Arrays.asList(ids)); return R.ok(); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/IGenDatabaseTypeService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/IGenDatabaseTypeService.java index 48bba317..5a1eaed1 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/IGenDatabaseTypeService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/IGenDatabaseTypeService.java @@ -3,6 +3,8 @@ package com.cloud.kicc.system.devtools.service; import com.cloud.kicc.system.api.devtools.entity.GenDatabaseType; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 数据库类型 服务类 @@ -15,4 +17,6 @@ public interface IGenDatabaseTypeService extends IService { void saveAndGenTableFieldType(GenDatabaseType genDatabaseType); + void removeByIdsAndGenTableFieldType(List ids); + } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/impl/GenDatabaseTypeServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/impl/GenDatabaseTypeServiceImpl.java index 8289a846..7bf5f186 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/impl/GenDatabaseTypeServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/impl/GenDatabaseTypeServiceImpl.java @@ -1,6 +1,7 @@ package com.cloud.kicc.system.devtools.service.impl; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.cloud.kicc.system.api.devtools.entity.GenDatabaseType; import com.cloud.kicc.system.api.devtools.entity.GenTableFieldType; @@ -46,4 +47,13 @@ public class GenDatabaseTypeServiceImpl extends ServiceImpl ids) { + ids.forEach(id-> { + super.removeById(id); + iGenTableFieldTypeService.remove(Wrappers.lambdaUpdate().eq(GenTableFieldType::getTypeId, id)); + }); + } + }