feat: 111

proto/safe.pb.go

@@ -0,0 +1,463 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.9.0
+// source: safe.proto
+
+package proto
+
+import (
+	context "context"
+	proto "github.com/golang/protobuf/proto"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
+
+// The request message containing the user's name.
+type SafeGetRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+}
+
+func (x *SafeGetRequest) Reset() {
+	*x = SafeGetRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_safe_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SafeGetRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SafeGetRequest) ProtoMessage() {}
+
+func (x *SafeGetRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_safe_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SafeGetRequest.ProtoReflect.Descriptor instead.
+func (*SafeGetRequest) Descriptor() ([]byte, []int) {
+	return file_safe_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *SafeGetRequest) GetId() int32 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+type SafePostRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id         int32  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	Code       string `protobuf:"bytes,2,opt,name=code,proto3" json:"code,omitempty"`
+	Position   string `protobuf:"bytes,3,opt,name=position,proto3" json:"position,omitempty"`
+	CreateTime string `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	Inspection string `protobuf:"bytes,5,opt,name=inspection,proto3" json:"inspection,omitempty"`
+}
+
+func (x *SafePostRequest) Reset() {
+	*x = SafePostRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_safe_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SafePostRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SafePostRequest) ProtoMessage() {}
+
+func (x *SafePostRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_safe_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SafePostRequest.ProtoReflect.Descriptor instead.
+func (*SafePostRequest) Descriptor() ([]byte, []int) {
+	return file_safe_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *SafePostRequest) GetId() int32 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *SafePostRequest) GetCode() string {
+	if x != nil {
+		return x.Code
+	}
+	return ""
+}
+
+func (x *SafePostRequest) GetPosition() string {
+	if x != nil {
+		return x.Position
+	}
+	return ""
+}
+
+func (x *SafePostRequest) GetCreateTime() string {
+	if x != nil {
+		return x.CreateTime
+	}
+	return ""
+}
+
+func (x *SafePostRequest) GetInspection() string {
+	if x != nil {
+		return x.Inspection
+	}
+	return ""
+}
+
+// The response message containing the greetings
+type SafeReply struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Code int32  `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"`
+	Data string `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+	Msg  string `protobuf:"bytes,3,opt,name=msg,proto3" json:"msg,omitempty"`
+}
+
+func (x *SafeReply) Reset() {
+	*x = SafeReply{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_safe_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SafeReply) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SafeReply) ProtoMessage() {}
+
+func (x *SafeReply) ProtoReflect() protoreflect.Message {
+	mi := &file_safe_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SafeReply.ProtoReflect.Descriptor instead.
+func (*SafeReply) Descriptor() ([]byte, []int) {
+	return file_safe_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *SafeReply) GetCode() int32 {
+	if x != nil {
+		return x.Code
+	}
+	return 0
+}
+
+func (x *SafeReply) GetData() string {
+	if x != nil {
+		return x.Data
+	}
+	return ""
+}
+
+func (x *SafeReply) GetMsg() string {
+	if x != nil {
+		return x.Msg
+	}
+	return ""
+}
+
+var File_safe_proto protoreflect.FileDescriptor
+
+var file_safe_proto_rawDesc = []byte{
+	0x0a, 0x0a, 0x73, 0x61, 0x66, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x05, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x22, 0x20, 0x0a, 0x0e, 0x53, 0x61, 0x66, 0x65, 0x47, 0x65, 0x74, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x92, 0x01, 0x0a, 0x0f, 0x53, 0x61, 0x66, 0x65, 0x50, 0x6f,
+	0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1a, 0x0a,
+	0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x72, 0x65,
+	0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+	0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6e,
+	0x73, 0x70, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+	0x69, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x45, 0x0a, 0x09, 0x53, 0x61,
+	0x66, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64,
+	0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12,
+	0x10, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73,
+	0x67, 0x32, 0x78, 0x0a, 0x04, 0x53, 0x61, 0x66, 0x65, 0x12, 0x38, 0x0a, 0x0b, 0x67, 0x65, 0x74,
+	0x53, 0x61, 0x66, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x15, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x53, 0x61, 0x66, 0x65, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x10, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x61, 0x66, 0x65, 0x52, 0x65, 0x70, 0x6c,
+	0x79, 0x22, 0x00, 0x12, 0x36, 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x74, 0x53, 0x61, 0x66, 0x65, 0x12,
+	0x16, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x61, 0x66, 0x65, 0x50, 0x6f, 0x73, 0x74,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x10, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x53, 0x61, 0x66, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
+}
+
+var (
+	file_safe_proto_rawDescOnce sync.Once
+	file_safe_proto_rawDescData = file_safe_proto_rawDesc
+)
+
+func file_safe_proto_rawDescGZIP() []byte {
+	file_safe_proto_rawDescOnce.Do(func() {
+		file_safe_proto_rawDescData = protoimpl.X.CompressGZIP(file_safe_proto_rawDescData)
+	})
+	return file_safe_proto_rawDescData
+}
+
+var file_safe_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_safe_proto_goTypes = []interface{}{
+	(*SafeGetRequest)(nil),  // 0: proto.SafeGetRequest
+	(*SafePostRequest)(nil), // 1: proto.SafePostRequest
+	(*SafeReply)(nil),       // 2: proto.SafeReply
+}
+var file_safe_proto_depIdxs = []int32{
+	0, // 0: proto.Safe.getSafeList:input_type -> proto.SafeGetRequest
+	1, // 1: proto.Safe.postSafe:input_type -> proto.SafePostRequest
+	2, // 2: proto.Safe.getSafeList:output_type -> proto.SafeReply
+	2, // 3: proto.Safe.postSafe:output_type -> proto.SafeReply
+	2, // [2:4] is the sub-list for method output_type
+	0, // [0:2] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_safe_proto_init() }
+func file_safe_proto_init() {
+	if File_safe_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_safe_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SafeGetRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_safe_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SafePostRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_safe_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SafeReply); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_safe_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   3,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_safe_proto_goTypes,
+		DependencyIndexes: file_safe_proto_depIdxs,
+		MessageInfos:      file_safe_proto_msgTypes,
+	}.Build()
+	File_safe_proto = out.File
+	file_safe_proto_rawDesc = nil
+	file_safe_proto_goTypes = nil
+	file_safe_proto_depIdxs = nil
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConnInterface
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion6
+
+// SafeClient is the client API for Safe service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type SafeClient interface {
+	// Sends a greeting
+	GetSafeList(ctx context.Context, in *SafeGetRequest, opts ...grpc.CallOption) (*SafeReply, error)
+	PostSafe(ctx context.Context, in *SafePostRequest, opts ...grpc.CallOption) (*SafeReply, error)
+}
+
+type safeClient struct {
+	cc grpc.ClientConnInterface
+}
+
+func NewSafeClient(cc grpc.ClientConnInterface) SafeClient {
+	return &safeClient{cc}
+}
+
+func (c *safeClient) GetSafeList(ctx context.Context, in *SafeGetRequest, opts ...grpc.CallOption) (*SafeReply, error) {
+	out := new(SafeReply)
+	err := c.cc.Invoke(ctx, "/proto.Safe/getSafeList", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *safeClient) PostSafe(ctx context.Context, in *SafePostRequest, opts ...grpc.CallOption) (*SafeReply, error) {
+	out := new(SafeReply)
+	err := c.cc.Invoke(ctx, "/proto.Safe/postSafe", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// SafeServer is the server API for Safe service.
+type SafeServer interface {
+	// Sends a greeting
+	GetSafeList(context.Context, *SafeGetRequest) (*SafeReply, error)
+	PostSafe(context.Context, *SafePostRequest) (*SafeReply, error)
+}
+
+// UnimplementedSafeServer can be embedded to have forward compatible implementations.
+type UnimplementedSafeServer struct {
+}
+
+func (*UnimplementedSafeServer) GetSafeList(context.Context, *SafeGetRequest) (*SafeReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetSafeList not implemented")
+}
+func (*UnimplementedSafeServer) PostSafe(context.Context, *SafePostRequest) (*SafeReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method PostSafe not implemented")
+}
+
+func RegisterSafeServer(s *grpc.Server, srv SafeServer) {
+	s.RegisterService(&_Safe_serviceDesc, srv)
+}
+
+func _Safe_GetSafeList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SafeGetRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(SafeServer).GetSafeList(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/proto.Safe/GetSafeList",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(SafeServer).GetSafeList(ctx, req.(*SafeGetRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Safe_PostSafe_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SafePostRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(SafeServer).PostSafe(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/proto.Safe/PostSafe",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(SafeServer).PostSafe(ctx, req.(*SafePostRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _Safe_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "proto.Safe",
+	HandlerType: (*SafeServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "getSafeList",
+			Handler:    _Safe_GetSafeList_Handler,
+		},
+		{
+			MethodName: "postSafe",
+			Handler:    _Safe_PostSafe_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "safe.proto",
+}

proto/safe.proto

@@ -5,17 +5,24 @@ package proto;
 // The greeting service definition.
 service Safe {
   // Sends a greeting
-  rpc getSafeList (SafeRequest) returns (SafeReply) {}
+  rpc getSafeList (SafeGetRequest) returns (SafeReply) {}
+  rpc postSafe (SafePostRequest) returns (SafeReply) {}
 }
 
 // The request message containing the user's name.
-message SafeRequest {
+message SafeGetRequest {
     int32 id = 1;
 }
-
+message SafePostRequest {
+  int32 id = 1;
+  string code = 2;
+  string position = 3;
+  string create_time = 4;
+  string inspection = 5;
+}
 // The response message containing the greetings
 message SafeReply {
   int32 code = 1;
   string data = 2;
-  string message = 3;
+  string msg = 3;
 }

services/safe_service.go

@@ -0,0 +1,129 @@
+package services
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"log"
+	"strconv"
+	"time"
+
+	"go.mod/models"
+
+	"github.com/kataras/iris/v12"
+	"go.mod/comm"
+	"go.mod/conf"
+	rpc "go.mod/proto"
+	"go.mod/web/viewmodels"
+	"google.golang.org/grpc"
+)
+
+type SafeService interface {
+	Get(id int) (int32, string, []viewmodels.Safe)
+	Post(id int, code string, position string, createTime string, inspection string) (int32, string)
+	ValidRule(ctx iris.Context) (viewmodels.Safe, error)
+}
+
+// //返回service操作类
+type safeService struct {
+	rpcClient *grpc.ClientConn
+	valid     string
+}
+
+//创建项目用户service
+func NewSafeService() SafeService {
+	return &safeService{
+		rpcClient: newGrpcClient(conf.NodeRpcHost),
+		valid:     "/api/safe",
+	}
+}
+
+func (s *safeService) newGrpcClient(address string) *grpc.ClientConn {
+	// 启动grpc客户端，连接grpc服务端
+	conn, err := grpc.Dial(address, grpc.WithInsecure())
+	if err != nil {
+		log.Fatalf("did not connect: %v", err)
+	}
+	// defer conn.Close()
+	return conn
+}
+
+func (s *safeService) Get(id int) (int32, string, []viewmodels.Safe) {
+	// 1.结束后关闭
+	// defer s.rpcClient.Close()
+	// 使用连接，创建HelloService实例
+	safeCmList := make([]models.CmSafe, 0)
+	safeList := make([]viewmodels.Safe, 0)
+
+	rpcClient := rpc.NewSafeClient(s.rpcClient)
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+	res, err := rpcClient.GetSafeList(ctx, &rpc.SafeGetRequest{Id: int32(id)})
+	if err != nil {
+		log.Fatalf("could not greet: %v", err)
+		return -1, "", safeList
+	}
+
+	err = json.Unmarshal([]byte(res.GetData()), &safeCmList)
+	if err != nil {
+		msg := fmt.Sprintf("Json转换出错:err=", err)
+		log.Println("Json转换出错:err=", err)
+		return -1, msg, safeList
+	}
+
+	for _, item := range safeCmList {
+		safeVM := viewmodels.Safe{}
+		safeVM.Code = item.Code
+
+		bidId, _ := comm.AesEncrypt(strconv.Itoa(item.BidsectionId), conf.SignSecret)
+		safeVM.BidsectionId = bidId
+		safeVM.CreateTime = item.CreateTime
+		safeVM.Demand = item.Demand
+		safeVM.EndTime = item.EndTime
+		id, _ := comm.AesEncrypt(strconv.Itoa(item.Id), conf.SignSecret)
+		safeVM.Id = id
+
+		safeVM.Inspection = item.Inspection
+		safeVM.InspectionDetail = item.InspectionDetail
+		safeVM.Position = item.Position
+		safeVM.Status = item.Status
+		safeList = append(safeList, safeVM)
+	}
+
+	return res.GetCode(), res.GetMsg(), safeList
+}
+
+func (s *safeService) Post(id int, code string, position string, createTime string, inspection string) (int32, string) {
+	rpcClient := rpc.NewSafeClient(s.rpcClient)
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+	res, err := rpcClient.PostSafe(ctx, &rpc.SafePostRequest{Id: int32(id), Code: code, Position: position, CreateTime: createTime, Inspection: inspection})
+	if err != nil {
+		log.Fatalf("could not greet: %v", err)
+		return -1, ""
+	}
+	return res.GetCode(), res.GetMsg()
+}
+
+func (s *safeService) ValidRule(ctx iris.Context) (viewmodels.Safe, error) {
+	safeVaild := viewmodels.Safe{}
+	err := ctx.ReadForm(&safeVaild)
+	//ReadJSON
+	if err != nil {
+		log.Println("account-ValidRule-ReadForm转换异常, error=", err)
+		return safeVaild, err
+	}
+
+	if ctx.Path() == s.valid {
+		err = safeVaild.ValidateList()
+	}
+
+	if err != nil {
+		log.Println("获取安全巡检列表, error=", err)
+		return safeVaild, err
+	}
+	return safeVaild, nil
+
+}

web/api/safe_rpc_api.go

@@ -43,12 +43,41 @@ func (c *SafeRpcApi) Get() {
 		return
 	}
 	c.ServiceSafe.Get(bidsectionId)
+	code, msg, data := c.ServiceSafe.Get(bidsectionId)
 
-	// SafeList := c.ServiceSafe.GetSafeList()
+	c.Ctx.JSON(iris.Map{
+		"code": code,
+		"msg":  msg,
+		"data": data,
+	})
+}
+
+// @Summary 安全巡检列表
+// @Tags 安全巡检
+// @Description 创建新的安全巡检记录
+// @Accept  json
+// @Produce  json
+// @Security ApiKeyAuth
+// @Success 200 {object} viewmodels.Safe "{code:0成功,msg:}"
+// @Failure 400 {string} string	"{code:0成功,-1参数类错误,-2服务端内部错误,msg:错误信息}"
+// @Router /api/safe [post]
+func (c *SafeRpcApi) Post() {
+	// 1.规则验证
+	safeData, err := c.ServiceSafe.ValidRule(c.Ctx)
+	if err != nil {
+		c.Ctx.JSON(iris.Map{"code": -1, "msg": err})
+		return
+	}
+
+	bidsectionId, err := utils.GetDecryptId(safeData.BidsectionId)
+	if err != nil {
+		c.Ctx.JSON(iris.Map{"code": -1, "msg": "ReadJSON转换异常,请检查参数"})
+		return
+	}
+	code, msg := c.ServiceSafe.Post(bidsectionId, safeData.Position, safeData.Code, string(safeData.CreateTime), safeData.Inspection)
 
-	// c.Ctx.JSON(iris.Map{
-	// 	"code": 0,
-	// 	"msg":  "",
-	// 	"data": SafeList,
-	// })
+	c.Ctx.JSON(iris.Map{
+		"code": code,
+		"msg":  msg,
+	})
 }

web/viewmodels/safe.go

@@ -13,8 +13,9 @@ import (
 )
 
 type Safe struct {
-	Id               string    `form:"id" json:"id" `
-	BidsectionId     string    `form:"bidsectionId" json:"bidsectionId"`
+	Id           string `form:"id" json:"id" `
+	BidsectionId string `form:"bidsectionId" json:"bidsectionId"`
+
 	Code             string    `form:"code" json:"code"`
 	CreateTime       time.Time `form:"createTime" json:"createTime"`
 	EndTime          time.Time `form:"endTime" json:"endTime"`
@@ -30,3 +31,13 @@ func (l Safe) ValidateList() error {
 		validation.Field(&l.BidsectionId, validation.Required.Error("标段ID不能为空")),
 	)
 }
+
+func (l Safe) ValidateCreate() error {
+	return validation.ValidateStruct(&l,
+		validation.Field(&l.BidsectionId, validation.Required.Error("标段ID不能为空")),
+		validation.Field(&l.CreateTime, validation.Required.Error("日期不能为空")),
+		validation.Field(&l.Code, validation.Required.Error("编号不能为空")),
+		validation.Field(&l.Position, validation.Required.Error("检查部位不能为空")),
+		validation.Field(&l.Inspection, validation.Required.Error("检查项目不能为空")),
+	)
+}