1, 方案管理和优化调度接口定义

funcDemo/main.cpp

@@ -23,28 +23,32 @@ int main(int argc, char* argv[])
     /*CivTestContext context(new CivConQuaTest());
     context.contextTest(findUri);*/
 
-    CivTestContext context(new CivModelHydrTest());
-    context.contextTest(findUri);
+    /*CivTestContext context(new CivModelHydrTest());
+    context.contextTest(findUri);*/
 
     // 测试追踪分析
     /*CivTestContext context(new CivConTrackTest());
     context.contextTest(findUri);*/
 
     // 测试根据时段获取值
-    /*CivTestContext context(new CivConGetDataTest());
-    context.contextTest(findUri);*/
+    /*
+        CivTestContext context(new CivConGetDataTest());
+        context.contextTest(findUri);
+    */
 
     // 测试根据
-  /*  CivTestContext context(new CivConGetRptTest());
-    context.contextTest(findUri);*/
+    /*
+        CivTestContext context(new CivConGetRptTest());
+        context.contextTest(findUri);
+    */
 
     // 上游追踪
      /*CivTestContext context(new CivUpstreamTrackingTest());
     context.contextTest(findUri);*/
 
     // 下游追踪
-   /*CivTestContext context(new CivDownStreamTrackingTest());
-    context.contextTest(findUri);*/
+   CivTestContext context(new CivDownStreamTrackingTest());
+    context.contextTest(findUri);
 
 
     // 水源供水范围分析

pandaAnalysis/CivBuilder.cpp

@@ -4,7 +4,7 @@
 
 #define ASSERT(A,B)  if ((A) == nullptr || (B) == nullptr) return;
 
-CivBuilder::CivBuilder()
+CivBuilder::CivBuilder():mNewInp(new CivNewInp())
 {
 }
 
@@ -22,15 +22,12 @@ CivNewInp* CivBuilder::getNewInp()
 CivInpBuilder::CivInpBuilder()
 	:mDbConn(nullptr)
 {
-    mNewInp = new CivNewInp();
-	mNewInp->setTtitle("");
+    
 }
 
 CivInpBuilder::CivInpBuilder(CivDbConn* dbConn)
 	:mDbConn(dbConn)
 {
-    mNewInp = new CivNewInp();
-	mNewInp->setTtitle("");
 }
 
 
@@ -130,11 +127,6 @@ void CivInpBuilder::buildEmitter()
 	mNewInp->setEmitters(emmiters);
 }
 
