修改代码

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/GtdataController.java

@@ -15,6 +15,7 @@ import com.upyuns.platform.rs.gtdata.GdLoginVO;
 import com.upyuns.platform.rs.gtdata.GtDataRestClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -40,6 +41,12 @@ public class GtdataController extends CommonBaseController implements UserRestIn
     @Autowired
     UserFeign userFeign;
 
+    @Value("${gtdata.gtDataUsername}")
+    protected String gtDataUsername;
+
+    @Value("${gtdata.gtDataPassword}")
+    protected String gtDataPassword;
+
     @Override
     public UserFeign getUserFeign() {
         return userFeign;
@@ -112,6 +119,18 @@ public class GtdataController extends CommonBaseController implements UserRestIn
         return ObjectRestResponse.succ(resultUrl);
     }
 
+    @RequestMapping(value = "/app/unauth/admindownload/**", method = RequestMethod.GET)
+    @IgnoreUserToken
+    public ObjectRestResponse admindownload() throws Exception  {
+        String url = request.getRequestURI();
+        String fileName = url.substring(url.lastIndexOf("/web/gtdata/app/unauth/download/")+32);
+
+        GdLoginVO gdLoginVO = gtDataRestClient.rsignUserlogin(gtDataUsername, gtDataPassword);
+        String resultUrl = gtDataRestClient.openUrl(fileName, gdLoginVO.getSign(), gdLoginVO.getTime(), gtDataUsername);
+        resultUrl = resultUrl.replace(gtDataRestClient.getBaseUrl(), gtDataRestClient.getOutUrl());
+        return ObjectRestResponse.succ(resultUrl);
+    }
+
     @RequestMapping(value = "/app/unauth/register", method = RequestMethod.GET)
     @IgnoreUserToken
     @IgnoreClientToken

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/FileData.java

@@ -25,6 +25,9 @@ public class FileData implements Serializable {
     public static final int HASGTDATA_FIN = 1;
     public static final int HASGTDATA_UPD = 2;
 
+    public static final int STORAGETYPE_UPLOAD = 1;
+    public static final int STORAGETYPE_GTDATA = 2;
+
 	    /**
     *  主键
    */
@@ -86,4 +89,9 @@ public class FileData implements Serializable {
     @Column(name = "has_gtdata")
     @ApiModelProperty(value = "是否已经存储gtdata 0--未处理；1--已处理；2--已更新")
     private Integer hasGtdata;
+
+    @Column(name = "storagetype")
+    @ApiModelProperty(value = "存储类型 1--服务器；2--gtdata")
+    private Integer storagetype;
+
 }

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

@@ -5,6 +5,7 @@ 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.website.biz.FileDataBiz;
 import com.upyuns.platform.rs.website.biz.GainDataBiz;
 import com.upyuns.platform.rs.website.dto.FileDataDTo;
@@ -33,6 +34,9 @@ public class AdminGaindataController extends BaseController<GainDataBiz, GainDat
     @Value("${universal.gaindataPath}")
     private String gaindataPath ;
 
+    @Autowired
+    GtDataRestClient gtDataRestClient;
+
     @Override
     public ObjectRestResponse<GainData> baseAdd(@RequestBody GainData gainData) {
         super.baseAdd(gainData);
@@ -80,11 +84,15 @@ public class AdminGaindataController extends BaseController<GainDataBiz, GainDat
     @ApiModelProperty("添加修改文件")
     @RequestMapping(value = "/addFileData",method = RequestMethod.POST)
     public ObjectRestResponse <FileData> addislandShip(@RequestBody FileData fileData) {
+
+        if(null != fileData.getStoragetype() && FileData.STORAGETYPE_GTDATA == fileData.getStoragetype()) {
+//            //gtdtat 获取数据
+//            gtDataRestClient.list()
+        }
+
         String name = fileData.getFilename();
-    //    String number = islandShip.getNumber();
         List<FileData> islandShips = fileDataBiz.selectByWeekend(o -> {
             o.andEqualTo(FileData::getFilename, name + "");
-//            o.andEqualTo(IslandShip::getNumber, number + "");
             o.andEqualTo(FileData::getIsDel,0);
             if (fileData.getId() != null) {
                 o.andNotEqualTo(FileData::getId, fileData.getId());  //修改的時候 不把自己搜出來
@@ -97,16 +105,12 @@ public class AdminGaindataController extends BaseController<GainDataBiz, GainDat
         if (fileData.getId()!=null){
             fileDataBiz.updateSelectiveById(fileData);
         }else {
-           // islandShip.setNumber(generateUniqueRandomNumber());
-          //  islandShip.setState(1);
-            fileData.setCrtTime(new Date());
             fileData.setIsDel(0);
             fileDataBiz.insertSelective(fileData);
         }
         return ObjectRestResponse.succ();
     }
 
-//
     @DeleteMapping("/filedeleteById")
     public ObjectRestResponse deleteInoPortAnalyse(Integer id) {
         FileData fileData = new FileData();

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

@@ -10,6 +10,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 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.website.biz.DataMenuBiz;
 import com.upyuns.platform.rs.website.biz.GainDataBiz;
 import com.upyuns.platform.rs.website.dto.GainDataDTO;
@@ -43,6 +44,9 @@ public class GainDataController extends BaseController<GainDataBiz,GainData> {
     @Autowired
     DataMenuBiz dataMenuBiz;
 
+    @Autowired
+    GtDataRestClient gtDataRestClient;
+
     @ApiModelProperty("列表")
     @IgnoreUserToken
     @RequestMapping(value = "/app/unauth/mapAll",method = RequestMethod.GET)
@@ -198,6 +202,14 @@ public class GainDataController extends BaseController<GainDataBiz,GainData> {
         return ObjectRestResponse.succ();
     }
 
+    @ApiModelProperty("处理历史图片")
+    @IgnoreUserToken
+    @RequestMapping(value = "/app/unauth/gtDataList",method = RequestMethod.GET)
+    public ObjectRestResponse gtDataList(String path) throws IOException {
+        //gtdtat 获取数据
+        return ObjectRestResponse.succ( gtDataRestClient.list(path));
+    }
+
     public static void main(String[] args) {
         String url = "https://zzrsmgmt.upyuns.com/image/admin/2024-05-30/11.JPG";
         String url2 = url.replaceAll("https://zzrsmgmt.upyuns.com/image","/sdbdata/www/gdweb_resources/image");