From 07a2fc9618e240448d376548e9336648d7084558 Mon Sep 17 00:00:00 2001 From: Saisai Liu <1374434128@qq.com> Date: Sat, 27 Apr 2024 18:34:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3bug=201=E3=80=81=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5=E6=97=B6=EF=BC=8C=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E8=BF=9E=E6=8E=A5=E6=9C=AA=E6=B7=BB=E5=8A=A0=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=A5=E9=94=99=E3=80=82=202=E3=80=81?= =?UTF-8?q?=E5=89=8D=E5=8F=B0=E8=BF=9B=E8=A1=8C=E5=AD=97=E5=85=B8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9-=E3=80=8B=E5=90=8E=E5=8F=B0=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BasicConfigInfoController.java | 22 +++++++++++++++++-- .../muyu/etl/service/StructureService.java | 2 ++ .../impl/BasicConfigInfoServiceImpl.java | 14 ++++++------ .../service/impl/StructureServiceImpl.java | 8 +++++++ 4 files changed, 37 insertions(+), 9 deletions(-) diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java index bf08f8a..e1f9606 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java @@ -10,11 +10,13 @@ import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.etl.domain.AssetDataDict; import com.muyu.etl.domain.BasicConfigInfo; import com.muyu.etl.domain.DictInfo; +import com.muyu.etl.domain.Structure; import com.muyu.etl.domain.resp.BasicDictResp; import com.muyu.etl.domain.resp.TableTreeResp; import com.muyu.etl.service.AssetDataDictService; import com.muyu.etl.service.BasicConfigInfoService; import com.muyu.etl.service.DictInfoService; +import com.muyu.etl.service.StructureService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -37,6 +39,8 @@ public class BasicConfigInfoController extends BaseController { private AssetDataDictService assetDataDictService; @Autowired private DictInfoService dictInfoService; + @Autowired + private StructureService structureService; /** * 查询基础信息列表 */ @@ -109,6 +113,10 @@ public class BasicConfigInfoController extends BaseController { return toAjax(basicConfigInfoService.connectionTest(basicConfigInfo)); } + /** + * 获取成功链接中的 + * @return + */ @RequiresPermissions("etl:info:test") @Log(title = "获取成功链接中的") @GetMapping("/dataConstruct") @@ -129,7 +137,7 @@ public class BasicConfigInfoController extends BaseController { } /** - * 模板 + * 通过接入id查询数据库所属字典 * * @return */ @@ -155,13 +163,23 @@ public class BasicConfigInfoController extends BaseController { * 添加字典详细信息 * @return */ - @RequiresPermissions("etl:table:list") + @RequiresPermissions("etl:table:add") @Log(title = "添加字典表") @PostMapping("/insertDictInfo") public Result insertDict(@RequestBody DictInfo dictInfo) throws ServletException { return Result.success(dictInfoService.insertDictInfo(dictInfo)); } + /** + * 修改资产结构中字典信息 + * @return + */ + @RequiresPermissions("etl:table:update") + @Log(title = "修改资产结构中字典信息") + @PutMapping("/updateStructureInfo") + public Result updateStructureInfo(@RequestBody Structure structure){ + return Result.success(structureService.updateStructureInfoDict(structure),"修改成功"); + } // /** // * 模板 diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/StructureService.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/StructureService.java index 8e1ebfc..8dc6edf 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/StructureService.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/StructureService.java @@ -60,4 +60,6 @@ public interface StructureService extends IService * @return 结果 */ public int deleteStructureById(Long id); + + boolean updateStructureInfoDict(Structure structure); } diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java index db6b61e..1d55cd9 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java @@ -15,7 +15,6 @@ import com.muyu.etl.service.StructureService; import com.muyu.etl.service.TableInfoService; import lombok.SneakyThrows; import lombok.extern.log4j.Log4j2; -import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,9 +23,6 @@ import java.sql.*; import java.util.Date; import java.util.*; import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import java.util.stream.Collectors; /** @@ -138,7 +134,7 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl(TableInfo.class){{ - eq(TableInfo::getTableName,tableInfo.getTableName()); + + tableInfoService.saveOrUpdate(tableInfoInsert,new LambdaUpdateWrapper(TableInfo.class){{ + eq(TableInfo::getTableName,tableInfoInsert.getTableName()); eq(TableInfo::getBasicId,basicConfigInfo.getId()); }}); + TableInfo tableInfo = tableInfoService.selectTableInfoByName(tableInfoInsert); DatabaseMetaData metaData = conn.getMetaData(); ResultSet rs = metaData.getTables(databaseName, null, "%", new String[]{"TABLE", "VIEW"}); @@ -249,6 +247,7 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl()); structureService.saveOrUpdate(build,new LambdaUpdateWrapper(){{ eq(Structure::getTableId,build.getTableId()); eq(Structure::getColumnName,build.getColumnName()); @@ -317,6 +316,7 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl { TableInfoStructureResp callable = null; + //同构线程获取响应体对象 try { callable = new Callable<>() { @Override diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/StructureServiceImpl.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/StructureServiceImpl.java index 2d73ad3..7b5d928 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/StructureServiceImpl.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/StructureServiceImpl.java @@ -97,4 +97,12 @@ public class StructureServiceImpl extends ServiceImpl