-CivNewInp* CivInpBuilder::getNewInp()
-{
-	return mNewInp;
-}
-
 void CivInpBuilder::buildPatterns()
 {
 	ASSERT(mDbConn, mNewInp)
@@ -175,7 +167,7 @@ void CivInpBuilder::buildCoordnates()
 
 void CivInpBuilder::buildVertices()
 {
-	
+	return;
 }
 
 void CivInpBuilder::buildLabels()
@@ -202,7 +194,7 @@ void CivInpBuilder::buildTags()
 
 void CivInpBuilder::buildBackDrop()
 {
-
+	return;
 }
 
 void CivInpBuilder::buildQuality()

pandaAnalysis/CivBuilder.h

@@ -38,7 +38,7 @@ public:
 	virtual void buildControls() = 0;
 	virtual void buildRules() = 0;
 	virtual void buildDemands() = 0;
-	virtual CivNewInp* getNewInp();
+	CivNewInp* getNewInp();
 
 protected:
 	CivNewInp* mNewInp;
@@ -57,6 +57,7 @@ public:
 
 	virtual void setQualityType(const QualityAnalyType analyType, const std::string& qulityName);
 	virtual void setDuration(int duration);
+
 	// 注册数据库连接
 	virtual void registDb(CivDbConn* dbConn);
 	virtual void buildNode();
@@ -81,7 +82,6 @@ public:
 	virtual void buildControls();
 	virtual void buildRules();
 	virtual void buildDemands();
-	virtual CivNewInp* getNewInp();       
 
 private:
 	CivDbConn* mDbConn;

pandaAnalysis/CivHydrCompute.cpp

+#include "CivHydrCompute.h"
+
+CivHydrCompute::CivHydrCompute()
+{
+
+}
+
+bool CivHydrCompute::qualityCompute(char* fileName)
+{
+	return true;
+}
+
+bool CivHydrCompute::hdyrCompute(char* inpFile)
+{
+	return true;
+}
\ No newline at end of file

pandaAnalysis/CivHydrCompute.h

+#pragma once
+
+/**
+  水力计算类
+*/
+class CivHydrCompute
+{
+public:
+	CivHydrCompute();
+
+	/**
+	*@brief 水质计算
+	*@param fileName 计算的inp文件名
+	*/
+	bool qualityCompute(char* fileName);
+
+	bool hdyrCompute(char* inpFile);
+};

pandaAnalysis/CivInpConvertor.cpp

+#include "CivInpConvertor.h"
+
+CivInpConvertor::CivInpConvertor(const std::string& uri)
+{
+
+}
+
+CivInpConvertor::~CivInpConvertor()
+{
+
+}
\ No newline at end of file

pandaAnalysis/CivInpConvertor.h

+#pragma once
+#include <string>
+
+/**
+   管网数据库数据转inp文件中转器
+*/
+class CivInpConvertor
+{
+public:
+	CivInpConvertor(const std::string& uri);
+	~CivInpConvertor();
+
+
+	/*
+	   inp文件名，输出文件名，二进制文件名设置和获取
+	*/
+	void setInpFile(const std::string& inpFile) { mInpFile = inpFile; }
+	void setRptFile(const std::string& rptFile) { mRptFile = rptFile; }
+	void setBinFile(const std::string& binFile) { mBinFile = binFile; }
+
+	char* getRptFile() { return const_cast<char*>(mInpFile.c_str()); }
+	char* getInpFile(){ return const_cast<char*>(mRptFile.c_str()); }
+	char* getBinFile(){ return const_cast<char*>(mBinFile.c_str()); }
+
+private:
+	std::string mInpFile; // inp文件名
+	std::string mRptFile; // 报告文件名
+	std::string mBinFile;// 二进制文件名
+};
\ No newline at end of file

pandaAnalysis/CivNewInp.cpp

@@ -10,6 +10,7 @@ CivNewInp::CivNewInp()
     mParamMap[TIMES] = &CivNewInp::setTimes;
     mParamMap[REPORT] = &CivNewInp::setReport;
     mParamMap[ENERGY] = &CivNewInp::setEnergy;
+    setTtitle(" ");
 }
 
 CivNewInp::~CivNewInp()
@@ -457,6 +458,7 @@ void CivNewInp::setTimes(const CivParameter& params)
     {
         return;
     }
+    
     writeHead(TIMES);
     auto iter = tables.rbegin();
     for (; iter != tables.rend(); iter++)

pandaAnalysis/CivOptSchedSimulation.cpp

+#include "CivOptSchedSimulation.h"
+
+CivOptSchedSimulation::CivOptSchedSimulation()
+{
+
+}
+
+bool CivOptSchedSimulation::optimal()
+{
+
+}
\ No newline at end of file

pandaAnalysis/CivOptSchedSimulation.h

+#pragma once
+
+/**
+  Żģ
+*/
+class CivOptSchedSimulation
+{
+public:
+	CivOptSchedSimulation();
+
+	bool optimal();
+
+private:
+
+};

pandaAnalysis/CivProjInpBuilder.cpp

