瀏覽代碼

功能:拆分文件服务starter,按文件服务类型拆分

lijie 3 年之前
父節點
當前提交
9a57bae8ba

+ 11 - 3
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectRelationController.java

@@ -1,8 +1,11 @@
 package com.persagy.dmp.rwd.digital.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.common.constant.CommonConstant;
 import com.persagy.dmp.common.constant.ResponseCode;
@@ -109,11 +112,16 @@ public class ObjectRelationController {
         return ResultHelper.multi(voList);
     }
 
-    /*@PostMapping("/deleteOne")
+    @PostMapping("/deleteOne")
     public CommonResult delete(@RequestBody String id){
-        service.delete(CollUtil.newArrayList(id));
+        QueryCriteria queryCriteria = new QueryCriteria();
+        ObjectMapper objectMapper = SpringUtil.getBean(ObjectMapper.class);
+        ObjectNode objectNode = objectMapper.createObjectNode();
+        objectNode.put(ObjectRelation.PROP_ID,id);
+        queryCriteria.setCriteria(objectNode);
+        this.deleteBatch(queryCriteria);
         return ResultHelper.success();
-    }*/
+    }
 
     /**
      * 删除关系

+ 7 - 1
dmp-cloud/dmp-file/pom.xml

@@ -28,7 +28,13 @@
         </dependency>
         <dependency>
             <groupId>com.persagy</groupId>
-            <artifactId>dmp-file-starter</artifactId>
+            <artifactId>dmp-file-minio-starter</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.persagy</groupId>
+            <artifactId>dmp-file-hdfs-starter</artifactId>
+            <version>1.0.0</version>
         </dependency>
     </dependencies>
 </project>

+ 1 - 0
dmp-comp/dmp-file-hdfs-starter/pom.xml

@@ -22,6 +22,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>log4j-over-slf4j</artifactId>
+            <version>1.7.32</version>
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>

+ 2 - 0
dmp-comp/dmp-file-minio-starter/pom.xml

@@ -12,9 +12,11 @@
     <artifactId>dmp-file-minio-starter</artifactId>
 
     <dependencies>
+        <!-- MinIO -->
         <dependency>
             <groupId>io.minio</groupId>
             <artifactId>minio</artifactId>
+            <version>8.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.persagy</groupId>

+ 7 - 80
dmp-comp/dmp-file-starter/pom.xml

@@ -16,97 +16,24 @@
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>dmp-common</artifactId>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-openfeign-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-core</artifactId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <version>2.1.5.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-annotation</artifactId>
+            <version>3.3.1</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-extension</artifactId>
+            <version>3.3.1</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>jdk.tools</groupId>
-                <artifactId>jdk.tools</artifactId>
-                <version>1.8</version>
-                <scope>system</scope>
-                <systemPath>${env.JAVA_HOME}/lib/tools.jar</systemPath>
-            </dependency>
-            <!-- https://mvnrepository.com/artifact/org.slf4j/log4j-over-slf4j -->
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>log4j-over-slf4j</artifactId>
-                <version>1.7.32</version>
-            </dependency>
-            <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-annotation</artifactId>
-                <version>3.3.1</version>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-extension</artifactId>
-                <version>3.3.1</version>
-                <scope>compile</scope>
-            </dependency>
-            <!-- MinIO -->
-            <dependency>
-                <groupId>io.minio</groupId>
-                <artifactId>minio</artifactId>
-                <version>8.3.0</version>
-            </dependency>
-            <!-- fm 工具包 -->
-            <dependency>
-                <groupId>com.persagy</groupId>
-                <artifactId>dmp-common</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-openfeign-core</artifactId>
-                <version>2.1.5.RELEASE</version>
-            </dependency>
-            <dependency>
-                <groupId>io.github.openfeign</groupId>
-                <artifactId>feign-core</artifactId>
-                <version>10.4.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-common</artifactId>
-                <version>2.5.1</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-log4j12</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-hdfs</artifactId>
-                <version>2.5.1</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-log4j12</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
 </project>

+ 1 - 0
dmp-comp/pom.xml

@@ -19,4 +19,5 @@
         <module>dmp-digital-starter</module>
         <module>dmp-amqp-starter</module>
     </modules>
+
 </project>

+ 3 - 0
pom.xml

@@ -21,6 +21,9 @@
         <module>dmp-parent</module>
         <module>dmp-package</module>
         <module>dmp-business</module>
+        <module>dmp-file-minio-starter</module>
+        <module>dmp-file-minio-starter</module>
+        <module>dmp-comp/dmp-file-hdfs-starter</module>
     </modules>
 
     <repositories>