修改代码

ace-common/src/main/java/com/upyuns/platform/rs/gtdata/GtFileInfo.java

+package com.upyuns.platform.rs.gtdata;
+
+import lombok.Data;
+
+@Data
+public class GtFileInfo {
+    String path;
+    String size;
+    String time;
+    String filename;
+}

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/AdminGaindataController.java

 package com.upyuns.platform.rs.website.controller;
 
+import cn.hutool.core.convert.Convert;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.upyuns.platform.rs.gtdata.GtDataRestClient;
+import com.upyuns.platform.rs.gtdata.GtFileInfo;
 import com.upyuns.platform.rs.website.biz.FileDataBiz;
 import com.upyuns.platform.rs.website.biz.GainDataBiz;
 import com.upyuns.platform.rs.website.dto.FileDataDTo;
@@ -13,6 +15,7 @@ import com.upyuns.platform.rs.website.dto.GainDataDTO;
 import com.upyuns.platform.rs.website.entity.FileData;
 import com.upyuns.platform.rs.website.entity.GainData;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -21,9 +24,13 @@ import tk.mybatis.mapper.entity.Example;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 
 @RestController
 @RequestMapping("Gaindata")
+@Slf4j
 public class AdminGaindataController extends BaseController<GainDataBiz, GainData> {
     @Autowired
     FileDataBiz fileDataBiz;
@@ -87,27 +94,50 @@ public class AdminGaindataController extends BaseController<GainDataBiz, GainDat
 
         if(null != fileData.getStoragetype() && FileData.STORAGETYPE_GTDATA == fileData.getStoragetype()) {
 //            //gtdtat 获取数据
-//            gtDataRestClient.list()
-        }
-
-        String name = fileData.getFilename();
-        List<FileData> islandShips = fileDataBiz.selectByWeekend(o -> {
-            o.andEqualTo(FileData::getFilename, name + "");
-            o.andEqualTo(FileData::getIsDel,0);
-            if (fileData.getId() != null) {
-                o.andNotEqualTo(FileData::getId, fileData.getId());  //修改的時候 不把自己搜出來
+            Map<String, Object> responseMap = gtDataRestClient.list(fileData.getGtdataPath());
+            if(null != responseMap && null != responseMap.get("HttpStatusCode") && null != responseMap.get("files") && 200 == (Integer) responseMap.get("HttpStatusCode")) {
+//                (List<GtFileInfo>)responseMap.get("files")
+                List<GtFileInfo> gtFileInfos = Convert.toList(GtFileInfo.class, responseMap.get("files"));
+                GtFileInfo gtFileInfo = gtFileInfos.get(0);
+                String filename = gtFileInfo.getFilename();
+                String filesize = gtFileInfo.getSize();
+
+                String filetype = filename.substring(filename.lastIndexOf("."));
+                long fileSize = Long.valueOf(filesize);
+                //  double fileSizeInKB = (double) fileSize / 1024; // 转换为 KB
+                double fileSizeInMB = (double) fileSize / (1024 * 1024); // 转换为 MB
+                double roundedFileSizeInMB = Math.round(fileSizeInMB * 100.0) / 100.0; // 保留两位小数
+                String fileSizeString = String.format("%.2f MB", roundedFileSizeInMB);
+
+                fileData.setHasGtdata(SYS_TRUE);
+                fileData.setFilename(filename);
+                fileData.setFiletype(filetype);
+                fileData.setFilesize(fileSizeString);
+            }else {
+                return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "分布式路径不对");
             }
-            return  o;
-        });
-        if (islandShips.size()!=0){
-            return ObjectRestResponse.createFailedResult(ResultCode.EXIST_CODE, ResultCode.getMsg(ResultCode.EXIST_CODE));
         }
+
+//        String name = fileData.getFilename();
+//        List<FileData> islandShips = fileDataBiz.selectByWeekend(o -> {
+//            o.andEqualTo(FileData::getFilename, name + "");
+//            o.andEqualTo(FileData::getIsDel,0);
+//            if (fileData.getId() != null) {
+//                o.andNotEqualTo(FileData::getId, fileData.getId());  //修改的時候 不把自己搜出來
+//            }
+//            return  o;
+//        });
+//        if (islandShips.size()!=0){
+//            return ObjectRestResponse.createFailedResult(ResultCode.EXIST_CODE, ResultCode.getMsg(ResultCode.EXIST_CODE));
+//        }
+
         if (fileData.getId()!=null){
             fileDataBiz.updateSelectiveById(fileData);
         }else {
             fileData.setIsDel(0);
             fileDataBiz.insertSelective(fileData);
         }
+
         return ObjectRestResponse.succ();
     }
 

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/GainDataController.java

@@ -11,6 +11,7 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
 import com.upyuns.platform.rs.gtdata.GtDataRestClient;
+import com.upyuns.platform.rs.gtdata.GtFileInfo;
 import com.upyuns.platform.rs.website.biz.DataMenuBiz;
 import com.upyuns.platform.rs.website.biz.GainDataBiz;
 import com.upyuns.platform.rs.website.dto.GainDataDTO;
@@ -202,12 +203,17 @@ public class GainDataController extends BaseController<GainDataBiz,GainData> {
         return ObjectRestResponse.succ();
     }
 
-    @ApiModelProperty("处理历史图片")
+    @ApiModelProperty("")
     @IgnoreUserToken
     @RequestMapping(value = "/app/unauth/gtDataList",method = RequestMethod.GET)
     public ObjectRestResponse gtDataList(String path) throws IOException {
         //gtdtat 获取数据
-        return ObjectRestResponse.succ( gtDataRestClient.list(path));
+        Map<String, Object> responseMap = gtDataRestClient.list(path);
+        List<GtFileInfo> gtFileInfos = Convert.toList(GtFileInfo.class, responseMap.get("files"));
+        GtFileInfo gtFileInfo = gtFileInfos.get(0);
+        String filename = gtFileInfo.getFilename();
+        String filesize = gtFileInfo.getSize();
+        return ObjectRestResponse.succ(responseMap);
     }
 
     public static void main(String[] args) {