+#include "CivProjInpBuilder.h"
+
+void CivProjInpBuilder::setQualityType(
+	const QualityAnalyType analyType,
+	const std::string& qulityName)
+{
+
+}
+
+void CivProjInpBuilder::setDuration(int duration)
+{
+	mNewInp->setDuration(10);
+}
+
+void CivProjInpBuilder::registDb(CivDbConn* dbConn)
+{
+
+}
+
+void CivProjInpBuilder::buildNode()
+{
+
+}
+
+void CivProjInpBuilder::buildPipe()
+{
+
+}
+
+void CivProjInpBuilder::buildTank()
+{
+
+}
+
+void CivProjInpBuilder::buildVavle()
+{
+
+}
+
+void CivProjInpBuilder::buildPump()
+{
+
+}
+
+void CivProjInpBuilder::buildReservoir()
+{
+
+}
+
+void CivProjInpBuilder::buildEmitter()
+{
+
+}
+
+void CivProjInpBuilder::buildPatterns()
+{
+
+}
+
+void CivProjInpBuilder::buildParamter()
+{
+
+}
+void CivProjInpBuilder::buildCoordnates()
+{
+
+}
+
+void CivProjInpBuilder::buildVertices()
+{
+
+}
+
+void CivProjInpBuilder::buildLabels()
+{
+
+}
+
+void CivProjInpBuilder::buildTags()
+{
+
+}
+
+void CivProjInpBuilder::buildBackDrop()
+{
+
+}
+
+void CivProjInpBuilder::buildQuality()
+{
+
+}
+
+void CivProjInpBuilder::buildSources()
+{
+
+}
+
+void CivProjInpBuilder::buildMixing()
+{
+
+}
+
+void CivProjInpBuilder::buildCurves()
+{
+
+}
+
+void CivProjInpBuilder::buildStatus()
+{
+
+}
+
+void CivProjInpBuilder::buildControls()
+{
+
+}
+
+void CivProjInpBuilder::buildRules()
+{
+
+}
+
+void CivProjInpBuilder::buildDemands()
+{
+
+}
+
+CivNewInp* getNewInp()
+{
+
+}
\ No newline at end of file

pandaAnalysis/CivProjInpBuilder.h

+#pragma once
+#include "CivBuilder.h"
+
+/**
+  ģתinpļ
+*/
+class CivProjInpBuilder :public CivBuilder
+{
+public:
+	virtual void setQualityType(const QualityAnalyType analyType, const std::string& qulityName);
+	virtual void setDuration(int duration);
+	virtual void registDb(CivDbConn* dbConn);
+	virtual void buildNode();
+	virtual void buildPipe();
+	virtual void buildTank();
+	virtual void buildVavle();
+	virtual void buildPump();
+	virtual void buildReservoir();
+	virtual void buildEmitter();
+	virtual void buildPatterns() ;
+	virtual void buildParamter() ;
+	virtual void buildCoordnates() ;
+	virtual void buildVertices() ;
+	virtual void buildLabels() ;
+	virtual void buildTags() ;
+	virtual void buildBackDrop() ;
+	virtual void buildQuality() ;
+	virtual void buildSources() ;
+	virtual void buildMixing() ;
+	virtual void buildCurves() ;
+	virtual void buildStatus() ;
+	virtual void buildControls() ;
+	virtual void buildRules() ;
+	virtual void buildDemands() ;
+};

pandaAnalysis/CivProjSimulation.cpp

+#include "CivProjSimulation.h"
+
+bool CivProjSimulation::simulationProj()
+{
+	return true;
+}
+
+bool CivProjSimulation::averPressureChange()
+{
+	return true;
+}
+
+bool CivProjSimulation::averFlowChange()
+{
+	return true;
+}
+
+bool CivProjSimulation::pressChangeDMA()
+{
+	return true;
+}
+
+bool CivProjSimulation::flowChangeDMA()
+{
+	return true;
+}
+
+bool CivProjSimulation::getDMANodes(std::map<std::string, std::vector<std::string>>& nodes)
+{
+	return true;
+}
+
+bool CivProjSimulation::getDMAPipes(std::map<std::string, std::vector<std::string>>& pipes)
+{
+	return true;
+}
\ No newline at end of file

pandaAnalysis/CivProjSimulation.h

