zhangyang 6 лет назад
Родитель
Сommit
75326af840

+ 0 - 40
bin/Win32/Debug/conf/dispatch.conf

@@ -1,40 +0,0 @@
-#这个是调度中心的配置文件,“#"用来注释当前行
-
-#模式,debug或者release
-mode = release
-
-#release环境路径规划服务器参数
-release_pathplanning_host = 172.16.1.71:50051
-
-#debug环境路径规划服务器参数
-debug_pathplanning_host = 172.16.1.71:50051
-
-#release环境的数据库参数
-release_host = rdsqnuyurqnuyur505.mysql.rds.aliyuncs.com
-release_port = 3306
-release_username = liantongxue
-release_password = LewaimaiLongtailiDB200
-release_dbname = dispatch
-
-#release环境的队列参数
-release_dispatch_task_queue = prod-dispather-task
-release_dispatch_result_queue = prod-lwmWorker-dispatchResult
-
-#debug环境的数据库参数
-debug_host = rm-bp113vj32hrp7wpws.mysql.rds.aliyuncs.com
-debug_port = 3306
-debug_username = weixin
-debug_password = hhyz122131
-debug_dbname = dispatch
-
-#debug环境的队列参数
-debug_dispatch_task_queue = dev-dispather-task
-debug_dispatch_result_queue = dev-lwmWorker-dispatchResult
-
-#连接阿里云的mns需要用到的参数
-mns.accountendpoint = https://1111769578085953.mns.cn-hangzhou.aliyuncs.com/
-mns.accesskeyid = 2HUnzc9XJV92PjvW
-mns.accesskeysecret = 20mMc8wuzlfC0r323b6oJqxlBPEyjW
-
-#配送员最大可接单数量,最大不能超过10
-deliveryman_max_order_num = 8

+ 0 - 29
bin/Win32/Debug/conf/pathplanning.conf

@@ -1,29 +0,0 @@
-#这个是调度中心的配置文件,“#"用来注释当前行
-
-#模式,debug或者release
-mode = debug
-
-#release环境的数据库参数
-release_host = rdsqnuyurqnuyur.mysql.rds.aliyuncs.com
-release_port = 3306
-release_username = liantongxue
-release_password = LewaimaiLongtailiDB200
-release_dbname = dispatch
-
-#release环境的队列参数
-release_pos_task_queue = zhipuzi-pos-windows-release
-
-#debug环境的数据库参数
-debug_host = rm-bp113vj32hrp7wpws.mysql.rds.aliyuncs.com
-debug_port = 3306
-debug_username = weixin
-debug_password = hhyz122131
-debug_dbname = dispatch
-
-#debug环境的队列参数
-debug_pos_task_queue = zhipuzi-pos-windows-dev
-
-#连接阿里云的mns需要用到的参数
-mns.accountendpoint = https://1111769578085953.mns.cn-hangzhou.aliyuncs.com/
-mns.accesskeyid = 2HUnzc9XJV92PjvW
-mns.accesskeysecret = 20mMc8wuzlfC0r323b6oJqxlBPEyjW

Разница между файлами не показана из-за своего большого размера
+ 4 - 0
bin/Win32/Debug/zhipuzi_pos_windows/log/pos.log


BIN
bin/Win32/Debug/zhipuzi_pos_windows/zhipuzi_pos_windows.exe


BIN
bin/Win32/Debug/zhipuzi_pos_windows_server/zhipuzi_pos_windows_server.exe


+ 1 - 1
lewaimai_dispatch/helper/CConfigReader.cpp

