Merge branch 'dev/20220228_v3.0.1通用版_渠道管理第一期' into debug

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

@@ -37,7 +37,7 @@ public class GetByIdColumnVerifyDTO implements Serializable {
     private String isRequired;
 
     @ApiModelProperty(value = "标准值")
-    private String standardvalue;
+    private String[] standardValueList;
 
     @ApiModelProperty(value = "正则式id")
     private Long regularId;

daqe-center/src/main/java/com/lantone/daqe/dto/GetColumnVerifyDTO.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 GetColumnVerifyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1598464598027326148L;
+    @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;
+}

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

@@ -13,6 +13,7 @@ import com.lantone.daqe.dto.GetByIdColumnVerifyDTO;
 import com.lantone.daqe.dto.GetColumnDTO;
 import com.lantone.daqe.dto.GetColumnInfoDTO;
 import com.lantone.daqe.dto.GetColumnNameDTO;
+import com.lantone.daqe.dto.GetColumnVerifyDTO;
 import com.lantone.daqe.dto.GetColumnVerifyPageDTO;
 import com.lantone.daqe.dto.GetRegularDTO;
 import com.lantone.daqe.dto.GetTableColumnNameDTO;
@@ -94,16 +95,42 @@ public class ColumnVerifyManagementFacade {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("column_id", getByIdColumnVerifyVO.getColumnId())
         );
-        GetByIdColumnVerifyDTO byIdColumnVerify = columnVerifyFacade.getBaseMapper().getByIdColumnVerify(getByIdColumnVerifyVO);
+        //获取规则总表数据
+        List<GetColumnVerifyDTO> columnVerifyDTOList = columnVerifyFacade.getBaseMapper().getByIdColumnVerify(getByIdColumnVerifyVO);
+        GetByIdColumnVerifyDTO getByIdColumnVerifyDTO = new GetByIdColumnVerifyDTO();
+        List<String> standardValueList = new ArrayList<>();
+        if (ListUtil.isEmpty(columnVerifyDTOList)) {
+            Asserts.fail("不存在该字段关联规则 !");
+        }
+        GetColumnVerifyDTO columnVerifyDTO = columnVerifyDTOList.get(0);
+        getByIdColumnVerifyDTO.setColumnId(columnVerifyDTO.getColumnId());
+        getByIdColumnVerifyDTO.setColumnCname(columnVerifyDTO.getColumnCname());
+        getByIdColumnVerifyDTO.setColumnEname(columnVerifyDTO.getColumnEname());
+        getByIdColumnVerifyDTO.setTableCname(columnVerifyDTO.getTableCname());
+        getByIdColumnVerifyDTO.setTableEname(columnVerifyDTO.getTableEname());
+        getByIdColumnVerifyDTO.setIsRequired(columnVerifyDTO.getIsRequired());
+        getByIdColumnVerifyDTO.setRegular(columnVerifyDTO.getRegular());
+        getByIdColumnVerifyDTO.setDescription(columnVerifyDTO.getDescription());
+        //处理关键值信息
+        for (GetColumnVerifyDTO getColumnVerifyDTO : columnVerifyDTOList) {
+            if (StringUtil.isNotEmpty(getColumnVerifyDTO.getStandardValue())) {
+                standardValueList.add(getColumnVerifyDTO.getStandardValue());
+            }
+        }
+
         if (mappingFacadeOne != null) {
             RegularInfo one = regularInfoFacade.getOne(new QueryWrapper<RegularInfo>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("id", mappingFacadeOne.getRegularId())
             );
-            byIdColumnVerify.setRegularId(mappingFacadeOne.getRegularId());
-            byIdColumnVerify.setRegular(one.getName());
+            getByIdColumnVerifyDTO.setRegularId(mappingFacadeOne.getRegularId());
+            getByIdColumnVerifyDTO.setRegular(one.getName());
         }
