调整 GeneralDeviceService

internal/app/service/device/proto/device.pb.go

@@ -235,8 +235,7 @@ func (x *BatchCollectCommand) GetTasks() []*CollectTask {
 // 定义了单个采集任务的“意图”。现在直接包含平台生成的原始485指令，并带上总线号。
 type CollectTask struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
-	BusNumber     int32                  `protobuf:"varint,1,opt,name=bus_number,json=busNumber,proto3" json:"bus_number,omitempty"` // 总线号，用于指示单片机将指令发送到哪个总线
-	Command       *Raw485Command         `protobuf:"bytes,2,opt,name=command,proto3" json:"command,omitempty"`                       // 平台生成的原始485指令
+	Command       *Raw485Command         `protobuf:"bytes,2,opt,name=command,proto3" json:"command,omitempty"` // 平台生成的原始485指令
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -271,13 +270,6 @@ func (*CollectTask) Descriptor() ([]byte, []int) {
 	return file_device_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *CollectTask) GetBusNumber() int32 {
-	if x != nil {
-		return x.BusNumber
-	}
-	return 0
-}
-
 func (x *CollectTask) GetCommand() *Raw485Command {
 	if x != nil {
 		return x.Command
@@ -353,10 +345,8 @@ const file_device_proto_rawDesc = "" +
 	"\x04data\x18\x02 \x01(\v2\x14.google.protobuf.AnyR\x04data\"g\n" +
 	"\x13BatchCollectCommand\x12%\n" +
 	"\x0ecorrelation_id\x18\x01 \x01(\tR\rcorrelationId\x12)\n" +
-	"\x05tasks\x18\x02 \x03(\v2\x13.device.CollectTaskR\x05tasks\"]\n" +
-	"\vCollectTask\x12\x1d\n" +
-	"\n" +
-	"bus_number\x18\x01 \x01(\x05R\tbusNumber\x12/\n" +
+	"\x05tasks\x18\x02 \x03(\v2\x13.device.CollectTaskR\x05tasks\">\n" +
+	"\vCollectTask\x12/\n" +
 	"\acommand\x18\x02 \x01(\v2\x15.device.Raw485CommandR\acommand\"N\n" +
 	"\rCollectResult\x12%\n" +
 	"\x0ecorrelation_id\x18\x01 \x01(\tR\rcorrelationId\x12\x16\n" +