From 6ce14499cf5d525686a984b62aeac3dc3c0354d7 Mon Sep 17 00:00:00 2001
From: Kane Wang <wangkane@qq.com>
Date: Fri, 27 Dec 2019 17:04:44 +0800
Subject: [PATCH] ...

---
 .../car_dealer_util/car_dealer_util.vcxproj   |  4 ++++
 .../car_dealer_util.vcxproj.filters           | 23 +++++++++++++------
 .../oracle/ImportToOracle.cpp                 | 12 ++++++++++
 .../DataManipulation/oracle/ImportToOracle.h  | 11 +++++++++
 .../cpp/car_dealer_util/source/test/test.cpp  | 12 +++++-----
 5 files changed, 49 insertions(+), 13 deletions(-)
 create mode 100644 代码/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.cpp
 create mode 100644 代码/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.h

diff --git a/代码/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj b/代码/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj
index 7c84b28..febb8b0 100644
--- a/代码/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj
+++ b/代码/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj
@@ -19,6 +19,7 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\source\Data\DataManipulation\Excel\ExportToExcel.cpp" />
     <ClCompile Include="..\..\..\source\Data\DataManipulation\Excel\LoadFromExcel.cpp" />
+    <ClCompile Include="..\..\..\source\Data\DataManipulation\oracle\ImportToOracle.cpp" />
     <ClCompile Include="..\..\..\source\Data\Datastructure\CarDealerAchievement\CarDealerAchievement.cpp" />
     <ClCompile Include="..\..\..\source\Data\Datastructure\CarDealerScheme\CarDealerScheme.cpp" />
     <ClCompile Include="..\..\..\source\data\Datastructure\RepairOrder\RepairOrder.cpp" />
@@ -40,6 +41,7 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\source\Data\DataManipulation\Excel\ExportToExcel.h" />
     <ClInclude Include="..\..\..\source\Data\DataManipulation\Excel\LoadFromExcel.h" />
+    <ClInclude Include="..\..\..\source\Data\DataManipulation\oracle\ImportToOracle.h" />
     <ClInclude Include="..\..\..\source\Data\Datastructure\CarDealerAchievement\CarDealerAchievement.h" />
     <ClInclude Include="..\..\..\source\Data\Datastructure\CarDealerScheme\CarDealerScheme.h" />
     <ClInclude Include="..\..\..\source\data\Datastructure\RepairOrder\RepairOrder.h" />
@@ -83,10 +85,12 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\..\..\..\..\..\sdk\cpp\libxl\libxl-3.8.5.0\libxl_3.8.5.0_x64.props" />
+    <Import Project="..\..\..\..\..\..\..\..\..\sdk\cpp\ocilib\4.6.3\ocilib_4.6.3_x64_vs2019_ansi.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\..\..\..\..\..\sdk\cpp\libxl\libxl-3.8.5.0\libxl_3.8.5.0_x64.props" />
+    <Import Project="..\..\..\..\..\..\..\..\..\sdk\cpp\ocilib\4.6.3\ocilib_4.6.3_x64_vs2019_ansi.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
diff --git a/代码/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj.filters b/代码/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj.filters
index cde6766..9eb4cf8 100644
--- a/代码/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj.filters
+++ b/代码/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj.filters
@@ -47,9 +47,6 @@
     <Filter Include="数据\数据管理\导入导出">
       <UniqueIdentifier>{1aa1a23b-6239-4b36-98be-cd6497547504}</UniqueIdentifier>
     </Filter>
-    <Filter Include="数据\数据管理\excel">
-      <UniqueIdentifier>{849ef05c-ca3c-479b-ad38-3b9eae188820}</UniqueIdentifier>
-    </Filter>
     <Filter Include="测试">
       <UniqueIdentifier>{c6a0a5fd-26f9-4d8d-84a5-ce7edb04eb5f}</UniqueIdentifier>
     </Filter>
@@ -62,6 +59,12 @@
     <Filter Include="操作系统">
       <UniqueIdentifier>{fe56cbb8-cdae-4845-ba36-378341641817}</UniqueIdentifier>
     </Filter>