@@ -19,7 +19,7 @@ void CConfigReader::ReadConfigFile()
 {
 	ifstream configFile;
 
-	string path = "config.ini";
+	string path = "conf/config.ini";
 
 	configFile.open(path.c_str());
 	string str_line;

+ 2 - 2
lewaimai_dispatch/lewaimai_dispatch_windows.vcxproj

@@ -141,7 +141,7 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
       <Command>mkdir $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\
 copy $(TargetPath) $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\
 copy $(SolutionDir)dll\debug\ $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\
-copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\</Command>
+copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\conf\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -234,7 +234,7 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     <ClCompile Include="network\CHttpClient.cpp" />
     <ClCompile Include="wnd\MiniDumper.cpp" />
     <ClCompile Include="tool\CLewaimaiLog.cpp" />
-    <ClCompile Include="lewaimai_dispatch_windows.cpp" />
+    <ClCompile Include="zhipuzi_pos_windows.cpp" />
     <ClCompile Include="pch\pch.cpp" />
     <ClCompile Include="tool\CLewaimaiTime.cpp" />
     <ClCompile Include="wnd\OrderListUI.cpp" />

+ 3 - 3
lewaimai_dispatch/lewaimai_dispatch_windows.vcxproj.filters

@@ -83,9 +83,6 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="lewaimai_dispatch_windows.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
     <ClCompile Include="pch\pch.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
@@ -143,6 +140,9 @@
     <ClCompile Include="wnd\CWaimaiOrderInfoUI.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
+    <ClCompile Include="zhipuzi_pos_windows.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Image Include="resource\duilib.ico">

+ 2 - 2
lewaimai_dispatch/lewaimai_dispatch_windows.cpp

@@ -26,9 +26,9 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
     CPaintManagerUI::SetInstance(hInstance);
 #if 0
     CPaintManagerUI::SetResourcePath(CPaintManagerUI::GetInstancePath() + _T("skin"));
-    CPaintManagerUI::SetResourceZip(_T("GameRes.zip"));
+    CPaintManagerUI::SetResourceZip(_T("skin.zip"));
 #else
-    CPaintManagerUI::SetResourcePath(CPaintManagerUI::GetInstancePath() + _T("skin/GameRes"));
+    CPaintManagerUI::SetResourcePath(CPaintManagerUI::GetInstancePath() + _T("skin"));
 #endif
 
     HRESULT Hr = ::CoInitialize(NULL);

+ 1 - 1
lewaimai_pathplanning/helper/CConfigReader.cpp

@@ -19,7 +19,7 @@ void CConfigReader::ReadConfigFile()
 {
 	ifstream configFile;
 
-	string path = "../conf/pathplanning.conf";
+	string path = "conf/pathplanning.conf";
 
 	configFile.open(path.c_str());
 	string str_line;

+ 1 - 2
lewaimai_pathplanning/lewaimai_pathplanning_windows.vcxproj

@@ -143,8 +143,7 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
       <Command>mkdir $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\
 copy $(TargetPath) $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\
 copy $(SolutionDir)dll\debug\ $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\
-mkdir $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\
-copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Command>
+copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\conf\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+ 4 - 4
lewaimai_pathplanning/tool/CLewaimaiLog.cpp

@@ -20,19 +20,19 @@ void CLewaimaiLog::Init()
 
 #ifdef _WIN32
 	SharedFileAppenderPtr append_1(
-		new RollingFileAppender(LOG4CPLUS_TEXT("../logs/pathplanning_server.log"), 200 * 1024 * 1024, 100,
+		new RollingFileAppender(LOG4CPLUS_TEXT("log/pathplanning_server.log"), 200 * 1024 * 1024, 100,
 			true, true));
 
 	SharedFileAppenderPtr append_2(
-		new RollingFileAppender(LOG4CPLUS_TEXT("../logs/pathplanning_server_error.log"), 200 * 1024 * 1024, 100,
+		new RollingFileAppender(LOG4CPLUS_TEXT("log/pathplanning_server_error.log"), 200 * 1024 * 1024, 100,
 			true, true));
 #else
 	SharedFileAppenderPtr append_1(
-		new RollingFileAppender(LOG4CPLUS_TEXT("/usr/local/lewaimai_pathplanning/logs/pathplanning_server.log"), 200 * 1024 * 1024, 100,
+		new RollingFileAppender(LOG4CPLUS_TEXT("/usr/local/lewaimai_pathplanning/log/pathplanning_server.log"), 200 * 1024 * 1024, 100,
 			true, true));
 
 	SharedFileAppenderPtr append_2(
-		new RollingFileAppender(LOG4CPLUS_TEXT("/usr/local/lewaimai_pathplanning/logs/pathplanning_server_error.log"), 200 * 1024 * 1024, 100,
+		new RollingFileAppender(LOG4CPLUS_TEXT("/usr/local/lewaimai_pathplanning/log/pathplanning_server_error.log"), 200 * 1024 * 1024, 100,
 			true, true));
 #endif
 

+ 0 - 64
proto/PathPlanning.grpc.pb.cc

@@ -1,64 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: PathPlanning.proto
-
-#include "PathPlanning.pb.h"
-#include "PathPlanning.grpc.pb.h"
-
-#include <grpcpp/impl/codegen/async_stream.h>
-#include <grpcpp/impl/codegen/async_unary_call.h>
-#include <grpcpp/impl/codegen/channel_interface.h>
-#include <grpcpp/impl/codegen/client_unary_call.h>
-#include <grpcpp/impl/codegen/method_handler_impl.h>
-#include <grpcpp/impl/codegen/rpc_service_method.h>
-#include <grpcpp/impl/codegen/service_type.h>
-#include <grpcpp/impl/codegen/sync_stream.h>
-namespace pathplanning {
-
-static const char* CPathPlanning_method_names[] = {
-  "/pathplanning.CPathPlanning/CalPath",
-};
-
-std::unique_ptr< CPathPlanning::Stub> CPathPlanning::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) {
-  (void)options;
-  std::unique_ptr< CPathPlanning::Stub> stub(new CPathPlanning::Stub(channel));
-  return stub;
-}
-
-CPathPlanning::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel)
-  : channel_(channel), rpcmethod_CalPath_(CPathPlanning_method_names[0], ::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  {}
-
-::grpc::Status CPathPlanning::Stub::CalPath(::grpc::ClientContext* context, const ::pathplanning::PathPlanningRequest& request, ::pathplanning::PathPlanningReply* response) {
-  return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_CalPath_, context, request, response);
-}
-
-::grpc::ClientAsyncResponseReader< ::pathplanning::PathPlanningReply>* CPathPlanning::Stub::AsyncCalPathRaw(::grpc::ClientContext* context, const ::pathplanning::PathPlanningRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderFactory< ::pathplanning::PathPlanningReply>::Create(channel_.get(), cq, rpcmethod_CalPath_, context, request, true);
-}
-
-::grpc::ClientAsyncResponseReader< ::pathplanning::PathPlanningReply>* CPathPlanning::Stub::PrepareAsyncCalPathRaw(::grpc::ClientContext* context, const ::pathplanning::PathPlanningRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderFactory< ::pathplanning::PathPlanningReply>::Create(channel_.get(), cq, rpcmethod_CalPath_, context, request, false);
-}
-
-CPathPlanning::Service::Service() {
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      CPathPlanning_method_names[0],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< CPathPlanning::Service, ::pathplanning::PathPlanningRequest, ::pathplanning::PathPlanningReply>(
-          std::mem_fn(&CPathPlanning::Service::CalPath), this)));
-}
-
-CPathPlanning::Service::~Service() {
-}
-
-::grpc::Status CPathPlanning::Service::CalPath(::grpc::ServerContext* context, const ::pathplanning::PathPlanningRequest* request, ::pathplanning::PathPlanningReply* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-
-}  // namespace pathplanning
-

+ 0 - 159
proto/PathPlanning.grpc.pb.h

@@ -1,159 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: PathPlanning.proto
-#ifndef GRPC_PathPlanning_2eproto__INCLUDED
-#define GRPC_PathPlanning_2eproto__INCLUDED
-
-#include "PathPlanning.pb.h"
-
-#include <grpcpp/impl/codegen/async_generic_service.h>
-#include <grpcpp/impl/codegen/async_stream.h>
-#include <grpcpp/impl/codegen/async_unary_call.h>
-#include <grpcpp/impl/codegen/method_handler_impl.h>
-#include <grpcpp/impl/codegen/proto_utils.h>
-#include <grpcpp/impl/codegen/rpc_method.h>
-#include <grpcpp/impl/codegen/service_type.h>
-#include <grpcpp/impl/codegen/status.h>
-#include <grpcpp/impl/codegen/stub_options.h>
-#include <grpcpp/impl/codegen/sync_stream.h>
-
-namespace grpc {
-class CompletionQueue;
-class Channel;
-class ServerCompletionQueue;
-class ServerContext;
-}  // namespace grpc
-
-namespace pathplanning {
-
-class CPathPlanning final {
- public:
-  static constexpr char const* service_full_name() {
-    return "pathplanning.CPathPlanning";
-  }
-  class StubInterface {
-   public:
-    virtual ~StubInterface() {}
-    virtual ::grpc::Status CalPath(::grpc::ClientContext* context, const ::pathplanning::PathPlanningRequest& request, ::pathplanning::PathPlanningReply* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::pathplanning::PathPlanningReply>> AsyncCalPath(::grpc::ClientContext* context, const ::pathplanning::PathPlanningRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::pathplanning::PathPlanningReply>>(AsyncCalPathRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::pathplanning::PathPlanningReply>> PrepareAsyncCalPath(::grpc::ClientContext* context, const ::pathplanning::PathPlanningRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::pathplanning::PathPlanningReply>>(PrepareAsyncCalPathRaw(context, request, cq));
-    }
-  private:
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::pathplanning::PathPlanningReply>* AsyncCalPathRaw(::grpc::ClientContext* context, const ::pathplanning::PathPlanningRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::pathplanning::PathPlanningReply>* PrepareAsyncCalPathRaw(::grpc::ClientContext* context, const ::pathplanning::PathPlanningRequest& request, ::grpc::CompletionQueue* cq) = 0;
-  };
-  class Stub final : public StubInterface {
-   public:
-    Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel);
-    ::grpc::Status CalPath(::grpc::ClientContext* context, const ::pathplanning::PathPlanningRequest& request, ::pathplanning::PathPlanningReply* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::pathplanning::PathPlanningReply>> AsyncCalPath(::grpc::ClientContext* context, const ::pathplanning::PathPlanningRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::pathplanning::PathPlanningReply>>(AsyncCalPathRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::pathplanning::PathPlanningReply>> PrepareAsyncCalPath(::grpc::ClientContext* context, const ::pathplanning::PathPlanningRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::pathplanning::PathPlanningReply>>(PrepareAsyncCalPathRaw(context, request, cq));
-    }
-
-   private:
-    std::shared_ptr< ::grpc::ChannelInterface> channel_;
-    ::grpc::ClientAsyncResponseReader< ::pathplanning::PathPlanningReply>* AsyncCalPathRaw(::grpc::ClientContext* context, const ::pathplanning::PathPlanningRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::pathplanning::PathPlanningReply>* PrepareAsyncCalPathRaw(::grpc::ClientContext* context, const ::pathplanning::PathPlanningRequest& request, ::grpc::CompletionQueue* cq) override;
-    const ::grpc::internal::RpcMethod rpcmethod_CalPath_;
-  };
-  static std::unique_ptr<Stub> NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-
-  class Service : public ::grpc::Service {
-   public:
-    Service();
-    virtual ~Service();
-    virtual ::grpc::Status CalPath(::grpc::ServerContext* context, const ::pathplanning::PathPlanningRequest* request, ::pathplanning::PathPlanningReply* response);
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_CalPath : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithAsyncMethod_CalPath() {
-      ::grpc::Service::MarkMethodAsync(0);
-    }
-    ~WithAsyncMethod_CalPath() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CalPath(::grpc::ServerContext* context, const ::pathplanning::PathPlanningRequest* request, ::pathplanning::PathPlanningReply* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestCalPath(::grpc::ServerContext* context, ::pathplanning::PathPlanningRequest* request, ::grpc::ServerAsyncResponseWriter< ::pathplanning::PathPlanningReply>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  typedef WithAsyncMethod_CalPath<Service > AsyncService;
-  template <class BaseClass>
-  class WithGenericMethod_CalPath : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithGenericMethod_CalPath() {
-      ::grpc::Service::MarkMethodGeneric(0);
-    }
-    ~WithGenericMethod_CalPath() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CalPath(::grpc::ServerContext* context, const ::pathplanning::PathPlanningRequest* request, ::pathplanning::PathPlanningReply* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_CalPath : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithRawMethod_CalPath() {
-      ::grpc::Service::MarkMethodRaw(0);
-    }
-    ~WithRawMethod_CalPath() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CalPath(::grpc::ServerContext* context, const ::pathplanning::PathPlanningRequest* request, ::pathplanning::PathPlanningReply* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestCalPath(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_CalPath : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service *service) {}
-   public:
-    WithStreamedUnaryMethod_CalPath() {
-      ::grpc::Service::MarkMethodStreamed(0,
-        new ::grpc::internal::StreamedUnaryHandler< ::pathplanning::PathPlanningRequest, ::pathplanning::PathPlanningReply>(std::bind(&WithStreamedUnaryMethod_CalPath<BaseClass>::StreamedCalPath, this, std::placeholders::_1, std::placeholders::_2)));
-    }
-    ~WithStreamedUnaryMethod_CalPath() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status CalPath(::grpc::ServerContext* context, const ::pathplanning::PathPlanningRequest* request, ::pathplanning::PathPlanningReply* response) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedCalPath(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::pathplanning::PathPlanningRequest,::pathplanning::PathPlanningReply>* server_unary_streamer) = 0;
-  };
-  typedef WithStreamedUnaryMethod_CalPath<Service > StreamedUnaryService;
-  typedef Service SplitStreamedService;
-  typedef WithStreamedUnaryMethod_CalPath<Service > StreamedService;
-};
-
-}  // namespace pathplanning
-
-
-#endif  // GRPC_PathPlanning_2eproto__INCLUDED

Разница между файлами не показана из-за своего большого размера
+ 0 - 2674
proto/PathPlanning.pb.cc


Разница между файлами не показана из-за своего большого размера
+ 0 - 1583
proto/PathPlanning.pb.h


+ 0 - 80
proto/PathPlanning.proto

@@ -1,80 +0,0 @@
-syntax = "proto3";
-
-package pathplanning;
-
-message WaimaiOrder {
-	int64 init_time = 1;
-	int64 confirme_time = 2;
-	int64 daodian_time = 3;
-	int64 quhuo_time = 4;
-	int64 guke_time = 5;
-	int64 songda_time = 6;
-	int64 qiwang_time = 7;
-	
-	int32 chucan_time = 8;
-	int32 jiaofu_time = 9;
-	
-	int32 haoshi_second = 10;
-	
-	int32 is_chaoshi = 11;
-	int32 chaoshi_second = 12;
-	
-	int32 m_waimaiorder_id = 13;
-	int32 m_group_id = 14;
-	int32 m_deliveryman_id = 15;
-	int32 m_status = 16;
-	
-	double shop_lat = 17;
-	double shop_lng = 18;
-	double cus_lat = 19;
-	double cus_lng = 20;
-}
-
-message PathPlanningRequest {
-	double lat = 1; //配送员当前位置的维度
-	double lng = 2; //配送员当前位置的经度
-	
-	string name = 3; //配送员姓名
-	
-	int32 group_id = 4;
-	int32 deliveryman_id = 5; //配送员ID
-	
-	int32 deliveryman_num = 6; //配送员在group中的编号
-	int32 order_num = 7; //新添加的订单在group待分配列表中的编号
-	
-	repeated WaimaiOrder orders = 8;
-	
-	int32 request_type = 9; //请求类型 1:初始配送员路径计算 2:邻接矩阵配送员路径计算
-	
-	int32 group_code = 10; //群组的编号
-	
-	int64 init_time = 11;
-}
-
-message WaimaiOrderTask {
-	int32 order_id = 1; //任务的订单ID
-	int32 task_type = 2; //任务的类型 1:取货 2:送货
-}	
-
-message PathPlanningReply {
-	string status = 1; //请求返回的状态 success:成功 fail:失败
-	string err_message = 2; //请求返回的错误信息
-	
-	double m_bestDes = 3;
-	
-	int32 group_id = 4;
-	int32 deliveryman_id = 5;
-	
-	int32 deliveryman_num = 6; //配送员在group中的编号
-	int32 order_num = 7; //新添加的订单在group待分配列表中的编号
-	
-	int32 request_type = 8; //请求类型 1:初始配送员路径计算 2:邻接矩阵配送员路径计算 3:接入层的单次路径规划请求
-	
-	repeated WaimaiOrderTask bestRoad = 9; //最佳路径的任务顺序,每个任务包含一个订单ID和一个任务类型(取货或者送货),配送员按照这个顺序去执行是最佳的
-	
-	int32 group_code = 10; //群组的编号
-}
-
-service CPathPlanning {
-	rpc CalPath (PathPlanningRequest) returns (PathPlanningReply) {}
-}

+ 0 - 3
proto/readme.txt

@@ -1,3 +0,0 @@
-protoc.exe -I=. --cpp_out=. PathPlanning.proto
-
-protoc.exe -I=. --grpc_out=. --plugin=protoc-gen-grpc=..\tool\grpc_cpp_plugin.exe PathPlanning.proto

BIN
tool/grpc_cpp_plugin.exe


BIN
tool/protoc.exe


+ 0 - 1
tool/readme.txt

@@ -1 +0,0 @@
-这个目录要加入系统的PATH环境变量