diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java index c876f43..5a4b6db 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java @@ -12,6 +12,7 @@ import com.muyu.etl.service.BasicConfigInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.ServletException; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -48,9 +49,16 @@ public class BasicConfigInfoController extends BaseController { @RequiresPermissions("etl:info:export") @Log(title = "基础信息",businessType = BusinessType.EXPORT) @PostMapping("/export") + //数据接入到basicConfigInfo public void export(HttpServletResponse response,BasicConfigInfo basicConfigInfo){ + + //数据接入后查询列表 List list = service.selectBasicConfigInfoList(basicConfigInfo); + + //new一个excelUtil 接入到basicConfigInfo ExcelUtil util = new ExcelUtil<>(BasicConfigInfo.class); + + //可以导出到表单 util.exportExcel(response,list,"基础信息数据"); } @@ -59,10 +67,55 @@ public class BasicConfigInfoController extends BaseController { */ @RequiresPermissions("etl:info:query") @GetMapping(value = "/{id}") + //响应信息主体 public Result getInfo(@PathVariable("id") Long id){ + //返回成功消息 return success(service.selectBasicConfigInfoById(id)); } + /** + * 新增基础信息 + */ + @RequiresPermissions("etl:info:add") + @Log(title = "基础信息",businessType = BusinessType.INSERT) + @PostMapping + //数据接入到basicConfigInfo + public Result add(@RequestBody BasicConfigInfo configQueryReq){ + //响应返回结果 + return toAjax(service.insertBasicConfigInfo(configQueryReq)); + } + + + /** + * 修改基础信息 + */ + @RequiresPermissions("etl:info:edit") + @Log(title = "基础信息",businessType = BusinessType.UPDATE) + @PostMapping + //数据接入basicConfigInfo + public Result edit(@RequestBody BasicConfigInfo configQueryReq){ + //响应返回结果 + return toAjax(service.updateBasicConfigInfo(configQueryReq)); + } + + + /** + * 删除基础信息 + */ + @RequiresPermissions("etl:info:remove") + @Log(title = "基础信息",businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public Result remove(@PathVariable Long[] ids){ + return toAjax(service.deleteBasicConfigInfoByIds(ids)); + } + + + @RequiresPermissions("etl:info:test") + @Log(title = "测试连接") + @PostMapping("/connectionTest") + public Result connectionTest(@RequestBody BasicConfigInfo basicConfigInfo) throws ServletException { + return toAjax(service.connectionTest(basicConfigInfo)); + } } diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/BasicConfigInfoMapper.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/BasicConfigInfoMapper.java index 6a9cc61..fb6c507 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/BasicConfigInfoMapper.java +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/BasicConfigInfoMapper.java @@ -27,6 +27,11 @@ public interface BasicConfigInfoMapper extends BaseMapper { * @param id * @return */ - String selectBasicConfigInfoById(Long id); + BasicConfigInfo selectBasicConfigInfoById(Long id); + int insertBasicConfigInfo(BasicConfigInfo configQueryReq); + + int updateBasicConfigInfo(BasicConfigInfo configQueryReq); + + int deleteBasicConfigInfoByIds(Long[] ids); } diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/BasicConfigInfoService.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/BasicConfigInfoService.java index f273dd2..e43bab5 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/BasicConfigInfoService.java +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/BasicConfigInfoService.java @@ -3,6 +3,8 @@ package com.muyu.etl.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.etl.domain.BasicConfigInfo; +import javax.servlet.ServletException; +import javax.sql.rowset.serial.SerialException; import java.util.List; /** @@ -20,5 +22,14 @@ public interface BasicConfigInfoService extends IService { */ List selectBasicConfigInfoList(BasicConfigInfo basicConfigInfo); - String selectBasicConfigInfoById(Long id); + BasicConfigInfo selectBasicConfigInfoById(Long id); + + int insertBasicConfigInfo(BasicConfigInfo configQueryReq); + + int updateBasicConfigInfo(BasicConfigInfo configQueryReq); + + int deleteBasicConfigInfoByIds(Long[] ids); + + boolean connectionTest(BasicConfigInfo basicConfigInfo) throws ServletException; + } diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java index cf42b1f..a7f021c 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java @@ -1,13 +1,21 @@ package com.muyu.etl.service.impl; +import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.etl.domain.BasicConfigInfo; import com.muyu.etl.mapper.BasicConfigInfoMapper; import com.muyu.etl.service.BasicConfigInfoService; import lombok.extern.log4j.Log4j2; +import net.sf.jsqlparser.schema.Table; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import javax.servlet.ServletException; +import javax.sql.rowset.serial.SerialException; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; import java.util.List; /** @@ -37,7 +45,60 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl + + + + insert into basic_config_info + + id, + data_resource_name, + data_sources_system_name, + host, + port, + database_type, + database_name, + username, + password + init_link_num, + max_link_num, + max_wait_time, + max_wait_times, + connection_params, + remark, + + + + #{id}, + #{dataResourceName}, + #{dataSourcesSystemName}, + #{host}, + #{port}, + #{databaseType}, + #{databaseName}, + #{username}, + #{password}, + #{initLinkNum}, + #{maxLinkNum}, + #{maxWaitTime}, + #{maxWaitTimes}, + #{connectionParams}, + #{remark}, + + + + + + + update basic_config_info + + data_resource_name = #{dataResourceName}, + data_sources_system_name = #{dataSourcesSystemName}, + host = #{host}, + port =#{port}, + database_type = #{databaseType}, + database_name =#{databaseName}, + username =#{username}, + password = #{password}, + init_link_num = #{initLinkNum}, + max_link_num = #{maxLinkNum}, + max_wait_time=#{maxWaitTime}, + max_wait_times = #{maxWaitTimes}, + connection_params = #{connectionParams}, + remark =#{remark}, + + + where id = #{id} + + + + + + delete from basic_config_info where id in + + #{id} + + +