From 65bfb8bbda2fbc7c9ce66b7d7f2256c053d41cd8 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Tue, 23 Mar 2021 15:48:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ccsens/tall/aspect/MustLoginTallAspect.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/tall/src/main/java/com/ccsens/tall/aspect/MustLoginTallAspect.java b/tall/src/main/java/com/ccsens/tall/aspect/MustLoginTallAspect.java index 0b9cbb4d..4b8fb33f 100644 --- a/tall/src/main/java/com/ccsens/tall/aspect/MustLoginTallAspect.java +++ b/tall/src/main/java/com/ccsens/tall/aspect/MustLoginTallAspect.java @@ -52,8 +52,6 @@ public class MustLoginTallAspect { RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletResponse httpServletResponse = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse(); -// Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); - final String authHeader = httpServletRequest.getHeader(WebConstant.HEADER_KEY_TOKEN); if (authHeader == null || !authHeader.startsWith(WebConstant.HEADER_KEY_TOKEN_PREFIX)) { HttpServletUtil.responseJson(httpServletResponse, From 60edeb7607b55b07d522fb2f31cf181a702cfad5 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Tue, 23 Mar 2021 16:24:50 +0800 Subject: [PATCH 2/2] ti --- tall/src/main/java/com/ccsens/tall/bean/dto/LwbsDto.java | 6 ++---- tall/src/main/java/com/ccsens/tall/bean/vo/LwbsVo.java | 2 ++ .../main/java/com/ccsens/tall/service/InputDocService.java | 2 +- tall/src/main/java/com/ccsens/tall/web/LwbsController.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/LwbsDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/LwbsDto.java index ccfe11bb..e060f9fc 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/LwbsDto.java +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/LwbsDto.java @@ -14,13 +14,11 @@ public class LwbsDto { @ApiModel("查询lwbs的任务") public static class SelByUserIdToComProject{ @NotNull - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") @ApiModelProperty("开始时间") - private Date startTime; + private Long startTime; @NotNull - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") @ApiModelProperty("结束时间") - private Date endTime; + private Long endTime; } @Data @ApiModel("查询lwbs的任务") diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/LwbsVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/LwbsVo.java index f855d5f2..2bcd1bca 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/LwbsVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/LwbsVo.java @@ -46,5 +46,7 @@ public class LwbsVo { private String name; @ApiModelProperty("所有的任务") private List list; + + } } diff --git a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java index 2653f266..4ad032ed 100644 --- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java +++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java @@ -41,7 +41,7 @@ public class InputDocService implements IInputDocService { longList.add(proMember.getProjectId()); }); SysProjectExample sysProjectExample=new SysProjectExample(); - sysProjectExample.createCriteria().andRecStatusEqualTo((byte)0).andIdIn(longList).andBeginTimeLessThanOrEqualTo(param.getStartTime().getTime()).andEndTimeGreaterThanOrEqualTo(param.getEndTime().getTime()); + sysProjectExample.createCriteria().andRecStatusEqualTo((byte)0).andIdIn(longList).andBeginTimeLessThanOrEqualTo(param.getStartTime()).andEndTimeGreaterThanOrEqualTo(param.getEndTime()); List sysProjects = sysProjectMapper.selectByExample(sysProjectExample); sysProjects.forEach(sysProject -> { LwbsVo.SelByUserIdToComProjectVo selByUserIdToComProjectVo_zhongjian =new LwbsVo.SelByUserIdToComProjectVo(); diff --git a/tall/src/main/java/com/ccsens/tall/web/LwbsController.java b/tall/src/main/java/com/ccsens/tall/web/LwbsController.java index faaf23be..5d6f3a58 100644 --- a/tall/src/main/java/com/ccsens/tall/web/LwbsController.java +++ b/tall/src/main/java/com/ccsens/tall/web/LwbsController.java @@ -29,7 +29,7 @@ public class LwbsController { @Autowired private IInputDocService iInputDocService; - @MustLogin + @MustLoginTall @ApiOperation(value = "查询人下参加的所有的项目", notes = "1007:输出") @RequestMapping(value = "/selByUserIdToComProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> selByUserIdToComProject(@ApiParam @Validated @RequestBody QueryDto params) {