From f47f4e3ac540574801b7589f85c8cfb027bc73af Mon Sep 17 00:00:00 2001 From: yujh_java Date: Fri, 23 May 2025 17:24:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=88=87=E6=8D=A2=E6=88=90wp?= =?UTF-8?q?s=E5=9C=A8=E7=BA=BF=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E7=BB=93=E5=90=88=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=9C=8D=E5=8A=A1=E5=BA=94=E7=94=A8=E4=B8=80?= =?UTF-8?q?=E8=B5=B7=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/apps/yiliwps/aslp/WPSOnlineReadOnlyASLP.java | 4 ++-- .../awspaas/user/apps/yiliwps/restful/YiliWpsApi.java | 5 +++-- .../src/com/awspaas/user/apps/yiliwps/web/WpsWeb.java | 11 ++++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/aslp/WPSOnlineReadOnlyASLP.java b/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/aslp/WPSOnlineReadOnlyASLP.java index c8f6e96e..f32d8805 100644 --- a/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/aslp/WPSOnlineReadOnlyASLP.java +++ b/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/aslp/WPSOnlineReadOnlyASLP.java @@ -34,8 +34,8 @@ public class WPSOnlineReadOnlyASLP implements ASLP { String fileType = getFileType(fileName); WPS4Util.initAppInfo(YiliWpsConst.AK, YiliWpsConst.SK); - String url = String.format("/api/preview/v1/files/%s/link?type=%s&preview_mode=%s&_w_third_sid=%s&_w_third_palId=%s&_w_third_queryFileId=%s&_w_third_fname=%s&_w_third_appId=%s&_w_third_repositoryName=%s&_w_third_groupValue=%s&_w_third_fileValue=%s" - ,sourceDc.getFileValue(),fileType,"ordinary",sid,sourceDc.getGroupValue(),sourceDc.getFileValue(), URLEncoder.encode(sourceDc.getFileName()),sourceDc.getAppId(),sourceDc.getRepositoryName(),sourceDc.getGroupValue(),sourceDc.getFileValue()); + String url = String.format("/api/preview/v1/files/%s/link?type=%s&preview_mode=%s&_w_third_sid=%s&_w_third_palId=%s&_w_third_queryFileId=%s&_w_third_fname=%s&_w_third_appId=%s&_w_third_repositoryName=%s&_w_third_groupValue=%s&_w_third_fileValue=%s&_w_third_filePreview=%s" + ,sourceDc.getFileValue(),fileType,"ordinary",sid,sourceDc.getGroupValue(),sourceDc.getFileValue(), URLEncoder.encode(sourceDc.getFileName()),sourceDc.getAppId(),sourceDc.getRepositoryName(),sourceDc.getGroupValue(),sourceDc.getFileValue(),"filePreview"); System.out.println(">>>>>>>>预览的url = " + url); Map headers = null; try { diff --git a/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/restful/YiliWpsApi.java b/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/restful/YiliWpsApi.java index 47c2c629..1da396a7 100644 --- a/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/restful/YiliWpsApi.java +++ b/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/restful/YiliWpsApi.java @@ -29,13 +29,14 @@ public class YiliWpsApi { @QueryParam("_w_third_appId") String appId, @QueryParam("_w_third_repositoryName") String repositoryName, @QueryParam("_w_third_groupValue") String groupValue, - @QueryParam("_w_third_fileValue") String fileValue + @QueryParam("_w_third_fileValue") String fileValue, + @QueryParam("_w_third_filePreview") String filePreview ) { JSONObject params = new JSONObject(); UserContext _uc = UserContext.fromSessionId(sid); logApi.consoleInfo(">>>>>文件信息请求成功/v1/3rd/file/info"+palId+","+headFileId+queryFileId+sid+fileName+appId+repositoryName+groupValue+fileValue); WpsWeb web =new WpsWeb(_uc); - return web.getFileInfo(sid,palId,queryFileId,fileName,appId,repositoryName,groupValue,fileValue); + return web.getFileInfo(sid,palId,queryFileId,fileName,appId,repositoryName,groupValue,fileValue,filePreview); } @Path("/v1/3rd/user/info") diff --git a/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/web/WpsWeb.java b/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/web/WpsWeb.java index 4e3780f9..0500d2af 100644 --- a/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/web/WpsWeb.java +++ b/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/web/WpsWeb.java @@ -23,6 +23,7 @@ import com.actionsoft.bpms.server.fs.dc.DCProfileManager; import com.actionsoft.bpms.util.DBSql; import com.actionsoft.bpms.util.UUIDGener; import com.actionsoft.bpms.util.UtilNumber; +import com.actionsoft.bpms.util.UtilString; import com.actionsoft.sdk.local.SDK; import com.actionsoft.sdk.local.api.LogAPI; import com.alibaba.fastjson.JSONArray; @@ -82,15 +83,19 @@ public class WpsWeb extends ActionWeb { return HttpPostUtil.sendGetRequest(YiliWpsConst.HOST+"/open"+url,headers); } - public String getFileInfo(String sid,String palId,String fileId,String fileName,String appId,String repositoryName,String groupValue,String fileValue){ + public String getFileInfo(String sid,String palId,String fileId,String fileName,String appId,String repositoryName,String groupValue,String fileValue,String filePreview){ String sourceFileName = null; try { sourceFileName = URLDecoder.decode(fileName,"UTF-8"); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } - //DCContext sourceDc = getFileDCContext(fileId); - DCContext sourceDc = getFileDCContext(palId,appId,repositoryName,groupValue,fileValue,sourceFileName); + DCContext sourceDc; + if(UtilString.isEmpty(filePreview)){ + sourceDc = getFileDCContext(fileId); + }else{ + sourceDc = getFileDCContext(palId,appId,repositoryName,groupValue,fileValue,sourceFileName); + } JSONObject jsonObject = new JSONObject(); JSONObject file = new JSONObject(); JSONObject user = new JSONObject();