1, 接口修改

pandaAnalysis/CivBuilder.cpp

@@ -10,7 +10,7 @@ CivBuilder::CivBuilder()
 
 CivBuilder::~CivBuilder()
 {
-
+	delete mNewInp;
 }
 
 CivNewInp* CivBuilder::getNewInp()

pandaAnalysis/CivHydrSimulation.cpp

@@ -24,7 +24,8 @@ CivHydrSimulation::CivHydrSimulation(CivDbConn* dbConn)
 	mRptFile("test.rpt"), 
 	mBinFile("test.bin")
 {
-
+    if (dbConn)
+        dbConn->checkHyDrNetTable();
 }
 
 CivHydrSimulation::~CivHydrSimulation()
@@ -85,6 +86,8 @@ void CivHydrSimulation::setBinFile(const std::string& binFile)
 void CivHydrSimulation::registDb(CivDbConn* dbConn)
 {
 	mDbConn = dbConn;
+    if (mDbConn)
+        mDbConn->checkHyDrNetTable();
 }
 
 bool CivHydrSimulation::convertInp(const QualityAnalyType analyType, const std::string& qulityName)
@@ -105,12 +108,10 @@ bool CivHydrSimulation::convertInp(const QualityAnalyType analyType, const std::
 		&& !newInp->writeToFile(inpFileName))
 	{
 		delete builder;
-		delete newInp;
 		return false;
 	}
 
 	delete builder;
-	delete newInp;
 	return true;
 }
 
@@ -636,4 +637,4 @@ void CivHydrSimulation::getLinkQuality(short time)
     }
     free(typeCode);
     free(quality);
-}
\ No newline at end of file
+}

pandaDbManager/CivDbConn.h

@@ -118,6 +118,7 @@ public:
 		const std::vector<std::string>& fileds,
 		std::vector< std::map<std::string, std::string>>& result) = 0;
 
+	virtual void checkHyDrNetTable() = 0;
 	// 获取当前执行错误信息
 	Str getLastError() const; 
 	

pandaDbManager/CivPgConn.cpp

@@ -944,3 +944,42 @@ bool CivPgConn::getValuesFromTableByCondition(
     return true;
 }
 
+void  CivPgConn::checkHyDrNetTable()
+{
+  
+    // 创建曲线表
+    CivCurveTableTemp temp;
+    if (!tableExist(temp.name()))
+    {
+        createTable(temp);
+    }
+
+    // 参数表
+    CivParametorTableTemp paraTemp;
+    if (!tableExist(paraTemp.name()))
+    {
+        createTable(paraTemp);
+    }
+
+    // 模式表
+    CivPatternTableTemp patternTemp;
+    if (!tableExist(patternTemp.name()))
+    {
+        createTable(patternTemp);
+    }
+
+    // 结果点表
+    CivNodeResultTableTemp nodeTemp;
+    if (!tableExist(nodeTemp.name()))
+    {
+        createTable(nodeTemp);
+    }
+
+    // 结果线表
+    CivPipeResultTableTemp pipeTemp;
+    if (!tableExist(pipeTemp.name()))
+    {
+        createTable(pipeTemp);
+    }
+}
+

pandaDbManager/CivPgConn.h

@@ -91,6 +91,8 @@ public:
 		 const std::string& condition,
 		 const std::vector<std::string>& fileds,
 		 std::vector< std::map<std::string, std::string>>& result) override;
+
+	 void  checkHyDrNetTable() override;
 	
 private:
 	PGconn* mConn; // 连接对象