+#pragma once
+#include <map>
+#include <vector>
+#include <string>
+
+/**
+	方案模拟
+*/
+class CivProjSimulation
+{
+public:
+
+	bool simulationProj();
+
+	bool averPressureChange();
+
+	bool averFlowChange();
+
+	bool pressChangeDMA();
+
+	bool flowChangeDMA();
+private:
+	/**
+	*@brief 获取dma分区所对应的点
+	*/
+	bool getDMANodes(std::map<std::string, std::vector<std::string>>& nodes);
+
+	/**
+	*@brief 获取dma分区所对管段
+	*/
+	bool getDMAPipes(std::map<std::string, std::vector<std::string>>& pipes);
+private:
+
+};

pandaAnalysis/pandaAnalysis.vcxproj

@@ -155,13 +155,18 @@
     <ClCompile Include="..\pandaDbManager\CivCommonUtils.cpp" />
     <ClCompile Include="CivGraphFactory.cpp" />
     <ClCompile Include="CivHydDataType.cpp" />
+    <ClCompile Include="CivHydrCompute.cpp" />
     <ClCompile Include="CivHydrFuncInter.cpp" />
     <ClCompile Include="CivHydrSimulation.cpp" />
     <ClCompile Include="CivBuilder.cpp" />
+    <ClCompile Include="CivInpConvertor.cpp" />
     <ClCompile Include="CivInpDirector.cpp" />
     <ClCompile Include="CivNewInp.cpp" />
+    <ClCompile Include="CivOptSchedSimulation.cpp" />
     <ClCompile Include="CivProject.cpp" />
+    <ClCompile Include="CivProjInpBuilder.cpp" />
     <ClCompile Include="CivProjManager.cpp" />
+    <ClCompile Include="CivProjSimulation.cpp" />
     <ClCompile Include="CivSimulResultCache.cpp" />
     <ClCompile Include="CivTrackingAnalysis.cpp" />
   </ItemGroup>
@@ -169,13 +174,18 @@
     <ClInclude Include="CivGraphFactory.h" />
     <ClInclude Include="CivGraphList.h" />
     <ClInclude Include="CivHydDataType.h" />
+    <ClInclude Include="CivHydrCompute.h" />
     <ClInclude Include="CivHydrFuncInter.h" />
     <ClInclude Include="CivHydrSimulation.h" />
     <ClInclude Include="CivBuilder.h" />
+    <ClInclude Include="CivInpConvertor.h" />
     <ClInclude Include="CivInpDirector.h" />
     <ClInclude Include="CivNewInp.h" />
+    <ClInclude Include="CivOptSchedSimulation.h" />
     <ClInclude Include="CivProject.h" />
+    <ClInclude Include="CivProjInpBuilder.h" />
     <ClInclude Include="CivProjManager.h" />
+    <ClInclude Include="CivProjSimulation.h" />
     <ClInclude Include="CivSimulResultCache.h" />
     <ClInclude Include="CivTrackingAnalysis.h" />
   </ItemGroup>

pandaAnalysis/pandaAnalysis.vcxproj.filters

@@ -51,6 +51,21 @@
     <ClCompile Include="CivProject.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
+    <ClCompile Include="CivProjInpBuilder.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="CivInpConvertor.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="CivProjSimulation.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="CivHydrCompute.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="CivOptSchedSimulation.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CivHydrFuncInter.h">
@@ -89,5 +104,20 @@
     <ClInclude Include="CivProject.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="CivProjInpBuilder.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="CivInpConvertor.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="CivProjSimulation.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="CivHydrCompute.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="CivOptSchedSimulation.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

pandaDbManager/CivInpDbHelper.cpp

 #include "CivInpDbHelper.h"
 #include "CivTableTemp.h"
 #include "CivConnection.h"
+#include "CivPgDbConnection.h"
 
 
 CivInpDbHelper::CivInpDbHelper(CivConnection* dbConn)
-	:mDbConn(dbConn)
+	:CivInpHelperAbs(dbConn)
 {
 
 }
 
 CivInpDbHelper::~CivInpDbHelper()
 {
-	if (mDbConn != nullptr)
-		delete mDbConn;
 }
 
 bool CivInpDbHelper::getNode(CivNode& node)

