修改对接接口
This commit is contained in:
+2
-1
@@ -68,6 +68,7 @@ public class DockingController {
|
||||
String docId = json.getString("docId");
|
||||
String filePath = json.getString("filePath");
|
||||
String token = json.getString("token");
|
||||
String appId = json.getString("appId");
|
||||
|
||||
SarFileSplitInfoEO sarFileSplitInfoEO = new SarFileSplitInfoEO();
|
||||
sarFileSplitInfoEO.setFileName(fileName);
|
||||
@@ -76,7 +77,7 @@ public class DockingController {
|
||||
sarFileSplitInfoEO.setTitle(title);
|
||||
sarFileSplitInfoEO.setId(docId);
|
||||
sarFileSplitInfoEO.setFilePath(filePath);
|
||||
documentSplitService.add(token,sarFileSplitInfoEO, CommonConstant.SPLIT_SOURCE_2);
|
||||
documentSplitService.add(token,appId,sarFileSplitInfoEO, CommonConstant.SPLIT_SOURCE_2);
|
||||
|
||||
Map<String,String> resultMap = new HashMap<>();
|
||||
resultMap.put("infoId",docId);
|
||||
|
||||
+1
-1
@@ -140,7 +140,7 @@ public class DocumentSplitController {
|
||||
@PostMapping(value = "/split")
|
||||
@ApiOperationSupport(order = 6)
|
||||
public Result<T> split(@Validated @RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) {
|
||||
documentSplitService.add("",sarFileSplitInfoEO, CommonConstant.SPLIT_SOURCE_1);
|
||||
documentSplitService.add("","",sarFileSplitInfoEO, CommonConstant.SPLIT_SOURCE_1);
|
||||
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -66,7 +66,7 @@ public interface IDocumentSplitService {
|
||||
* 文档拆分-拆分
|
||||
* @param sarFileSplitInfoEO
|
||||
*/
|
||||
void add(String token,SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource);
|
||||
void add(String token,String appId,SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource);
|
||||
|
||||
/**
|
||||
* 拆分文档保存
|
||||
|
||||
+2
-2
@@ -312,7 +312,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void add(String token,SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource) {
|
||||
public void add(String token,String appId,SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource) {
|
||||
// 唯一校验
|
||||
uniqueCheck(sarFileSplitInfoEO);
|
||||
// 保存文本拆分数据
|
||||
@@ -323,7 +323,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
|
||||
//拆分
|
||||
int count = -1;
|
||||
try{
|
||||
count = fileSpiltService.fileCHN(sarFileSplitInfoEO, SplitFileTypeTypeEnum.GBT,splitSource);
|
||||
count = fileSpiltService.fileCHN(sarFileSplitInfoEO, SplitFileTypeTypeEnum.GBT,splitSource,token,appId);
|
||||
}catch (Exception e){
|
||||
log.error("拆分标准失败:" + e.getMessage());
|
||||
}
|
||||
|
||||
+1
@@ -603,6 +603,7 @@ public class OnlyOfficeController {
|
||||
Map<String, Object> params = new HashMap<>();
|
||||
params.put("fileId", createTimeLatestOnlineFileLog2.getHisId()); // 每一次草稿的id(第一次发起文档编辑时的id)
|
||||
params.put("docId", createTimeLatestOnlineFileLog2.getId()); // 基线文档主键id
|
||||
params.put("jxFileName", jxFileName); // 基线文档名称
|
||||
|
||||
// 使用HttpEntity对象包装请求体和请求头
|
||||
HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(params, headers);
|
||||
|
||||
+3
-1
@@ -141,7 +141,7 @@ public class FileSpiltService {
|
||||
* @param enumByValue
|
||||
* @return
|
||||
*/
|
||||
public int fileCHN(SarFileSplitInfoEO sarFileSplitInfoEO, SplitFileTypeTypeEnum enumByValue,String splitSource) {
|
||||
public int fileCHN(SarFileSplitInfoEO sarFileSplitInfoEO, SplitFileTypeTypeEnum enumByValue,String splitSource,String token,String appId) {
|
||||
if (sarFileSplitInfoEO.getStopNumber() <= 0) {
|
||||
sarFileSplitInfoEO.setStopNumber(200);
|
||||
}
|
||||
@@ -223,6 +223,8 @@ public class FileSpiltService {
|
||||
RestTemplate restTemplate = new RestTemplate();
|
||||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.setContentType(MediaType.APPLICATION_JSON);
|
||||
headers.add("Authorization",token);
|
||||
headers.add("appId",appId);
|
||||
|
||||
// 创建MultiValueMap对象,用于存储请求参数
|
||||
Map<String, String> params = new HashMap<>();
|
||||
|
||||
+1
-1
@@ -96,7 +96,7 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
|
||||
}*/
|
||||
|
||||
int result = 0;
|
||||
result = fileSpiltService.fileCHN(sarFileSplitInfoEO,SplitFileTypeTypeEnum.GBT, CommonConstant.SPLIT_SOURCE_1);
|
||||
result = fileSpiltService.fileCHN(sarFileSplitInfoEO,SplitFileTypeTypeEnum.GBT, CommonConstant.SPLIT_SOURCE_1,"","");
|
||||
|
||||
if(result == -1){
|
||||
if(LanguageEnum.CN.equals(MessageUtils.getLanguage())) {
|
||||
|
||||
Reference in New Issue
Block a user