-        return byIdColumnVerify;
+        String[] strings = new String[standardValueList.size()];
+        if (ListUtil.isNotEmpty(standardValueList)) {
+            getByIdColumnVerifyDTO.setStandardValueList(standardValueList.toArray(strings));
+        }
+        return getByIdColumnVerifyDTO;
     }
 
     /**
@@ -125,8 +152,8 @@ public class ColumnVerifyManagementFacade {
     public List<GetColumnNameDTO> getColumnName(GetColumnNameVO getColumnNameVO) {
         List<ColumnInfo> columnInfoList = columnInfoFacade.getBaseMapper().selectList(new QueryWrapper<ColumnInfo>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq(StringUtil.isNotBlank(getColumnNameVO.getTableEname()),"table_ename",getColumnNameVO.getTableEname())
-                .eq(StringUtil.isNotBlank(getColumnNameVO.getTableCname()),"table_cname",getColumnNameVO.getTableCname())
+                .eq(StringUtil.isNotBlank(getColumnNameVO.getTableEname()), "table_ename", getColumnNameVO.getTableEname())
+                .eq(StringUtil.isNotBlank(getColumnNameVO.getTableCname()), "table_cname", getColumnNameVO.getTableCname())
                 .like(StringUtil.isNotBlank(getColumnNameVO.getColumnCname()), "column_cname", getColumnNameVO.getColumnCname())
                 .like(StringUtil.isNotBlank(getColumnNameVO.getColumnEname()), "column_ename", getColumnNameVO.getColumnEname())
                 .groupBy("column_cname", "column_ename")
@@ -215,6 +242,11 @@ public class ColumnVerifyManagementFacade {
             columnVerify.setTableCname(columnInfoVO.getTableCname());
             columnVerify.setTableEname(columnInfoVO.getTableEname());
             if (addColumnVerifyVO.getRegularId() != null) {
+                //新增前判断是否存在该正则
+                RegularInfo regularInfo = regularInfoFacade.getBaseMapper().selectById(addColumnVerifyVO.getRegularId());
+                if (regularInfo == null) {
+                    Asserts.fail("该正则不存在,已被删除，请重新关联正则!");
+                }
                 //插入正则维护表
                 //先判断是否该字段信息是否已关联正则
                 RegularMapping selectOneMapping = regularMappingFacade.getBaseMapper().selectOne(new QueryWrapper<RegularMapping>()
@@ -228,7 +260,7 @@ public class ColumnVerifyManagementFacade {
                 regularMapping.setColumnId(columnId);
                 regularMapping.setGmtCreate(new Date());
                 regularMapping.setGmtModified(new Date());
-                if(principleId!=null) {
+                if (principleId != null) {
                     regularMapping.setCreator(principleId.toString());
                 }
                 regularMapping.setRegularId(addColumnVerifyVO.getRegularId());
@@ -245,7 +277,7 @@ public class ColumnVerifyManagementFacade {
                 columnVerify.setDescription(addColumnVerifyVO.getDescription());
                 columnVerify.setGmtCreate(new Date());
                 columnVerify.setGmtModified(new Date());
-                if(principleId!=null) {
+                if (principleId != null) {
                     columnVerify.setCreator(principleId.toString());
                 }
                 try {
@@ -268,7 +300,7 @@ public class ColumnVerifyManagementFacade {
                 nonnullInfo.setColumnId(columnId);
                 nonnullInfo.setGmtCreate(new Date());
                 nonnullInfo.setGmtModified(new Date());
-                if(principleId!=null) {
+                if (principleId != null) {
                     nonnullInfo.setCreator(principleId.toString());
                 }
                 nonnullInfo.setIsRequired(addColumnVerifyVO.getIsRequired());
@@ -285,7 +317,7 @@ public class ColumnVerifyManagementFacade {
                 columnVerify.setDescription(addColumnVerifyVO.getDescription());
                 columnVerify.setGmtCreate(new Date());
                 columnVerify.setGmtModified(new Date());
-                if(principleId!=null) {
+                if (principleId != null) {
                     columnVerify.setCreator(principleId.toString());
                 }
                 try {
@@ -302,7 +334,7 @@ public class ColumnVerifyManagementFacade {
                     standardvalueInfo.setColumnId(columnId);
                     standardvalueInfo.setGmtCreate(new Date());
                     standardvalueInfo.setGmtModified(new Date());
-                    if(principleId!=null) {
+                    if (principleId != null) {
                         standardvalueInfo.setCreator(principleId.toString());
                     }
                     standardvalueInfo.setVal(standardValue);
@@ -319,7 +351,7 @@ public class ColumnVerifyManagementFacade {
                     columnVerify.setDescription(addColumnVerifyVO.getDescription());
                     columnVerify.setGmtCreate(new Date());
                     columnVerify.setGmtModified(new Date());
-                    if(principleId!=null) {
+                    if (principleId != null) {
                         columnVerify.setCreator(principleId.toString());
                     }
                     try {
@@ -473,6 +505,11 @@ public class ColumnVerifyManagementFacade {
                 if (updateColumnVerifyVO.getRegularId() != null) {
                     //插入正则维护表
                     if (selectOneMapping != null) {
+                        //修改前判断是否存在该正则
+                        RegularInfo regularInfo = regularInfoFacade.getBaseMapper().selectById(updateColumnVerifyVO.getRegularId());
+                        if (regularInfo == null) {
+                            Asserts.fail("该正则不存在,已被删除，请重新关联正则!");
+                        }
                         //已关联正则走修改
                         regularMappingFacade.update(new UpdateWrapper<RegularMapping>()
                                 .eq("column_id", columnId)
@@ -494,10 +531,15 @@ public class ColumnVerifyManagementFacade {
                         );
                     } else {
                         //未关联正则走新增
+                        //新增前判断是否存在该正则
+                        RegularInfo regularInfo = regularInfoFacade.getBaseMapper().selectById(updateColumnVerifyVO.getRegularId());
+                        if (regularInfo == null) {
+                            Asserts.fail("该正则不存在,已被删除，请重新关联正则!");
+                        }
                         RegularMapping regularMapping = new RegularMapping();
                         regularMapping.setColumnId(columnId);
                         regularMapping.setGmtCreate(new Date());
-                        if(principleId!=null) {
+                        if (principleId != null) {
                             regularMapping.setCreator(principleId.toString());
                         }
                         regularMapping.setRegularId(updateColumnVerifyVO.getRegularId());
@@ -513,7 +555,7 @@ public class ColumnVerifyManagementFacade {
                         columnVerify.setVerifyVal(updateColumnVerifyVO.getRegularName());
                         columnVerify.setDescription(updateColumnVerifyVO.getDescription());
                         columnVerify.setGmtCreate(new Date());
-                        if(principleId!=null) {
+                        if (principleId != null) {
                             columnVerify.setCreator(principleId.toString());
                         }
                         try {
@@ -522,7 +564,7 @@ public class ColumnVerifyManagementFacade {
                             Asserts.fail("保存失败");
                         }
                     }
-                }else {
+                } else {
                     //为空则存在的关联给删掉
                     if (selectOneMapping != null) {
                         //已关联正则删除
@@ -571,7 +613,7 @@ public class ColumnVerifyManagementFacade {
                         NonnullInfo nonnullInfo = new NonnullInfo();
                         nonnullInfo.setColumnId(columnId);
                         nonnullInfo.setGmtCreate(new Date());
-                        if(principleId!=null) {
+                        if (principleId != null) {
                             nonnullInfo.setCreator(principleId.toString());
                         }
                         nonnullInfo.setIsRequired(updateColumnVerifyVO.getIsRequired());
@@ -587,7 +629,7 @@ public class ColumnVerifyManagementFacade {
                         columnVerify.setVerifyVal(updateColumnVerifyVO.getIsRequired());
                         columnVerify.setDescription(updateColumnVerifyVO.getDescription());
                         columnVerify.setGmtCreate(new Date());
-                        if(principleId!=null) {
+                        if (principleId != null) {
                             columnVerify.setCreator(principleId.toString());
                         }
                         try {
@@ -614,7 +656,7 @@ public class ColumnVerifyManagementFacade {
                         standardvalueInfo.setGmtCreate(new Date());
                         standardvalueInfo.setGmtModified(new Date());
                         standardvalueInfo.setVal(standardValue);
-                        if(principleId!=null) {
+                        if (principleId != null) {
                             standardvalueInfo.setCreator(principleId.toString());
                         }
                         try {
@@ -630,7 +672,7 @@ public class ColumnVerifyManagementFacade {
                         columnVerify.setDescription(updateColumnVerifyVO.getDescription());
                         columnVerify.setGmtCreate(new Date());
                         columnVerify.setGmtModified(new Date());
-                        if(principleId!=null) {
+                        if (principleId != null) {
                             columnVerify.setCreator(principleId.toString());
                         }
                         try {
@@ -639,7 +681,7 @@ public class ColumnVerifyManagementFacade {
                             Asserts.fail("保存失败");
                         }
                     }
-                }else {
+                } else {
                     //为空则存在的关联给删掉
                     standardvalueInfoFacade.remove(new UpdateWrapper<StandardvalueInfo>()
                             .eq("column_id", columnId)

daqe-center/src/main/java/com/lantone/daqe/facade/RegularManagementFacade.java

@@ -14,6 +14,7 @@ import com.lantone.daqe.entity.ColumnVerify;
 import com.lantone.daqe.entity.RegularInfo;
 import com.lantone.daqe.entity.RegularMapping;
 import com.lantone.daqe.entity.RegularResult;
+import com.lantone.daqe.enums.ColumnVerifyTypeEnum;
 import com.lantone.daqe.facade.base.ColumnVerifyFacade;
 import com.lantone.daqe.facade.base.RegularInfoFacade;
 import com.lantone.daqe.facade.base.RegularMappingFacade;
@@ -105,6 +106,7 @@ public class RegularManagementFacade {
                 return columnVerifyFacade.update(new UpdateWrapper<ColumnVerify>()
                         .eq("verify_id", upRegularByIdVO.getId())
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .eq("type", ColumnVerifyTypeEnum.REGULAR_TYPE.getKey())
                         .set("verify_val", upRegularByIdVO.getName())
                         .set("modifier", SysUserUtils.getCurrentPrinciple() == null ? "0" : SysUserUtils.getCurrentPrinciple())
                         .set("gmt_modified", DateUtil.now()));
@@ -151,6 +153,7 @@ public class RegularManagementFacade {
                     .eq("is_deleted", IsDeleteEnum.N.getKey()))){
                 return columnVerifyFacade.remove(new UpdateWrapper<ColumnVerify>()
                         .eq("verify_id", id)
+                        .eq("type", ColumnVerifyTypeEnum.REGULAR_TYPE.getKey())
                         .eq("is_deleted", IsDeleteEnum.N.getKey()));
             }
             //删除表字段的正则式校验结果表中的正则式

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

@@ -2,8 +2,8 @@ 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.GetColumnDTO;
+import com.lantone.daqe.dto.GetColumnVerifyDTO;
 import com.lantone.daqe.dto.GetColumnVerifyPageDTO;
 import com.lantone.daqe.entity.ColumnVerify;
 import com.lantone.daqe.vo.AddColumnVO;
@@ -21,7 +21,7 @@ import java.util.List;
 public interface ColumnVerifyMapper extends BaseMapper<ColumnVerify> {
     IPage<GetColumnVerifyPageDTO> getColumnVerifyPage(@Param("getColumnVerifyPageVO") GetColumnVerifyPageVO getColumnVerifyPageVO);
 
-    GetByIdColumnVerifyDTO getByIdColumnVerify(@Param("getByIdColumnVerifyVO") GetByIdColumnVerifyVO getByIdColumnVerifyVO);
+    List<GetColumnVerifyDTO> getByIdColumnVerify(@Param("getByIdColumnVerifyVO") GetByIdColumnVerifyVO getByIdColumnVerifyVO);
 
     List<GetColumnDTO> getColumn(@Param("addColumnVO") AddColumnVO addColumnVO);
 

daqe-center/src/main/resources/mapper/ColumnVerifyMapper.xml

@@ -64,19 +64,7 @@
     </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 id="getByIdColumnVerify" resultType="com.lantone.daqe.dto.GetColumnVerifyDTO">
         SELECT
         dcv.column_id,
         dcv.table_cname,
@@ -93,9 +81,6 @@
         WHERE
         dcv.is_deleted = 'N'
         and dcv.column_id= #{getByIdColumnVerifyVO.columnId}
-        ) a
-        GROUP BY
-        a.column_id
     </select>
 
     <select id="getColumn" resultType="com.lantone.daqe.dto.GetColumnDTO">