pandaDbManager/CivInpDbHelper.h

 #pragma once
 #include "CivAssembly.h"
+#include "CivInpHelperAbs.h"
 #include <memory>
 
-class CivConnection;
 /**
 	从数据库获取inp文件相关的类
 */
-class CivInpDbHelper
+class CivInpDbHelper:public CivInpHelperAbs
 {
 public:
-	explicit CivInpDbHelper(CivConnection* mDbConn);
+	explicit CivInpDbHelper(CivConnection* dbConn);
 	~CivInpDbHelper();
 
-	bool getNode(CivNode& node);
-	bool getPipe(CivPipe& pipe) ;
-	bool getTank(CivTank& tank) ;
-	bool getValve(CivValve& valve) ;
-	bool getPumps(CivPumps& pump) ;
-	bool getReservoirs(CivReservoirs& reservoirs) ;
-	bool getEmitters(CivEmitters& emitter) ;
-	bool getCoordinates(CivCoordinates& coord) ;
-	bool getMixing(CivMixing& mixing) ;
-	bool getParameter(std::vector<CivParameter>& param) ;
-	bool getPatterns(CivPatterns& patterns) ;
-	bool getCurves(CivCurves& curves) ;
-	bool getDemands(CivDemands& demands) ;
-	bool getSources(CivSources& sources) ;
-	bool getStatus(CivStatus& status) ;
-	bool getQuality(CivQuality& quality) ;
-	bool getLabels(CivLabels& labels) ;
-	bool getTags(CivTags& tags) ;
-
-private:
-	CivConnection* mDbConn;
-	std::map<std::string, std::map<std::string, std::string>> mCacheMap;
+	bool getNode(CivNode& node)override;
+	bool getPipe(CivPipe& pipe) override;
+	bool getTank(CivTank& tank) override;
+	bool getValve(CivValve& valve) override;
+	bool getPumps(CivPumps& pump) override;
+	bool getReservoirs(CivReservoirs& reservoirs) override;
+	bool getEmitters(CivEmitters& emitter) override;
+	bool getCoordinates(CivCoordinates& coord) override;
+	bool getMixing(CivMixing& mixing) override;
+	bool getParameter(std::vector<CivParameter>& param) override;
+	bool getPatterns(CivPatterns& patterns) override;
+	bool getCurves(CivCurves& curves) override;
+	bool getDemands(CivDemands& demands) override;
+	bool getSources(CivSources& sources) override;
+	bool getStatus(CivStatus& status) override;
+	bool getQuality(CivQuality& quality) override;
+	bool getLabels(CivLabels& labels) override;
+	bool getTags(CivTags& tags) override;
 };

pandaDbManager/CivInpHelperAbs.h

+#pragma once
+#include "CivAssembly.h"
+
+class CivConnection;
+
+/**
+	תinpݿ
+*/
+class CivInpHelperAbs
+{
+public:
+
+	explicit CivInpHelperAbs(CivConnection* dbConn);
+	virtual ~CivInpHelperAbs();
+
+	virtual bool getNode(CivNode& node) ;
+	virtual bool getPipe(CivPipe& pipe) ;
+	virtual bool getTank(CivTank& tank) ;
+	virtual bool getValve(CivValve& valve) ;
+	virtual bool getPumps(CivPumps& pump) ;
+	virtual bool getReservoirs(CivReservoirs& reservoirs) ;
+	virtual bool getEmitters(CivEmitters& emitter) ;
+	virtual bool getCoordinates(CivCoordinates& coord) ;
+	virtual bool getMixing(CivMixing& mixing) ;
+	virtual bool getParameter(std::vector<CivParameter>& param) ;
+	virtual bool getPatterns(CivPatterns& patterns) ;
+	virtual bool getCurves(CivCurves& curves) ;
+	virtual bool getDemands(CivDemands& demands) ;
+	virtual bool getSources(CivSources& sources) ;
+	virtual bool getStatus(CivStatus& status) ;
+	virtual bool getQuality(CivQuality& quality) ;
+	virtual bool getLabels(CivLabels& labels) ;
+	virtual bool getTags(CivTags& tags) ;
+
+protected:
+	CivConnection* mDbConn;
+	std::map<std::string, std::map<std::string, std::string>> mCacheMap;
+};

