Merge branch 'master' of github.com:gcpaas/DataRoom

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/DataRoomConst.java

@@ -15,20 +15,6 @@ public interface DataRoomConst {
         String LINE = "----------------------------------------";
     }
 
-    /**
-     * 删除标志位
-     */
-    interface DelFlag {
-        /**
-         * 删除
-         */
-        int DELETE = 1;
-        /**
-         * 未删除
-         */
-        int NOAMAL = 0;
-    }
-
     /**
      * 响应
      */

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java

@@ -132,82 +132,6 @@ public interface PageDesignConstant {
              */
             String LINK = "linkChart";
         }
-
-        interface Operator {
-            /**
-             * 等于
-             */
-            String EQUAL = "=";
-            /**
-             * 不等于
-             */
-            String NOT_EQUAL = "!=";
-            /**
-             * 大于
-             */
-            String GREATER_THAN = ">";
-            /**
-             * 小于
-             */
-            String LESS_THAN = "<";
-            /**
-             * 大于等于
-             */
-            String GREATER_THAN_OR_EQUAL = ">=";
-            /**
-             * 小于等于
-             */
-            String LESS_THAN_OR_EQUAL = "<=";
-            /**
-             * 在...之中
-             */
-            String IN = "IN";
-            /**
-             * 不在...之中
-             */
-            String NOT_IN = "NOT IN";
-            /**
-             * 包含
-             */
-            String LIKE = "LIKE";
-            /**
-             * 为空
-             */
-            String IS_NULL = "IS NULL";
-            /**
-             * 不为空
-             */
-            String IS_NOT_NULL = "IS NOT NULL";
-
-
-        }
-
-        interface Aggregate {
-            /**
-             * 统计
-             */
-            String COUNT = "COUNT";
-            /**
-             * 求和
-             */
-            String SUM = "SUM";
-            /**
-             * 平均值
-             */
-            String AVG = "AVG";
-            /**
-             * 最大值
-             */
-            String MAX = "MAX";
-            /**
-             * 最小值
-             */
-            String MIN = "MIN";
-            /**
-             * 统计不重复值
-             */
-            String COUNT_DISTINCT = "COUNT_DISTINCT";
-        }
     }
 
 

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/entity/DataRoomFileEntity.java

@@ -22,7 +22,7 @@ public class DataRoomFileEntity extends SuperEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(notes = "业务所属模块，从业务字典FILE_MODULE获取值")
+    @ApiModelProperty(notes = "业务所属模块，非必须，提供给业务作为分类标识使用")
     private String module;
 
     @ApiModelProperty(notes = "原文件名")
@@ -34,7 +34,7 @@ public class DataRoomFileEntity extends SuperEntity implements Serializable {
     @ApiModelProperty(notes = "后缀名(如: txt、png、doc、java等)")
     private String extension;
 
-    @ApiModelProperty(notes = "路径")
+    @ApiModelProperty(notes = "存储路径")
     private String path;
 
     @ApiModelProperty(notes = "访问地址")
@@ -49,7 +49,7 @@ public class DataRoomFileEntity extends SuperEntity implements Serializable {
     @ApiModelProperty(notes = "上传用户")
     private String userName;
 
-    @ApiModelProperty(notes = "桶名")
+    @ApiModelProperty(notes = "桶名, 用于存储在云存储中的桶名")
     private String bucket;
 
 }

DataRoom/dataroom-server/src/main/java/com/gccloud/dataroom/config/SwaggerBootstrapConfig.java

@@ -1,7 +1,9 @@
 package com.gccloud.dataroom.config;
 
 import com.gccloud.dataroom.core.constant.DataRoomConst;
+import com.gccloud.dataset.constant.DatasetConstant;
 import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI;
+import com.google.common.base.Predicates;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
@@ -60,7 +62,10 @@ public class SwaggerBootstrapConfig implements WebMvcConfigurer {
                 .globalResponseMessage(RequestMethod.DELETE, RESPONSE_MESSAGES)
                 .select()
                 // 包扫描路径
-                .apis(RequestHandlerSelectors.basePackage(DataRoomConst.ScanPackage.COMPONENT))
+                .apis(Predicates.or(
+                        RequestHandlerSelectors.basePackage(DataRoomConst.ScanPackage.COMPONENT),
+                        RequestHandlerSelectors.basePackage(DatasetConstant.ScanPackage.COMPONENT)
+                ))
                 .paths(PathSelectors.any())
                 .build();
     }

data-room-ui/packages/BigScreenList/CatalogEditForm.vue

@@ -208,7 +208,7 @@ export default {
           }).catch(() => {
           })
         } else {
-          this.$dataRoomAxios('/bigScreen/type/update', { ...this.currentCatalog, type: this.type || 'bigScreenCatalog' }).then(data => {
+          this.$dataRoomAxios.post('/bigScreen/type/update', { ...this.currentCatalog, type: this.type || 'bigScreenCatalog' }).then(data => {
             this.catalogVisible = false
             this.getCatalogList()
           }).catch(() => {

data-room-ui/vue.config.example.js

@@ -42,7 +42,7 @@ module.exports = {
   },
   publicPath:
     process.env.VUE_APP_HISTORY === 'y' ? process.env.VUE_APP_BASE : './',
-  outputDir: 'bigScreen',
+  outputDir: 'dataRoomUi',
   assetsDir: 'static',
   lintOnSave: false,
   productionSourceMap: false,