From e5c0b86017235dd965ff15c940fd8d76854f55a6 Mon Sep 17 00:00:00 2001 From: fjj <–1066869486@qq.com> Date: Fri, 22 Dec 2023 08:09:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=AE=A1=E7=90=863.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DatastandardController.java | 1 + .../net/srt/convert/DatastandardConvert.java | 26 +++++++++ .../net/srt/convert/QualityRuleConvert.java | 3 +- .../java/net/srt/dao/DatastandardDao.java | 15 +++++ .../net/srt/entity/DatastandardEntity.java | 39 +++++++++++++ .../net/srt/entity/QualityQueryEntity.java | 10 +++- .../java/net/srt/entity/StandardEntity.java | 57 +++++++++++++++++++ .../net/srt/service/DatastandardService.java | 24 ++++++++ .../service/impl/DatastandardServiceImpl.java | 54 ++++++++++++++++++ .../framework/common/constant/Constant.java | 2 + 10 files changed, 228 insertions(+), 3 deletions(-) create mode 100644 srt-cloud-data-governance/src/main/java/net/srt/convert/DatastandardConvert.java create mode 100644 srt-cloud-data-governance/src/main/java/net/srt/dao/DatastandardDao.java create mode 100644 srt-cloud-data-governance/src/main/java/net/srt/entity/DatastandardEntity.java create mode 100644 srt-cloud-data-governance/src/main/java/net/srt/entity/StandardEntity.java create mode 100644 srt-cloud-data-governance/src/main/java/net/srt/service/DatastandardService.java create mode 100644 srt-cloud-data-governance/src/main/java/net/srt/service/impl/DatastandardServiceImpl.java diff --git a/srt-cloud-data-governance/src/main/java/net/srt/controller/DatastandardController.java b/srt-cloud-data-governance/src/main/java/net/srt/controller/DatastandardController.java index 8dfe1e7..110c889 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/controller/DatastandardController.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/controller/DatastandardController.java @@ -44,6 +44,7 @@ public class DatastandardController { return Result.ok(DatastandardConvert.INSTANCE.convert(entity)); } + @GetMapping("/table-code/list") @Operation(summary = "查询表编码") public Result> getTableCode(){ diff --git a/srt-cloud-data-governance/src/main/java/net/srt/convert/DatastandardConvert.java b/srt-cloud-data-governance/src/main/java/net/srt/convert/DatastandardConvert.java new file mode 100644 index 0000000..374ff18 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/convert/DatastandardConvert.java @@ -0,0 +1,26 @@ +package net.srt.convert; + +import net.srt.entity.DatastandardEntity; +import net.srt.vo.StandardManagementVo; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** + * @BelongsProject: srt_cloud + * @BelongsPackage: net.srt.convert + * @Author: jpz + * @CreateTime: 2023/12/20 19:50 + */ + +@Mapper +public interface DatastandardConvert { + DatastandardConvert INSTANCE = Mappers.getMapper(DatastandardConvert.class); + + + List convertList(List list); + + StandardManagementVo convert(DatastandardEntity entity); + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/convert/QualityRuleConvert.java b/srt-cloud-data-governance/src/main/java/net/srt/convert/QualityRuleConvert.java index 770d9a3..0f0b5b3 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/convert/QualityRuleConvert.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/convert/QualityRuleConvert.java @@ -4,7 +4,6 @@ import net.srt.entity.QualityQueryEntity; import net.srt.vo.QualityRuleVo; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import org.springframework.stereotype.Component; import java.util.List; @@ -16,6 +15,8 @@ import java.util.List; */ @Mapper public interface QualityRuleConvert { + + QualityRuleConvert INSTANCE = Mappers.getMapper(QualityRuleConvert.class); diff --git a/srt-cloud-data-governance/src/main/java/net/srt/dao/DatastandardDao.java b/srt-cloud-data-governance/src/main/java/net/srt/dao/DatastandardDao.java new file mode 100644 index 0000000..9e18dd1 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/dao/DatastandardDao.java @@ -0,0 +1,15 @@ +package net.srt.dao; + +import net.srt.entity.DatastandardEntity; +import net.srt.framework.mybatis.dao.BaseDao; +import org.apache.ibatis.annotations.Mapper; + +/** + * @ClassName : DatastandardDao + * @Description : + * @Author : FJJ + * @Date: 2023-12-21 11:09 + */ +@Mapper +public interface DatastandardDao extends BaseDao { +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/entity/DatastandardEntity.java b/srt-cloud-data-governance/src/main/java/net/srt/entity/DatastandardEntity.java new file mode 100644 index 0000000..cf01e07 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/entity/DatastandardEntity.java @@ -0,0 +1,39 @@ +package net.srt.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import net.srt.framework.mybatis.entity.BaseEntity; + +/** + * @ClassName : DatastandardEntity + * @Description : + * @Author : FJJ + * @Date: 2023-12-21 11:09 + */ +@EqualsAndHashCode(callSuper = false) +@Data +@TableName("standard_management") +public class DatastandardEntity extends BaseEntity { + private static final long serialVersionUID = 1L; + @TableId("id") + private Long id; + private Integer categoryId; + private String engName; + private String cnName; + private Integer codeNum; + private String dataType; + private Integer dataLength; + private Integer dataPrecision; + private Integer nullable; + private Integer standardCodeId; + private Integer type; + private String note; + private Integer projectId; + private Integer status; + private Integer version; + private Integer deleted; + private Integer ifStandardRel; + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/entity/QualityQueryEntity.java b/srt-cloud-data-governance/src/main/java/net/srt/entity/QualityQueryEntity.java index f205541..067eaae 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/entity/QualityQueryEntity.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/entity/QualityQueryEntity.java @@ -3,8 +3,11 @@ package net.srt.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import net.srt.framework.mybatis.entity.BaseEntity; import net.srt.vo.QualityParam; @@ -16,9 +19,12 @@ import java.util.List; * @Author: jpz * @CreateTime: 2023/12/20 19:51 */ +@EqualsAndHashCode(callSuper = true) +@SuperBuilder @Data -@EqualsAndHashCode(callSuper = false) -@TableName(value = "data_governance_quality_rule",autoResultMap=true) +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "data_governance_quality_rule") public class QualityQueryEntity extends BaseEntity { /** * 名称 diff --git a/srt-cloud-data-governance/src/main/java/net/srt/entity/StandardEntity.java b/srt-cloud-data-governance/src/main/java/net/srt/entity/StandardEntity.java new file mode 100644 index 0000000..b13e9a4 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/entity/StandardEntity.java @@ -0,0 +1,57 @@ +package net.srt.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import net.srt.framework.mybatis.entity.BaseEntity; + +/** + * 文件分组表 + * + * @author zrx 985134801@qq.com + * @since 1.0.0 2022-11-12 + */ +@EqualsAndHashCode(callSuper = true) +@SuperBuilder +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName("data_file_category") +public class StandardEntity extends BaseEntity { + + /** + * 父级id（顶级为0） + */ + private Long parentId; + + /** + * 分组名称 + */ + private String name; + + /** + * 分组序号 + */ + private Integer orderNo; + + /** + * 描述 + */ + private String description; + + /** + * 分组路径 + */ + private String path; + + private Integer type; + + /** + * 项目id + */ + private Long projectId; + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/DatastandardService.java b/srt-cloud-data-governance/src/main/java/net/srt/service/DatastandardService.java new file mode 100644 index 0000000..130e888 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/DatastandardService.java @@ -0,0 +1,24 @@ +package net.srt.service; + +import net.srt.entity.DatastandardEntity; +import net.srt.framework.common.page.PageResult; +import net.srt.framework.mybatis.service.BaseService; +import net.srt.query.StandardManagementQuery; +import net.srt.vo.StandardManagementVo; +import org.mybatis.spring.annotation.MapperScan; + +import java.util.List; + +/** + * @ClassName : DatastandardService + * @Description : + * @Author : FJJ + * @Date: 2023-12-21 11:21 + */ +@MapperScan("net.srt.service.DatastandardService") +public interface DatastandardService extends BaseService { + PageResult page(StandardManagementQuery query); + + List getTableCode(); + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/DatastandardServiceImpl.java b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/DatastandardServiceImpl.java new file mode 100644 index 0000000..90e7b47 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/DatastandardServiceImpl.java @@ -0,0 +1,54 @@ +package net.srt.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.AllArgsConstructor; +import net.srt.convert.DatastandardConvert; +import net.srt.dao.DatastandardDao; +import net.srt.entity.DatastandardEntity; +import net.srt.framework.common.page.PageResult; +import net.srt.framework.mybatis.service.impl.BaseServiceImpl; +import net.srt.query.StandardManagementQuery; +import net.srt.service.DatastandardService; +import net.srt.vo.StandardManagementVo; +import org.springframework.stereotype.Service; +import srt.cloud.framework.dbswitch.common.util.StringUtil; + +import java.util.List; + +/** + * @ClassName : DatastandardServiceImpl + * @Description : + * @Author : FJJ + * @Date: 2023-12-21 11:21 + */ +@Service +@AllArgsConstructor +public class DatastandardServiceImpl extends BaseServiceImpl implements DatastandardService { + private final DatastandardDao datastandardDao; + @Override + public PageResult page(StandardManagementQuery query) { + IPage page = baseMapper.selectPage(getPage(query), getWrapper(query)); + return new PageResult<>(DatastandardConvert.INSTANCE.convertList(page.getRecords()), page.getTotal()); + } + + @Override + public List getTableCode() { + List list= datastandardDao.selectList(Wrappers.lambdaQuery()); + return list; + } + + + + + private LambdaQueryWrapper getWrapper(StandardManagementQuery query) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StringUtil.isNotBlank(query.getCnName()), DatastandardEntity::getCnName, query.getCnName()); + wrapper.like(StringUtil.isNotBlank(query.getEngName()), DatastandardEntity::getEngName, query.getEngName()); + wrapper.eq(query.getCategoryId() != null, DatastandardEntity::getCategoryId, query.getCategoryId()); + dataScopeWithOrgId(wrapper); + return wrapper; + } + +} diff --git a/srt-cloud-framework/srt-cloud-common/src/main/java/net/srt/framework/common/constant/Constant.java b/srt-cloud-framework/srt-cloud-common/src/main/java/net/srt/framework/common/constant/Constant.java index 50fcc05..c32b480 100644 --- a/srt-cloud-framework/srt-cloud-common/src/main/java/net/srt/framework/common/constant/Constant.java +++ b/srt-cloud-framework/srt-cloud-common/src/main/java/net/srt/framework/common/constant/Constant.java @@ -42,4 +42,6 @@ public interface Constant { * OK */ String OK = "OK"; + + String STATUS_NORMAL="0"; }