admin/src/views/business/empower.vue
@@ -86,7 +86,7 @@ </template> </el-table-column> <el-table-column prop="sendDate" label="下发时间" min-width="150px"></el-table-column> <el-table-column prop="sendInfo" label="下发失败原因" min-width="150px"></el-table-column> <el-table-column prop="sendInfo" label="下发备注" min-width="150px"></el-table-column> </el-table> <pagination @size-change="handleSizeChange" server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -79,8 +79,6 @@ String visitingRecords= "/api/visitor/v2/visiting/records";//查询访客来访记录v2 String vehicleList= "/api/resource/v2/vehicle/advance/vehicleList";//查询车辆列表v2 String vehicleTimeRangeList= "/api/resource/v1/vehicle/timeRange";//增量获取车辆数据 } /** server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -1012,13 +1012,18 @@ ||StringUtils.isBlank(param.getUserId())){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } if(Objects.nonNull(param.getValidStartTime())&&Objects.nonNull(param.getValidEndTime())){ if(param.getValidStartTime().getTime()> param.getValidEndTime().getTime()){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，有效期时间不合法！"); } } Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1")); if(Objects.isNull(member)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，用户信息不存在！"); } List<Integer> doorIds = getRoleIdByParam(param.getRoleIds(),member); if(StringUtils.isBlank(member.getRoleId())){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到门禁组数据"); if(param.getRoleIds()!=null && param.getRoleIds().length>0 && StringUtils.isBlank(member.getRoleId())){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，未查询到有效门禁组数据"); } //更新授权有效期 Member update = new Member(); @@ -1029,7 +1034,14 @@ update.setRoleId(StringUtils.isNotBlank(member.getRoleId())?member.getRoleId():null); update.setHkStatus(Constants.ZERO);//做一遍更新逻辑 update.setRemark("待同步安防平台"); memberMapper.updateById(update); memberMapper.update(null,new UpdateWrapper<Member>().lambda() .eq(Member::getId,member.getId()) .set(Member::getRoleId,member.getRoleId()) .set(Member::getRemark,"待同步安防平台") .set(Member::getStartTime,param.getValidStartTime()) .set(Member::getEndTime,param.getValidEndTime()) .set(Member::getEditDate,new Date()) .set(Member::getHkStatus,Constants.ZERO )); }
@@ -75,9 +75,9 @@ //查询下发状态 BaseResponse<TaskPersonDetailListResponse> response = HKService.taskPersoDetail(param); if(response!=null && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE) && response.getData()!=null && response.getData().getList() != null && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){ if( response.getData().getList() != null && response.getData().getList().size()>0 ){ TaskPersonDetailResponse model = response.getData().getList().get(0); if(model != null && StringUtils.equals(model.getPersondownloadResult(),"0")){ @@ -104,7 +104,14 @@ .set(Empower::getSendInfo,remark ) .set(Empower::getSendStatus,Constants.EmpowerStatus.pass) ); } }else{ empowerMapper.update(null,new UpdateWrapper<Empower>() .lambda() .eq(Empower::getId,c.getId() ) .set(Empower::getRemark,"下发失败" ) .set(Empower::getSendInfo,"下发失败" ) .set(Empower::getSendStatus,Constants.EmpowerStatus.fail) ); } } } checkDelMemberTask(); @@ -249,8 +256,8 @@ empowerMapper.update(null,new UpdateWrapper<Empower>() .lambda() .eq(Empower::getHkId,c.getHkId() ) .set(Empower::getSendInfo,"任务已下载完成" ) .set(Empower::getSendStatus,Constants.EmpowerStatus.downloaded) ); } } }catch (Exception e){
