From a8ab134f83175c26b9daac59bf0dc7bfaf7a4d09 Mon Sep 17 00:00:00 2001 From: Jiang Peng <2622360564@qq.com> Date: Wed, 1 May 2024 14:59:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=B5=84=E4=BA=A7=E6=8E=88=E6=9D=83(?= =?UTF-8?q?=E5=88=9D)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/etl/domain/AssetModel.java | 9 + .../muyu/etl/domain/custom/Statistics.java | 29 ++ .../muyu/etl/domain/req/AssetAccreditReq.java | 20 + .../etl/domain/req/SourceAccreditReq.java | 20 + .../muyu/etl/mapper/AssetAccreditMapper.java | 35 ++ .../com/muyu/etl/mapper/DataAssetMapper.java | 2 + .../muyu/etl/mapper/SourceAccreditMapper.java | 71 ++++ .../etl/service/AssetAccreditService.java | 30 ++ .../etl/service/DictionaryDataService.java | 6 + .../etl/service/SourceAccreditService.java | 71 ++++ .../impl/AssetAccreditServiceImpl.java | 140 +++++++ .../service/impl/DataSourceServiceImpl.java | 373 +++++++++++------- .../impl/DictionaryDataServiceImpl.java | 74 ++++ .../impl/SourceAccreditServiceImpl.java | 104 +++++ .../resources/mapper/AssetAccreditMapper.xml | 167 ++++++++ .../main/resources/mapper/DataAssetMapper.xml | 12 + .../resources/mapper/SourceAccreditMapper.xml | 139 +++++++ 17 files changed, 1151 insertions(+), 151 deletions(-) create mode 100644 muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/custom/Statistics.java create mode 100644 muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/req/AssetAccreditReq.java create mode 100644 muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/req/SourceAccreditReq.java create mode 100644 muyu-modules/muyu-etl/src/main/java/com/muyu/etl/mapper/AssetAccreditMapper.java create mode 100644 muyu-modules/muyu-etl/src/main/java/com/muyu/etl/mapper/SourceAccreditMapper.java create mode 100644 muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/AssetAccreditService.java create mode 100644 muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/SourceAccreditService.java create mode 100644 muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/AssetAccreditServiceImpl.java create mode 100644 muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/SourceAccreditServiceImpl.java create mode 100644 muyu-modules/muyu-etl/src/main/resources/mapper/AssetAccreditMapper.xml create mode 100644 muyu-modules/muyu-etl/src/main/resources/mapper/SourceAccreditMapper.xml diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/AssetModel.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/AssetModel.java index da58a1a..dc9a39a 100644 --- a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/AssetModel.java +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/AssetModel.java @@ -1,7 +1,10 @@ package com.muyu.etl.domain; import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.List; @@ -12,6 +15,9 @@ import java.util.List; * @Date 2024/4/22 19:39 */ @Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor public class AssetModel extends BaseEntity { private Long id; private Long dataAssetId; @@ -26,6 +32,9 @@ public class AssetModel extends BaseEntity { private String defaultValue; private String isDict; private String dictKey; + /** + * 字典ID + */ private Long dictionaryId; private List dictionaryDatas; diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/custom/Statistics.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/custom/Statistics.java new file mode 100644 index 0000000..564a1c8 --- /dev/null +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/custom/Statistics.java @@ -0,0 +1,29 @@ +package com.muyu.etl.domain.custom; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class Statistics { + + /** + * 数据资产ID + */ + private Long dataAsset; + + /** + * 资产模型ID + */ + private Long assetModel; + + /** + * 数据模型ID + */ + private Long dataModel; + +} diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/req/AssetAccreditReq.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/req/AssetAccreditReq.java new file mode 100644 index 0000000..be2912e --- /dev/null +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/req/AssetAccreditReq.java @@ -0,0 +1,20 @@ +package com.muyu.etl.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.List; + +@Data +@NoArgsConstructor +@SuperBuilder +@AllArgsConstructor +public class AssetAccreditReq { + + private List deptIds; + private Long userId; + private Long dataAssetId; + +} diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/req/SourceAccreditReq.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/req/SourceAccreditReq.java new file mode 100644 index 0000000..a5dd269 --- /dev/null +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/req/SourceAccreditReq.java @@ -0,0 +1,20 @@ +package com.muyu.etl.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder +public class SourceAccreditReq { + + private List deptIds; + private Long userId; + private Long dataSourceId; + +} 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 new file mode 100644 index 0000000..9b579af --- /dev/null +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/mapper/AssetAccreditMapper.java @@ -0,0 +1,35 @@ +package com.muyu.etl.mapper; + +import com.muyu.etl.domain.AssetAccredit; +import com.muyu.etl.domain.req.AssetAccreditReq; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.beans.PropertyValues; + +import java.util.ArrayList; +import java.util.List; + +@Mapper +public interface AssetAccreditMapper { + + List selectAssetAccreditList(AssetAccredit assetAccredit); + + public AssetAccredit selectAssetAccreditById(Long id); + + void insertAssetAccredit(AssetAccreditReq assetAccreditReq); + + public int updateAssetAccredit(AssetAccredit assetAccredit); + + public int deleteAssetAccreditByIds(Long[] ids); + + public int deleteAssetAccreditById(Long id); + + List getAssetAccreditByDataAssetId(Long id); + + void deleteAssetAccreditByDeptUser(@Param("deptIds") List deptIds, @Param("userId") Long userId, @Param("dataAssetId") Long dataAssetId); + + List getSourceAccreditByUserId(Long userId); + + void insertBachAssetAccredit(@Param("assetAccredits") List assetAccredits); + +} diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/mapper/DataAssetMapper.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/mapper/DataAssetMapper.java index 1071059..ed1a0bd 100644 --- a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/mapper/DataAssetMapper.java +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/mapper/DataAssetMapper.java @@ -68,4 +68,6 @@ public interface DataAssetMapper List selectById(Long id); + List getDataAssetByAssetId(@Param("assetIds") List assetIds); + } 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 new file mode 100644 index 0000000..9659df8 --- /dev/null +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/mapper/SourceAccreditMapper.java @@ -0,0 +1,71 @@ +package com.muyu.etl.mapper; + +import com.muyu.etl.domain.SourceAccredit; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Mapper +public interface SourceAccreditMapper { + + /** + * 查询【请填写功能名称】 + * + * @param id 【请填写功能名称】主键 + * @return 【请填写功能名称】 + */ + public SourceAccredit selectSourceAccreditById(Long id); + + /** + * 查询【请填写功能名称】列表 + * + * @param sourceAccredit 【请填写功能名称】 + * @return 【请填写功能名称】集合 + */ + public List selectSourceAccreditList(SourceAccredit sourceAccredit); + + /** + * 新增【请填写功能名称】 + * + * @param sourceAccredit 【请填写功能名称】 + * @return 结果 + */ + public int insertSourceAccredit(SourceAccredit sourceAccredit); + + /** + * 修改【请填写功能名称】 + * + * @param sourceAccredit 【请填写功能名称】 + * @return 结果 + */ + public int updateSourceAccredit(SourceAccredit sourceAccredit); + + /** + * 删除【请填写功能名称】 + * + * @param id 【请填写功能名称】主键 + * @return 结果 + */ + public int deleteSourceAccreditById(Long id); + + /** + * 批量删除【请填写功能名称】 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSourceAccreditByIds(Long[] ids); + + void deleteSourceAccreditBySourceIds(@Param("sourceIds") List sourceIds); + + List getSourceAccreditByDataSourceId(@Param("id") Long id); + + List getSourceAccreditByUserId(@Param("id") Long id); + + void insertBatchSourceAccredit(@Param("sourceAccredits") List sourceAccredits); + + void deleteSourceAccreditByDeptUser(@Param("deptIds") List deptIds, @Param("userId") Long userId, @Param("dataSourceId") Long dataSourceId); + +} diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/AssetAccreditService.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/AssetAccreditService.java new file mode 100644 index 0000000..dd12cc3 --- /dev/null +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/AssetAccreditService.java @@ -0,0 +1,30 @@ +package com.muyu.etl.service; + +import com.muyu.common.core.domain.Result; +import com.muyu.etl.domain.AssetAccredit; +import com.muyu.etl.domain.req.AssetAccreditReq; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public interface AssetAccreditService { + + List selectAssetAccreditList(AssetAccredit assetAccredit); + + AssetAccredit selectAssetAccreditById(Long id); + + public Result insertAssetAccredit(AssetAccreditReq assetAccreditReq); + + public int updateAssetAccredit(AssetAccredit assetAccredit); + + public int deleteAssetAccreditByIds(Long[] ids); + + public int deleteAssetAccreditById(Long id); + + Result getAssetAccreditByDataAssetId(Long id); + + Result deleteAssetAccreditByAssetId(AssetAccreditReq assetAccreditReq); + +} diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/DictionaryDataService.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/DictionaryDataService.java index cc3b23a..e70be80 100644 --- a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/DictionaryDataService.java +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/DictionaryDataService.java @@ -1,5 +1,6 @@ package com.muyu.etl.service; +import com.muyu.common.core.domain.Result; import com.muyu.etl.domain.DictionaryData; import org.springframework.stereotype.Service; @@ -54,4 +55,9 @@ public interface DictionaryDataService { * @return 结果 */ public int deleteDictionaryDataById(Long id); + + Result getDictionaryList(Long dataSourceId); + + Result delDict(Long id); + } diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/SourceAccreditService.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/SourceAccreditService.java new file mode 100644 index 0000000..21d2a49 --- /dev/null +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/SourceAccreditService.java @@ -0,0 +1,71 @@ +package com.muyu.etl.service; + +import com.muyu.common.core.domain.Result; +import com.muyu.etl.domain.SourceAccredit; +import com.muyu.etl.domain.req.SourceAccreditReq; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author ruoyi + * @date 2024-04-25 + */ +@Service +public interface SourceAccreditService { + + /** + * 查询【请填写功能名称】 + * + * @param id 【请填写功能名称】主键 + * @return 【请填写功能名称】 + */ + public SourceAccredit selectSourceAccreditById(Long id); + + /** + * 查询【请填写功能名称】列表 + * + * @param sourceAccredit 【请填写功能名称】 + * @return 【请填写功能名称】集合 + */ + public List selectSourceAccreditList(SourceAccredit sourceAccredit); + + /** + * 新增【请填写功能名称】 + * + * @param sourceAccreditReq 【请填写功能名称】 + * @return 结果 + */ + public Result insertSourceAccredit(SourceAccreditReq sourceAccreditReq); + + /** + * 修改【请填写功能名称】 + * + * @param sourceAccredit 【请填写功能名称】 + * @return 结果 + */ + public int updateSourceAccredit(SourceAccredit sourceAccredit); + + /** + * 批量删除【请填写功能名称】 + * + * @param ids 需要删除的【请填写功能名称】主键集合 + * @return 结果 + */ + public int deleteSourceAccreditByIds(Long[] ids); + + /** + * 删除【请填写功能名称】信息 + * + * @param id 【请填写功能名称】主键 + * @return 结果 + */ + public int deleteSourceAccreditById(Long id); + + Result getSourceAccreditByDataSourceId(Long id); + + Result deleteSourceAccreditBySourceIds(SourceAccreditReq sourceAccreditReq); + +} 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 new file mode 100644 index 0000000..6508f6b --- /dev/null +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/AssetAccreditServiceImpl.java @@ -0,0 +1,140 @@ +package com.muyu.etl.service.impl; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.DateUtils; +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.etl.domain.AssetAccredit; +import com.muyu.etl.domain.model.AccreditModel; +import com.muyu.etl.domain.req.AssetAccreditReq; +import com.muyu.etl.mapper.AssetAccreditMapper; +import com.muyu.etl.service.AssetAccreditService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; + +/** + * @ClassName AssetAccreditServiceImpl + * @Description 描述 + * @Author HaoRan.Zhang + * @Date 2024/4/28 15:11 + */ +@Service +public class AssetAccreditServiceImpl implements AssetAccreditService { + + @Autowired + private AssetAccreditMapper assetAccreditMapper; + + @Override + public List selectAssetAccreditList(AssetAccredit assetAccredit) { + List assetAccredits = assetAccreditMapper.selectAssetAccreditList(assetAccredit); + return assetAccredits; + } + + @Override + public AssetAccredit selectAssetAccreditById(Long id) { + AssetAccredit assetAccredit = assetAccreditMapper.selectAssetAccreditById(id); + return assetAccredit; + } + + @Override + public Result insertAssetAccredit(AssetAccreditReq assetAccreditReq) { + + // 根据资产ID删除资产授权信息 + deleteAssetAccreditByAssetId(assetAccreditReq); + List assetAccredits = new ArrayList<>(); + // 判断用户ID是否为空，不为空则为用户授权，为空则为部门授权 + if (assetAccreditReq.getUserId()!=null){ + // 为用户授权时，创建资产授权信息 + AssetAccredit assetAccredit = new AssetAccredit(); + assetAccredit.setDataAssetId(assetAccreditReq.getDataAssetId()); + assetAccredit.setUserId(assetAccreditReq.getUserId()); + assetAccredit.setCreateBy(SecurityUtils.getUsername()); + assetAccredit.setCreateTime(new Date()); + assetAccredits.add(assetAccredit); + }else{ + // 为部门授权时，循环遍历部门ID，创建相应的资产授权信息 + 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(); + } + // 将资产授权信息插入数据库 + assetAccreditMapper.insertBachAssetAccredit(assetAccredits); + return Result.success(); + } + + @Override + public int updateAssetAccredit(AssetAccredit assetAccredit) { + assetAccredit.setUpdateTime(DateUtils.getNowDate()); + return assetAccreditMapper.updateAssetAccredit(assetAccredit); + } + + + @Override + public int deleteAssetAccreditByIds(Long[] ids) { + return assetAccreditMapper.deleteAssetAccreditByIds(ids); + + } + + @Override + public int deleteAssetAccreditById(Long id) { + return assetAccreditMapper.deleteAssetAccreditById(id); + } + + /** + * 根据数据资产ID获取资产授权信息。 + * + * @param id 数据资产的ID，不能为空。 + * @return 返回一个Result对象，其中包含授权模型AccreditModel，包括部门授权ID集合和用户授权ID集合。 + */ + @Override + public Result getAssetAccreditByDataAssetId(Long id) { + // 通过数据资产ID查询所有的资产授权信息 + List assetAccreditList = assetAccreditMapper.getAssetAccreditByDataAssetId(id); + + // 通过流操作取出部门Id集合，过滤掉空值 + List deptListIds = assetAccreditList.stream().map(AssetAccredit::getDeptId).filter(Objects::nonNull).toList(); + + // 通过流操作取出用户ID集合，过滤掉空值 + List userListIds = assetAccreditList.stream().map(AssetAccredit::getUserId).filter(Objects::nonNull).toList(); + + // 创建授权模型，并设置部门和用户授权ID集合 + AccreditModel accreditModel = new AccreditModel(); + accreditModel.setDeptAccreditModelIds(deptListIds); + accreditModel.setUserAccreditModelIds(userListIds); + + // 返回成功结果，包含授权模型 + return Result.success(accreditModel); + } + + + @Override + public Result deleteAssetAccreditByAssetId(AssetAccreditReq assetAccreditReq) + { + /** + * 根据用户或部门删除资产授权记录。 + * 如果用户ID非空，则根据用户ID和数据资产ID删除授权记录。 + * 如果用户ID空，则根据部门ID列表和数据资产ID删除授权记录。 + * + * @param assetAccreditReq 包含用户ID、部门ID列表和数据资产ID的资产授权请求对象。 + * @return 返回操作成功的结果对象。 + */ + if (assetAccreditReq.getUserId()!=null){ + // 根据用户ID和数据资产ID删除授权记录 + assetAccreditMapper.deleteAssetAccreditByDeptUser(null,assetAccreditReq.getUserId(),assetAccreditReq.getDataAssetId()); + }else{ + // 根据部门ID列表和数据资产ID删除授权记录 + assetAccreditMapper.deleteAssetAccreditByDeptUser(assetAccreditReq.getDeptIds(),null,assetAccreditReq.getDataAssetId()); + } + return Result.success(); + } +} 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 f934357..7794f36 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 @@ -4,11 +4,11 @@ package com.muyu.etl.service.impl; 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.SysRole; import com.muyu.etl.domain.*; import com.muyu.etl.domain.Dictionary; -import com.muyu.etl.mapper.AssetModelMapper; -import com.muyu.etl.mapper.DataAssetMapper; -import com.muyu.etl.mapper.DataSourceMapper; +import com.muyu.etl.domain.custom.Statistics; +import com.muyu.etl.mapper.*; import com.muyu.etl.service.DataSourceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -38,6 +38,12 @@ public class DataSourceServiceImpl implements DataSourceService{ @Autowired private DictionaryServiceImpl dictionaryService; + @Autowired + private SourceAccreditMapper sourceAccreditMapper; + + @Autowired + private AssetAccreditMapper assetAccreditMapper; + /** * 查询【请填写功能名称】 * @@ -58,8 +64,27 @@ public class DataSourceServiceImpl implements DataSourceService{ */ @Override public List selectDataSourceList(DataSource dataSource) { + List dataSourceList = new ArrayList<>(); List dataSources = dataSourceMapper.selectDataSourceList(dataSource); - return dataSources; + List roles = SecurityUtils.getLoginUser().getSysUser().getRoles(); + if (roles.get(0).getRoleId()==1){ + dataSourceList = dataSources; + }else{ + ArrayList longs = new ArrayList<>(); + List sourceIds = sourceAccreditMapper.getSourceAccreditByUserId(SecurityUtils.getUserId()).stream() + .map(SourceAccredit::getDataSourceId) + .filter(Objects::nonNull).toList(); + List asserId = assetAccreditMapper.getSourceAccreditByUserId(SecurityUtils.getUserId()).stream() + .map(AssetAccredit::getDataAssetId) + .filter(Objects::nonNull).toList(); + if (!asserId.isEmpty()){ + List longList = dataAssetMapper.getDataAssetByAssetId(asserId).stream().map(DataAsset::getDataSourceId).toList(); + longs.addAll(longList); + } + longs.addAll(sourceIds); + dataSourceList = dataSources.stream().filter(dataSource1 -> longs.contains(dataSource1.getId())).toList(); + } + return dataSourceList; } /** @@ -91,11 +116,6 @@ public class DataSourceServiceImpl implements DataSourceService{ { dataSource.setUpdateTime(DateUtils.getNowDate()); dataSource.setUpdateBy(SecurityUtils.getUsername()); - if("Mysql".equals(dataSource.getType())){ - dataSource.setJdbcDriver("com.mysql.cj.jdbc.Driver"); - }else { - dataSource.setJdbcDriver("org.postgresql.Driver"); - } return dataSourceMapper.updateDataSource(dataSource); } @@ -232,84 +252,56 @@ public class DataSourceServiceImpl implements DataSourceService{ * @return 资产模型列表，每个资产模型代表数据表中的一列 */ public List getTableAssets(DataSource dataSource,String tableName){ - // 根据数据源获取用户名和密码 - String username = dataSource.getUsername(); - String password = dataSource.getPassword(); // 设置MySQL JDBC驱动类名和数据库连接URL - String jdbcDriver="com.mysql.cj.jdbc.Driver"; - String url = "jdbc:mysql://"+dataSource.getLinkAddress()+":"+dataSource.getPort()+"/"+dataSource.getDatabaseName(); - + String url = "jdbc:"+dataSource.getType().toLowerCase()+"://"+dataSource.getLinkAddress()+":"+dataSource.getPort()+"/"+dataSource.getDatabaseName(); Connection con = null; ArrayList tableAssets = new ArrayList<>(); + Map typeMap = getTypeMap(dataSource, tableName); try{ // 加载JDBC驱动 - Class.forName(jdbcDriver); + Class.forName(dataSource.getJdbcDriver()); // 建立数据库连接 - con = DriverManager.getConnection(url,username,password); + con = DriverManager.getConnection(url,dataSource.getUsername(),dataSource.getPassword()); }catch (SQLException | ClassNotFoundException exception){ // 抛出运行时异常 throw new RuntimeException(exception); } try{ - // 预编译SQL语句，查询指定数据库和数据表的列信息 - PreparedStatement preparedStatement = con.prepareStatement("SELECT COLUMN_NAME,DATA_TYPE,IS_NULLABLE,COLUMN_KEY,COLUMN_DEFAULT,COLUMN_COMMENT,CHARACTER_MAXIMUM_LENGTH,NUMERIC_PRECISION,NUMERIC_SCALE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = '"+dataSource.getDatabaseName()+"' AND TABLE_NAME = '"+tableName+"'"); - ResultSet resultSet = preparedStatement.executeQuery(); - // 遍历查询结果，创建并填充资产模型列表 - while (resultSet.next()){ - AssetModel assetModel = new AssetModel(); - assetModel.setComment(resultSet.getString("COLUMN_COMMENT")); - assetModel.setName(resultSet.getString("COLUMN_NAME")); -// int decimalPlaces = resultSet.getInt("DECIMAL_PLACES"); - // 设置列长度或精度 - if (resultSet.getString("CHARACTER_MAXIMUM_LENGTH")!=null){ - assetModel.setLength(resultSet.getString("CHARACTER_MAXIMUM_LENGTH")); - }else if (resultSet.getString("NUMERIC_PRECISION")!=null){ - assetModel.setLength(resultSet.getString("NUMERIC_PRECISION")); - }else{ - assetModel.setLength("-"); - } - if (resultSet.getString("NUMERIC_SCALE")!=null){ - assetModel.setDecimalPlaces(resultSet.getString("NUMERIC_SCALE")); - }else{ - assetModel.setDecimalPlaces("0"); - } - - // 设置是否可为空 - if (resultSet.getString("IS_NULLABLE").equals("YES")){ - assetModel.setIsNull("Y"); - }else{ - assetModel.setIsNull("N"); - } - // 设置是否有默认值 - if (resultSet.getString("COLUMN_DEFAULT")!=null){ - - assetModel.setDefaultValue(resultSet.getString("COLUMN_DEFAULT")); - }else{ - assetModel.setDefaultValue("-"); - } - // 初始化其他属性 - assetModel.setIsDict(""); - assetModel.setDictKey(""); - - assetModel.setType("s"); -// assetModel.setDecimalPlaces("0"); - - String dataType = mapDataTypeToJavaClass(resultSet.getString("DATA_TYPE")); - assetModel.setMappingType(dataType); - assetModel.setType(resultSet.getString("DATA_TYPE")); - // 设置是否为主键 - if ("PRI".equals(resultSet.getString("COLUMN_KEY"))){ - assetModel.setIsPrimaryKey("Y"); - }else{ - assetModel.setIsPrimaryKey("N"); - } - // 设置创建者和创建时间 - assetModel.setCreateBy(SecurityUtils.getUsername()); - assetModel.setCreateTime(new Date()); - tableAssets.add(assetModel); + // 获取数据库元数据 + DatabaseMetaData metaData = con.getMetaData(); + // 查询表的所有列信息 + ResultSet columnsRS = metaData.getColumns(dataSource.getDatabaseName(),dataSource.getModeName(), tableName, "%"); + // 查询表的主键列信息 + ResultSet primaryKeyRS = metaData.getPrimaryKeys(dataSource.getDatabaseName(), dataSource.getModeName(), tableName); + String primaryKeyColumnName ="";// 保存主键列名 + // 遍历结果集，获取主键列名 + while (primaryKeyRS.next()) { + primaryKeyColumnName = primaryKeyRS.getString("COLUMN_NAME"); + } + // 遍历列信息，为每个列创建AssetModel实例，并添加到列表中 + while (columnsRS.next()) { + // 根据数据库列信息构建AssetModel实例 + AssetModel build = AssetModel.builder() + // 构建表字段信息 + .createBy(SecurityUtils.getUsername()) // 通过安全工具获取当前用户名 + .createTime(new Date()) // 设置创建时间为当前时间 + .length(String.valueOf(columnsRS.getInt("COLUMN_SIZE"))) // 设置字段长度 + .decimalPlaces(String.valueOf(columnsRS.getInt("DECIMAL_DIGITS"))) // 设置小数位数 + .name(columnsRS.getString("COLUMN_NAME")) // 设置字段名称 + .type(columnsRS.getString("TYPE_NAME")) // 设置字段类型 + .mappingType(typeMap.get(columnsRS.getString("COLUMN_NAME"))) // 设置映射类型 + .dictKey("") // 设置字典键，默认为空 + .isDict("") // 设置是否为字典字段，默认为空 + .isNull(columnsRS.getString("IS_NULLABLE").substring(0, 1)) // 设置字段是否可为空 + .isPrimaryKey(columnsRS.getString("COLUMN_NAME").equals(primaryKeyColumnName) ? "Y" : "N") // 设置字段是否为 primary key + .comment(columnsRS.getString("REMARKS")==null || columnsRS.getString("REMARKS")=="" ? "-" : columnsRS.getString("REMARKS")) // 设置字段注释，若为空则默认为 "-" + .defaultValue(columnsRS.getString("COLUMN_DEF")==null || columnsRS.getString("COLUMN_DEF")=="" ? "-":columnsRS.getString("COLUMN_DEF")) // 设置字段默认值，若为空则默认为 "-" + .build(); // 构建并返回字段信息对象 + tableAssets.add(build); } - preparedStatement.close(); + columnsRS.close(); + primaryKeyRS.close(); }catch (SQLException e){ e.printStackTrace(); } @@ -317,35 +309,42 @@ public class DataSourceServiceImpl implements DataSourceService{ } //获取表结构 public AssetsModule getAssets(DataSource dataSource){ - String user = dataSource.getUsername(); - String password = dataSource.getPassword(); - String jdbcDriver = "com.mysql.cj.jdbc.Driver"; - String jdbcUrl = "jdbc:mysql://"+dataSource.getLinkAddress()+":"+dataSource.getPort()+"/"+dataSource.getDatabaseName(); + String jdbcUrl = "jdbc:"+dataSource.getType().toLowerCase()+"://"+dataSource.getLinkAddress()+":"+dataSource.getPort()+"/"+dataSource.getDatabaseName(); Connection conn = null; - HashMap map = new HashMap<>(); + HashMap map = new HashMap<>(); // 用于存储列名和对应的数据类型的映射关系 + // 通过dataSource和表名获取表资产信息 List tableAssets = getTableAssets(dataSource,dataSource.getTableName()); try { - Class.forName(jdbcDriver); - conn = DriverManager.getConnection(jdbcUrl, user, password); + // 加载JDBC驱动并获取数据库连接 从传过来的信息里获取驱动 + Class.forName(dataSource.getJdbcDriver()); + conn = DriverManager.getConnection(jdbcUrl, dataSource.getUsername(), dataSource.getPassword()); } catch (SQLException | ClassNotFoundException e) { + // 抛出运行时异常 throw new RuntimeException(e); } + try { + // 准备查询语句并执行 PreparedStatement pst = conn.prepareStatement("select * from "+dataSource.getTableName()+" where 1=1"); ResultSet resultSet = pst.executeQuery(); ResultSetMetaData rsd = resultSet.getMetaData(); + + // 遍历结果集元数据，构建列名和数据类型的映射关系 for(int i = 1; i <= rsd.getColumnCount(); i++) { String substring = rsd.getColumnClassName(i).substring(rsd.getColumnClassName(i).indexOf("java.lang.") + 10); map.put(rsd.getColumnName(i),substring); } + + // 根据映射关系，设置AssetModel的类型 for (AssetModel tableAsset : tableAssets) { - tableAsset.setType(map.get(tableAsset.getName())); + tableAsset.setType(map.get(tableAsset.getName())); } pst.close(); } catch(SQLException e) { e.printStackTrace(); } + // 创建AssetsModule并设置结构信息，然后返回 AssetsModule assetsModule = new AssetsModule(); assetsModule.setStructure(map); return assetsModule; @@ -353,37 +352,37 @@ public class DataSourceServiceImpl implements DataSourceService{ //获取数据表结构 public AssetsModule getStructure(DataSource dataSource){ - String user = dataSource.getUsername(); - String password = dataSource.getPassword(); - String jdbcDriver = "com.mysql.cj.jdbc.Driver"; - String jdbcUrl = "jdbc:mysql://"+dataSource.getLinkAddress()+":"+dataSource.getPort()+"/"+dataSource.getDatabaseName(); + String jdbcUrl = "jdbc:"+dataSource.getType().toLowerCase()+"://"+dataSource.getLinkAddress()+":"+dataSource.getPort()+"/"+dataSource.getDatabaseName(); Connection conn = null; List> kvtList = new ArrayList<>(); HashMap map = new HashMap<>(); + try { - Class.forName(jdbcDriver); - conn = DriverManager.getConnection(jdbcUrl, user, password); + // 加载数据库驱动并建立连接 + Class.forName(dataSource.getJdbcDriver()); + conn = DriverManager.getConnection(jdbcUrl,dataSource.getUsername(),dataSource.getPassword()); } catch (SQLException | ClassNotFoundException e) { + // 抛出运行时异常 throw new RuntimeException(e); } try { + // 准备语句并执行查询 PreparedStatement pst = conn.prepareStatement(dataSource.getSql()); ResultSet resultSet = pst.executeQuery(); ResultSetMetaData rsd = resultSet.getMetaData(); + + // 处理查询结果，生成列名与java类型的映射 for(int i = 1; i <= rsd.getColumnCount(); i++) { String substring = rsd.getColumnClassName(i).substring(rsd.getColumnClassName(i).indexOf("java.lang.") + 10); - System.out.print("java类型："+substring); - System.out.print(" 数据库类型:"+rsd.getColumnTypeName(i)); - System.out.print(" 字段名称:"+rsd.getColumnName(i)); - System.out.println(); map.put(rsd.getColumnName(i),substring); } + int columnCount = rsd.getColumnCount(); - // 遍历每一行的数据 + + // 遍历查询结果，填充数据到list中 while (resultSet.next()){ Map stringVTClassHashMap = new HashMap<>(); for (int i = 1; i <= columnCount; i++) { - // 根据列索引或列名获取数据 String columnName = rsd.getColumnName(i); String type = map.get(columnName); Object value = resultSet.getObject(i); @@ -399,6 +398,8 @@ public class DataSourceServiceImpl implements DataSourceService{ } catch(SQLException e) { e.printStackTrace(); } + + // 构建并返回AssetsModule对象 AssetsModule assetsModule = new AssetsModule(); assetsModule.setKvtList(kvtList); assetsModule.setStructure(map); @@ -424,78 +425,130 @@ public class DataSourceServiceImpl implements DataSourceService{ //数据同步 @Override public Result synchronization(DataSource dataSource) { - List dataSources = dataSourceMapper.selectId(dataSource.getId()); - List longs = dataSources.stream().map(DataSource::getId).toList(); - System.out.println("数据源的ID"+longs); - - ArrayList longArrayList = new ArrayList<>(); - - for (Long aLong : longs) { + List dataSources = dataSourceMapper.selectId(dataSource.getId()); // 根据数据源ID查询所有相关数据源 + List longList = dataSources.stream().map(DataSource::getId).toList(); // 提取数据源ID列表 + ArrayList l = new ArrayList<>(); + for (Long aLong : longList) { + // 对于每个数据源ID，查询其关联的所有数据模型 List dataAssets = dataAssetMapper.selectById(aLong); - List longList = dataAssets.stream().map(DataAsset::getId).toList(); - System.out.println("数据模型的Id"+longList); - longArrayList.addAll(longList); + // 提取数据模型ID列表 + List longs = dataAssets.stream().map(DataAsset::getId).toList(); + System.out.println("数据模型的Id" + longs); // 打印数据模型ID列表 + l.addAll(longs); // 将数据模型ID列表添加到总列表中 } - - Long[] longs2 = longArrayList.toArray(Long[]::new); - if (longs2.length != 0){ - assetModelMapper.clearTable1(longs2); - + Long[] dataAssetIdList = l.toArray(Long[]::new); + if (dataAssetIdList.length != 0){ + assetModelMapper.clearTable1(dataAssetIdList); } - String username = dataSource.getUsername(); - String password = dataSource.getPassword(); - String jdbcDriver = "com.mysql.cj.jdbc.Driver"; - String databaseName=dataSource.getDatabaseName(); - String url = "jdbc:mysql://"+dataSource.getLinkAddress()+":"+dataSource.getPort()+"/"+dataSource.getDatabaseName(); + String url = "jdbc:"+dataSource.getType().toLowerCase()+"://"+dataSource.getLinkAddress()+":"+dataSource.getPort()+"/"+dataSource.getDatabaseName(); Connection conn= null; + String sql; // 创建一个空的数据资产列表 ArrayList dataAssets = new ArrayList<>(); try{ - // 加载 JDBC 驱动 - Class.forName(jdbcDriver); - // 获取数据库连接 - conn = DriverManager.getConnection(url, username, password); - // 构造 SQL 查询语句，用于从 INFORMATION_SCHEMA.TABLES 表中获取表名、表注释和表行数 - String sql="SELECT TABLE_NAME t_name,TABLE_COMMENT table_comment,TABLE_ROWS table_rows,(SELECT count(*) FROM INFORMATION_SCHEMA.columns WHERE TABLE_SCHEMA = '"+dataSource.getDatabaseName()+"' and TABLE_NAME=t_name) fields FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='"+dataSource.getDatabaseName()+"'"; - // 准备 SQL 语句并执行查询 + // 加载 JDBC 驱动 + Class.forName(dataSource.getJdbcDriver()); + // 获取数据库连接 + conn = DriverManager.getConnection(url, dataSource.getUsername(), dataSource.getPassword()); + if (dataSource.getType().equals("MySql")){ + sql="SELECT TABLE_NAME t_name,TABLE_COMMENT table_comment,TABLE_ROWS table_rows,(SELECT count(*) FROM INFORMATION_SCHEMA.columns WHERE TABLE_SCHEMA = '"+dataSource.getDatabaseName()+"' and TABLE_NAME=t_name) fields FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='"+dataSource.getDatabaseName()+"'"; + }else{ + sql="SELECT \n" + + " c.relname AS t_name,\n" + + " pgd.description AS table_comment,\n" + + " COUNT(col.column_name) AS fields,\n" + + " c.reltuples AS table_rows\n" + + "FROM \n" + + " pg_catalog.pg_class c\n" + + "LEFT JOIN \n" + + " pg_catalog.pg_namespace n ON n.oid = c.relnamespace\n" + + "LEFT JOIN \n" + + " pg_catalog.pg_description pgd ON pgd.objoid = c.oid\n" + + "LEFT JOIN \n" + + " information_schema.columns col ON c.relname = col.table_name AND n.nspname = col.table_schema\n" + + "WHERE \n" + + " n.nspname = '"+dataSource.getModeName()+"' \n" + + "AND \n" + + " c.relkind = 'r' \n" + + "GROUP BY \n" + + " c.relname, pgd.description, c.reltuples"; + } + // 准备 SQL 语句并执行查询 根据传过来的参数进行查询 可重用 PreparedStatement preparedStatement = conn.prepareStatement(sql); + // 使用executeQuery 进行查询 以结果集的形式返回 ResultSet resultSet = preparedStatement.executeQuery(); // 遍历结果集，将每条记录转换为DataAsset对象，并添加到数据列表中 while (resultSet.next()){ - dataAssets.add(new DataAsset().dataAssetBuild(dataSource,resultSet)); + DataAsset dataAsset = new DataAsset(); + // 设置表名 + dataAsset.setTableName(resultSet.getString("t_name")); + // 设置表注释 + dataAsset.setTableComment(resultSet.getString("table_comment")); + // 设置表行数 + dataAsset.setTableCount(resultSet.getLong("table_rows")); + // 设置字段数 + dataAsset.setFields(resultSet.getLong("fields")); + // 设置数据源ID + dataAsset.setDataSourceId(dataSource.getId()); + // 设置创建者为当前登录用户 + dataAsset.setCreateBy(SecurityUtils.getUsername()); + // 设置创建时间为当前时间 + dataAsset.setCreateTime(new Date()); + // 将DataAsset对象添加到数据列表中 + dataAssets.add(dataAsset); } // 将 DataAsset 对象的 ID 提取出来并转换为 Long 数组 - int i = dataSourceMapper.clearTable(new Long[]{dataSource.getId()}); - dataSourceMapper.batchAdd(dataAssets); + Long id = dataSource.getId(); // 从数据源获取ID + Long[] a = new Long[1]; + a[0] = id; // 将ID存入数组 + int i = dataSourceMapper.clearTable(a); // 使用ID清理相关表 + dataSourceMapper.batchAdd(dataAssets); // 批量添加数据资产 + // 遍历每个数据资产，为其添加对应的资产模型 for (DataAsset dataAsset : dataAssets) { - List tableAssets = getTableAssets(dataSource, dataAsset.getTableName()); - tableAssets.stream().forEach(assetModel -> assetModel.setDataAssetId(dataAsset.getId())); - assetModelMapper.batchInsert(tableAssets); + List tableAssets = getTableAssets(dataSource, dataAsset.getTableName()); // 获取表资产 + tableAssets.stream().forEach(assetModel -> assetModel.setDataAssetId(dataAsset.getId())); // 关联数据资产ID + assetModelMapper.batchInsert(tableAssets); // 批量插入资产模型 } }catch (SQLException | ClassNotFoundException exception){ - throw new RuntimeException(exception); - } + throw new RuntimeException(exception); + } return Result.success(); } @Override public Result dataAssetList(DataSource dataSource) { + // 创建一个新的DataAsset实例，并设置其数据源ID DataAsset dataAsset = new DataAsset(); dataAsset.setDataSourceId(dataSource.getId()); + List dataAssetList = new ArrayList<>(); + // 根据数据源ID查询数据资产列表 List dataAssets = dataAssetMapper.selectDataAssetList(dataAsset); - return Result.success(dataAssets); + List roles = SecurityUtils.getLoginUser().getSysUser().getRoles(); + if (roles.get(0).getRoleId() ==1){ + dataAssetList = dataAssets; + }else{ + List assetIds = assetAccreditMapper.getSourceAccreditByUserId(SecurityUtils.getUserId()).stream().map(AssetAccredit::getDataAssetId).filter(Objects::nonNull).toList(); + dataAssets = dataAssets.stream().filter(dataAsset1 -> assetIds.contains(dataAsset1.getId())).toList(); + } + // 返回查询结果的成功响应 + return Result.success(dataAssetList); } @Override public Result assetModelList(DataAsset dataAsset) { + // 创建资产模型实例，并设置数据资产ID AssetModel assetModel = new AssetModel(); assetModel.setDataAssetId(dataAsset.getId()); + // 根据资产模型查询资产模型列表 List assetModels = assetModelMapper.selectAssetModelList(assetModel); + // 将资产模型列表中的字典键提取为字符串列表 List strings = assetModels.stream().map(AssetModel::getDictKey).toList(); + // 如果字符串列表不为空，则查询相应的字典数据 if (!strings.isEmpty()){ Result> dictionaryDataList = dictionaryService.getDictionaryDataList(strings); List data = dictionaryDataList.getData(); + // 为每个资产模型匹配并设置字典数据 assetModels.stream().forEach(assetModel1 -> { data.stream().forEach(dictionary -> { if (assetModel1.getDictKey().equals(dictionary.getDictionaryKey())) { @@ -503,8 +556,8 @@ public class DataSourceServiceImpl implements DataSourceService{ } }); }); - } + // 返回成功的查询结果，包含资产模型列表 return Result.success(assetModels); } @@ -516,28 +569,46 @@ public class DataSourceServiceImpl implements DataSourceService{ * @return Result 包含统计信息的结果对象，其中成功时携带Statistics对象，包含数据资产数量、数据模型数量和资产模型数量。 */ public Result statisticsInfo() { - long datasum; - long assetssum; + List dataSourcesList = new ArrayList<>(); // 查询所有的数据源 List dataSources = dataSourceMapper.selectDataSourceList(new DataSource()); - // 查出数据源ID列表 - List longs = dataSources.stream().map(s -> s.getId()).toList(); - // 根据数据源ID列表查询 - List dataAssets = dataSourceMapper.selectDataAssetBachId(longs); - // 初始化统计信息对象 - Statistics statistics = new Statistics(); - // 统计数据资产的数量 - statistics.setDataAsset((long) longs.size()); - System.out.println(statistics.getDataAsset()); - // 统计所有数据资产的字段总数 - datasum = dataAssets.stream().mapToLong(dataAsset -> Long.valueOf(dataAsset.getFields())).sum(); - // 统计所有数据资产的表数量 - assetssum = dataAssets.stream().mapToLong(dataAsset -> Long.valueOf(dataAsset.getTableCount())).sum(); - System.out.println("数据"+datasum); - System.out.println("资产"+assetssum); - // 设置数据模型数量和资产模型数量 - statistics.setDataModel(datasum); - statistics.setAssetModel(assetssum); + List roles = SecurityUtils.getLoginUser().getSysUser().getRoles(); + List assetIds; + if (roles.get(0).getRoleId()==1){ + assetIds = new ArrayList<>(); + dataSourcesList = dataSources; + }else{ + ArrayList longs1 = new ArrayList<>(); + List sourceIds = sourceAccreditMapper.getSourceAccreditByUserId(SecurityUtils.getUserId()).stream().map(SourceAccredit::getDataSourceId).filter(Objects::nonNull).toList(); + assetIds = assetAccreditMapper.getSourceAccreditByUserId(SecurityUtils.getUserId()).stream().map(AssetAccredit::getDataAssetId).filter(Objects::nonNull).toList(); + if (!assetIds.isEmpty()){ + List longs = dataAssetMapper.getDataAssetByAssetId(assetIds).stream().map(DataAsset::getDataSourceId).toList(); + longs1.addAll(longs); + } + longs1.addAll(sourceIds); + dataSourcesList = dataSources.stream().filter(dataSource -> longs1.contains(dataSource.getId())).toList(); + } + List longList = dataSourcesList.stream().map(dataSource -> dataSource.getId()).toList(); + com.muyu.etl.domain.custom.Statistics statistics= new Statistics(); + if (!longList.isEmpty()){ + List dataAssetByAssetId = dataAssetMapper.getDataAssetByAssetId(longList); + if (roles.get(0).getRoleId()!=1){ + dataSourcesList = dataSourcesList.stream().filter(dataSource -> longList.contains(dataSource.getId())).toList(); + } + statistics.setDataAsset(Long.valueOf(dataSourcesList.size())); + long sum; + long sum1; + // 统计所有数据资产的字段总数 + sum = dataAssetByAssetId.stream().mapToLong(dataAsset -> Long.valueOf(dataAsset.getFields())).sum(); + // 统计所有数据资产的表数量 + sum1 = dataAssetByAssetId.stream().mapToLong(dataAsset -> Long.valueOf(dataAsset.getTableCount())).sum(); + // 设置数据模型数量和资产模型数量 + statistics.setDataModel(sum); + statistics.setAssetModel(sum1); + }else{ + statistics.setDataAsset(0L); + statistics.setAssetModel(0L); + } // 返回携带统计信息的成功结果 return Result.success(statistics); } diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/DictionaryDataServiceImpl.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/DictionaryDataServiceImpl.java index bdd73e4..c38d4ba 100644 --- a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/DictionaryDataServiceImpl.java +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/DictionaryDataServiceImpl.java @@ -1,9 +1,14 @@ package com.muyu.etl.service.impl; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.DateUtils; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.etl.domain.Dictionary; import com.muyu.etl.domain.DictionaryData; +import com.muyu.etl.mapper.AssetModelMapper; import com.muyu.etl.mapper.DictionaryDataMapper; +import com.muyu.etl.mapper.DictionaryMapper; +import com.muyu.etl.service.AssetModelService; import com.muyu.etl.service.DictionaryDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -12,9 +17,16 @@ import java.util.List; @Service public class DictionaryDataServiceImpl implements DictionaryDataService { + @Autowired private DictionaryDataMapper dictionaryDataMapper; + @Autowired + private DictionaryMapper dictionaryMapper; + + @Autowired + private AssetModelMapper assetModelMapper; + /** * 查询【请填写功能名称】 * @@ -90,4 +102,66 @@ public class DictionaryDataServiceImpl implements DictionaryDataService { { return dictionaryDataMapper.deleteDictionaryDataById(id); } + + /** + * 获取数据源对应的字典列表。 + * + * @param dataSourceId 数据源ID，用于查询与之相关的字典列表。 + * @return 返回字典列表的成功结果，其中包含了字典及其相关数据。 + */ + @Override + public Result getDictionaryList(Long dataSourceId) { + // 从字典mapper中查询指定数据源ID的字典列表 + List dictionaryList = dictionaryMapper.getDictionaryList(dataSourceId); + if (!dictionaryList.isEmpty()){ + // 将字典列表中每个字典的ID提取出来，形成一个新的ID列表 + List longs = dictionaryList.stream() + .map(Dictionary::getId).toList(); + // 根据提取出的ID列表，从字典数据mapper中查询相应的字典数据列表 + List dictionaryDataList = dictionaryDataMapper.getDictionaryDataList(longs); + // 为每个字典设置其对应的字典数据列表 + dictionaryList.stream() + .forEach(dictionary->{ + // 过滤出与当前字典ID匹配的字典数据，并为当前字典设置这个列表 + dictionaryDataList.stream().filter(dictionaryData -> dictionaryData.getDictionaryId().equals(dictionary.getId()) ).toList(); + dictionary.setDictionaryDataList(dictionaryDataList); + }); + } + // 返回成功结果，包含处理后的字典列表 + return Result.success(dictionaryList); + } + + @Override + public Result delDict(Long id) { + dictionaryDataMapper.deleteDictionaryDataBy(id); + dictionaryMapper.deleteDictionaryById(id); + assetModelMapper.updateAssetModelDiction(id); + return Result.success(); + } + /** + * 获取字典数据列表。 + * + * @param string 一个字符串列表，代表需要查询的字典项的标识符。 + * @return 返回一个结果对象，其中包含了查询到的字典数据列表。如果查询成功，则结果对象的状态为成功，并附带字典数据列表；如果查询失败，则结果对象的状态为失败，并可能包含错误信息。 + */ + public Result getDictionaryDataList(List string){ + // 通过字符串列表查询字典数据列表 + List dictionaryDataList = dictionaryMapper.getDictionaryDataList(string); + if (!dictionaryDataList.isEmpty()){ + // 将字典数据列表中的每个字典项的ID提取出来，形成一个新的ID列表 + List longs = dictionaryDataList.stream() + .map(Dictionary::getId).toList(); + // 根据ID列表查询相应的字典详细数据列表 + List dictionaryDataList1 = dictionaryDataMapper.getDictionaryDataList(longs); + // 为每个字典项设置其详细的字典数据列表 + dictionaryDataList.stream() + .forEach(dictionary -> { + dictionaryDataList1.stream().filter(dictionaryData -> dictionaryData.getDictionaryId() ==(dictionary.getId())).toList(); + dictionary.setDictionaryDataList(dictionaryDataList1); + }); + } + // 返回成功结果，包含处理后的字典数据列表 + return Result.success(dictionaryDataList); + } + } 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 new file mode 100644 index 0000000..131876b --- /dev/null +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/SourceAccreditServiceImpl.java @@ -0,0 +1,104 @@ +package com.muyu.etl.service.impl; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.DateUtils; +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.etl.domain.SourceAccredit; +import com.muyu.etl.domain.model.AccreditModel; +import com.muyu.etl.domain.req.SourceAccreditReq; +import com.muyu.etl.mapper.SourceAccreditMapper; +import com.muyu.etl.service.SourceAccreditService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; + +/** + * @ClassName SourceAccreditServiceImpl + * @Description 描述 + * @Author HaoRan.Zhang + * @Date 2024/4/29 15:06 + */ +@Service +public class SourceAccreditServiceImpl implements SourceAccreditService { + @Autowired + private SourceAccreditMapper sourceAccreditMapper; + @Override + public SourceAccredit selectSourceAccreditById(Long id) { + SourceAccredit sourceAccredit = sourceAccreditMapper.selectSourceAccreditById(id); + return sourceAccredit; + } + + @Override + public List selectSourceAccreditList(SourceAccredit sourceAccredit) { + List sourceAccredits = sourceAccreditMapper.selectSourceAccreditList(sourceAccredit); + return sourceAccredits; + } + + @Override + public Result insertSourceAccredit(SourceAccreditReq sourceAccreditReq) { + deleteSourceAccreditBySourceIds(sourceAccreditReq); + List sourceAccredits = new ArrayList<>(); + if (sourceAccreditReq.getUserId()!=null){ + SourceAccredit sourceAccredit = new SourceAccredit(); + sourceAccredit.setDataSourceId(sourceAccreditReq.getDataSourceId()); + sourceAccredit.setUserId(sourceAccreditReq.getUserId()); + sourceAccredit.setCreateBy(SecurityUtils.getUsername()); + sourceAccredit.setCreateTime(new Date()); + sourceAccredits.add(sourceAccredit); + }else{ + sourceAccredits = 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(); + } + sourceAccreditMapper.insertBatchSourceAccredit(sourceAccredits); + return Result.success(); + } + + @Override + public int updateSourceAccredit(SourceAccredit sourceAccredit) { + sourceAccredit.setUpdateTime(DateUtils.getNowDate()); + return sourceAccreditMapper.updateSourceAccredit(sourceAccredit); + } + + @Override + public int deleteSourceAccreditByIds(Long[] ids) { + return sourceAccreditMapper.deleteSourceAccreditByIds(ids); + + } + + @Override + public int deleteSourceAccreditById(Long id) { + return sourceAccreditMapper.deleteSourceAccreditById(id); + } + + @Override + public Result getSourceAccreditByDataSourceId(Long id) { + List sourceAccreditList = sourceAccreditMapper.getSourceAccreditByDataSourceId(id); + List userAccreditIds = sourceAccreditList.stream().map(SourceAccredit::getUserId).filter(Objects::nonNull).toList(); + List deptAccreditIds = sourceAccreditList.stream().map(SourceAccredit::getDeptId).filter(Objects::nonNull).toList(); + AccreditModel accreditModel = new AccreditModel(); + accreditModel.setDeptAccreditModelIds(deptAccreditIds); + accreditModel.setUserAccreditModelIds(userAccreditIds); + return Result.success(accreditModel); + } + + @Override + public Result deleteSourceAccreditBySourceIds(SourceAccreditReq sourceAccreditReq) { + if (sourceAccreditReq.getUserId()!=null){ + sourceAccreditMapper.deleteSourceAccreditByDeptUser(null,sourceAccreditReq.getUserId(),sourceAccreditReq.getDataSourceId()); + }else{ + sourceAccreditMapper.deleteSourceAccreditByDeptUser(sourceAccreditReq.getDeptIds(),null,sourceAccreditReq.getDataSourceId()); + } + return Result.success(); + } +} diff --git a/muyu-modules/muyu-etl/src/main/resources/mapper/AssetAccreditMapper.xml b/muyu-modules/muyu-etl/src/main/resources/mapper/AssetAccreditMapper.xml new file mode 100644 index 0000000..f003264 --- /dev/null +++ b/muyu-modules/muyu-etl/src/main/resources/mapper/AssetAccreditMapper.xml @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + select id, dept_id, data_asset_id, user_id, remark, create_by, create_time, update_by, update_time from asset_accredit + + + + + + + + + + + insert into asset_accredit + + dept_id, + data_asset_id, + user_id, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{deptId}, + #{dataAssetId}, + #{userId}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + insert into asset_accredit + + dept_id, + data_asset_id, + user_id, + create_by, + create_time + + values + + ( + #{assetAccredit.deptId}, + null, + #{assetAccredit.dataAssetId}, + #{assetAccredit.userId}, + null, + #{assetAccredit.createBy}, + #{assetAccredit.createTime} + ) + + + + insert into asset_accredit + + dept_id, + data_asset_id, + user_id, + create_by, + create_time + + values + + ( + #{assetAccredit.deptId}, + null, + #{assetAccredit.dataAssetId}, + #{assetAccredit.userId}, + null, + #{assetAccredit.createBy}, + #{assetAccredit.createTime} + ) + + + + + update asset_accredit + + dept_id = #{deptId}, + data_asset_id = #{dataAssetId}, + user_id = #{userId}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from asset_accredit where id = #{id} + + + + delete from asset_accredit where id in + + #{id} + + + + delete from asset_accredit where data_asset_id in + + #{assetId} + + + + delete from asset_accredit where + data_asset_id = #{dataAssetId} + + and user_id = #{userId} + + + and dept_id in + + #{deptId} + + + + diff --git a/muyu-modules/muyu-etl/src/main/resources/mapper/DataAssetMapper.xml b/muyu-modules/muyu-etl/src/main/resources/mapper/DataAssetMapper.xml index 1b89fdf..3bf5caf 100644 --- a/muyu-modules/muyu-etl/src/main/resources/mapper/DataAssetMapper.xml +++ b/muyu-modules/muyu-etl/src/main/resources/mapper/DataAssetMapper.xml @@ -37,10 +37,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + + insert into data_asset diff --git a/muyu-modules/muyu-etl/src/main/resources/mapper/SourceAccreditMapper.xml b/muyu-modules/muyu-etl/src/main/resources/mapper/SourceAccreditMapper.xml new file mode 100644 index 0000000..814dbf8 --- /dev/null +++ b/muyu-modules/muyu-etl/src/main/resources/mapper/SourceAccreditMapper.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + select id, dept_id, datasource_id, user_id, remark, create_by, create_time, update_by, update_time from source_accredit + + + + + + + + + + insert into source_accredit + + dept_id, + datasource_id, + user_id, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{dept_id}, + #{dataSourceId}, + #{userId}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + insert into source_accredit + + dept_id, + datasource_id, + user_id, + create_by, + create_time + + values + + ( + #{sourceAccredit.deptId}, + null, + #{sourceAccredit.dataSourceId}, + #{sourceAccredit.userId}, + null, + #{sourceAccredit.createBy}, + #{sourceAccredit.createTime} + ) + + + + + update source_accredit + + dept_id = #{deptId}, + datasource_id = #{dataSourceId}, + user_id = #{userId}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from source_accredit where id = #{id} + + + + delete from source_accredit where id in + + #{id} + + + + delete from source_accredit where datasource_id in + + #{sourceId} + + + + delete from source_accredit where + datasource_id = #{dataSourceId} + + and user_id = #{userId} + + + and dept_id in + + #{deptId} + + + +