server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
@@ -4,6 +4,7 @@ import com.doumee.service.business.PlatformJobService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -13,6 +14,7 @@ * @author 江蹄蹄 * @date 2023/11/30 15:33 */ @Slf4j @Api(tags = "月台作业定时") @RestController @RequestMapping("/timer/platformJob") @@ -52,10 +54,12 @@ } @ApiOperation("月台今日作业外完成通知定时") @ApiOperation("月台今日作业未完成通知定时") @GetMapping("/sendUnFinishNotice") public ApiResponse sendUnFinishNotice() { log.error("========月台今日作业未完成通知定时============开始"+System.currentTimeMillis()+""); platformJobService.sendUnFinishNotice(); log.error("========月台今日作业未完成通知定时============结束"+System.currentTimeMillis()+""); return ApiResponse.success("月台今日作业外完成通知定时"); }
@@ -1202,8 +1202,9 @@ menuId = HKConstants.MenuPageId.kqdbcl; }else if(Constants.equalsInteger(type,Constants.SIX)){ //https://10.50.250.253:443/xauthplus-plugin/thirdLogin?type=third&componentId=cems&componentMenuId=010200 componentId = HKConstants.MenuPageId.componentIds[2]; menuId = HKConstants.MenuPageId.xfzx; return "https://10.50.250.253:443/xauthplus-plugin/thirdLogin?type=third&service=https://10.50.250.253:443/cems/config/generalCard&token="+token; // componentId = HKConstants.MenuPageId.componentIds[2]; // menuId = HKConstants.MenuPageId.xfzx; } log.info("【海康获取工作台菜单免密登陆调整地址】================开始====menuId:"+menuId+"==token:"+token); try { server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/PCWorkPlatformDataVO.java
@@ -58,6 +58,10 @@ @ApiModelProperty(value = "长期相关方相关方分布 top 5") private List<InterestedListVO> lwList; @ApiModelProperty(value = "内部人员分布 top 5") private List<InterestedListVO> internalList; @ApiModelProperty(value = "近七日访客统计") private List<InterestedListVO> weekVisitList;
@@ -331,4 +331,16 @@ @TableField(exist = false) private ApproveDataVO approveDateVO; @ApiModelProperty(value = "查询时间开始 日期格式：yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") @TableField(exist = false) private Date queryStarttime; @ApiModelProperty(value = "查询时间结束 日期格式：yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") @TableField(exist = false) private Date queryEndtime; } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
@@ -270,6 +270,7 @@ .eq(Platform::getIsdeleted, Constants.ZERO) .eq(Objects.nonNull(platformDataDTO.getQueryType())&&!Constants.equalsInteger(platformDataDTO.getQueryType(),Constants.ZERO), Platform::getStatus,Constants.ZERO) .orderByAsc(Platform::getSortnum) ); //处理我的月台信息 是否配置隐藏 if(Constants.equalsInteger(platformDataDTO.getQueryType(),Constants.ONE)){ server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -131,6 +131,8 @@ @Autowired private PlatformWarnEventServiceImpl platformWarnEventService; @Autowired private PlatformWarnEventMapper platformWarnEventMapper; @Autowired private MemberMapper memberMapper; @Autowired private WxNoticeConfigMapper wxNoticeConfigMapper; @@ -1141,6 +1143,11 @@ if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.DONE.getKey())){ //如果已下发成功，标记已授权离园状态 platformJob.setStatus(Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()); //删除报警信息 platformWarnEventMapper.update(new UpdateWrapper<PlatformWarnEvent>().lambda() .set(PlatformWarnEvent::getIsdeleted,Constants.ONE) .eq(PlatformWarnEvent::getPlatformId,platformJob.getId()) ); } }else{ platformJob.setInHkstatus(Constants.THREE); @@ -1606,6 +1613,12 @@ savePlatformLog(Constants.PlatformJobLogType.DONE.getKey(),oldPlatformJob,platformJob , Constants.PlatformJobLogType.DONE.getInfo()); //删除报警信息 platformWarnEventMapper.update(new UpdateWrapper<PlatformWarnEvent>().lambda() .set(PlatformWarnEvent::getIsdeleted,Constants.ONE) .eq(PlatformWarnEvent::getPlatformId,platformJob.getId()) ); if(Constants.equalsInteger(platformJob.getType(),Constants.THREE)){ // 外协车装货 查询TMS 电子锁情况 List<PlatformWmsDetail> details = platformWmsDetailMapper.selectList(new QueryWrapper<PlatformWmsDetail>().lambda() server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
@@ -132,6 +132,9 @@ platform.setEditor(platform.getLoginUserInfo().getId()); platform.setEditDate(new Date()); Platform model = platformMapper.selectById(platform.getId()); if(Objects.isNull(platform.getSortnum())){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } if(model ==null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){ throw new BusinessException(ResponseStatus.DATA_EMPTY); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java
@@ -202,6 +202,7 @@ platformWarnEvent.setIsdeleted(Constants.ZERO); platformWarnEvent.setPlatformId(savePlatformWarnEventDTO.getPlatformId()); platformWarnEvent.setCarCode(savePlatformWarnEventDTO.getCarCode()); platformWarnEvent.setPlatformId(savePlatformWarnEventDTO.getPlatformJobId()); Constants.PlatformWarnEvent cPl = Constants.PlatformWarnEvent.STOP_TIMEOUT; if(Constants.equalsInteger(savePlatformWarnEventDTO.getEventType(),Constants.ZERO)){ if(Objects.isNull(savePlatformWarnEventDTO.getPlatformJobId())){ server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1321,6 +1321,9 @@ queryWrapper.isNull(Visits::getParentId); queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getMemberId()),Visits::getMemberId,pageWrap.getModel().getMemberId()); queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getReceptMemberId()),Visits::getReceptMemberId,pageWrap.getModel().getReceptMemberId()); queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStarttime()),Visits::getStarttime,Utils.Date.getStart(pageWrap.getModel().getQueryStarttime())); queryWrapper.le(Objects.nonNull(pageWrap.getModel().getQueryEndtime()),Visits::getStarttime,Utils.Date.getEnd(pageWrap.getModel().getQueryEndtime())); if(Objects.nonNull(pageWrap.getModel().getBusinessStatus())){ if(Constants.equalsInteger(pageWrap.getModel().getBusinessStatus(),Constants.TWO)){ @@ -1839,6 +1842,7 @@ List<InterestedListVO> weekVisitList = new ArrayList<>(); List<InterestedListVO> weekCarList = new ArrayList<>(); List<InterestedListVO> lwList = new ArrayList<>(); List<InterestedListVO> internalList = new ArrayList<>(); //查询七天前的访客记录数量 List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda().in(Visits::getStatus, Constants.VisitStatus.signin,Constants.VisitStatus.signout) @@ -1893,14 +1897,18 @@ .eq(Company::getIsdeleted,Constants.ZERO) ); if(CollectionUtils.isNotEmpty(companyList)){ List<Integer> companyIds = companyList.stream().map(i->i.getId()).collect(Collectors.toList()); List<Company> lwCompanyList = companyList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList()); if(CollectionUtils.isNotEmpty(lwCompanyList)){ List<Integer> lwCompanyIds = lwCompanyList.stream().map(i->i.getId()).collect(Collectors.toList()); List<Retention> retentionList = retentionMapper.selectList( new QueryWrapper<Retention>().lambda() .eq(Retention::getType,Constants.TWO) .in(Retention::getCompanyId,companyIds) .in(Retention::getCompanyId,lwCompanyIds) ); for (Company company:companyList) { for (Company company:lwCompanyList) { Integer count = retentionList.stream().filter(i->Constants.equalsInteger(i.getCompanyId(),company.getId())).collect(Collectors.toList()).size(); if(count>0){ InterestedListVO lw = new InterestedListVO(); @@ -1911,6 +1919,26 @@ } } List<Company> internalCompanyList = companyList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).collect(Collectors.toList()); if(CollectionUtils.isNotEmpty(internalCompanyList)){ List<Integer> internalCompanyIds = internalCompanyList.stream().map(i->i.getId()).collect(Collectors.toList()); List<Retention> retentionList = retentionMapper.selectList( new QueryWrapper<Retention>().lambda() .eq(Retention::getType,Constants.TWO) .in(Retention::getCompanyId,internalCompanyIds) ); for (Company company:internalCompanyList) { Integer count = retentionList.stream().filter(i->Constants.equalsInteger(i.getCompanyId(),company.getId())).collect(Collectors.toList()).size(); if(count>0){ InterestedListVO lw = new InterestedListVO(); lw.setNum(count); lw.setName(company.getName()); internalList.add(lw); } } } } pcWorkPlatformDataVO.setInternalList(internalList); pcWorkPlatformDataVO.setLwList(lwList ); }else if(Constants.equalsInteger(queryType,Constants.THREE)) { if (Objects.isNull(loginUserInfo.getMemberId())) { server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -2031,7 +2031,7 @@ .in(PlatformJob ::getStatus,new Integer[]{Constants.PlatformJobStatus.WORKING.getKey(),Constants.PlatformJobStatus.CALLED.getKey() }) // .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId) .orderByDesc(PlatformJob::getStatus ) .orderByAsc(PlatformJob::getId ) .orderByAsc(PlatformJob::getSortnum ) ); List<PlatformDevice> platformDevices = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda().eq(PlatformDevice::getType,Constants.ONE) .eq(PlatformDevice::getIsdeleted,Constants.ZERO).isNotNull(PlatformDevice::getDeviceId));
