server/dmvisit_admin/src/main/resources/application.yml
@@ -10,7 +10,7 @@ # application: # name: doumeemes profiles: active: devYL active: testHS # JSON返回配置 jackson: server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/RoleListResponse.java
@@ -20,6 +20,8 @@ private String name; @ApiModelProperty(value = "状态 0禁用 1启用", example = "1") private Integer status; @ApiModelProperty(value = "类型 0访客 1内部人员" ) private Integer type; @ApiModelProperty(value = "关联门禁设备集合" ) private List<DeviceListResponse> deviceList;
@@ -1,5 +1,6 @@ package com.doumee.dao.business.model; import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -31,7 +32,6 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "更新人编码", example = "1") @@ -40,7 +40,6 @@ @ApiModelProperty(value = "更新时间") @ExcelColumn(name="更新时间") @JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "是否删除0否 1是", example = "1") @@ -87,4 +86,13 @@ @ExcelColumn(name="关联对象编码（多个用英文逗号隔开）") private String objId; @ApiModelProperty(value = "开始时间") @TableField(exist = false) private Date startDate; @ApiModelProperty(value = "结束时间") @TableField(exist = false) private Date endDate; } server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
@@ -106,6 +106,13 @@ queryWrapper.lambda().ge(InterfaceLog::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate())); queryWrapper.lambda().le(InterfaceLog::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate())); } if (pageWrap.getModel().getStartDate() != null) { queryWrapper.lambda().ge(InterfaceLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartDate())); } if (pageWrap.getModel().getEndDate() != null) { queryWrapper.lambda().le(InterfaceLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getEndDate())); } if (pageWrap.getModel().getIsdeleted() != null) { queryWrapper.lambda().eq(InterfaceLog::getIsdeleted, pageWrap.getModel().getIsdeleted()); } @@ -116,16 +123,16 @@ queryWrapper.lambda().eq(InterfaceLog::getType, pageWrap.getModel().getType()); } if (pageWrap.getModel().getName() != null) { queryWrapper.lambda().eq(InterfaceLog::getName, pageWrap.getModel().getName()); queryWrapper.lambda().like(InterfaceLog::getName, pageWrap.getModel().getName()); } if (pageWrap.getModel().getUrl() != null) { queryWrapper.lambda().like(InterfaceLog::getUrl, pageWrap.getModel().getUrl()); } if (pageWrap.getModel().getRequest() != null) { queryWrapper.lambda().eq(InterfaceLog::getRequest, pageWrap.getModel().getRequest()); queryWrapper.lambda().like(InterfaceLog::getRequest, pageWrap.getModel().getRequest()); } if (pageWrap.getModel().getRepose() != null) { queryWrapper.lambda().eq(InterfaceLog::getRepose, pageWrap.getModel().getRepose()); queryWrapper.lambda().like(InterfaceLog::getRepose, pageWrap.getModel().getRepose()); } if (pageWrap.getModel().getSuccess() != null) { queryWrapper.lambda().eq(InterfaceLog::getSuccess, pageWrap.getModel().getSuccess()); @@ -139,13 +146,7 @@ if (pageWrap.getModel().getObjId() != null) { queryWrapper.lambda().eq(InterfaceLog::getObjId, pageWrap.getModel().getObjId()); } for(PageWrap.SortData sortData: pageWrap.getSorts()) { if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) { queryWrapper.orderByDesc(sortData.getProperty()); } else { queryWrapper.orderByAsc(sortData.getProperty()); } } queryWrapper.lambda().orderByDesc(InterfaceLog::getCreateDate); return PageData.from(interfaceLogMapper.selectPage(page, queryWrapper)); }
@@ -277,7 +277,7 @@ .ge(Objects.nonNull(pageWrap.getModel().getStartTime()), Retention::getEventDate,pageWrap.getModel().getStartTime()) .le(Objects.nonNull(pageWrap.getModel().getEndTime()), Retention::getEventDate,pageWrap.getModel().getStartTime()); Retention::getEventDate,pageWrap.getModel().getEndTime()); queryWrapper.orderByDesc(Retention::getCreateDate); IPage<Retention> retentionIPage = retentionJoinMapper.selectJoinPage(page, Retention.class, queryWrapper); return retentionIPage; server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -963,6 +963,9 @@ } }else{ //如果必须选择门禁，但未选择 if(StringUtils.isNotBlank(visits.getDoors())){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，请选择有效访问门禁！"); } String[] dIds = visits.getDoors().split(","); roles = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda() .eq(DeviceRole::getIsdeleted,Constants.ZERO) server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -408,6 +408,7 @@ member.setRoleIds(param.getRoleIds()); member.setCompanyId(Objects.isNull(company)?null:company.getId()); member.setErpOrgId(param.getOrgId()); member.setCanVisit(Constants.ONE); // member.setStartTime(request.getStartTime()); // member.setEndTime(request.getEndTime()); return member; @@ -523,6 +524,11 @@ for (DeviceRole deviceRole:deviceRoleList) { RoleListResponse roleListResponse = new RoleListResponse(); BeanUtils.copyProperties(deviceRole,roleListResponse); if(deviceRole.getType().equals(Constants.TWO)){ roleListResponse.setType(Constants.ONE); }else{ roleListResponse.setType(Constants.ZERO); } if(StringUtils.isNotBlank(deviceRole.getDoorIds())){ List<DeviceListResponse> DeviceListResponseList = new ArrayList<>(); List<String> doorList = Arrays.asList(deviceRole.getDoorIds().split(",")); server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -264,7 +264,7 @@ List<Member> list = memberMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>() .selectAll(Member.class ) .selectAs(Company::getHkId,Member::getHkOrgId) .isNotNull(Member::getFaceId) // .isNotNull(Member::getFaceId .leftJoin(Company.class,Company::getId,Member::getCompanyId) .eq(Member::getHkStatus,Constants.ZERO) .eq(Member::getType,Constants.memberType.internal) @@ -548,6 +548,7 @@ noticeErpFail(c,Constants.ZERO,"人脸照片不存在，获取失败！"); c.setHkStatus(Constants.TWO); c.setRemark("人脸照片不存在，获取失败！"); c.setHkDate(new Date()); memberMapper.updateById(c); return false; } @@ -557,6 +558,7 @@ c.setFaceId(result.getData().getFaceId()); c.setHkStatus(Constants.ONE); c.setHkId(addHkModel.getPersonId()); c.setHkDate(new Date()); memberMapper.updateById(c); dealMemberRoleEmpower(c); return true; @@ -564,6 +566,7 @@ noticeErpFail(c,Constants.ZERO,"人员信息同步安防平台失败，请修正后重试！"+result.getCode()+result.getMsg()); c.setHkStatus(Constants.TWO); c.setRemark("人员信息同步安防平台失败，请修正后重试！"+(result!=null?result.getMsg():"")); c.setHkDate(new Date()); memberMapper.updateById(c); return false; }