pandaDbManager/CivProjInpDbHelper.cpp

+#include "CivProjInpDbHelper.h"
+#include "CivConnection.h"
+
+CivProjInpDbHelper::CivProjInpDbHelper(CivConnection* dbConn)
+	:CivInpHelperAbs(dbConn)
+{
+
+}
+
+CivProjInpDbHelper::~CivProjInpDbHelper()
+{
+
+}
+
+bool CivProjInpDbHelper::getNode(CivNode& node)
+{
+	return true;
+}
+
+bool CivProjInpDbHelper::getPipe(CivPipe& pipe)
+{
+	return true;
+}
+
+bool CivProjInpDbHelper::getTank(CivTank& tank)
+{
+	return true;
+}
+
+bool CivProjInpDbHelper::getValve(CivValve& valve)
+{
+	return true;
+}
+
+bool CivProjInpDbHelper::getPumps(CivPumps& pump)
+{
+	return true;
+}
+
+bool CivProjInpDbHelper::getReservoirs(CivReservoirs& reservoirs)
+{
+	return true;
+}
+
+bool CivProjInpDbHelper::getEmitters(CivEmitters& emitter)
+{
+	return true;
+}
+
+bool CivProjInpDbHelper::getCoordinates(CivCoordinates& coord)
+{
+	return true;
+}
+
+bool CivProjInpDbHelper::getMixing(CivMixing& mixing)
+{
+	return true;
+}
+
+bool CivProjInpDbHelper::getParameter(std::vector<CivParameter>& param)
+{
+	return true;
+}
+
+bool CivProjInpDbHelper::getPatterns(CivPatterns& patterns)
+{
+	return true;
+}
+
+bool CivProjInpDbHelper::getCurves(CivCurves& curves)
+{
+	return true;
+}
+
+bool CivProjInpDbHelper::getDemands(CivDemands& demands)
+{
+	return true;
+}
+
+bool CivProjInpDbHelper::getSources(CivSources& sources)
+{
+	return true;
+}
+
+bool CivProjInpDbHelper::getStatus(CivStatus& status)
+{
+	return true;
+}
+
+bool CivProjInpDbHelper::getQuality(CivQuality& quality)
+{
+	return true;
+}
+
+bool CivProjInpDbHelper::getLabels(CivLabels& labels)
+{
+	return true;
+}
+
+bool CivProjInpDbHelper::getTags(CivTags& tags)
+{
+	return true;
+}
+

pandaDbManager/CivProjInpDbHelper.h

+#pragma once
+#include "CivAssembly.h"
+#include "CivInpHelperAbs.h"
+
+/**
+* 
+*/
+class CivProjInpDbHelper: public CivInpHelperAbs
+{
+public:
+	explicit CivProjInpDbHelper(CivConnection* dbConn);
+
+	~CivProjInpDbHelper();
+
+	bool getNode(CivNode& node)override;
+	bool getPipe(CivPipe& pipe) override;
+	bool getTank(CivTank& tank) override;
+	bool getValve(CivValve& valve) override;
+	bool getPumps(CivPumps& pump) override;
+	bool getReservoirs(CivReservoirs& reservoirs) override;
+	bool getEmitters(CivEmitters& emitter) override;
+	bool getCoordinates(CivCoordinates& coord) override;
+	bool getMixing(CivMixing& mixing) override;
+	bool getParameter(std::vector<CivParameter>& param) override;
+	bool getPatterns(CivPatterns& patterns) override;
+	bool getCurves(CivCurves& curves) override;
+	bool getDemands(CivDemands& demands) override;
+	bool getSources(CivSources& sources) override;
+	bool getStatus(CivStatus& status) override;
+	bool getQuality(CivQuality& quality) override;
+	bool getLabels(CivLabels& labels) override;
+	bool getTags(CivTags& tags) override;
+};