+    <Filter Include="数据\数据管理\导入导出\excel">
+      <UniqueIdentifier>{849ef05c-ca3c-479b-ad38-3b9eae188820}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="数据\数据管理\导入导出\oracle">
+      <UniqueIdentifier>{cfe6b511-cb09-441f-8496-69415615391a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\source\main.cpp">
@@ -77,10 +80,10 @@
       <Filter>数据\数据结构\车商业绩表</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\source\Data\DataManipulation\Excel\ExportToExcel.cpp">
-      <Filter>数据\数据管理\excel</Filter>
+      <Filter>数据\数据管理\导入导出\excel</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\source\Data\DataManipulation\Excel\LoadFromExcel.cpp">
-      <Filter>数据\数据管理\excel</Filter>
+      <Filter>数据\数据管理\导入导出\excel</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\source\test\test.cpp">
       <Filter>测试</Filter>
@@ -94,6 +97,9 @@
     <ClCompile Include="..\..\..\source\system\system_util.cpp">
       <Filter>操作系统</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\source\Data\DataManipulation\oracle\ImportToOracle.cpp">
+      <Filter>数据\数据管理\导入导出\oracle</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <QtRcc Include="..\..\..\source\resource.qrc">
@@ -128,10 +134,10 @@
       <Filter>数据\数据结构\车商业绩表</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\source\Data\DataManipulation\Excel\ExportToExcel.h">
-      <Filter>数据\数据管理\excel</Filter>
+      <Filter>数据\数据管理\导入导出\excel</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\source\Data\DataManipulation\Excel\LoadFromExcel.h">
-      <Filter>数据\数据管理\excel</Filter>
+      <Filter>数据\数据管理\导入导出\excel</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\source\test\test.h">
       <Filter>测试</Filter>
@@ -145,5 +151,8 @@
     <ClInclude Include="..\..\..\source\system\system_util.h">
       <Filter>操作系统</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\source\Data\DataManipulation\oracle\ImportToOracle.h">
+      <Filter>数据\数据管理\导入导出\oracle</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/代码/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.cpp b/代码/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.cpp
new file mode 100644
index 0000000..f877020
--- /dev/null
+++ b/代码/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.cpp
@@ -0,0 +1,12 @@
+#include <ocilib.h>
+#include <stdexcept>
+#include "ImportToOracle.h"
+
+using namespace std;
+
+void ImportCarDealerAchievementToOracle(std::string                         userName,
+	std::string                         password,
+	std::string                         tnsName,
+	std::vector<CarDealerAchievement>& achievementVector)
+{
+}
diff --git a/代码/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.h b/代码/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.h
new file mode 100644
index 0000000..10c8727
--- /dev/null
+++ b/代码/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include <string>
+#include <vector>
+#include "../../Datastructure/CarDealerAchievement/CarDealerAchievement.h"
+
+
+void ImportCarDealerAchievementToOracle(std::string                         userName,
+	std::string                         password,
+	std::string                         tnsName,
+	std::vector<CarDealerAchievement>& achievementVector);
diff --git a/代码/cpp/car_dealer_util/source/test/test.cpp b/代码/cpp/car_dealer_util/source/test/test.cpp
index 3e6251e..67a0fb4 100644
--- a/代码/cpp/car_dealer_util/source/test/test.cpp
+++ b/代码/cpp/car_dealer_util/source/test/test.cpp
@@ -19,15 +19,15 @@ void excelTest()
 {
 	vector<CarDealerScheme>      schemeVector;
 	vector<CarDealerAchievement> achievementsVector;
-	vector<RepairOrder> repairOrderVector;
-	
-	wstring filePath = L"D:/develop/projects_win/2019/car_dealer_util/数据/345517_1.xls";
+	vector<RepairOrder>          repairOrderVector;
+
+	wstring filePath = L"D:/develop/projects_win/2019/car_dealer_util/数据/送返修工单/送返修工单.xlsx";
 
 	string xlsFilePath = "D:/develop/projects_win/2019/car_dealer_util/数据/345517_1.xls";
-	
+
 	//LoadCarDealerSchemeFromXlsx(filePath, 0, 1, schemeVector);
 	//LoadCarDealerAchievementFromXlsx( filePath, 0, 1, achievementsVector );
-	LoadRepairOrderFromXls(filePath, 0, 1, repairOrderVector);
+	LoadRepairOrderFromXlsx(filePath, 0, 1, repairOrderVector);
 
 	return;
 }
@@ -37,4 +37,4 @@ void test_username()
 	wstring userName = getUserName();
 
 	QMessageBox::information(nullptr, "测试", QString::fromStdWString(userName));
-}
\ No newline at end of file
+}