From fa6963552a125f2b05a20288eccc488da2afe157 Mon Sep 17 00:00:00 2001 From: yaoxin <1752800946@qq.com> Date: Tue, 30 Apr 2024 09:53:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E4=BA=86=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E6=8E=88=E6=9D=83=E6=97=B6,=E7=BB=99=E7=88=B6?= =?UTF-8?q?=E7=BA=A7=E6=8E=88=E6=9D=83=E5=90=8C=E6=97=B6=E4=B9=9F=E4=BC=9A?= =?UTF-8?q?=E7=BB=99=E5=AD=90=E7=BA=A7=E9=83=A8=E9=97=A8=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8E=88=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/remote/RemoteUserService.java | 9 +++++ .../factory/RemoteUserFallbackFactory.java | 10 +++++ .../etl/controller/DataSourceController.java | 11 +++++- .../muyu/etl/mapper/AssetAccreditMapper.java | 2 + .../muyu/etl/mapper/SourceAccreditMapper.java | 2 + .../impl/AssetAccreditServiceImpl.java | 28 +++++++++++++- .../service/impl/DataSourceServiceImpl.java | 38 ++++++++++++++++--- .../impl/SourceAccreditServiceImpl.java | 33 ++++++++++++++-- .../mapper/system/AssetAccreditMapper.xml | 8 ++++ .../mapper/system/SourceAccreditMapper.xml | 9 +++++ .../system/controller/SysUserController.java | 10 +++++ 11 files changed, 147 insertions(+), 13 deletions(-) diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java index cb968e0..f2d0624 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java @@ -3,12 +3,15 @@ package com.muyu.common.system.remote; import com.muyu.common.core.constant.SecurityConstants; import com.muyu.common.core.constant.ServiceNameConstants; import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory; import com.muyu.common.system.domain.LoginUser; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 用户服务 * @@ -16,6 +19,12 @@ import org.springframework.web.bind.annotation.*; */ @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) public interface RemoteUserService { + + /** + * 获取用户信息 + */ + @PostMapping("/user/UserList") + public Result> userList (@RequestBody SysUser user); /** * 通过用户名查询用户信息 * diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java index b7f4d60..759ccf7 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java @@ -1,6 +1,7 @@ package com.muyu.common.system.remote.factory; import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.system.remote.RemoteUserService; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.LoginUser; @@ -9,6 +10,8 @@ import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; +import java.util.List; + /** * 用户服务降级处理 * @@ -22,6 +25,13 @@ public class RemoteUserFallbackFactory implements FallbackFactory> userList(SysUser user) { + return Result.error("获取用户列表失败:" + throwable.getMessage()); + } + @Override public Result getUserInfo (String username, String source) { return Result.error("获取用户失败:" + throwable.getMessage()); diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/controller/DataSourceController.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/controller/DataSourceController.java index 6c0b5b2..bf0d4a7 100644 --- a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/controller/DataSourceController.java +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/controller/DataSourceController.java @@ -24,7 +24,7 @@ import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.page.TableDataInfo; /** - * 【请填写功能名称】Controller + * 数据接入Controller * * @author ruoyi * @date 2024-04-20 @@ -37,7 +37,7 @@ public class DataSourceController extends BaseController private IDataSourceService dataSourceService; /** - * 查询【请填写功能名称】列表 + * 查询数据接入列表 */ @RequiresPermissions("system:source:list") @GetMapping("/list") @@ -48,29 +48,36 @@ public class DataSourceController extends BaseController return getDataTable(list); } + + //获取数据源中表的数据(KVT结构) @PostMapping("/AssetsList") public Result assetsList(@RequestBody DataSource dataSource) { return dataSourceService.assetsList(dataSource); } + + //数据接入同步资产结构 @PostMapping("/SynchronousData") public Result synchronousData(@RequestBody DataSource dataSource) { return dataSourceService.synchronousData(dataSource); } + //根据数据接入信息获取资产表列表信息 @PostMapping("/DataAssetList") public Result dataAssetList(@RequestBody DataSource dataSource) { return dataSourceService.dataAssetList(dataSource); } + //统计选中数据接入的数据(数据接入量 数据接入表中字段量 数据接入表中数据量) @GetMapping("/Statistics") public Result statistics(){ return dataSourceService.statistics(); } + //根据数据表信息获取资产模型字段列表信息 @PostMapping("/AssetModelList") public Result assetModelList(@RequestBody DataAsset dataAsset) { diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/mapper/AssetAccreditMapper.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/mapper/AssetAccreditMapper.java index e6c91be..109ee32 100644 --- a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/mapper/AssetAccreditMapper.java +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/mapper/AssetAccreditMapper.java @@ -70,4 +70,6 @@ public interface AssetAccreditMapper void deleteAssetAccreditByDeptUser(@Param("deptIds") List deptIds, @Param("userId") Long userId, @Param("dataAssetId") Long dataAssetId); void insertBatchAssetAccredit(@Param("assetAccredits") List assetAccredits); + + void deleteAssetAccreditByUser(@Param("userIds") List userIds, @Param("dataAssetId") Long dataAssetId); } diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/mapper/SourceAccreditMapper.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/mapper/SourceAccreditMapper.java index 9a99fa9..caf287e 100644 --- a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/mapper/SourceAccreditMapper.java +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/mapper/SourceAccreditMapper.java @@ -69,4 +69,6 @@ public interface SourceAccreditMapper void insertBatchSourceAccredit(@Param("sourceAccredits") List sourceAccredits); void deleteSourceAccreditByDeptUser(@Param("deptIds") List deptIds, @Param("userId") Long userId, @Param("dataSourceId") Long dataSourceId); + + void deleteSourceAccreditByUser(@Param("userIds") List userIds, @Param("dataSourceId") Long dataSourceId); } diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/AssetAccreditServiceImpl.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/AssetAccreditServiceImpl.java index e68d824..4a3a70b 100644 --- a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/AssetAccreditServiceImpl.java +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/AssetAccreditServiceImpl.java @@ -8,6 +8,8 @@ import java.util.Objects; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.DateUtils; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.remote.RemoteUserService; import com.muyu.etl.domain.SourceAccredit; import com.muyu.etl.domain.model.AccreditModel; import com.muyu.etl.domain.req.AssetAccreditReq; @@ -29,6 +31,9 @@ public class AssetAccreditServiceImpl implements IAssetAccreditService @Autowired private AssetAccreditMapper assetAccreditMapper; + @Autowired + private RemoteUserService remoteUserService; + /** * 查询【请填写功能名称】 * @@ -72,14 +77,25 @@ public class AssetAccreditServiceImpl implements IAssetAccreditService assetAccredit.setCreateTime(new Date()); assetAccredits.add(assetAccredit); }else{ - assetAccredits=assetAccreditReq.getDeptIds().stream().map(deptId -> { + assetAccredits.addAll(assetAccreditReq.getDeptIds().stream().map(deptId -> { AssetAccredit assetAccredit = new AssetAccredit(); assetAccredit.setDataAssetId(assetAccreditReq.getDataAssetId()); assetAccredit.setDeptId(deptId); assetAccredit.setCreateBy(SecurityUtils.getUsername()); assetAccredit.setCreateTime(new Date()); return assetAccredit; - }).toList(); + }).toList()); + List deptIds = assetAccreditReq.getDeptIds(); + Result> list = remoteUserService.userList(new SysUser()); + List sysUsers = list.getData(); + assetAccredits.addAll(sysUsers.stream().filter(sysUser -> deptIds.contains(sysUser.getDeptId())).toList().stream().map(sysUser -> { + AssetAccredit assetAccredit = new AssetAccredit(); + assetAccredit.setDataAssetId(assetAccreditReq.getDataAssetId()); + assetAccredit.setUserId(sysUser.getUserId()); + assetAccredit.setCreateBy(SecurityUtils.getUsername()); + assetAccredit.setCreateTime(new Date()); + return assetAccredit; + }).toList()); } assetAccreditMapper.insertBatchAssetAccredit(assetAccredits); return Result.success(); @@ -138,6 +154,14 @@ public class AssetAccreditServiceImpl implements IAssetAccreditService if (assetAccreditReq.getUserId() != null){ assetAccreditMapper.deleteAssetAccreditByDeptUser(null,assetAccreditReq.getUserId(),assetAccreditReq.getDataAssetId()); }else{ + List deptIds = assetAccreditReq.getDeptIds(); + Result> list = remoteUserService.userList(new SysUser()); + List sysUsers = list.getData(); + List userIds = sysUsers.stream() + .filter(sysUser -> deptIds.contains(sysUser.getDeptId())).toList().stream() + .filter(sysUser -> deptIds.contains(sysUser.getDeptId())).toList().stream() + .map(SysUser::getUserId).toList(); + assetAccreditMapper.deleteAssetAccreditByUser(userIds,assetAccreditReq.getDataAssetId()); assetAccreditMapper.deleteAssetAccreditByDeptUser(assetAccreditReq.getDeptIds(),null,assetAccreditReq.getDataAssetId()); } return null; diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/DataSourceServiceImpl.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/DataSourceServiceImpl.java index 107fd11..fb418a1 100644 --- a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/DataSourceServiceImpl.java +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/DataSourceServiceImpl.java @@ -60,7 +60,7 @@ public class DataSourceServiceImpl implements IDataSourceService private final ExecutorService executorService = Executors.newFixedThreadPool(6); /** - * 查询【请填写功能名称】 + * 根据id查询数据接入集合 * * @param id 【请填写功能名称】主键 * @return 【请填写功能名称】 @@ -73,7 +73,7 @@ public class DataSourceServiceImpl implements IDataSourceService } /** - * 查询【请填写功能名称】列表 + * 查询数据接入列表 * * @param dataSource 【请填写功能名称】 * @return 【请填写功能名称】 @@ -84,24 +84,32 @@ public class DataSourceServiceImpl implements IDataSourceService List dataSourceList = new ArrayList(); List dataSources = dataSourceMapper.selectDataSourceList(dataSource); List roles = SecurityUtils.getLoginUser().getSysUser().getRoles(); + //判断登录人是否为管理员,不是则需要过滤掉未授权的信息 if (roles.get(0).getRoleId()==1){ dataSourceList = dataSources; }else{ + //数据接入过滤完的主键id集合 ArrayList longs1 = new ArrayList<>(); + //已授权的数据接入id集合 List sourceIds = sourceAccreditMapper.getSourceAccreditByUserId(SecurityUtils.getUserId()).stream().map(SourceAccredit::getDataSourceId).filter(Objects::nonNull).toList(); + //已授权数据模型表的主键id集合 List assetIds = assetAccreditMapper.getAssetAccreditByUserId(SecurityUtils.getUserId()).stream().map(AssetAccredit::getDataAssetId).filter(Objects::nonNull).toList(); + //判断已授权数据模型表的主键id集合是否为空 if (!assetIds.isEmpty()){ + //获取已授权的数据模型表的数据源id集合 List longs = dataAssetMapper.getDataAssetByAssetId(assetIds).stream().map(DataAsset::getDataSourceId).toList(); + //添加到已授权的数据源id集合中 longs1.addAll(longs); } longs1.addAll(sourceIds); + //从所有的数据源信息集合中过滤掉未授权的数据源信息 dataSourceList = dataSources.stream().filter(dataSourceInfo -> longs1.contains(dataSourceInfo.getId())).toList(); } return dataSourceList; } /** - * 新增【请填写功能名称】 + * 新增数据接入信息 * * @param dataSource 【请填写功能名称】 * @return 结果 @@ -111,6 +119,7 @@ public class DataSourceServiceImpl implements IDataSourceService { dataSource.setCreateTime(DateUtils.getNowDate()); dataSource.setCreateBy(SecurityUtils.getUsername()); + //判断添加的数据源数据库类型 if ("MySql".equals(dataSource.getType())){ dataSource.setJdbcDriver("com.mysql.cj.jdbc.Driver"); }else{ @@ -120,7 +129,7 @@ public class DataSourceServiceImpl implements IDataSourceService } /** - * 修改【请填写功能名称】 + * 修改数据接入信息 * * @param dataSource 【请填写功能名称】 * @return 结果 @@ -130,6 +139,7 @@ public class DataSourceServiceImpl implements IDataSourceService { dataSource.setUpdateTime(DateUtils.getNowDate()); dataSource.setUpdateBy(SecurityUtils.getUsername()); + //判断修改的数据源数据库类型 if ("MySql".equals(dataSource.getType())){ dataSource.setJdbcDriver("com.mysql.cj.jdbc.Driver"); }else{ @@ -139,7 +149,7 @@ public class DataSourceServiceImpl implements IDataSourceService } /** - * 批量删除【请填写功能名称】 + * 批量删除数据接入 * * @param ids 需要删除的【请填写功能名称】主键 * @return 结果 @@ -148,31 +158,43 @@ public class DataSourceServiceImpl implements IDataSourceService @Transactional public int deleteDataSourceByIds(Long[] ids) { + //删除数据接入的数据模型表及关联数据 deleteChildLevel(ids,"delete"); return dataSourceMapper.deleteDataSourceByIds(ids); } + //删除数据接入的用户授权数据 public void deleteAccredit(List sourceIds,List assetIds){ + //删除数据接入的用户授权数据 if (!sourceIds.isEmpty()){ sourceAccreditMapper.deleteSourceAccreditBySourceIds(sourceIds); } + //删除数据接入的数据模型表及关联数据 if (!assetIds.isEmpty()){ assetAccreditMapper.deleteAssetAccreditByAssetIds(assetIds); } } + //删除数据接入相关信息(数据表,数据表中字段,关联字典) public void deleteChildLevel(Long[] ids,String type){ + //获取数据模型表 List dataAssetList=dataAssetMapper.getDataAssetList(ids); + //数据模型表主键id集合 List dataAssetIds = new ArrayList<>(); if (!dataAssetList.isEmpty()){ + //获取数据模型表主键id集合 dataAssetIds = dataAssetList.stream().map(DataAsset::getId).toList(); + //获取数据模型表关联的字典表 List assetModelList=assetModelMapper.getAssetModelList(dataAssetIds); + //根据数据模型表id删除数据模型表信息 dataAssetMapper.deleteDataAssetByIds(dataAssetIds.toArray(Long[]::new)); + //根据数据模型表id删除数据模型表的字段信息 if (!assetModelList.isEmpty()){ List assetModelIds = assetModelList.stream().map(AssetModel::getId).toList(); assetModelMapper.deleteAssetModelByIds(assetModelIds.toArray(Long[]::new)); } } + //删除数据接入的用户授权数据 if ("delete".equals(type)){ deleteAccredit(Arrays.stream(ids).toList(),dataAssetIds); }else{ @@ -182,7 +204,7 @@ public class DataSourceServiceImpl implements IDataSourceService } /** - * 删除【请填写功能名称】信息 + * 删除数据接入信息 * * @param id 【请填写功能名称】主键 * @return 结果 @@ -193,6 +215,8 @@ public class DataSourceServiceImpl implements IDataSourceService return dataSourceMapper.deleteDataSourceById(id); } + //测试连接 + @Override public Result testConnection(DataSource dataSource) { String jdbcUrl = "jdbc:"+dataSource.getType().toLowerCase()+"://"+dataSource.getLinkAddress()+":"+dataSource.getPort()+"/"+dataSource.getDatabaseName(); @@ -215,6 +239,7 @@ public class DataSourceServiceImpl implements IDataSourceService return Result.success("连接成功"); } + //获取数据模型的数据(KVT结构) public AssetsModule getStructure(DataSource dataSource){ String jdbcUrl = "jdbc:"+dataSource.getType().toLowerCase()+"://"+dataSource.getLinkAddress()+":"+dataSource.getPort()+"/"+dataSource.getDatabaseName(); if (dataSource.getConnectionParam()!=null && dataSource.getConnectionParam()!=""){ @@ -266,6 +291,7 @@ public class DataSourceServiceImpl implements IDataSourceService return new AssetsModule().assetsModuleBuilder(kvtList,map); } + //获取数据模型表内字段信息的映射类型map集合 public Map getTypeMap(DataSource dataSource, String tableName){ String jdbcUrl=""; String sql=""; diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/SourceAccreditServiceImpl.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/SourceAccreditServiceImpl.java index f521af6..f6727ea 100644 --- a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/SourceAccreditServiceImpl.java +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/SourceAccreditServiceImpl.java @@ -10,6 +10,7 @@ import com.muyu.common.core.utils.DateUtils; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.remote.RemoteUserService; import com.muyu.etl.domain.model.AccreditModel; import com.muyu.etl.domain.req.SourceAccreditReq; import com.muyu.etl.feign.SysUserFeignService; @@ -18,6 +19,7 @@ import org.springframework.stereotype.Service; import com.muyu.etl.mapper.SourceAccreditMapper; import com.muyu.etl.domain.SourceAccredit; import com.muyu.etl.service.ISourceAccreditService; +import org.springframework.transaction.annotation.Transactional; /** * 【请填写功能名称】Service业务层处理 @@ -31,6 +33,9 @@ public class SourceAccreditServiceImpl implements ISourceAccreditService @Autowired private SourceAccreditMapper sourceAccreditMapper; + @Autowired + private RemoteUserService remoteUserService; + /** * 查询【请填写功能名称】 * @@ -62,11 +67,13 @@ public class SourceAccreditServiceImpl implements ISourceAccreditService * @return 结果 */ @Override + @Transactional public Result insertSourceAccredit(SourceAccreditReq sourceAccreditReq) { deleteSourceAccreditBySourceIds(sourceAccreditReq); - List sourceAccredits = new ArrayList<>(); + List sourceAccredits; if (sourceAccreditReq.getUserId() != null){ + sourceAccredits = new ArrayList<>(); SourceAccredit sourceAccredit = new SourceAccredit(); sourceAccredit.setDataSourceId(sourceAccreditReq.getDataSourceId()); sourceAccredit.setUserId(sourceAccreditReq.getUserId()); @@ -74,14 +81,26 @@ public class SourceAccreditServiceImpl implements ISourceAccreditService sourceAccredit.setCreateTime(new Date()); sourceAccredits.add(sourceAccredit); }else{ - sourceAccredits=sourceAccreditReq.getDeptIds().stream().map(deptId -> { + + sourceAccredits = new ArrayList<>(sourceAccreditReq.getDeptIds().stream().map(deptId -> { SourceAccredit sourceAccredit = new SourceAccredit(); sourceAccredit.setDataSourceId(sourceAccreditReq.getDataSourceId()); sourceAccredit.setDeptId(deptId); sourceAccredit.setCreateBy(SecurityUtils.getUsername()); sourceAccredit.setCreateTime(new Date()); return sourceAccredit; - }).toList(); + }).toList()); + List deptIds = sourceAccreditReq.getDeptIds(); + Result> list = remoteUserService.userList(new SysUser()); + List sysUsers = list.getData(); + sourceAccredits.addAll(sysUsers.stream().filter(sysUser -> deptIds.contains(sysUser.getDeptId())).toList().stream().map(sysUser -> { + SourceAccredit sourceAccredit = new SourceAccredit(); + sourceAccredit.setDataSourceId(sourceAccreditReq.getDataSourceId()); + sourceAccredit.setUserId(sysUser.getUserId()); + sourceAccredit.setCreateBy(SecurityUtils.getUsername()); + sourceAccredit.setCreateTime(new Date()); + return sourceAccredit; + }).toList()); } sourceAccreditMapper.insertBatchSourceAccredit(sourceAccredits); return Result.success(); @@ -140,6 +159,14 @@ public class SourceAccreditServiceImpl implements ISourceAccreditService if (sourceAccreditReq.getUserId() != null){ sourceAccreditMapper.deleteSourceAccreditByDeptUser(null,sourceAccreditReq.getUserId(),sourceAccreditReq.getDataSourceId()); }else{ + List deptIds = sourceAccreditReq.getDeptIds(); + Result> list = remoteUserService.userList(new SysUser()); + List sysUsers = list.getData(); + List userIds = sysUsers.stream() + .filter(sysUser -> deptIds.contains(sysUser.getDeptId())).toList().stream() + .filter(sysUser -> deptIds.contains(sysUser.getDeptId())).toList().stream() + .map(SysUser::getUserId).toList(); + sourceAccreditMapper.deleteSourceAccreditByUser(userIds,sourceAccreditReq.getDataSourceId()); sourceAccreditMapper.deleteSourceAccreditByDeptUser(sourceAccreditReq.getDeptIds(),null,sourceAccreditReq.getDataSourceId()); } return Result.success(); diff --git a/muyu-modules/muyu-etl/src/main/resources/mapper/system/AssetAccreditMapper.xml b/muyu-modules/muyu-etl/src/main/resources/mapper/system/AssetAccreditMapper.xml index ba41ae2..fcc3c0a 100644 --- a/muyu-modules/muyu-etl/src/main/resources/mapper/system/AssetAccreditMapper.xml +++ b/muyu-modules/muyu-etl/src/main/resources/mapper/system/AssetAccreditMapper.xml @@ -136,4 +136,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + delete from asset_accredit where data_asset_id = #{dataAssetId} + and user_id in ( + + #{id} + + ) + \ No newline at end of file diff --git a/muyu-modules/muyu-etl/src/main/resources/mapper/system/SourceAccreditMapper.xml b/muyu-modules/muyu-etl/src/main/resources/mapper/system/SourceAccreditMapper.xml index 89ae6ab..e5d20e7 100644 --- a/muyu-modules/muyu-etl/src/main/resources/mapper/system/SourceAccreditMapper.xml +++ b/muyu-modules/muyu-etl/src/main/resources/mapper/system/SourceAccreditMapper.xml @@ -136,4 +136,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + delete from source_accredit where + data_source_id = #{dataSourceId} + and user_id in ( + + #{id} + + ) + \ No newline at end of file diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java index af40fa9..b8286f6 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java @@ -66,6 +66,16 @@ public class SysUserController extends BaseController { return getDataTable(list); } + /** + * 获取用户列表 + */ + @PostMapping("/UserList") + public Result> userList (@RequestBody SysUser user) { + startPage(); + List list = userService.selectUserList(user); + return Result.success(list); + } + @Log(title = "用户管理", businessType = BusinessType.EXPORT) @RequiresPermissions("system:user:export") @PostMapping("/export")