pandaDbManager/pandaDbManager.vcxproj

@@ -162,9 +162,11 @@ copy CivDbConn.h $(OutDir)..\include  /y
     <ClInclude Include="CivConnection.h" />
     <ClInclude Include="CivDbConn.h" />
     <ClInclude Include="CivInpDbHelper.h" />
+    <ClInclude Include="CivInpHelperAbs.h" />
     <ClInclude Include="CivMaintainModel.h" />
     <ClInclude Include="CivPgConn.h" />
     <ClInclude Include="CivPgDbConnection.h" />
+    <ClInclude Include="CivProjInpDbHelper.h" />
     <ClInclude Include="CivTableTemp.h" />
     <ClInclude Include="CivTrackingResultCache.h" />
     <ClInclude Include="CivTypes.h" />
@@ -175,9 +177,11 @@ copy CivDbConn.h $(OutDir)..\include  /y
     <ClCompile Include="CivConnection.cpp" />
     <ClCompile Include="CivDbConn.cpp" />
     <ClCompile Include="CivInpDbHelper.cpp" />
+    <ClCompile Include="CivInpHelperAbs.cpp" />
     <ClCompile Include="CivMaintainModel.cpp" />
     <ClCompile Include="CivPgConn.cpp" />
     <ClCompile Include="CivPgDbConnection.cpp" />
+    <ClCompile Include="CivProjInpDbHelper.cpp" />
     <ClCompile Include="CivTableTemp.cpp" />
     <ClCompile Include="CivTrackingResultCache.cpp" />
   </ItemGroup>

建模文档/Workspace.sws

+<?xml version="1.0" encoding="UTF-8"?>
+<?PowerDesigner signature="Workspace" version="16.5.0.3982"?>
+<!-- do not edit this file -->
+
+<Workspace>
+	<Local Expanded="Yes">
+		<Model Expanded="Yes" ID="{580FE8E0-39C2-4622-A220-B5F2A502195E}" Name="数据库表" Selected="Yes" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" URL="../../水力模型文档/数据库表.pdm"/>
+	</Local>
+	<BrowserModule Name="Repository"/>
+</Workspace>

建模文档/table.sql

---参数--
-CREATE TABLE public.__parameter__
-(
-    id serial primary key,
-    "参数名" character varying(64),
-    "参数值" character varying(128),
-    "参数类型" character varying(20),
-    "管网名" character varying(64)
-);
-
---模式表--
-CREATE TABLE public.__pattern__
-(
-    id serial primary key,
-    "模式名" character varying(64),
-    "时段" integer,
-    "系数" double precision,
-	"类型" integer
-)
-
-CREATE TABLE public.__pattern__
-(
-    id serial primary key,
-    model_name character varying(64),
-    model_type integer,
-    model_data character varying
-)
-
---曲线表--
-CREATE TABLE public.__curve__
-(
-     id serial primary key,
-    "曲线名" character varying(64),
-    "类型" character varying(64),
-    x double precision,
-    y double precision
-)
-
---结果点表--
-CREATE TABLE public.__node_result__
-(
-    id serial primary key,
-    "本点号" character varying(20),
-    "类型" integer,
-    "压力" double precision,
-    "水头" double precision,
-    "标高" double precision,
-    "实际需水量" double precision,
-    "水池容量" double precision,
-    "水池最大容量" double precision,
-    "液位高度" double precision,
-    "水质" double precision,
-    "时间" timestamp without time zone
-)
-
---结果线表--
-CREATE TABLE public.__pipe_result__
-(
-    id serial primary key,
-    "编号" character varying(20),
-    "流量" double precision,
-    "流向" integer,
-    "流速" double precision,
-    "水头损失" double precision,
-    "单位水头损" double precision,
-    "上点水头" double precision,
-    "本点水头" double precision,
-    "局部水头损" double precision,
-    "摩擦水头损" double precision,
-    "状态" character varying(20),
-    "水质" double precision,
-    "时间" timestamp without time zone
-)