修改代码

ace-common/src/main/java/com/github/wxiaoqi/security/common/rest/BaseController.java

@@ -92,6 +92,15 @@ public class BaseController<Biz extends BaseBiz,Entity> extends CommonBaseContro
         return ObjectRestResponse.succ(baseBiz.selectByQueryPage(query));
     }
 
+    @ApiOperation("查询分页-ObjectRestResponse")
+    @RequestMapping(value = "/baseLogicPages",method = RequestMethod.GET)
+    @ResponseBody
+    public ObjectRestResponse<PageDataVO<Entity>> baseLogicPages(@RequestParam Map<String, Object> params){
+        //查询列表数据
+        Query query = new Query(params);
+        return ObjectRestResponse.succ(baseBiz.selectByQueryLogicPage(query));
+    }
+
     @ApiOperation("根据参数查询，等于")
     @RequestMapping(value = "/entityList",method = RequestMethod.GET)
     @ResponseBody

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

@@ -46,7 +46,7 @@ public class DataTempcache implements Serializable {
      *  数据类型 1--图片；2--栅格文件；3--图库
      */
     @Column(name = "type")
-	@ApiModelProperty(value = "数据类型 1--图片；2--栅格文件；3--图库")
+	@ApiModelProperty(value = "数据类型 1--图片；2--栅格文件；3--shp；4--压缩包")
     private Integer type;
 	
 	    /**
@@ -172,4 +172,7 @@ public class DataTempcache implements Serializable {
 	@Column(name = "upurl")
 	@ApiModelProperty(value = "上传文件url地址")
 	private String upurl;
+
+	@ApiModelProperty(value = "文件服务器路径")
+	private String filepath;
 }

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

@@ -94,4 +94,7 @@ public class FileData implements Serializable {
     @ApiModelProperty(value = "存储类型 1--服务器；2--gtdata")
     private Integer storagetype;
 
+    @Column(name = "datatemp_id")
+    @ApiModelProperty(value = "数据临时缓存库 id")
+    private Integer datatempId;
 }

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

+package com.upyuns.platform.rs.website.controller;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpUtil;
+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.util.process.SystemConfig;
+import com.upyuns.platform.rs.gtdata.GtDataRestClient;
+import com.upyuns.platform.rs.gtdata.GtFileInfo;
+import com.upyuns.platform.rs.website.biz.DataTempcacheBiz;
+import com.upyuns.platform.rs.website.entity.DataTempcache;
+import com.upyuns.platform.rs.website.entity.FileData;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+
+@RestController
+@RequestMapping("dataTempcache/web")
+public class AdminDataTempcacheController extends BaseController<DataTempcacheBiz,DataTempcache> {
+
+    @Autowired
+    GtDataRestClient gtDataRestClient;
+
+    @Value("${universal.tempcachePath}")
+    private String tempcachePath ;
+
+    @Value("${universal.baseUploadPath}")
+    private String baseUploadPath ;
+
+    @Value("${universal.url}")
+    private String xx_url ;
+
+    //BaseController.baseLogicPages
+
+}
\ No newline at end of file

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

@@ -13,12 +13,14 @@ 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.DataMenuBiz;
+import com.upyuns.platform.rs.website.biz.DataTempcacheBiz;
 import com.upyuns.platform.rs.website.biz.FileDataBiz;
 import com.upyuns.platform.rs.website.biz.GainDataBiz;
 import com.upyuns.platform.rs.website.controller.web.GainDataController;
 import com.upyuns.platform.rs.website.dto.FileDataDTo;
 import com.upyuns.platform.rs.website.dto.GainDataDTO;
 import com.upyuns.platform.rs.website.entity.DataMenu;
+import com.upyuns.platform.rs.website.entity.DataTempcache;
 import com.upyuns.platform.rs.website.entity.FileData;
 import com.upyuns.platform.rs.website.entity.GainData;
 import com.upyuns.platform.rs.website.vo.DataMenuTree;
@@ -47,6 +49,10 @@ import static com.upyuns.platform.rs.website.controller.AdminGaindataController.
 @Slf4j
 public class AdminGaindataController extends BaseController<GainDataBiz, GainData> {
 
+
+    @Autowired
+    DataTempcacheBiz dataTempcacheBiz;
+
     @Autowired
     DataMenuBiz dataMenuBiz;
 
@@ -114,7 +120,21 @@ public class AdminGaindataController extends BaseController<GainDataBiz, GainDat
     @RequestMapping(value = "/addFileData",method = RequestMethod.POST)
     public ObjectRestResponse <FileData> addislandShip(@RequestBody FileData fileData) {
 
-        if(null != fileData.getStoragetype() && FileData.STORAGETYPE_GTDATA == fileData.getStoragetype()) {
+        if(null != fileData.getDatatempId()) {
+            DataTempcache dataTempcache = dataTempcacheBiz.selectById(fileData.getId());
+            fileData.setFilename(dataTempcache.getFilename());
+            fileData.setFiletype(dataTempcache.getFiletype());
+            fileData.setFilesize(dataTempcache.getFilesize());
+            fileData.setGtdataPath(dataTempcache.getGtdataPath());
+            fileData.setHasGtdata(dataTempcache.getHasGtdata());
+            if(dataTempcache.getUptype() == DataTempcache.UPTYPE_UPLOAD || dataTempcache.getUptype() == DataTempcache.UPTYPE_URL ) {
+                fileData.setFilepath(dataTempcache.getFilepath());
+                fileData.setFileurl(dataTempcache.getFilename());
+                fileData.setStoragetype(FileData.STORAGETYPE_UPLOAD);
+            }else {
+                fileData.setStoragetype(FileData.STORAGETYPE_GTDATA);
+            }
+        } if(null != fileData.getStoragetype() && FileData.STORAGETYPE_GTDATA == fileData.getStoragetype()) {
 //            //gtdtat 获取数据
             Map<String, Object> responseMap = gtDataRestClient.list(fileData.getGtdataPath());
             if(null != responseMap && null != responseMap.get("HttpStatusCode") && null != responseMap.get("files") && 200 == (Integer) responseMap.get("HttpStatusCode")) {

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

@@ -106,6 +106,7 @@ public class DataTempcacheController extends BaseController<DataTempcacheBiz,Dat
                 double roundedFileSizeInMB = Math.round(fileSizeInMB * 100.0) / 100.0; // 保留两位小数
                 String fileSizeString = String.format("%.2f MB", roundedFileSizeInMB);
                 dataTempcache.setFilesize(fileSizeString);
+                dataTempcache.setFilepath(serverPath + "/" + dataTempcache.getFilename());
                 dataTempcache.setFileurl(xx_url+ SystemConfig.XXMP_URL + realPath + "/" + dataTempcache.getFilename());
             }
         }