Ver código fonte

根据ID获取字段校验明细

zhanghang 3 anos atrás
pai
commit
3ce75d9a4a

+ 50 - 0
daqe-center/src/main/java/com/lantone/daqe/dto/GetByIdColumnVerifyDTO.java

@@ -0,0 +1,50 @@
+package com.lantone.daqe.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 根据ID获取字段校验规则明细数据-接口入参
+ * @author: zhanghang
+ * @time: 2022/3/10 10:01
+ */
+@ApiModel(value = "根据ID获取字段校验规则明细数据-接口出参")
+@Getter
+@Setter
+public class GetByIdColumnVerifyDTO implements Serializable {
+    private static final long serialVersionUID = 7115193150830411314L;
+
+    @ApiModelProperty(value = "表的列信息ID")
+    private Long columnId;
+
+    @ApiModelProperty(value = "表名称(中文)")
+    private String tableCname;
+
+    @ApiModelProperty(value = "表名称(英文)")
+    private String tableEname;
+
+    @ApiModelProperty(value = "字段名称(中文)")
+    private String columnCname;
+
+    @ApiModelProperty(value = "字段名称(英文)")
+    private String columnEname;
+
+    @ApiModelProperty(value = "是否必填,0:否,1:是")
+    private String isRequired;
+
+    @ApiModelProperty(value = "标准值")
+    private String standardvalue;
+
+    @ApiModelProperty(value = "正则式id")
+    private Long regularId;
+
+    @ApiModelProperty(value = "正则式名称")
+    private String regular;
+
+    @ApiModelProperty(value = "说明")
+    private String description;
+}

+ 2 - 2
daqe-center/src/main/java/com/lantone/daqe/facade/ColumnResultManagementFacade.java

@@ -23,7 +23,7 @@ import com.lantone.daqe.facade.base.StandardvalueResultFacade;
 import com.lantone.daqe.vo.GetColumnResultNumberVO;
 import com.lantone.daqe.vo.GetColumnResultPageVO;
 import com.lantone.daqe.vo.UpdateColumnResultVO;
