删除机构优化１１

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

@@ -17,6 +17,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -37,21 +38,12 @@ public class RelationResource {
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @DeleteMapping(value = "/relation/{agencyCodeId}/{sequenceNbrs}")
     @ApiOperation(httpMethod = "DELETE", value = "机构删除", notes = "机构删除")
-    public ResponseModel<String> joinSQL(@PathVariable Long agencyCodeId, @PathVariable String sequenceNbrs) throws ClassNotFoundException, SQLException {
+    public ResponseModel<String> deleteDataBase(@PathVariable Long agencyCodeId, @PathVariable String sequenceNbrs) throws ClassNotFoundException, SQLException {
         Long[] seqs = dataBaseService.stringToLong(sequenceNbrs);
-            for (Long seq : seqs) {
-                Connection connection = connectService.connectNewDatabase(dataBaseService.queryBySeq(seq));
-                relationService.deleteDataBaseByAgencyCode(connection, agencyTreeService.queryForAgencyCodeById(agencyCodeId));
-            }
+        for (Long seq : seqs) {
+            Connection connection = connectService.connectNewDatabase(dataBaseService.queryBySeq(seq));
+            relationService.deleteDataBase(connection,agencyTreeService.queryForAgencyCodeById(agencyCodeId));
+        }
         return ResponseHelper.buildResponse("The data has been deleted !");
     }
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-    @GetMapping(value = "/relation/test")
-    @ApiOperation(httpMethod = "GET", value = "sql",notes = "sql")
-    public ResponseModel<List<List<RelationTreeModel>>> test() throws SQLException, ClassNotFoundException {
-        Long[] seqs = dataBaseService.stringToLong("1675757337942056962");
-            Connection connection = connectService.connectNewDatabase(dataBaseService.queryBySeq(seqs[0]));
-        return  ResponseHelper.buildResponse(relationService.createRelationTree(connection));
-    }
 }

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

@@ -78,8 +78,9 @@ public class TplResource {
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @DeleteMapping(value = "/s/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除多项", notes = "根据sequenceNbr删除多项")
-    public void deleteModelsBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr")String sequenceNbr){
+    public ResponseModel<String> deleteModelsBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr")String sequenceNbr){
         tplService.deleteByIds(sequenceNbr);
+        return ResponseHelper.buildResponse("Succeed!");
     }
     /**
      * 根据sequenceNbr查询

src/main/java/com/yeejoin/amos/api/tool/face/model/RelationTreeModel.java

@@ -16,10 +16,10 @@ public class RelationTreeModel {
     private String name;
 
     @ApiModelProperty(value = "表字段")
-    private String frontField;
+    private String field;
 
     @ApiModelProperty(value = "前表关联字段")
-    private String postField;
+    private String parentField;
 
     @ApiModelProperty(value = "父表名")
     private String parentName;
@@ -27,10 +27,10 @@ public class RelationTreeModel {
     @ApiModelProperty(value = "子节点")
     private List<RelationTreeModel> children;
 
-    public RelationTreeModel(String name, String frontField,String postField , String parentName, List<RelationTreeModel> children) {
+    public RelationTreeModel(String name, String field,String parentField , String parentName, List<RelationTreeModel> children) {
         this.name = name;
-        this.frontField = frontField;
-        this.postField = postField;
+        this.field = field;
+        this.parentField = parentField;
         this.parentName = parentName;
         this.children = children;
     }

src/main/java/com/yeejoin/amos/api/tool/face/orm/dao/RelationMapper.java

@@ -10,9 +10,9 @@ import org.apache.ibatis.annotations.SelectProvider;
 import java.util.HashMap;
 import java.util.List;
 public interface RelationMapper extends BaseMapper<Relation> {
-    @SelectProvider(type = RelationService.class, method = "deleteDataBaseByAgencyCode")
+    @SelectProvider(type = RelationService.class, method = "deleteDataBase")
     @SqlParser(filter = true)
-    List<Relation> deleteDataBaseByAgencyCode(@Param("maps") List<HashMap<String,String>> maps);
+    List<Relation> deleteDataBase(@Param("maps") List<HashMap<String,String>> maps);
 
 
 }

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

@@ -79,8 +79,10 @@ public class TplService extends BaseService<TplModel, Tpl, TplMapper> {
      * 删除多个模板
      */
     public void deleteByIds(String sequenceNbr){
-        Long[] seq = StringUtil.String2LongArray(sequenceNbr);
+        String[] seqs = sequenceNbr.split(",");
+        Long[] seq = new Long[seqs.length];
         for (int i = 0;i < seq.length;i++){
+            seq[i] = Long.parseLong(seqs[i]);
             this.removeById(seq[i]);
         }
     }