server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
@@ -139,6 +139,7 @@ public ApiResponse reservationCancel(@RequestBody BusinessOverDTO businessOverDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) { LoginUserInfo user = getLoginUser(token); businessOverDTO.setUserId(user.getId()); businessOverDTO.setLoginUser(user); bookingsService.reservationCancel(businessOverDTO); return ApiResponse.success("操作成功"); } server/meeting/meeting_service/src/main/java/com/doumee/dao/admin/request/BusinessOverDTO.java
@@ -4,6 +4,7 @@ import com.doumee.core.exception.BusinessException; import com.doumee.core.utils.DESUtil; import com.doumee.dao.admin.response.DevWgResponseParam; import com.doumee.service.business.third.model.LoginUserInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -21,4 +22,6 @@ @ApiModelProperty(value = "开始类型 0 提前开始 1 正常开始",required = true) private Integer startType ; private LoginUserInfo loginUser ; } server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -644,11 +644,11 @@ s.setSysList(userrelList); //会议室管理员 MPJLambdaWrapper<UserRel> param = new MPJLambdaWrapper<>(); urquery.selectAll(UserRel.class); urquery.eq(UserRel::getObjType, MeetConstants.ZERO); urquery.eq(UserRel::getIsdeleted, MeetConstants.ZERO); urquery.eq(UserRel::getObjId, s.getRoomId()); List<UserRel> adminList = userRelJoinMapper.selectJoinList(UserRel.class, urquery); param.selectAll(UserRel.class); param.eq(UserRel::getObjType, MeetConstants.ZERO); param.eq(UserRel::getIsdeleted, MeetConstants.ZERO); param.eq(UserRel::getObjId, s.getRoomId()); List<UserRel> adminList = userRelJoinMapper.selectJoinList(UserRel.class, param); s.setAdminList(adminList); //查询是否有权限 @@ -674,7 +674,7 @@ if(Constants.equalsInteger(userInfo.getId(),s.getCreator()) ){ return 1; } if(adminList!=null){ if(adminList!=null && userInfo!=null){ for(UserRel u : adminList){ if(Constants.equalsInteger(userInfo.getId(),u.getUserId()) ){ return 1; @@ -1210,8 +1210,20 @@ if (Objects.isNull(bookings)) { throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "未查询到预约记录"); } if (!bookings.getCreator().equals(businessOverDTO.getUserId())) { throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "非你的预约记录,无法进行取消"); // LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); //会议室管理员 MPJLambdaWrapper<UserRel> param = new MPJLambdaWrapper<>(); param.selectAll(UserRel.class); param.eq(UserRel::getObjType, MeetConstants.ZERO); param.eq(UserRel::getIsdeleted, MeetConstants.ZERO); param.eq(UserRel::getObjId, bookings.getRoomId()); List<UserRel> adminList = userRelJoinMapper.selectJoinList(UserRel.class, param); Integer hasRole =getHasRoleByParam(bookings,businessOverDTO.getLoginUser(),adminList); // if (!bookings.getCreator().equals(businessOverDTO.getUserId())) { if (!Constants.equalsInteger(hasRole,Constants.ONE)) { throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，只有会议室管理员和申请人才能进行该操作哦！"); } if (Objects.nonNull(bookings.getStartTimeReal()) && System.currentTimeMillis() > bookings.getStartTimeReal().getTime()) { throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "会议已开始,无法进行取消"); server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
@@ -463,10 +463,6 @@ } public List<InoutRecord> getListByType(List<InoutRecord> list,Integer type){ return Constants.equalsInteger(type,Constants.ONE)?this.getDataByMemberPhoneSize(list):this.getDataByCarCodeSize(list); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -1154,14 +1154,12 @@ } } @Override public void cancelInPark(PlatformJob platformJob){ if(Constants.equalsInteger(platformJob.getType(),Constants.TWO) || Constants.equalsInteger(platformJob.getType(),Constants.THREE) || StringUtils.isBlank(platformJob.getCarCodeFront()) || Constants.equalsInteger(platformJob.getType(),Constants.FOUR)){ List<VisitPark> visitParkList = visitParkMapper.selectList(new QueryWrapper<VisitPark>().lambda() .eq(VisitPark::getCarCode,platformJob.getCarCodeFront()) .eq(VisitPark::getObjType,Constants.ONE) @@ -1186,7 +1184,6 @@ } } } /** * 月台叫号 */ server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
@@ -30,10 +30,8 @@ */ @Service public class HkSyncDeviceServiceImpl extends HkSyncBaseServiceImpl { @Autowired private DeviceMapper deviceMapper; /** * 同步海康门禁设备数据 * @param param server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -263,7 +263,6 @@ delRetentionLis.add(member.getId()); if( Constants.formatIntegerNum(request.getData().getExtEventInOut()) == Constants.ONE){ //如果是进门，录入人员的在场数据记录 retentionList.add(getRetentionModelByRequest(member,request)); if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){ record.setMemberType(Constants.RetentionMemberType.internalMember); inoutDayCount.setInSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getInSelfMemberNum())+1);//内部人员入场人次 @@ -271,6 +270,7 @@ record.setMemberType(Constants.RetentionMemberType.relMember); inoutDayCount.setInOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getInOtherMemberNum())+1);//相关方入场人次 } retentionList.add(getRetentionModelByRequest(member,request,record.getMemberType())); }else{ if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){ record.setMemberType(Constants.RetentionMemberType.internalMember); @@ -372,7 +372,7 @@ * @param request * @return */ private Retention getRetentionModelByRequest(Member member, EventAcsInfoRequest request) { private Retention getRetentionModelByRequest(Member member, EventAcsInfoRequest request,int memberType) { Retention retention = new Retention(); retention.setIsdeleted(Constants.ZERO); retention.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime())); @@ -382,7 +382,7 @@ retention.setIdcardDecode(member.getIdcardDecode()); retention.setName(member.getName()); retention.setBirthday(member.getBirthday()); retention.setType(member.getType()); retention.setType(memberType); retention.setCompanyId(member.getCompanyId()); retention.setCompanyName(member.getCompanyName()); retention.setEventCode(request.getData().getExtEventCode()+"");
