10-11 bug修改

src/main/java/io/renren/modules/sys/controller/dataset/DataSetController.java

@@ -106,8 +106,15 @@ public class DataSetController {
 
 //        model.setCreateUserId(getUserId());
         dataSetService.update(dataSet);
+        String res = dataSetService.renameMino("dataset", dataSet.getDatasetName()+".csv", "dataset", dataSet.getDfsUrl()+".csv");
+        if ("200".equals(res)){
+              return R.ok();
+        }else {
+            dataSet.setDatasetName(dataSet.getDfsUrl());
+            dataSetService.update(dataSet);
+            return R.error(res);
+        }
 
-        return R.ok();
     }
 
     /**

src/main/java/io/renren/modules/sys/service/DataSetService.java

@@ -20,4 +20,6 @@ public interface DataSetService extends IService<DataSet> {
     Long querycategoryId(Long datasetId);
 
     void update(DataSet dataSet);
+
+    String renameMino(String buckName,String newFileName,String srcBuckName,String srcFileName);
 }

src/main/java/io/renren/modules/sys/service/impl/DataSetServiceImpl.java

@@ -2,6 +2,8 @@ package io.renren.modules.sys.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.minio.errors.*;
+import io.renren.common.utils.MinIoUtils;
 import io.renren.common.utils.PageUtils;
 import io.renren.modules.sys.dao.algs.AlgorithmModelMapper;
 import io.renren.modules.sys.dao.algs.AlgorithmModelVoMapper;
@@ -19,6 +21,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.IOException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -113,4 +118,32 @@ public class DataSetServiceImpl extends ServiceImpl<DataSetMapper, DataSet>  imp
         this.updateById(dataSet);
     }
 
+    @Override
+    public String renameMino(String buckName, String newFileName, String srcBuckName, String srcFileName) {
+        if (newFileName.equals(srcFileName) && buckName.equals(srcBuckName) ) return "200";
+        try {
+            MinIoUtils.copyFile(buckName,newFileName,srcBuckName,srcFileName);
+            MinIoUtils.deleteFile(srcBuckName,srcFileName);
+        } catch (IOException e) {
+            e.printStackTrace();
+            return srcFileName + " 文件服务器连接异常！！";
+        } catch (InvalidKeyException e) {
+            e.printStackTrace();
+            return srcFileName + " 不存在！";
+        } catch (InvalidResponseException e) {
+            e.printStackTrace();
+        } catch (InvalidBucketNameException e) {
+            e.printStackTrace();
+            return  srcBuckName + "不存在！！！";
+        } catch (ErrorResponseException e) {
+            e.printStackTrace();
+            return   "执行失败";
+        } catch (Exception e){
+            return "内部错误";
+        }
+
+        return "200";
+
+    }
+
 }

src/main/resources/mapper/dataSet/SubsystemMapper.xml

@@ -3,7 +3,8 @@
 <mapper namespace="io.renren.modules.dataSet.mapper.SubsystemMapper">
     <select id="getcoal" resultType="io.renren.modules.dataSet.entity.Subsystem">
         select id,substring(name,5) as name from coal
-        WHERE coal.uid = #{userId,jdbcType=INTEGER}
+
+        where coal.delete = 0
     </select>
 
 
@@ -14,8 +15,10 @@
             WHERE coal.id = coal_system.cid
               AND coal.id =#{id,jdbcType=INTEGER}
         )
-        AND `system`.uid = #{userId,jdbcType=INTEGER}
+
+        AND  `system`.delete = 0
     </select>
+<!--    AND `system`.uid = #{userId,jdbcType=INTEGER}-->
     <select id="getsubsystem" resultType="io.renren.modules.dataSet.entity.Subsystem">
 --         SELECT id,substring(name,5)  as name  FROM subSystem
             SELECT id,substring(name,5)  as name  FROM subsystem
@@ -24,9 +27,10 @@
                 WHERE `system`.id = system_subsystem.systemId
                   AND `system`.id =#{id,jdbcType=INTEGER}
             )
-            AND subsystem.uid = #{userId,jdbcType=INTEGER}
-    </select>
 
+              AND  subsystem.delete = 0
+    </select>
+<!--    AND subsystem.uid = #{userId,jdbcType=INTEGER}-->
     <select id="getEquipment" resultType="io.renren.modules.dataSet.entity.Subsystem">
         SELECT
             id,substring(name,5)  as name
@@ -42,9 +46,10 @@
                   AND
                     subSystem.id =#{id,jdbcType=INTEGER}
             )
-          AND equipment.uid = #{userId,jdbcType=INTEGER}
-    </select>
 
+          AND  equipment.delete = 0
+    </select>
+<!--    AND equipment.uid = #{userId,jdbcType=INTEGER}-->
     <select id="getSubequipment" resultType="io.renren.modules.dataSet.entity.Subsystem">
         SELECT id,substring(name,5)  as name,hbaseTableName  FROM subEquipment
         WHERE id IN(
@@ -57,9 +62,10 @@
               AND
                 equipment.id =#{id,jdbcType=INTEGER}
         )
-          AND subEquipment.uid = #{userId,jdbcType=INTEGER}
-    </select>
 
+          AND  subEquipment.delete = 0
+    </select>
+<!--    AND subEquipment.uid = #{userId,jdbcType=INTEGER}-->
 
     <select id="getcolumns" resultType="io.renren.modules.dataSet.entity.Subsystem">
         SELECT