server/system_service/src/main/java/com/doumee/dao/system/dto/NoticesDTO.java
@@ -17,9 +17,12 @@ @Data public class NoticesDTO { @ApiModelProperty(value = "用户主键",hidden = true) @ApiModelProperty(value = "member主键",hidden = true) private Integer memberId; @ApiModelProperty(value = "用户主键",hidden = true) private Integer userId; @ApiModelProperty(value = "查询类型: 0=待处理；1=已处理；2=我发布的；3=抄送我") private Integer queryType;
@@ -178,6 +178,7 @@ queryWrapper.ge(noticesDTO.getStartDate() != null, Notices::getCreateDate, Utils.Date.getStart(noticesDTO.getStartDate() )); queryWrapper.le(noticesDTO.getEndDate() != null, Notices::getCreateDate, Utils.Date.getEnd(noticesDTO.getEndDate() )); queryWrapper.eq(Objects.nonNull(noticesDTO.getType()),Notices::getType,noticesDTO.getType()); queryWrapper.eq(Objects.nonNull(noticesDTO.getMemberId()),Notices::getUserId,noticesDTO.getMemberId()); queryWrapper.eq(StringUtils.isNotBlank(noticesDTO.getTitle()),Notices::getTitle,noticesDTO.getTitle()); queryWrapper.orderByDesc(Notices::getCreateDate); PageData<Notices> pageData = PageData.from(noticesMapper.selectJoinPage(page,Notices.class, queryWrapper)); server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java
@@ -97,7 +97,9 @@ @ApiOperation(value = "任务中心头部 - PC", notes = "PC") @PostMapping("/taskCenterHeadPC") public ApiResponse<InternalHomeVO> taskCenterHeadPC(@RequestBody NoticesDTO noticesDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { noticesDTO.setMemberId(getLoginUser(token).getMemberId()); LoginUserInfo loginUserInfo = getLoginUser(token); noticesDTO.setMemberId(loginUserInfo.getMemberId()); noticesDTO.setUserId(loginUserInfo.getId()); return ApiResponse.success("查询成功",approveService.getHomeDataPC(noticesDTO)); } @@ -107,6 +109,7 @@ public ApiResponse<PageData<Notices>> taskPage (@RequestBody PageWrap<NoticesDTO> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) { LoginUserInfo loginUserInfo = getLoginUser(token); pageWrap.getModel().setMemberId(loginUserInfo.getMemberId()); pageWrap.getModel().setUserId(loginUserInfo.getId()); return ApiResponse.success(noticesService.taskCanterPage(pageWrap)); }
@@ -22,6 +22,7 @@ import com.doumee.dao.business.join.VisitsJoinMapper; import com.doumee.dao.business.model.*; import com.doumee.dao.web.reqeust.SavePlatformWarnEventDTO; import com.doumee.service.business.PlatformJobService; import com.doumee.service.business.impl.PlatformWarnEventServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.extern.slf4j.Slf4j; @@ -86,6 +87,8 @@ private PlatformLogMapper platformLogMapper; @Autowired private PlatformWarnEventServiceImpl platformWarnEventService; @Autowired private PlatformJobService platformJobService; /** * 海康门禁事件推送 * @param param @@ -822,12 +825,14 @@ .last("limit 1" )); if(cars!=null){ event.setMemberId(cars.getMemberId()); //自有车 查询当前是否有待签到的任务 if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){ if(carsMapper.selectCount(new QueryWrapper<Cars>() .lambda().eq(Cars::getCode,event.getPlateNos()) .eq(Cars::getType,Constants.ONE) .eq(Cars::getIsdeleted,Constants.ZERO) )>Constants.ZERO){ //自有车进场 查询当前是否有待签到的任务 //查询车辆当前是否存在进行中的任务 if( platformJobMapper.selectCount(new QueryWrapper<PlatformJob>().lambda() .eq(PlatformJob::getCarCodeFront,event.getPlateNos()) @@ -867,10 +872,28 @@ platformJobMapper.updateById(platformJob); } } }; } }else if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_OUT.getKey()){ //离场判断是否存在未离场的订单数据 处理订单数据 List<PlatformJob> platformJobList = platformJobMapper.selectList(new QueryWrapper<PlatformJob>().lambda() .eq(PlatformJob::getCarCodeFront,event.getPlateNos()) .eq(PlatformJob::getIsdeleted,Constants.ZERO) .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey(), Constants.PlatformJobStatus.AUTHED_LEAVE.getKey() )); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformJobList)){ for (PlatformJob platformJob:platformJobList) { platformJob.setStatus(Constants.PlatformJobStatus.LEAVED.getKey()); platformJob.setOutDate(new Date()); platformJob.setEditDate(new Date()); platformJob.setOutType(Constants.ZERO); platformJobMapper.updateById(platformJob); //清空授权 platformJobService.cancelInPark(platformJob); } } } }else{ Visits visits = visitsMapper.selectOne(new QueryWrapper<Visits>().lambda() .eq(Visits::getCarNos,event.getPlateNos())
