删除、导出修改

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

@@ -4,9 +4,11 @@ import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.api.tool.enums.SourceEnum;
 
 import com.yeejoin.amos.api.tool.face.model.DataBaseLinkModel;
+import com.yeejoin.amos.api.tool.face.model.DataBaseNameListModel;
 import com.yeejoin.amos.api.tool.face.model.RelationModel;
 import com.yeejoin.amos.api.tool.face.model.RelationTreeModel;
 import com.yeejoin.amos.api.tool.face.orm.dao.RelationMapper;
+import com.yeejoin.amos.api.tool.face.orm.entity.DataBaseNameList;
 import com.yeejoin.amos.api.tool.face.orm.entity.Relation;
 import com.yeejoin.amos.api.tool.face.orm.entity.TableColumn;
 import com.yeejoin.amos.api.tool.utils.TableUtils;
@@ -41,14 +43,16 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
     @Autowired
     JdbcTemplate jdbcTemplate;
     @Autowired
-    StudioResourceService studioResourceService;
+    private DataBaseNameListService dataBaseNameListService;
 
     /**
      * 根据机构删除
      */
     public void deleteAgency(String agencyCode, String sequenceNbrs) throws Exception {
         for (Long seq : (Long[]) ConvertUtils.convert(StringUtil.string2Array(sequenceNbrs), Long.class)) {
-            DataBaseLinkModel model = dataBaseLinkService.queryBySeq(seq);
+            DataBaseNameListModel nameListModel = dataBaseNameListService.queryBySeq(seq);
+            DataBaseLinkModel model = dataBaseLinkService.queryBySeq(nameListModel.getParentId());
+            model.setDbName(nameListModel.getDbName());
             Connection connection = dataBaseLinkService.connectNewDatabase(model);
             this.deleteDataBase(
                     connection, agencyCode, model.getDbName());
@@ -60,7 +64,9 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
      */
     public void outputAgency(String agencyCode, String sequenceNbrs, HttpServletResponse response) throws Exception {
         for (Long seq : (Long[]) ConvertUtils.convert(StringUtil.string2Array(sequenceNbrs), Long.class)) {
-            DataBaseLinkModel model = dataBaseLinkService.queryBySeq(seq);
+            DataBaseNameListModel nameListModel = dataBaseNameListService.queryBySeq(seq);
+            DataBaseLinkModel model = dataBaseLinkService.queryBySeq(nameListModel.getParentId());
+            model.setDbName(nameListModel.getDbName());
             Connection connection = dataBaseLinkService.connectNewDatabase(model);
             this.insertData(
                     connection, agencyCode, model.getDbName(), response);