From c01e2e70d0ac800463e04f64b35b196bea59266b Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Fri, 2 Apr 2021 15:06:42 +0800 Subject: [PATCH] 20210402v1.1 --- .../java/com/ccsens/tall/service/ExcelService.java | 2 +- .../main/java/com/ccsens/tall/web/DebugController.java | 10 +++++++++- tall/src/main/resources/application-dev.yml | 3 ++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java index 710fac62..e2e122ad 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java @@ -1240,7 +1240,7 @@ public class ExcelService implements IExcelService { throw new BaseException(CodeEnum.NOT_ROW.addMsg(sheet.getSheetName() + (2))); } - for (int i = 2; i < sheet.getLastRowNum() + 1; i++) { + for (int i = 3; i < sheet.getLastRowNum() + 1; i++) { List taskNameList = null; XSSFRow pluginRow = sheet.getRow(i); if(ObjectUtil.isNull(pluginRow)){ diff --git a/tall/src/main/java/com/ccsens/tall/web/DebugController.java b/tall/src/main/java/com/ccsens/tall/web/DebugController.java index 2b292916..dd904c6f 100644 --- a/tall/src/main/java/com/ccsens/tall/web/DebugController.java +++ b/tall/src/main/java/com/ccsens/tall/web/DebugController.java @@ -1,5 +1,6 @@ package com.ccsens.tall.web; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.ccsens.tall.bean.dto.message.SyncMessageWithStartDto; import com.ccsens.tall.bean.vo.FileVo; @@ -123,11 +124,18 @@ public class DebugController { public JsonResponse https(HttpServletRequest request) throws Exception { String requestUrl = "http://localhost:8001/file/query"; List files = new ArrayList<>(); - files.add(1321760076465311744L); + files.add(1L); + files.add(2L); + files.add(3L); String c = RestTemplateUtil.postBody1(requestUrl,files); JsonResponse a = JSONObject.parseObject(c,JsonResponse.class); +// Object x = a.getData(); +// List filePositions = JSONArray.parseObject(a.getData().toString(),FileVo.FilePosition.class); + + List filePosition = JSONArray.parseArray(a.getData().toString(), FileVo.FilePosition.class); + filePosition.get(0).getId(); return a; } diff --git a/tall/src/main/resources/application-dev.yml b/tall/src/main/resources/application-dev.yml index b99ba8b1..c035b920 100644 --- a/tall/src/main/resources/application-dev.yml +++ b/tall/src/main/resources/application-dev.yml @@ -40,4 +40,5 @@ file: path: /home/cloud/tall/uploads/ domain: http://localhost:7030/v1.0/ imgDomain: http://localhost:7030/v1.0/uploads -filedeal: http://localhost:8001/file/query \ No newline at end of file +#filedeal: http://localhost:8001/file/query +filedeal: https://test.tall.wiki/file/query \ No newline at end of file