删除调整

src/main/java/com/yeejoin/amos/api/tool/controller/ApiSourceResource.java

@@ -66,8 +66,7 @@ public class ApiSourceResource {
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
     public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        apiInfoService.removeByIds(apiInfoService.selectSeqByApiSource(apiSourceService.queryCodeById(sequenceNbr)));
-        return ResponseHelper.buildResponse(apiSourceService.removeById(sequenceNbr));
+        return ResponseHelper.buildResponse(apiSourceService.deleteById(sequenceNbr));
     }
 
     /**

src/main/java/com/yeejoin/amos/api/tool/controller/TemplateCategoryResource.java

@@ -68,8 +68,7 @@ public class TemplateCategoryResource {
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
     public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        templateService.removeByIds(templateService.selectSeqsByCategorySeq(sequenceNbr));
-        return ResponseHelper.buildResponse(templateCategoryService.removeById(sequenceNbr));
+        return ResponseHelper.buildResponse(templateCategoryService.deleteById(sequenceNbr));
     }
 
     /**

src/main/java/com/yeejoin/amos/api/tool/face/service/ApiSourceService.java

 package com.yeejoin.amos.api.tool.face.service;
 
 
+import com.yeejoin.amos.api.tool.face.model.ApiInfoModel;
 import com.yeejoin.amos.api.tool.face.model.ApiSourceModel;
 import com.yeejoin.amos.api.tool.face.orm.entity.ApiSource;
 import com.yeejoin.amos.api.tool.face.orm.dao.ApiSourceMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import java.util.List;
@@ -11,6 +13,8 @@ import java.util.List;
 @Service
 public class ApiSourceService extends BaseService<ApiSourceModel, ApiSource, ApiSourceMapper> {
 
+    @Autowired
+    private ApiInfoService apiInfoService;
 
     /**
      * 列表查询
@@ -26,4 +30,15 @@ public class ApiSourceService extends BaseService<ApiSourceModel, ApiSource, Api
         ApiSourceModel model = this.queryModelByParams(sequenceNbr);
         return  model.getCode();
     }
+
+    /**
+     * 通过API来源ID删除API来源
+     */
+    public Boolean deleteById(Long sequenceNbr){
+        List<String> strings = apiInfoService.selectSeqByApiSource(this.queryCodeById(sequenceNbr));
+        if(strings.size() != 0) {
+            this.removeByIds(strings);
+        }
+        return this.removeById(sequenceNbr);
+    }
 }

src/main/java/com/yeejoin/amos/api/tool/face/service/TemplateCategoryService.java

@@ -2,13 +2,16 @@ package com.yeejoin.amos.api.tool.face.service;
 
 import com.yeejoin.amos.api.tool.face.model.TemplateCategoryModel;
 import com.yeejoin.amos.api.tool.face.model.TemplateCategoryTreeModel;
+import com.yeejoin.amos.api.tool.face.model.TemplateModel;
 import com.yeejoin.amos.api.tool.face.orm.dao.TemplateCategoryMapper;
 import com.yeejoin.amos.api.tool.face.orm.entity.TemplateCategory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.typroject.tyboot.core.foundation.utils.StringUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 
@@ -17,6 +20,8 @@ public class TemplateCategoryService extends BaseService<TemplateCategoryModel,
 
     @Autowired
     private VisualDesignerService visualDesignerService;
+    @Autowired
+    private TemplateService templateService;
 
     /**
      * 列表查询
@@ -26,6 +31,16 @@ public class TemplateCategoryService extends BaseService<TemplateCategoryModel,
     }
 
     /**
+     * 通过模板分类ID删除模板分类
+     */
+    public Boolean deleteById(Long sequenceNbr){
+        List<String> strings = templateService.selectSeqsByCategorySeq(sequenceNbr);
+        if(strings.size() != 0) {
+            this.removeByIds(strings);
+        }
+        return this.removeById(sequenceNbr);
+    }
+    /**
      * 模板分类表单数据转化为树形节点
      */
     public List<TemplateCategoryTreeModel> tplCateToNode(List<TemplateCategoryModel> templateCategoryModels){

src/main/java/com/yeejoin/amos/api/tool/face/service/TemplateService.java

@@ -12,12 +12,14 @@ import com.yeejoin.amos.api.tool.utils.ConvertUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.foundation.utils.StringUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
@@ -48,6 +50,7 @@ public class TemplateService extends BaseService<TemplateModel, Template, Templa
         return strings;
     }
 
+
     /**
      * 列表查询
      */