Commit 1eb12ffd authored by 陈祥烨's avatar 陈祥烨

修订

parent d2a7edfc
package com.yeejoin.amos.api.tool.controller; package com.yeejoin.amos.api.tool.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.api.tool.face.model.ApiInfoModel;
import com.yeejoin.amos.api.tool.face.model.DataBaseLinkModel; import com.yeejoin.amos.api.tool.face.model.DataBaseLinkModel;
import com.yeejoin.amos.api.tool.face.service.DataBaseLinkService; import com.yeejoin.amos.api.tool.face.service.DataBaseLinkService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -13,7 +12,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation; ...@@ -13,7 +12,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -65,7 +63,7 @@ public class DataBaseLinkResource { ...@@ -65,7 +63,7 @@ public class DataBaseLinkResource {
public ResponseModel<Page<DataBaseLinkModel>> queryForPage( public ResponseModel<Page<DataBaseLinkModel>> queryForPage(
@RequestParam(value = "current") int current, @RequestParam(value = "current") int current,
@RequestParam(value = "size") int size) { @RequestParam(value = "size") int size) {
Page<DataBaseLinkModel> page = new Page<DataBaseLinkModel>(); Page<DataBaseLinkModel> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(dataBaseLinkService.queryForDataBasePage(page)); return ResponseHelper.buildResponse(dataBaseLinkService.queryForDataBasePage(page));
......
...@@ -6,14 +6,10 @@ import com.yeejoin.amos.api.tool.face.model.DataBaseLinkModel; ...@@ -6,14 +6,10 @@ import com.yeejoin.amos.api.tool.face.model.DataBaseLinkModel;
import com.yeejoin.amos.api.tool.face.orm.dao.DataBaseLinkMapper; import com.yeejoin.amos.api.tool.face.orm.dao.DataBaseLinkMapper;
import com.yeejoin.amos.api.tool.face.orm.entity.DataBaseLink; import com.yeejoin.amos.api.tool.face.orm.entity.DataBaseLink;
import com.yeejoin.amos.api.tool.utils.AESUtils; import com.yeejoin.amos.api.tool.utils.AESUtils;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.sql.*; import java.sql.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List; import java.util.List;
/** /**
...@@ -22,13 +18,8 @@ import java.util.List; ...@@ -22,13 +18,8 @@ import java.util.List;
* @author r * @author r
*/ */
@Service @Service
public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBaseLink, DataBaseLinkMapper> { public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBaseLink, DataBaseLinkMapper> {
@Autowired
private DataBaseLinkMapper dataBaseLinkMapper;
@Autowired
private DataBaseLinkService dataBaseLinkService;
/** /**
* 分页查询 * 分页查询
*/ */
...@@ -58,33 +49,6 @@ public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBase ...@@ -58,33 +49,6 @@ public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBase
} }
/** /**
* 初始化数据库连接表
*/
public List<DataBaseLinkModel> refreshDataBase(DataBaseLinkModel dataBaseLinkModel) throws Exception {
//清空表单
this.remove(new QueryWrapper<>());
//连接数据库
Connection connection = this.connectNewDatabase(dataBaseLinkModel);
if (connection == null)
return null;
List<DataBaseLinkModel> dataBaseLinkModels = new ArrayList<>();
Collection<DataBaseLink> dataBaseLinks = new ArrayList<>();
for (String name : this.getDataBaseName(connection)) {
if (name == null)
break;
DataBaseLinkModel model = new DataBaseLinkModel();
BeanUtils.copyProperties(model, dataBaseLinkModel);
model.setDbName(name);
dataBaseLinkModels.add(model);
dataBaseLinks.add(this.prepareEntity(model));
}
this.saveBatch(dataBaseLinks);
connection.close();
return dataBaseLinkModels;
}
/**
* 连接数据库 * 连接数据库
*/ */
public Connection connectNewDatabase(DataBaseLinkModel model) throws Exception { public Connection connectNewDatabase(DataBaseLinkModel model) throws Exception {
...@@ -104,6 +68,4 @@ public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBase ...@@ -104,6 +68,4 @@ public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBase
return model; return model;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment