From f94ca7d72b4f805f3eef073ec21e6b50b86fa729 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 19 七月 2019 18:11:24 +0800
Subject: [PATCH] imgid改为int64
---
.idea/workspace.xml | 20 ++++++++------------
protomsg.proto | 2 +-
protomsg.pb.go | 29 +++++++++++++++--------------
3 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 741ac40..6126fff 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="becdd117-1021-4e06-af58-0f70d982f4ee" name="Default Changelist" comment="">
- <change beforePath="$PROJECT_DIR$/base.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/base.pb.go" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/commsg.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/commsg.pb.go" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/es.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/es.pb.go" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/protomsg.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/protomsg.pb.go" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/protomsg.proto" beforeDir="false" afterPath="$PROJECT_DIR$/protomsg.proto" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/sdk.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/sdk.pb.go" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/sysset.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/sysset.pb.go" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -30,8 +25,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/protomsg.proto">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="297">
- <caret line="163" column="30" lean-forward="true" selection-start-line="163" selection-start-column="30" selection-end-line="163" selection-end-column="30" />
+ <state relative-caret-position="595">
+ <caret line="221" column="20" lean-forward="true" selection-start-line="221" selection-start-column="20" selection-end-line="221" selection-end-column="20" />
</state>
</provider>
</entry>
@@ -85,6 +80,7 @@
</panes>
</component>
<component name="PropertiesComponent">
+ <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="go.gopath.indexing.explicitly.defined" value="true" />
<property name="go.import.settings.migrated" value="true" />
@@ -110,12 +106,12 @@
<editor active="true" />
<layout>
<window_info id="Favorites" side_tool="true" />
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19527897" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Docker" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" />
<window_info anchor="bottom" id="Version Control" />
- <window_info active="true" anchor="bottom" id="Terminal" visible="true" weight="0.43039215" />
+ <window_info active="true" anchor="bottom" id="Terminal" visible="true" weight="0.22058824" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
@@ -143,8 +139,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/protomsg.proto">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="297">
- <caret line="163" column="30" lean-forward="true" selection-start-line="163" selection-start-column="30" selection-end-line="163" selection-end-column="30" />
+ <state relative-caret-position="595">
+ <caret line="221" column="20" lean-forward="true" selection-start-line="221" selection-start-column="20" selection-end-line="221" selection-end-column="20" />
</state>
</provider>
</entry>
diff --git a/protomsg.pb.go b/protomsg.pb.go
index 3bf8e57..35f8141 100644
--- a/protomsg.pb.go
+++ b/protomsg.pb.go
@@ -1657,7 +1657,7 @@
EsDataId string `protobuf:"bytes,1,opt,name=esDataId,proto3" json:"esDataId,omitempty"`
CameraId string `protobuf:"bytes,2,opt,name=cameraId,proto3" json:"cameraId,omitempty"`
TaskId string `protobuf:"bytes,3,opt,name=taskId,proto3" json:"taskId,omitempty"`
- ImgId string `protobuf:"bytes,4,opt,name=imgId,proto3" json:"imgId,omitempty"`
+ ImgId int64 `protobuf:"varint,4,opt,name=imgId,proto3" json:"imgId,omitempty"`
SdkIds []string `protobuf:"bytes,5,rep,name=sdkIds,proto3" json:"sdkIds,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
@@ -1710,11 +1710,11 @@
return ""
}
-func (m *VideotapeInfo) GetImgId() string {
+func (m *VideotapeInfo) GetImgId() int64 {
if m != nil {
return m.ImgId
}
- return ""
+ return 0
}
func (m *VideotapeInfo) GetSdkIds() []string {
@@ -1753,7 +1753,7 @@
func init() { proto.RegisterFile("protomsg.proto", fileDescriptor_32de24555f916688) }
var fileDescriptor_32de24555f916688 = []byte{
- // 1648 bytes of a gzipped FileDescriptorProto
+ // 1649 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x57, 0xcd, 0x8e, 0xdc, 0xc6,
0x11, 0x36, 0xe7, 0x97, 0xac, 0xf9, 0x11, 0xd5, 0x52, 0x6c, 0x46, 0x8e, 0x91, 0x15, 0xa3, 0x20,
0x0b, 0x21, 0xd1, 0x61, 0xed, 0x53, 0x6e, 0x13, 0x6d, 0x14, 0x0c, 0xe0, 0x18, 0x0a, 0x77, 0xac,
@@ -1847,14 +1847,15 @@
0x4d, 0x0f, 0xda, 0xf5, 0x01, 0x9b, 0x85, 0x54, 0xf9, 0x63, 0x36, 0xfb, 0x4b, 0x00, 0x8b, 0x3b,
0x25, 0x64, 0x6d, 0x79, 0x23, 0x69, 0xff, 0x7b, 0x06, 0xa1, 0x34, 0x97, 0xdc, 0xf2, 0x75, 0x3f,
0x78, 0x3a, 0x1d, 0x7d, 0xdd, 0x53, 0x3f, 0x78, 0xba, 0xdf, 0x8f, 0xd7, 0xa7, 0xfb, 0xd1, 0x53,
- 0x18, 0xab, 0x5d, 0xb1, 0xee, 0xe8, 0xcc, 0x29, 0x18, 0x4d, 0xe4, 0xe5, 0x3e, 0xba, 0x28, 0xf3,
- 0xda, 0xcb, 0x7f, 0x04, 0x30, 0x3f, 0xec, 0x33, 0x9b, 0x43, 0xb8, 0xc9, 0x5d, 0x47, 0xe2, 0x4f,
- 0x58, 0x0c, 0xf3, 0x4e, 0x43, 0x3e, 0x8d, 0x03, 0xf6, 0x14, 0xe2, 0x43, 0x0b, 0x0e, 0xb6, 0x78,
- 0xc0, 0x00, 0x26, 0x9b, 0x9c, 0x22, 0x86, 0x6c, 0x01, 0x91, 0x93, 0xaf, 0xc4, 0x6d, 0x3c, 0x62,
- 0x8f, 0x61, 0xd1, 0xab, 0xc8, 0xe3, 0xf1, 0x98, 0x45, 0x30, 0xde, 0xe4, 0xe8, 0x9d, 0xb0, 0x27,
- 0xf0, 0xa8, 0x3b, 0xce, 0x03, 0x20, 0x9e, 0xb2, 0x25, 0xc0, 0x26, 0xdf, 0xf8, 0x4d, 0x24, 0x0e,
- 0x5d, 0x4e, 0xee, 0x6f, 0x48, 0x1c, 0xb9, 0x9c, 0xde, 0xd6, 0x65, 0xf9, 0xba, 0xae, 0x6e, 0x54,
- 0x11, 0xc3, 0xcb, 0x57, 0x10, 0x76, 0x60, 0xc3, 0x4c, 0xd6, 0x95, 0x91, 0xda, 0xc6, 0x9f, 0xa0,
- 0xfc, 0x2d, 0x7d, 0xe7, 0x71, 0x80, 0xf2, 0xa5, 0x2c, 0xa5, 0x95, 0xf1, 0xe0, 0x7a, 0x42, 0x18,
- 0xfd, 0xf2, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0xed, 0xa0, 0x5b, 0x99, 0x40, 0x0f, 0x00, 0x00,
+ 0x18, 0xab, 0x5d, 0xb1, 0x76, 0x74, 0x36, 0xcc, 0x9c, 0x82, 0xd1, 0x44, 0x5e, 0xee, 0xa3, 0x8b,
+ 0x32, 0xaf, 0xbd, 0xfc, 0x47, 0x00, 0xf3, 0xc3, 0x3e, 0xb3, 0x39, 0x84, 0x9b, 0xdc, 0x75, 0x24,
+ 0xfe, 0x84, 0xc5, 0x30, 0xef, 0x34, 0xe4, 0xd3, 0x38, 0x60, 0x4f, 0x21, 0x3e, 0xb4, 0xe0, 0x60,
+ 0x8b, 0x07, 0x0c, 0x60, 0xb2, 0xc9, 0x29, 0x62, 0xc8, 0x16, 0x10, 0x39, 0xf9, 0x4a, 0xdc, 0xc6,
+ 0x23, 0xf6, 0x18, 0x16, 0xbd, 0x8a, 0x3c, 0x1e, 0x8f, 0x59, 0x04, 0xe3, 0x4d, 0x8e, 0xde, 0x09,
+ 0x7b, 0x02, 0x8f, 0xba, 0xe3, 0x3c, 0x00, 0xe2, 0x29, 0x5b, 0x02, 0x6c, 0xf2, 0x8d, 0xdf, 0x44,
+ 0xe2, 0xd0, 0xe5, 0xe4, 0xfe, 0x86, 0xc4, 0x91, 0xcb, 0xe9, 0x6d, 0x5d, 0x96, 0xaf, 0xeb, 0xea,
+ 0x46, 0x15, 0x31, 0xbc, 0x7c, 0x05, 0x61, 0x07, 0x36, 0xcc, 0x64, 0x5d, 0x19, 0xa9, 0x6d, 0xfc,
+ 0x09, 0xca, 0xdf, 0xd2, 0x77, 0x1e, 0x07, 0x28, 0x5f, 0xca, 0x52, 0x5a, 0x19, 0x0f, 0xae, 0x27,
+ 0x84, 0xd1, 0x2f, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x09, 0xad, 0x45, 0x30, 0x40, 0x0f, 0x00,
+ 0x00,
}
diff --git a/protomsg.proto b/protomsg.proto
index 7246f98..7ff9456 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -219,6 +219,6 @@
string esDataId = 1;
string cameraId = 2;
string taskId = 3;
- string imgId = 4;
+ int64 imgId = 4;
repeated string sdkIds = 5;
}
\ No newline at end of file
--
Gitblit v1.8.0