diff --git a/xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/pass/domain/dto/DmRecognizedRecordsDto.java b/xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/pass/domain/dto/DmRecognizedRecordsDto.java index 698a1304..f77c5fb9 100644 --- a/xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/pass/domain/dto/DmRecognizedRecordsDto.java +++ b/xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/pass/domain/dto/DmRecognizedRecordsDto.java @@ -1,5 +1,6 @@ package com.xueyi.system.api.pass.domain.dto; +import com.xueyi.system.api.digitalmans.domain.dto.DmVisitorsDto; import com.xueyi.system.api.pass.domain.po.DmRecognizedRecordsPo; import lombok.Data; import lombok.EqualsAndHashCode; @@ -28,4 +29,6 @@ public class DmRecognizedRecordsDto extends DmRecognizedRecordsPo { public final static Integer TYPE_STAFF = 1; public final static Integer TYPE_STRANGER = 6; + private DmVisitorsDto visitor; + } \ No newline at end of file diff --git a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/domain/model/DmVisitorOperateLogConverter.java b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/domain/model/DmVisitorOperateLogConverter.java new file mode 100644 index 00000000..f2b56352 --- /dev/null +++ b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/domain/model/DmVisitorOperateLogConverter.java @@ -0,0 +1,17 @@ +package com.xueyi.system.staff.domain.model; + +import com.xueyi.common.core.web.entity.model.BaseConverter; +import com.xueyi.system.staff.domain.dto.DmVisitorOperateLogDto; +import com.xueyi.system.staff.domain.po.DmVisitorOperateLogPo; +import com.xueyi.system.staff.domain.query.DmVisitorOperateLogQuery; +import org.mapstruct.Mapper; +import org.mapstruct.MappingConstants; + +/** + * 访客 对象映射器 + * + * @author xueyi + */ +@Mapper(componentModel = MappingConstants.ComponentModel.SPRING) +public interface DmVisitorOperateLogConverter extends BaseConverter { +} diff --git a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/domain/po/DmVisitorOperateLogPo.java b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/domain/po/DmVisitorOperateLogPo.java index fd0e45b8..05a23740 100644 --- a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/domain/po/DmVisitorOperateLogPo.java +++ b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/domain/po/DmVisitorOperateLogPo.java @@ -18,7 +18,7 @@ import java.time.LocalDateTime; */ @Data @EqualsAndHashCode(callSuper = true) -@TableName(value = "dm_visitor_operate_log",excludeProperty = {"name","sort","createBy","createTime","updateBy","updateTime","remark"}) +@TableName(value = "dm_visitor_operate_log",excludeProperty = {"name","sort","createBy","createTime","updateBy","updateTime","remark","status"}) public class DmVisitorOperateLogPo extends TBaseEntity { @Serial @@ -33,9 +33,6 @@ public class DmVisitorOperateLogPo extends TBaseEntity { /** 请求方法 */ protected String method; - /** 请求方式 */ - protected String requestMethod; - protected Long visitorId; diff --git a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitRecordGraphQLMutationResolver.java b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitRecordGraphQLMutationResolver.java index f5df817b..c81afd4e 100644 --- a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitRecordGraphQLMutationResolver.java +++ b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitRecordGraphQLMutationResolver.java @@ -1,13 +1,19 @@ package com.xueyi.system.staff.graphql; +import com.alibaba.fastjson.JSON; import com.xueyi.system.api.digitalmans.domain.po.DmVisitRecordsPo; +import com.xueyi.system.staff.domain.dto.DmVisitorOperateLogDto; import com.xueyi.system.staff.domain.model.DmVisitRecordsConverter; import com.xueyi.system.staff.mapper.DmVisitRecordsMapper; import com.xueyi.system.staff.mapper.DmVisitorsMapper; +import com.xueyi.system.staff.service.impl.DmVisitorOperateLogServiceImpl; import graphql.kickstart.tools.GraphQLMutationResolver; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.HashMap; +import java.util.Map; + /* * @author yk * @description @@ -25,16 +31,36 @@ class VisitRecordGraphQLMutationResolver implements GraphQLMutationResolver { @Autowired private DmVisitRecordsConverter converter; + private DmVisitorOperateLogServiceImpl visitorLogsService; public boolean createVisitRecord(DmVisitRecordsPo input, Long staffId){ - return mapper.insert(input) > 0; + Map map = new HashMap<>(); + map.put("input", input); + map.put("staffId", staffId); + Boolean result = mapper.insert(input) > 0; + DmVisitorOperateLogDto operateLogPo = visitorLogsService.initData(input.getVisitorId(), staffId, DmVisitorOperateLogDto.BUSINESS_TYPE_CREATE, "createVisitRecord", JSON.toJSONString(map),JSON.toJSONString(result)); + visitorLogsService.insert(operateLogPo); + return result; } public boolean updateVisitRecord(DmVisitRecordsPo input, Long staffId){ - return mapper.updateById(input) > 0; + Map map = new HashMap<>(); + map.put("input", input); + map.put("staffId", staffId); + Boolean result = mapper.updateById(input) > 0; + DmVisitorOperateLogDto operateLogPo = visitorLogsService.initData(input.getVisitorId(), staffId, DmVisitorOperateLogDto.BUSINESS_TYPE_UPDATE, "updateVisitRecord",JSON.toJSONString(map),JSON.toJSONString(result)); + visitorLogsService.insert(operateLogPo); + return result; } public Boolean deleteVisitRecord(Long id, Long staffId){ - return mapper.deleteById(id) > 0; + DmVisitRecordsPo recordsPo = mapper.selectById(id); + Map map = new HashMap<>(); + map.put("id", id); + map.put("staffId", staffId); + Boolean result = mapper.deleteById(id) > 0; + DmVisitorOperateLogDto operateLogPo = visitorLogsService.initData(recordsPo.getVisitorId(), staffId, DmVisitorOperateLogDto.BUSINESS_TYPE_DELETE, "deleteVisitRecord", JSON.toJSONString(map), JSON.toJSONString(result)); + visitorLogsService.insert(operateLogPo); + return result; } } diff --git a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitRecordsGraphQLQueryResolver.java b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitRecordsGraphQLQueryResolver.java index b6ff5d8e..e15c108c 100644 --- a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitRecordsGraphQLQueryResolver.java +++ b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitRecordsGraphQLQueryResolver.java @@ -41,7 +41,7 @@ class VisitRecordsGraphQLQueryResolver implements GraphQLQueryResolver { return converter.mapperDto(mapper.selectById(id)); } - public List visitRecords(String receiverName, String receiverPhone, Long visitorId){ + public List visitRecords(String receiverName, String receiverPhone, Long visitorId, Integer limit){ QueryWrapper query = new QueryWrapper<>(); if (StringUtils.isNotEmpty(receiverName)) { @@ -56,6 +56,10 @@ class VisitRecordsGraphQLQueryResolver implements GraphQLQueryResolver { query.eq("visitor_id", visitorId); } + if (null!= limit) { + query.last("limit " + limit); + } + return mapper.selectList(query).stream().map( t -> { DmVisitorsPo po = visitorsMapper.selectById(t.getVisitorId()); diff --git a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitorGraphQLMutationResolver.java b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitorGraphQLMutationResolver.java index c3286243..22e66bab 100644 --- a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitorGraphQLMutationResolver.java +++ b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitorGraphQLMutationResolver.java @@ -1,15 +1,21 @@ package com.xueyi.system.staff.graphql; import com.alibaba.excel.util.BooleanUtils; +import com.alibaba.fastjson.JSON; import com.xueyi.system.api.digitalmans.domain.po.DmVisitorsPo; import com.xueyi.system.api.resource.domain.po.DmResourcesPo; import com.xueyi.system.resource.mapper.DmResourcesMapper; +import com.xueyi.system.staff.domain.dto.DmVisitorOperateLogDto; import com.xueyi.system.staff.domain.model.DmVisitorsConverter; import com.xueyi.system.staff.mapper.DmVisitorsMapper; +import com.xueyi.system.staff.service.impl.DmVisitorOperateLogServiceImpl; import graphql.kickstart.tools.GraphQLMutationResolver; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.HashMap; +import java.util.Map; + /* * @author yk @@ -28,6 +34,9 @@ class VisitorGraphQLMutationResolver implements GraphQLMutationResolver { @Autowired private DmResourcesMapper resourcesMapper; + @Autowired + private DmVisitorOperateLogServiceImpl visitorLogsService; + private DmVisitorsPo initPo(DmVisitorsPo po){ if (BooleanUtils.isTrue(po.getIsVip())) { po.setType(9L); @@ -44,14 +53,32 @@ class VisitorGraphQLMutationResolver implements GraphQLMutationResolver { } public boolean updateVisitor(DmVisitorsPo po, Long staffId){ - return mapper.updateOne(initPo(po)) > 0; + Map map = new HashMap<>(); + map.put("input", po); + map.put("staffId", staffId); + Boolean result = mapper.updateOne(initPo(po)) > 0; + DmVisitorOperateLogDto operateLogPo = visitorLogsService.initData(po.getId(),staffId, DmVisitorOperateLogDto.BUSINESS_TYPE_UPDATE, "updateVisitor",JSON.toJSONString(map),JSON.toJSONString(result)); + visitorLogsService.insert(operateLogPo); + return result; } public boolean createVisitor(DmVisitorsPo po, Long staffId){ - return mapper.insert(initPo(po)) > 0; + Map map = new HashMap<>(); + map.put("input", po); + map.put("staffId", staffId); + Boolean result = mapper.insert(initPo(po)) > 0; + DmVisitorOperateLogDto operateLogPo = visitorLogsService.initData(po.getId(),staffId, DmVisitorOperateLogDto.BUSINESS_TYPE_CREATE, "createVisitor",JSON.toJSONString(map),JSON.toJSONString(result)); + visitorLogsService.insert(operateLogPo); + return result; } public Boolean deleteVisitor(Long id, Long staffId){ - return mapper.deleteById(id) > 0; + Map map = new HashMap<>(); + map.put("id", id); + map.put("staffId", staffId); + Boolean result = mapper.deleteById(id) > 0; + DmVisitorOperateLogDto operateLogPo = visitorLogsService.initData(id,staffId, DmVisitorOperateLogDto.BUSINESS_TYPE_DELETE, "deleteVisitor",JSON.toJSONString(map),JSON.toJSONString(result)); + visitorLogsService.insert(operateLogPo); + return result; } } diff --git a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitorLogsGraphQLQueryResolver.java b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitorLogsGraphQLQueryResolver.java index 32a52f66..86cb4063 100644 --- a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitorLogsGraphQLQueryResolver.java +++ b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitorLogsGraphQLQueryResolver.java @@ -30,7 +30,7 @@ class VisitorLogsGraphQLQueryResolver implements GraphQLQueryResolver { return mapper.selectById(id); } - public List visitorLogs(String userName, Long userId, Long visitorId, Integer businessType, LocalDate startDate, LocalDate endDate){ + public List visitorLogs(String userName, Long userId, Long visitorId, Integer businessType, LocalDate startDate, LocalDate endDate, Integer limit){ QueryWrapper query = new QueryWrapper<>(); if (StringUtils.isNotEmpty(userName)) { @@ -49,6 +49,10 @@ class VisitorLogsGraphQLQueryResolver implements GraphQLQueryResolver { query.eq("business_type", businessType); } + if (null!= limit) { + query.last("limit " + limit); + } + if (null != startDate && null != endDate){ query.between("operate_time", LocalDateTimeUtil.format(startDate, MyDateUtils.DEFAULT_DATE_PATTERN),LocalDateTimeUtil.format(endDate, MyDateUtils.DEFAULT_DATE_PATTERN)); } diff --git a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/PassRecordsGraphQLQueryResolver.java b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitorPassRecordsGraphQLQueryResolver.java similarity index 58% rename from xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/PassRecordsGraphQLQueryResolver.java rename to xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitorPassRecordsGraphQLQueryResolver.java index 358434dd..a40d410c 100644 --- a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/PassRecordsGraphQLQueryResolver.java +++ b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitorPassRecordsGraphQLQueryResolver.java @@ -4,10 +4,13 @@ import cn.hutool.core.date.LocalDateTimeUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.xueyi.common.web.utils.MyDateUtils; +import com.xueyi.system.api.digitalmans.domain.po.DmVisitorsPo; import com.xueyi.system.api.pass.domain.dto.DmRecognizedRecordsDto; import com.xueyi.system.api.pass.domain.po.DmRecognizedRecordsPo; import com.xueyi.system.pass.domain.model.DmRecognizedRecordsConverter; import com.xueyi.system.pass.mapper.DmRecognizedRecordsMapper; +import com.xueyi.system.staff.domain.model.DmVisitorsConverter; +import com.xueyi.system.staff.mapper.DmVisitorsMapper; import graphql.kickstart.tools.GraphQLQueryResolver; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -23,19 +26,26 @@ import java.util.stream.Collectors; */ @Component -class PassRecordsGraphQLQueryResolver implements GraphQLQueryResolver { +class VisitorPassRecordsGraphQLQueryResolver implements GraphQLQueryResolver { @Autowired private DmRecognizedRecordsMapper mapper; @Autowired private DmRecognizedRecordsConverter converter; + @Autowired + private DmVisitorsMapper visitorsMapper; + + + @Autowired + private DmVisitorsConverter visitorsConverter; + - public DmRecognizedRecordsDto passRecord(Long id) { + public DmRecognizedRecordsDto visitorPassRecord(Long id) { return converter.mapperDto(mapper.selectById(id)); } - public List passRecords(String userName, Long userId, Integer type, LocalDate startDate, LocalDate endDate){ + public List visitorPassRecords(String userName, Long userId, Integer type, LocalDate startDate, LocalDate endDate, Integer limit){ QueryWrapper query = new QueryWrapper<>(); if (StringUtils.isNotEmpty(userName)) { @@ -48,12 +58,25 @@ class PassRecordsGraphQLQueryResolver implements GraphQLQueryResolver { if (null != type) { query.eq("type", type); + } else { + query.in("type", 8, 9, 10); } if (null != startDate && null != endDate){ query.between("recognized_time", LocalDateTimeUtil.format(startDate, MyDateUtils.DEFAULT_DATE_PATTERN),LocalDateTimeUtil.format(endDate, MyDateUtils.DEFAULT_DATE_PATTERN)); } - return mapper.selectList(query).stream().map(t->converter.mapperDto(t)).collect(Collectors.toList()); + if (null!= limit) { + query.last("limit " + limit); + } + return mapper.selectList(query).stream().map(t-> + { + DmRecognizedRecordsDto recognizedRecordsDto = converter.mapperDto(t); + DmVisitorsPo po = visitorsMapper.selectById(t.getUserId()); + if (null == po) { + recognizedRecordsDto.setVisitor(visitorsConverter.mapperDto(po)); + } + return recognizedRecordsDto; + }).collect(Collectors.toList()); } } diff --git a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/manager/IDmVisitorOperateLogManager.java b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/manager/IDmVisitorOperateLogManager.java new file mode 100644 index 00000000..51f8e04b --- /dev/null +++ b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/manager/IDmVisitorOperateLogManager.java @@ -0,0 +1,13 @@ +package com.xueyi.system.staff.manager; + +import com.xueyi.common.web.entity.manager.IBaseManager; +import com.xueyi.system.staff.domain.dto.DmVisitorOperateLogDto; +import com.xueyi.system.staff.domain.query.DmVisitorOperateLogQuery; + +/** + * 访客管理 数据封装层 + * + * @author xueyi + */ +public interface IDmVisitorOperateLogManager extends IBaseManager { +} \ No newline at end of file diff --git a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/manager/impl/DmVisitorOperateLogManager.java b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/manager/impl/DmVisitorOperateLogManager.java new file mode 100644 index 00000000..f7b46b1f --- /dev/null +++ b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/manager/impl/DmVisitorOperateLogManager.java @@ -0,0 +1,35 @@ +package com.xueyi.system.staff.manager.impl; + +import com.xueyi.common.core.constant.basic.OperateConstants; +import com.xueyi.common.web.entity.domain.SlaveRelation; +import com.xueyi.common.web.entity.manager.impl.BaseManagerImpl; +import com.xueyi.system.api.digitalmans.domain.dto.DmVisitorsDto; +import com.xueyi.system.api.digitalmans.domain.po.DmVisitorsPo; +import com.xueyi.system.digitalmans.domain.merge.DmReceptionVisitorMerge; +import com.xueyi.system.digitalmans.mapper.merge.DmReceptionVisitorMergeMapper; +import com.xueyi.system.staff.domain.dto.DmVisitorOperateLogDto; +import com.xueyi.system.staff.domain.model.DmVisitorOperateLogConverter; +import com.xueyi.system.staff.domain.model.DmVisitorsConverter; +import com.xueyi.system.staff.domain.po.DmVisitorOperateLogPo; +import com.xueyi.system.staff.domain.query.DmVisitorOperateLogQuery; +import com.xueyi.system.staff.domain.query.DmVisitorsQuery; +import com.xueyi.system.staff.manager.IDmVisitorOperateLogManager; +import com.xueyi.system.staff.manager.IDmVisitorsManager; +import com.xueyi.system.staff.mapper.DmVisitorOperateLogMapper; +import com.xueyi.system.staff.mapper.DmVisitorsMapper; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; + +import static com.xueyi.system.api.digitalmans.domain.merge.MergeGroup.Visitor_DmReceptionVisitorMerge_GROUP; + +/** + * 访客管理 数据封装层处理 + * + * @author xueyi + */ +@Component +public class DmVisitorOperateLogManager extends BaseManagerImpl implements IDmVisitorOperateLogManager { + +} \ No newline at end of file diff --git a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/service/IDmVisitorOperateLogService.java b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/service/IDmVisitorOperateLogService.java new file mode 100644 index 00000000..a0dabfd9 --- /dev/null +++ b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/service/IDmVisitorOperateLogService.java @@ -0,0 +1,13 @@ +package com.xueyi.system.staff.service; + +import com.xueyi.common.web.entity.service.IBaseService; +import com.xueyi.system.staff.domain.dto.DmVisitorOperateLogDto; +import com.xueyi.system.staff.domain.query.DmVisitorOperateLogQuery; + +/** + * 访客日志管理 服务层 + * + * @author xueyi + */ +public interface IDmVisitorOperateLogService extends IBaseService { +} \ No newline at end of file diff --git a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/service/impl/DmVisitorOperateLogServiceImpl.java b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/service/impl/DmVisitorOperateLogServiceImpl.java new file mode 100644 index 00000000..e814ba6c --- /dev/null +++ b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/service/impl/DmVisitorOperateLogServiceImpl.java @@ -0,0 +1,45 @@ +package com.xueyi.system.staff.service.impl; + +import com.alibaba.fastjson.JSON; +import com.xueyi.common.web.entity.service.impl.BaseServiceImpl; +import com.xueyi.system.api.staff.domain.po.DmStaffPo; +import com.xueyi.system.staff.domain.dto.DmVisitorOperateLogDto; +import com.xueyi.system.staff.domain.po.DmVisitorOperateLogPo; +import com.xueyi.system.staff.domain.query.DmVisitorOperateLogQuery; +import com.xueyi.system.staff.manager.IDmVisitorOperateLogManager; +import com.xueyi.system.staff.mapper.DmStaffMapper; +import com.xueyi.system.staff.service.IDmVisitorOperateLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.Map; + +/** + * 访客管理 服务层处理 + * + * @author xueyi + */ +@Service +public class DmVisitorOperateLogServiceImpl extends BaseServiceImpl implements IDmVisitorOperateLogService { + + @Autowired + private DmStaffMapper staffMapper; + + public DmVisitorOperateLogDto initData(Long visitorId, Long staffId, Integer businessType, String funName, String parms, String result){ + DmVisitorOperateLogDto operateLogPo = new DmVisitorOperateLogDto(); + operateLogPo.setVisitorId(visitorId); + operateLogPo.setUserId(staffId); + DmStaffPo staffPo = staffMapper.selectById(staffId); + operateLogPo.setBusinessType(businessType); + operateLogPo.setMethod(funName); + operateLogPo.setUserName(staffPo.getUserName()); + operateLogPo.setTitle("访客方面操作日志（小程序）"); + operateLogPo.setOperateTime(LocalDateTime.now()); + operateLogPo.setParam(parms); + operateLogPo.setJsonResult(result); + return operateLogPo; + } + +} \ No newline at end of file diff --git a/xueyi-modules/xueyi-system/src/main/resources/graphql/visitRecords.graphqls b/xueyi-modules/xueyi-system/src/main/resources/graphql/visitRecords.graphqls index bf00271d..6fc1abfa 100644 --- a/xueyi-modules/xueyi-system/src/main/resources/graphql/visitRecords.graphqls +++ b/xueyi-modules/xueyi-system/src/main/resources/graphql/visitRecords.graphqls @@ -2,18 +2,19 @@ extend type Query { visitRecords( receiverName:String receiverPhone:String - visitorId:Long + visitorId:ID + limit:Int ): [VisitRecord!] - visitRecord(id:Long!): VisitRecord + visitRecord(id:ID!): VisitRecord } input VisitRecordInput { - id: Long - visitorId: Long! + id: ID + visitorId: ID! visitDate: Date! - userId: Long + userId: ID receiverName: String receiverPhone: String } @@ -21,23 +22,23 @@ input VisitRecordInput { extend type Mutation { createVisitRecord( input:VisitRecordInput! - staffId: Long! + staffId: ID! ): Boolean updateVisitRecord( input:VisitRecordInput! - staffId: Long! + staffId: ID! ): Boolean deleteVisitRecord( - id:Long! - staffId: Long! + id:ID! + staffId: ID! ): Boolean } type VisitRecord { - id: Long - visitorId: Long - userId: Long + id: ID + visitorId: ID + userId: ID receiverName: String receiverPhone: String recordStatus: Int diff --git a/xueyi-modules/xueyi-system/src/main/resources/graphql/visitor.graphqls b/xueyi-modules/xueyi-system/src/main/resources/graphql/visitor.graphqls index 521f6035..b7d10f09 100644 --- a/xueyi-modules/xueyi-system/src/main/resources/graphql/visitor.graphqls +++ b/xueyi-modules/xueyi-system/src/main/resources/graphql/visitor.graphqls @@ -1,16 +1,16 @@ extend type Query { visitors( - id: Long + id: ID name: String type: Int phone: String ): [Visitor!] - visitor(id: Long): Visitor + visitor(id: ID): Visitor } input VisitorInput { - id: Long + id: ID name: String nickname: String phone: String @@ -18,23 +18,23 @@ input VisitorInput { isVip:Boolean flexVisit:Boolean isBlock:Boolean - resourceId: Long + resourceId: ID } extend type Mutation { createVisitor( input: VisitorInput! - staffId: Long! + staffId: ID! ): Boolean updateVisitor( input: VisitorInput! - staffId: Long! + staffId: ID! ): Boolean deleteVisitor( - id: Long!, - staffId: Long! + id: ID!, + staffId: ID! ): Boolean } @@ -50,5 +50,5 @@ type Visitor { isVip:Boolean flexVisit:Boolean isBlock:Boolean - resourceId: Long + resourceId: ID } diff --git a/xueyi-modules/xueyi-system/src/main/resources/graphql/visitorOperateLog.graphqls b/xueyi-modules/xueyi-system/src/main/resources/graphql/visitorLog.graphqls similarity index 87% rename from xueyi-modules/xueyi-system/src/main/resources/graphql/visitorOperateLog.graphqls rename to xueyi-modules/xueyi-system/src/main/resources/graphql/visitorLog.graphqls index 8aed3ebf..62cddd76 100644 --- a/xueyi-modules/xueyi-system/src/main/resources/graphql/visitorOperateLog.graphqls +++ b/xueyi-modules/xueyi-system/src/main/resources/graphql/visitorLog.graphqls @@ -6,9 +6,10 @@ extend type Query { businessType:Int startDate:Date endDate:Date + limit:Int ): [VisitorLog!] - visitorLog(id:Long!): VisitorLog + visitorLog(id:ID!): VisitorLog } diff --git a/xueyi-modules/xueyi-system/src/main/resources/graphql/passRecords.graphqls b/xueyi-modules/xueyi-system/src/main/resources/graphql/visitorPassRecords.graphqls similarity index 61% rename from xueyi-modules/xueyi-system/src/main/resources/graphql/passRecords.graphqls rename to xueyi-modules/xueyi-system/src/main/resources/graphql/visitorPassRecords.graphqls index 7402a195..754b1b0e 100644 --- a/xueyi-modules/xueyi-system/src/main/resources/graphql/passRecords.graphqls +++ b/xueyi-modules/xueyi-system/src/main/resources/graphql/visitorPassRecords.graphqls @@ -1,17 +1,18 @@ extend type Query { - passRecords( + visitorPassRecords( userName:String userId:ID type:Int startDate:Date endDate:Date - ): [PassRecord!] + limit:Int + ): [VisitorPassRecord!] - passRecord(id:Long!): PassRecord + visitorPassRecord(id:ID!): VisitorPassRecord } -type PassRecord { +type VisitorPassRecord { id: ID userName: String userId: ID @@ -19,4 +20,5 @@ type PassRecord { recognizedTime: String createTime: Date type: Int + visitor: Visitor }