1,graphQL 完善字段

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitRecordGraphQLMutationResolver.java

@@ -9,6 +9,7 @@ import com.xueyi.system.api.staff.domain.dto.DmVisitCommonDto;
 import com.xueyi.system.api.staff.domain.dto.GraphqlVisitRecordInput;
 import com.xueyi.system.staff.domain.model.DmVisitRecordsConverter;
 import com.xueyi.system.staff.domain.model.DmVisitorsConverter;
+import com.xueyi.system.staff.domain.query.DmVisitRecordsQuery;
 import com.xueyi.system.staff.mapper.DmVisitRecordsMapper;
 import com.xueyi.system.staff.mapper.DmVisitorsMapper;
 import graphql.kickstart.tools.GraphQLMutationResolver;
@@ -35,11 +36,8 @@ class VisitRecordGraphQLMutationResolver implements GraphQLMutationResolver {
     private DmVisitRecordsConverter converter;
 
 
-    public boolean saveVisitRecord(GraphqlVisitRecordInput input){
-
-        DmVisitRecordsPo visitRecordsPo = JSONObject.parseObject(input.toString(), DmVisitRecordsPo.class);
-
-        return mapper.insert(visitRecordsPo) > 0;
+    public boolean saveVisitRecord(DmVisitRecordsPo input){
+        return mapper.insert(input) > 0;
     }
 
     public Boolean deleteVisitRecord(Long id){

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitorGraphQLMutationResolver.java

@@ -2,6 +2,9 @@ package com.xueyi.system.staff.graphql;
 
 import com.alibaba.excel.util.BooleanUtils;
 import com.xueyi.system.api.digitalmans.domain.po.DmVisitorsPo;
+import com.xueyi.system.api.resource.domain.po.DmResourcesPo;
+import com.xueyi.system.resource.domain.dto.DmResourcesDto;
+import com.xueyi.system.resource.mapper.DmResourcesMapper;
 import com.xueyi.system.staff.domain.model.DmVisitorsConverter;
 import com.xueyi.system.staff.mapper.DmVisitorsMapper;
 import graphql.kickstart.tools.GraphQLMutationResolver;
@@ -23,8 +26,11 @@ class VisitorGraphQLMutationResolver implements GraphQLMutationResolver {
     @Autowired
     private DmVisitorsConverter converter;
 
+    @Autowired
+    private DmResourcesMapper resourcesMapper;
+
 
-    public boolean saveVisitor( String name, String nickname, String phone, Integer type, Boolean isVip, Boolean flexVisit, Boolean isBlock){
+    public boolean saveVisitor(String name, String nickname, String phone, Boolean isVip, Boolean flexVisit, Boolean isBlock, Long resourceId){
         DmVisitorsPo dto =new DmVisitorsPo();
         dto.setPhone(phone);
         dto.setNickname(nickname);
@@ -37,6 +43,13 @@ class VisitorGraphQLMutationResolver implements GraphQLMutationResolver {
         }
         dto.setFlexVisit(flexVisit);
         dto.setIsBlock(isBlock);
+        dto.setResourceId(resourceId);
+        if (null != resourceId) {
+            DmResourcesPo resourcesPo = resourcesMapper.selectById(resourceId);
+            if (null != resourcesPo) {
+                dto.setAvatar(resourcesPo.getUrl());
+            }
+        }
         return mapper.updateById(dto) > 0;
     }
 

xueyi-modules/xueyi-system/src/main/resources/graphql/visitRecords.graphqls

@@ -3,20 +3,23 @@ extend type Query {
         receiverName:String
         receiverPhone:String
         visitorId:Long
-    ): [VisitRecord]
+    ): [VisitRecord!]
 
-    visitRecord(id:Long): VisitRecord
+    visitRecord(id:Long!): VisitRecord
 }
 
-input visitRecordInput{
-    visitorId: Long
-    visitDate:Date
-}
 
+input VisitRecordInput {
+    visitorId: Long!
+    visitDate: Date!
+    userId: Long
+    receiverName: String
+    receiverPhone: String
+}
 
 extend type Mutation {
     saveVisitRecord(
-        input: visitRecordInput
+        input:VisitRecordInput!
     ):  Boolean
     deleteVisitRecord(id:Long): Boolean
 }

xueyi-modules/xueyi-system/src/main/resources/graphql/visitor.graphqls

@@ -11,13 +11,13 @@ extend type Query {
 
 extend type Mutation {
     saveVisitor(
-        name: String
+        name: String!
         nickname: String
-        type: Int
         phone: String
         isVip:Boolean
         flexVisit:Boolean
         isBlock:Boolean
+        resourceId: Long
     ): Boolean
 
     deleteVisitor(id: Long!): Boolean
@@ -32,4 +32,8 @@ type Visitor {
     type: Int
     visitorCompany: String
     avatar:  String
+    isVip:Boolean
+    flexVisit:Boolean
+    isBlock:Boolean
+    resourceId: Long
 }