chore: 遗留逻辑完善

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
+        genDatabaseType.setGenTableFieldTypeList(iGenTableFieldTypeService.list(Wrappers.<GenTableFieldType>lambdaQuery()
-                .list(Wrappers.<GenTableFieldType>lambdaQuery().eq(GenTableFieldType::getTypeId, genDatabaseType.getId())));
+            .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,]+}")
+    @DeleteMapping("/remove/{ids:[\\w,]+}")
-    public R remove(@PathVariable String[] id) {
+    public R remove(@PathVariable String[] ids) {
-        iGenDatabaseTypeService.removeByIds(Arrays.asList(id));
+        iGenDatabaseTypeService.removeByIdsAndGenTableFieldType(Arrays.asList(ids));
         return R.ok();
     }
 
-
 }
 

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<GenTableFieldType> getQueryWrapper(GenTableFieldType genTableFieldType) {
         return new LambdaQueryWrapper<GenTableFieldType>()
                 .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,]+}")
+    @DeleteMapping("/remove/{ids:[\\w,]+}")
-    public R remove(@PathVariable String[] id) {
+    public R remove(@PathVariable String[] ids) {
-        iGenTableFieldTypeService.removeByIds(Arrays.asList(id));
+        iGenTableFieldTypeService.removeByIds(Arrays.asList(ids));
         return R.ok();
     }
 

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;
+
 /**
  * <p>
  * 数据库类型 服务类
@@ -15,4 +17,6 @@ public interface IGenDatabaseTypeService extends IService<GenDatabaseType> {
 
     void saveAndGenTableFieldType(GenDatabaseType genDatabaseType);
 
+    void removeByIdsAndGenTableFieldType(List<String> ids);
+
 }

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<GenDatabaseTypeMappe
         iGenTableFieldTypeService.removeBatchByIds(delGenTableFieldTypeList);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void removeByIdsAndGenTableFieldType(List<String> ids) {
+        ids.forEach(id-> {
+            super.removeById(id);
+            iGenTableFieldTypeService.remove(Wrappers.<GenTableFieldType>lambdaUpdate().eq(GenTableFieldType::getTypeId, id));
+        });
+    }
+
 }