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

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

@@ -260,6 +260,12 @@ public class ColumnVerifyManagementFacade {
         if (distinctNum < columnList.size()) {
             Asserts.fail("表字段信息不能重复 !");
         }
+        if(ListUtil.isNotEmpty(addColumnVerifyVO.getStandardValueList())) {
+            long count = addColumnVerifyVO.getStandardValueList().stream().distinct().count();
+            if (count < addColumnVerifyVO.getStandardValueList().size()){
+                Asserts.fail("标准值不允许重复!");
+            }
+        }
         //查出表列信息ID
         for (ColumnInfoVO columnInfoVO : columnList) {
             Long columnId = columnInfoVO.getId();
@@ -511,6 +517,12 @@ public class ColumnVerifyManagementFacade {
         if (distinctNum < columnList.size()) {
             Asserts.fail("表字段信息不能重复 !");
         }
+        if(ListUtil.isNotEmpty(updateColumnVerifyVO.getStandardValueList())) {
+            long count = updateColumnVerifyVO.getStandardValueList().stream().distinct().count();
+            if (count < updateColumnVerifyVO.getStandardValueList().size()){
+                Asserts.fail("标准值不允许重复!");
+            }
+        }
         AddColumnVerifyVO addColumnVerifyVO = new AddColumnVerifyVO();
         List<ColumnInfoVO> columnInfoAdd = new ArrayList<>();
         List<ColumnInfoVO> columnInfoUpdate = new ArrayList<>();

document/docker/docker-compose-debug.yml

@@ -81,6 +81,7 @@ services:
       - eureka-addr=register-center
       - eureka-port=6751
       - log-level=debug
+      - LANG=zh_CN.UTF-8
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime

document/docker/docker-compose-inner.yml

@@ -81,6 +81,7 @@ services:
       - eureka-addr=register-center
       - eureka-port=6751
       - log-level=error
+      - LANG=zh_CN.UTF-8
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime

document/docker/docker-compose-outer.yml

@@ -81,6 +81,7 @@ services:
       - eureka-addr=register-center
       - eureka-port=6751
       - log-level=error
+      - LANG=zh_CN.UTF-8
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime

document/docker/docker-compose-test.yml

@@ -81,6 +81,7 @@ services:
       - eureka-addr=register-center
       - eureka-port=6751
       - log-level=info
+      - LANG=zh_CN.UTF-8
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime