From b532839d5588cc7842e1ddb926c7a6ec1d41521e Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 24 Feb 2021 17:48:30 +0800 Subject: [PATCH] 20210224v1.1 --- .../tall/service/ITaskPluginService.java | 9 +++++++++ .../tall/service/TaskPluginService.java | 11 ++++++++++ .../com/ccsens/tall/web/PluginController.java | 16 +++++++++++++++ .../ccsens/tall/web/ProjectController.java | 2 +- .../com/ccsens/tcm/bean/vo/QuestionVo.java | 20 +++++++++---------- .../resources/mapper_dao/ReportCodeDao.xml | 2 +- .../java/com/ccsens/util/JsonResponse.java | 3 +++ 7 files changed, 50 insertions(+), 13 deletions(-) diff --git a/tall/src/main/java/com/ccsens/tall/service/ITaskPluginService.java b/tall/src/main/java/com/ccsens/tall/service/ITaskPluginService.java index 773c9fd7..c1f0c71b 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ITaskPluginService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ITaskPluginService.java @@ -85,4 +85,13 @@ public interface ITaskPluginService { * @return 返回文件的访问路径，下载路径和文件id */ List saveMinutesDay(Long currentUserId, PluginDto.GetMinutesDay getMinutesDay, String token) throws FileNotFoundException, Exception; + + /** + * 打开Excel + * @param taskId 任务id + * @param token token + * @param currentUserId userId + * @return 返回excel路径 + */ + String openExcel(Long taskId, String token, Long currentUserId); } diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java b/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java index 5ee1fd30..eb3d2a2d 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java @@ -983,4 +983,15 @@ public class TaskPluginService implements ITaskPluginService{ minutesInfoList.add(minutesInfo); }); } + + @Override + public String openExcel(Long taskId, String token, Long currentUserId) { + //查询此任务是否有关联的excel，有直接返回 + + //没有则新建一个空白excel + //关联wps + //查询wps路径并返回 + + return null; + } } diff --git a/tall/src/main/java/com/ccsens/tall/web/PluginController.java b/tall/src/main/java/com/ccsens/tall/web/PluginController.java index fe28d920..9759c2e9 100644 --- a/tall/src/main/java/com/ccsens/tall/web/PluginController.java +++ b/tall/src/main/java/com/ccsens/tall/web/PluginController.java @@ -1,6 +1,7 @@ package com.ccsens.tall.web; import com.ccsens.tall.bean.dto.PluginDto; +import com.ccsens.tall.bean.dto.TaskDto; import com.ccsens.tall.bean.dto.WeekMeetingDto; import com.ccsens.tall.bean.vo.PluginVo; import com.ccsens.tall.bean.vo.TaskVo; @@ -9,6 +10,7 @@ import com.ccsens.tall.service.ITaskPluginService; import com.ccsens.util.JsonResponse; import com.ccsens.util.WebConstant; import com.ccsens.util.annotation.OperateType; +import com.ccsens.util.bean.dto.QueryDto; import io.jsonwebtoken.Claims; import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; @@ -222,4 +224,18 @@ public class PluginController { log.info("生成每日会议纪要完成"); return JsonResponse.newInstance().ok(wpsPath); } + + @ApiOperation(value = "打开excel", notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "/openExcel", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse openExcel(HttpServletRequest request,@RequestParam(required = true) Long taskId) throws Exception { + log.info("打开excel：{}",taskId); + Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); + String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN); + String token = authHeader.substring(WebConstant.HEADER_KEY_TOKEN_PREFIX.length()); + String path = taskPluginService.openExcel(taskId,token,currentUserId); + log.info("excel的路径：{}",path); + return JsonResponse.newInstance().ok(path); + } } diff --git a/tall/src/main/java/com/ccsens/tall/web/ProjectController.java b/tall/src/main/java/com/ccsens/tall/web/ProjectController.java index 8ba3206c..30a4f4a6 100644 --- a/tall/src/main/java/com/ccsens/tall/web/ProjectController.java +++ b/tall/src/main/java/com/ccsens/tall/web/ProjectController.java @@ -218,7 +218,7 @@ public class ProjectController { @ApiImplicitParams({ }) @RequestMapping(value = "/create", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse createProject(HttpServletRequest request,@RequestBody ProjectDto.CreateProject createProject) throws Exception { + public JsonResponse createProject(HttpServletRequest request,@RequestBody ProjectDto.CreateProject createProject) throws Exception { Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN); String token = authHeader.substring(WebConstant.HEADER_KEY_TOKEN_PREFIX.length()); diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java index ac5c94ed..5ec03dad 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java @@ -98,22 +98,20 @@ public class QuestionVo { private String remark; @ApiModelProperty("记录类型 0：只记录1次数据，1：记录3次，分别为0,14,90天 ，2：记录两次，分别是180,365") private byte reportType; -// @ApiModelProperty("题目信息") -// private List questionNums; @ApiModelProperty("题目信息") private List questionVos; @ApiModelProperty("子类型") - private List optionVos; + private List subReportCodes; } - @Data - @ApiModel("患者多次答题信息") - public static class PatientQuestionNum { - @ApiModelProperty("第几次记录，默认为0代表第一次记录，14代表第14天记录的信息") - private Integer reportNums; - @ApiModelProperty("题目信息") - private List questionList; - } +// @Data +// @ApiModel("患者多次答题信息") +// public static class PatientQuestionNum { +// @ApiModelProperty("第几次记录，默认为0代表第一次记录，14代表第14天记录的信息") +// private Integer reportNums; +// @ApiModelProperty("题目信息") +// private List questionList; +// } @Data diff --git a/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml b/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml index 9be5bca0..50d73679 100644 --- a/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml +++ b/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml @@ -96,7 +96,7 @@ - + diff --git a/util/src/main/java/com/ccsens/util/JsonResponse.java b/util/src/main/java/com/ccsens/util/JsonResponse.java index 537127d5..2654fa99 100644 --- a/util/src/main/java/com/ccsens/util/JsonResponse.java +++ b/util/src/main/java/com/ccsens/util/JsonResponse.java @@ -53,6 +53,9 @@ public class JsonResponse { public static JsonResponse newInstance(){ return new JsonResponse(); } +// public static JsonResponse newInstance(Class T){ +// return new JsonResponse(); +// } public JsonResponse ok(){ this.code = CodeEnum.SUCCESS.getCode();