-import com.lantone.daqe.vo.getByIdColumnResultVO;
+import com.lantone.daqe.vo.GetByIdColumnResultVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -143,7 +143,7 @@ public class ColumnResultManagementFacade {
      * @param getByIdColumnResultVO
      * @return: 字段校验问题明细明细
      */
-    public GetByIdColumnResultDTO getByIdColumnResult(getByIdColumnResultVO getByIdColumnResultVO) {
+    public GetByIdColumnResultDTO getByIdColumnResult(GetByIdColumnResultVO getByIdColumnResultVO) {
         ColumnResult columnResult = columnResultFacade.getBaseMapper().selectById(getByIdColumnResultVO.getId());
         String type = columnResult.getType();
         GetByIdColumnResultDTO getByIdColumnResultDTO = new GetByIdColumnResultDTO();

+ 20 - 2
daqe-center/src/main/java/com/lantone/daqe/facade/ColumnVerifyManagementFacade.java

@@ -8,6 +8,7 @@ import com.lantone.common.exception.Asserts;
 import com.lantone.common.util.BeanUtil;
 import com.lantone.common.util.ListUtil;
 import com.lantone.common.util.StringUtil;
+import com.lantone.daqe.dto.GetByIdColumnVerifyDTO;
 import com.lantone.daqe.dto.GetColumnInfoDTO;
 import com.lantone.daqe.dto.GetColumnNameDTO;
 import com.lantone.daqe.dto.GetColumnVerifyPageDTO;
@@ -30,6 +31,7 @@ import com.lantone.daqe.facade.base.StandardvalueInfoFacade;
 import com.lantone.daqe.vo.AddColumnVerifyVO;
 import com.lantone.daqe.vo.ColumnInfoVO;
 import com.lantone.daqe.vo.DelColumnVerifyVO;
+import com.lantone.daqe.vo.GetByIdColumnVerifyVO;
 import com.lantone.daqe.vo.GetColumnNameVO;
 import com.lantone.daqe.vo.GetColumnVerifyPageVO;
 import com.lantone.daqe.vo.GetRegularVO;
@@ -75,6 +77,22 @@ public class ColumnVerifyManagementFacade {
         return columnVerifyFacade.getBaseMapper().getColumnVerifyPage(getColumnVerifyPageVO);
     }
 
+    /**
+     * 根据ID获取字段校验规则明细数据
+     *
+     * @param getByIdColumnVerifyVO
+     * @return: 字段校验规则明细数据
+     */
+    public GetByIdColumnVerifyDTO getByIdColumnVerify(GetByIdColumnVerifyVO getByIdColumnVerifyVO) {
+        RegularMapping mappingFacadeOne = regularMappingFacade.getOne(new QueryWrapper<RegularMapping>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("column_id", getByIdColumnVerifyVO.getColumnId())
+        );
+        GetByIdColumnVerifyDTO byIdColumnVerify = columnVerifyFacade.getBaseMapper().getByIdColumnVerify(getByIdColumnVerifyVO);
+        byIdColumnVerify.setRegularId(mappingFacadeOne.getRegularId());
+        return byIdColumnVerify;
+    }
+
     /**
      * 查询下拉框获取数据库表中列数据表名称信息
      *
@@ -125,12 +143,12 @@ public class ColumnVerifyManagementFacade {
             List<GetColumnNameDTO> getColumnNameDTOS = new ArrayList<GetColumnNameDTO>();
             getTableNameDTO.setTableCname(columnInfo.getTableCname());
             getTableNameDTO.setTableEname(columnInfo.getTableEname());
-            if(columnString.contains(columnInfo.getTableCname())){
+            if (columnString.contains(columnInfo.getTableCname())) {
                 continue;
             }
             columnString.add(columnInfo.getTableCname());
             for (GetColumnInfoDTO info : columnInfoList) {
-                if(info.getTableCname().equals(columnInfo.getTableCname()) && info.getTableEname().equals(columnInfo.getTableEname())){
+                if (info.getTableCname().equals(columnInfo.getTableCname()) && info.getTableEname().equals(columnInfo.getTableEname())) {
                     GetColumnNameDTO getColumnNameDTO = new GetColumnNameDTO();
                     getColumnNameDTO.setId(info.getId());
                     getColumnNameDTO.setColumnCname(info.getColumnCname());

+ 5 - 0
daqe-center/src/main/java/com/lantone/daqe/mapper/ColumnVerifyMapper.java

@@ -2,9 +2,11 @@ package com.lantone.daqe.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.daqe.dto.GetByIdColumnVerifyDTO;
 import com.lantone.daqe.dto.GetColumnInfoDTO;
 import com.lantone.daqe.dto.GetColumnVerifyPageDTO;
 import com.lantone.daqe.entity.ColumnVerify;
+import com.lantone.daqe.vo.GetByIdColumnVerifyVO;
 import com.lantone.daqe.vo.GetColumnVerifyPageVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,4 +19,7 @@ import java.util.List;
  */
 public interface ColumnVerifyMapper extends BaseMapper<ColumnVerify> {
     IPage<GetColumnVerifyPageDTO> getColumnVerifyPage(@Param("getColumnVerifyPageVO") GetColumnVerifyPageVO getColumnVerifyPageVO);
+
+    GetByIdColumnVerifyDTO getByIdColumnVerify(@Param("getByIdColumnVerifyVO") GetByIdColumnVerifyVO getByIdColumnVerifyVO);
+
 }

+ 1 - 1
daqe-center/src/main/java/com/lantone/daqe/vo/getByIdColumnResultVO.java

@@ -16,7 +16,7 @@ import java.io.Serializable;
 @ApiModel(value = "根据ID查看字段校验问题明细-接口入参")
 @Getter
 @Setter
-public class getByIdColumnResultVO implements Serializable {
+public class GetByIdColumnResultVO implements Serializable {
 
 
     private static final long serialVersionUID = 9163756356308300151L;

+ 27 - 0
daqe-center/src/main/java/com/lantone/daqe/vo/GetByIdColumnVerifyVO.java

@@ -0,0 +1,27 @@
+package com.lantone.daqe.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Description: 根据ID获取字段校验规则明细数据-接口入参
+ * @author: zhanghang
+ * @time: 2022/3/10 10:30
+ */
+@ApiModel(value = "根据ID获取字段校验规则明细数据-接口入参")
+@Getter
+@Setter
+public class GetByIdColumnVerifyVO implements Serializable {
+
+    private static final long serialVersionUID = -1975195805997230670L;
+    @ApiModelProperty(value = "列信息ID", required = true)
+    @NotNull(message = "列信息ID不能为空")
+    private Long columnId;
+
+}

+ 2 - 2
daqe-center/src/main/java/com/lantone/daqe/web/ColumnResultManagmentController.java

@@ -10,7 +10,7 @@ import com.lantone.daqe.facade.ColumnResultManagementFacade;
 import com.lantone.daqe.vo.GetColumnResultNumberVO;
 import com.lantone.daqe.vo.GetColumnResultPageVO;
 import com.lantone.daqe.vo.UpdateColumnResultVO;
-import com.lantone.daqe.vo.getByIdColumnResultVO;
+import com.lantone.daqe.vo.GetByIdColumnResultVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,7 +53,7 @@ public class ColumnResultManagmentController {
 
     @ApiOperation(value = "根据ID查看字段校验问题明细 [by:zhanghang]")
     @PostMapping("/getByIdColumnResult")
-    public CommonResult<GetByIdColumnResultDTO> getByIdColumnResult(@RequestBody getByIdColumnResultVO getByIdColumnResultVO) {
+    public CommonResult<GetByIdColumnResultDTO> getByIdColumnResult(@RequestBody GetByIdColumnResultVO getByIdColumnResultVO) {
         return CommonResult.success(columnResultManagementFacade.getByIdColumnResult(getByIdColumnResultVO));
     }
 }

+ 8 - 0
daqe-center/src/main/java/com/lantone/daqe/web/ColumnVerifyManagementController.java

@@ -2,6 +2,7 @@ package com.lantone.daqe.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
+import com.lantone.daqe.dto.GetByIdColumnVerifyDTO;
 import com.lantone.daqe.dto.GetColumnNameDTO;
 import com.lantone.daqe.dto.GetColumnVerifyPageDTO;
 import com.lantone.daqe.dto.GetRegularDTO;
@@ -10,6 +11,7 @@ import com.lantone.daqe.dto.GetTableNameDTO;
 import com.lantone.daqe.facade.ColumnVerifyManagementFacade;
 import com.lantone.daqe.vo.AddColumnVerifyVO;
 import com.lantone.daqe.vo.DelColumnVerifyVO;
+import com.lantone.daqe.vo.GetByIdColumnVerifyVO;
 import com.lantone.daqe.vo.GetColumnNameVO;
 import com.lantone.daqe.vo.GetColumnVerifyPageVO;
 import com.lantone.daqe.vo.GetRegularVO;
@@ -47,6 +49,12 @@ public class ColumnVerifyManagementController {
         return CommonResult.success(columnVerifyManagementFacade.getColumnVerifyPage(getColumnVerifyPageVO));
     }
 
+    @ApiOperation(value = "根据ID获取字段校验规则明细数据 [by:zhanghang]")
+    @PostMapping("/getByIdColumnVerify")
+    public CommonResult<GetByIdColumnVerifyDTO> getByIdColumnVerify(@RequestBody GetByIdColumnVerifyVO getByIdColumnVerifyVO) {
+        return CommonResult.success(columnVerifyManagementFacade.getByIdColumnVerify(getByIdColumnVerifyVO));
+    }
+
     @ApiOperation(value = "查询下拉框获取数据库表中列数据表名称信息 [by:zhanghang]")
     @PostMapping("/getTableName")
     public CommonResult<List<GetTableNameDTO>> getTableName(@RequestBody GetTableNameVO getTableNameVO) {

+ 35 - 0
daqe-center/src/main/resources/mapper/ColumnVerifyMapper.xml

@@ -61,4 +61,39 @@
         </if>
     </select>
 
+
+    <select id="getByIdColumnVerify" resultType="com.lantone.daqe.dto.GetByIdColumnVerifyDTO">
+        SELECT
+        a.column_id,
+        a.table_cname,
+        a.table_ename,
+        a.column_cname,
+        a.column_ename,
+        GROUP_CONCAT(a.isRequired SEPARATOR ';') isRequired,
+        GROUP_CONCAT(a.standardvalue SEPARATOR ';') standardvalue,
+        GROUP_CONCAT(a.regular SEPARATOR ';') regular,
+        a.description
+        FROM
+        (
+        SELECT
+        dcv.column_id,
+        dcv.table_cname,
+        dcv.table_ename,
+        dcv.column_cname,
+        dcv.column_ename,
+        dcv.type,
+        dcv.description,
+        CASE dcv.type WHEN 1 THEN dcv.verify_val ELSE NULL END isRequired,
+        CASE dcv.type WHEN 2 THEN dcv.verify_val ELSE NULL END standardvalue,
+        CASE dcv.type WHEN 3 THEN dcv.verify_val ELSE NULL END regular
+        FROM
+        dc_column_verify dcv
+        WHERE
+        dcv.is_deleted = 'N'
+        and dcv.column_id= #{getByIdColumnVerifyVO.columnId}
+        ) a
+        GROUP BY
+        a.column_id
+    </select>
+
 </mapper>