水力接口修改

funcDemo/main.cpp

@@ -6,6 +6,8 @@
 #include "string.h"
 #include "CivTestContext.h"
 #include "CivHydrTest.h"
+#include <vector>
+#include <string>
 
 using namespace std;
 
@@ -47,14 +49,24 @@ int main(int argc, char* argv[])
     context.contextTest(findUri);*/
 
     // 下游追踪
-   CivTestContext context(new CivDownStreamTrackingTest());
-    context.contextTest(findUri);
+   /*CivTestContext context(new CivDownStreamTrackingTest());
+    context.contextTest(findUri);*/
 
 
     // 水源供水范围分析
    /* CivTestContext context(new CivWaterSupplyScopeTest());
     context.contextTest(findUri);*/
 
+    int base = 10000001;
+    std::vector<std::string> vec;
+    for (int i = base; i < base + 730; i++)
+    {
+        std::string res = std::to_string(i);
+        res ="JD"+ res.substr(1, res.length());
+        vec.push_back(res);
+        std::cout << res << std::endl;
+    }
+
     getchar();
     return 0;
 }
\ No newline at end of file

pandaAnalysis/CivHydrFuncInter.cpp

@@ -116,7 +116,7 @@ bool FUNEXPORT getRptByCondition(char* uri, char* type, char* condition, char* r
     if (type == PIPENODE)
     {
 
-        table = "__node_result__";
+        table = NODERESULTTABLE;
         CivNodeResultTableTemp::NodeResultTable tableTemp;
 
         fileds.push_back(tableTemp.Number);
@@ -129,7 +129,7 @@ bool FUNEXPORT getRptByCondition(char* uri, char* type, char* condition, char* r
     }
     else if (type == PIPELINE)
     {
-        table = "__pipe_result__";
+        table = PIPERESULTTABLE;
         CivPipeResultTableTemp::PipeResultTable pipeTable;
         
         fileds.push_back(pipeTable.szNo);

pandaAnalysis/CivProjSimulation.cpp

@@ -25,12 +25,7 @@ bool CivProjSimulation::flowChangeDMA()
 	return true;
 }
 
-bool CivProjSimulation::getDMANodes(std::map<std::string, std::vector<std::string>>& nodes)
+void CivProjSimulation::getDMADatas(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

@@ -4,7 +4,7 @@
 #include <string>
 
 /**
-	方案模拟
+方案模拟
 */
 class CivProjSimulation
 {
@@ -21,14 +21,12 @@ public:
 	bool flowChangeDMA();
 private:
 	/**
-	*@brief 获取dma分区所对应的点
-	*/
-	bool getDMANodes(std::map<std::string, std::vector<std::string>>& nodes);
+	 *@brief 获取dma分区所对应的点
+	 */
+	void getDMADatas(std::map<std::string, std::vector<std::string>>& nodes);
+
 
-	/**
-	*@brief 获取dma分区所对管段
-	*/
-	bool getDMAPipes(std::map<std::string, std::vector<std::string>>& pipes);
 private:
+	std::map<std::string, std::string> m;
 
 };

pandaDbManager/CivDbConn.h

@@ -64,20 +64,6 @@ public:
 	*/
 	virtual bool deleteByField(StrQuote table, StrQuote filedName, StrQuote fieldValue) =0 ;
 
-	/**
-	 *@brief 根据时段将结果电表的数据回填到管网节点表
-	 *@param currDate 日期字符串， 格式： xxxx-xx-xx
-	 *@param interval 时段
-	 */
-	virtual bool updateNodeByInterval(StrQuote currDate, StrQuote interval)=0;
-
-	/**
-	 *@brief 根据时段将结果线表的数据回填到管网管线表
-	 *@param currDate 日期字符串， 格式： xxxx-xx-xx
-	 *@param interval 时段
-	 */
-	virtual bool updateLinkByInterval(StrQuote currDate, StrQuote interval)=0;
-
 	/**
 	 *@brief 更新点表数据
 	 *@param nodeItems：需要更新的值

pandaDbManager/CivDbUtils.cpp

+#include "CivDbUtils.h"
+#include "CivConnection.h"
+
+CivConnection* CivDbUtils::getConnection()
+{
+	return nullptr;
+}
\ No newline at end of file

pandaDbManager/CivDbUtils.h

+#pragma once
+
+class CivConnection;
+
+/**
+   ݿ
+*/
+class CivDbUtils
+{
+public:
+	static CivConnection* getConnection();
+};

pandaDbManager/CivPgConn.cpp

@@ -22,13 +22,13 @@ CivPgConn::~CivPgConn()
 
 bool CivPgConn::deleteByField(StrQuote table, StrQuote filedName, StrQuote fieldValue)
 {
-    char delSql[256] = "delete from public.\"";
-    strcat_s(delSql, table.c_str());
-    strcat_s(delSql, "\" where   ");
-    strcat_s(delSql, filedName.c_str());
-    strcat_s(delSql, "='");
-    strcat_s(delSql, fieldValue.c_str());
-    strcat_s(delSql, "'");
+    std::string delSql = "delete from public.\"";
+    delSql.append(table);
+    delSql.append("\" where   ");
+    delSql.append(filedName);
+    delSql.append("='");
+    delSql.append(fieldValue);
+    delSql.append("'");
 
     std::string utf8Sql = TransUTFCoding(delSql);
 
@@ -42,90 +42,6 @@ bool CivPgConn::deleteByField(StrQuote table, StrQuote filedName, StrQuote field
     return true;
 }
 
-bool CivPgConn::updateNodeByInterval(StrQuote currDate, StrQuote interval)
-{
-    std::stringstream os;
-    NodeFieldName filedNames;
-
-    os << "UPDATE  "
-        << PIPENODE << "  AS  tb1 set ("
-        << "总水头"<< ","
-        << "压力"<< ","
-        << "实际需水量"<<","
-        <<"水质"
-        << ")=( "
-        << "tb2." << filedNames.dHead << ","
-        << "tb2." << filedNames.dPressure << ","
-        << "tb2." << filedNames.dDemand <<","
-        << "tb2." << filedNames.dQuality << ")"
-        << " from "
-        << NODERESULTTABLE<< " AS tb2 where tb1."
-        << filedNames.Number << "= tb2."
-        <<filedNames.Number << " AND tb2."
-        << filedNames.dDate<< "='" << currDate << "'  AND tb2."
-        << filedNames.dInterval<< "=" << interval;
-
-    std::string updateSql = os.str();
-    os.clear();
-    os.str("");
-
-   std::string utfSql = TransUTFCoding(updateSql);
-    if (!execSql(utfSql))
-    {
-        CivSysLog::getInstance()->error(mLastError, "CivPgConn", __FUNCTION__);
-        return false;
-    }
-
-    return true;
-}
-
-bool CivPgConn::updateLinkByInterval(StrQuote currDate, StrQuote interval)
-{
-    std::stringstream os;
-    LinkFiledName filedNames;
-
-    os << "UPDATE  "
-        << PIPELINE<< "  AS  tb1 set ("
-        << "流量"<< ","
-        << "流速"<< ","
-        << "单位水头损"<< ","
-        << "水头总损失"<< ","
-        << "摩擦水头损"<< ","
-        << "上点水头"<< ","
-        << "本点水头"<< ","
-        << "局部水头损"<<","
-        <<"水质"
-        << ")=( "
-        << "tb2." << filedNames.dFlow<< ","
-        << "tb2." << filedNames.dVelocity<< ","
-        << "tb2." << filedNames.dUnitHeadloss<< ","
-        << "tb2." << filedNames.dHeadloss<< ","
-        << "tb2." << filedNames.dFrictionHeadloss<< ","
-        << "tb2." << filedNames.dFromNodHeadloss<< ","
-        << "tb2." << filedNames.dToNodHeadloss<< ","
-        << "tb2." << filedNames.dLocalHeadloss<<","
-        <<" tb2."<< filedNames.dQuality<< ")" 
-        << "  from "
-        << PIPERESULTTABLE<< " AS tb2 where tb1."
-        << filedNames.szNo<< "= tb2."
-        << filedNames.szNo<< " AND tb2."
-        << filedNames.dDate<< "='" << currDate << "'  AND tb2."
-        << filedNames.dInterval<< "=" << interval;
-
-    std::string updateSql = os.str();
-    os.clear();
-    os.str("");
-
-    std::string utfSql = TransUTFCoding(updateSql);
-    if (!execSql(utfSql))
-    {
-        CivSysLog::getInstance()->error(mLastError, "CivPgConn", __FUNCTION__);
-        return false;
-    }
-
-    return true;
-}
-
 bool CivPgConn::updateNode(const NodeResultItems& nodeItems)
 {
     if (!isValid())
@@ -384,23 +300,24 @@ bool CivPgConn::getPipe(CivPipe& pipe)
     CivPipeTableTemp::PipeTable pipeTable;
 
     //;ID              	Node1           	Node2           	Length      	Diameter    	Roughness   	MinorLoss   	Status
-    char sql[256] = "select ";
-    strcat_s(sql, pipeTable.snNo.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, pipeTable.lastPoint.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, pipeTable.thePoint.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, pipeTable.length.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, pipeTable.diameter.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, pipeTable.friction.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, pipeTable.localHeadLoss.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, pipeTable.status.c_str());
-    strcat_s(sql, " from  管段");
+    std::string sql = "select ";
+    sql.append(pipeTable.snNo.c_str());
+    sql.append(",");
+    sql.append(pipeTable.lastPoint);
+    sql.append(",");
+    sql.append(pipeTable.thePoint);
+    sql.append(",");
+    sql.append(pipeTable.length);
+    sql.append(",");
+    sql.append(pipeTable.diameter);
+    sql.append(",");
+    sql.append(pipeTable.friction);
+    sql.append(",");
+    sql.append(pipeTable.localHeadLoss);
+    sql.append(",");
+    sql.append(pipeTable.status);
+    sql.append(" from  ");
+    sql.append(PIPELINE)
 
     std::string utf8Sql = TransUTFCoding(sql);
     if (!execSql(utf8Sql))
@@ -434,25 +351,25 @@ bool CivPgConn::getTank(CivTank& tank)
     CivTankTableTemp::TankTable tankTable;
 
     //;ID              	Elevation   	InitLevel   	MinLevel    	MaxLevel    	Diameter    	MinVol      	VolCurve
-    char sql[512] = "select ";
-    strcat_s(sql, tankTable.thePoint.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, tankTable.elev.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, tankTable.initLevel.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, tankTable.lowLevel.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, tankTable.highLevel.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, tankTable.diametor.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, tankTable.capacity.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, tankTable.volCurve.c_str());
-    strcat_s(sql, " from  public.\"");
-    strcat_s(sql, TANK.c_str());
-    strcat_s(sql, "\"");
+    std::string sql = "select ";
+    sql.append(tankTable.thePoint);
+    sql.append(",");
+    sql.append(tankTable.elev);
+    sql.append(",");
+    sql.append(tankTable.initLevel);
+    sql.append(",");
+    sql.append(tankTable.lowLevel);
+    sql.append(",");
+    sql.append(tankTable.highLevel);
+    sql.append(",");
+    sql.append(tankTable.diametor);
+    sql.append(",");
+    sql.append(tankTable.capacity);
+    sql.append(",");
+    sql.append(tankTable.volCurve);
+    sql.append(" from  public.\"");
+    sql.append(TANK);
+    sql.append("\"");
 
     std::string utf8Sql = TransUTFCoding(sql);
     if (!execSql(utf8Sql))
@@ -487,23 +404,23 @@ bool CivPgConn::getValve(CivValve& valve)
     CivValveTableTemp::ValveTable vaveTable;
 
     //;ID              	Node1           	Node2           	Length      	Diameter    	Roughness   	MinorLoss   	Status
-    char sql[256] = "select ";
-    strcat_s(sql, vaveTable.id.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, vaveTable.startPoint.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, vaveTable.endPoint.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, vaveTable.diameter.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, vaveTable.type.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, vaveTable.setting.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, vaveTable.loss.c_str());
-    strcat_s(sql, " from  public.\"");
-    strcat_s(sql, VALVE.c_str());
-    strcat_s(sql, "\"");
+    std::string sql = "select ";
+    sql.append(vaveTable.id);
+    sql.append(",");
+    sql.append(vaveTable.startPoint);
+    sql.append(",");
+    sql.append(vaveTable.endPoint);
+    sql.append(",");
+    sql.append(vaveTable.diameter);
+    sql.append(",");
+    sql.append(vaveTable.type);
+    sql.append(",");
+    sql.append(vaveTable.setting);
+    sql.append(",");
+    sql.append(vaveTable.loss);
+    sql.append(" from  public.\"");
+    sql.append(VALVE);
+    sql.append("\"");
 
     std::string utf8Sql = TransUTFCoding(sql);
     if (!execSql(utf8Sql))
@@ -537,17 +454,17 @@ bool CivPgConn::getPumps(CivPumps& pump)
     CivPumpTableTemp::PumpTable pmTable;
 
     //;ID              	Node1           	Node2           	Length      	Diameter    	Roughness   	MinorLoss   	Status
-    char sql[256] = "select ";
-    strcat_s(sql, pmTable.thePoint.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, pmTable.startPoint.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, pmTable.endPoint.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, pmTable.headCurve.c_str());
-    strcat_s(sql, " from  public.\"");
-    strcat_s(sql, PUMP.c_str());
-    strcat_s(sql, "\"");
+    std::string sql = "select ";
+    sql.append(pmTable.thePoint);
+    sql.append(",");
+    sql.append(pmTable.startPoint);
+    sql.append(",");
+    sql.append(pmTable.endPoint);
+    sql.append(",");
+    sql.append(pmTable.headCurve);
+    sql.append(" from  public.\"");
+    sql.append(PUMP);
+    sql.append("\"");
 
     std::string utf8Sql = TransUTFCoding(sql);
     if (!execSql(utf8Sql))
@@ -577,15 +494,15 @@ bool CivPgConn::getReservoirs(CivReservoirs& reservoirs)
     CivResourcesTableTemp::ResourcesTable restemTable;
 
     //;ID              	Head        	Pattern     
-    char sql[512] = "select ";
-    strcat_s(sql, restemTable.thePoint.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, restemTable.head.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, restemTable.headPattern.c_str());
-    strcat_s(sql, " from  public.\"");
-    strcat_s(sql, RESIVOIR.c_str());
-    strcat_s(sql,"\"");
+    std::string sql = "select ";
+    sql.append(restemTable.thePoint);
+    sql.append(",");
+    sql.append(restemTable.head);
+    sql.append(",");
+    sql.append(restemTable.headPattern);
+    sql.append(" from  public.\"");
+    sql.append(RESIVOIR);
+    sql.append("\"");
 
     std::string utf8Sql = TransUTFCoding(sql);
     if (!execSql(utf8Sql))
@@ -617,35 +534,35 @@ bool CivPgConn::getCoordinates(CivCoordinates& coord)
 {
     CivJunctionTableTemp::JunctionTable nodeTable;
 
-    char sql[512] = "select ";
-    strcat_s(sql, TransUTFCoding(nodeTable.thePoint).c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, TransUTFCoding(nodeTable.xCoord).c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, TransUTFCoding(nodeTable.yCoord).c_str());
-    strcat_s(sql, " from public.\"");
-    strcat_s(sql, TransUTFCoding(PIPENODE).c_str());
-    strcat_s(sql, "\"");
+    std::string sql = "select ";
+    sql.append(TransUTFCoding(nodeTable.thePoint));
+    sql.append(",");
+    sql.append(TransUTFCoding(nodeTable.xCoord));
+    sql.append(",");
+    sql.append(TransUTFCoding(nodeTable.yCoord));
+    sql.append(" from public.\"");
+    sql.append(TransUTFCoding(PIPENODE));
+    sql.append("\"");
 
-    strcat_s(sql, " UNION  select ");
-    strcat_s(sql, TransUTFCoding(nodeTable.thePoint).c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, TransUTFCoding(nodeTable.xCoord).c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, TransUTFCoding(nodeTable.yCoord).c_str());
-    strcat_s(sql, " from public.\"");
-    strcat_s(sql, TransUTFCoding(TANK).c_str());
-    strcat_s(sql, "\"");
+    sql.append(" UNION  select ");
+    sql.append(TransUTFCoding(nodeTable.thePoint));
+    sql.append(",");
+    sql.append(TransUTFCoding(nodeTable.xCoord));
+    sql.append(",");
+    sql.append(TransUTFCoding(nodeTable.yCoord));
+    sql.append(" from public.\"");
+    sql.append(TransUTFCoding(TANK));
+    sql.append("\"");
 
-    strcat_s(sql, " UNION  select ");
-    strcat_s(sql, TransUTFCoding(nodeTable.thePoint).c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, TransUTFCoding(nodeTable.xCoord).c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, TransUTFCoding(nodeTable.yCoord).c_str());
-    strcat_s(sql, " from public.\"");
-    strcat_s(sql, TransUTFCoding(RESIVOIR).c_str());
-    strcat_s(sql, "\"");
+    sql.append(" UNION  select ");
+    sql.append(TransUTFCoding(nodeTable.thePoint));
+    sql.append(",");
+    sql.append(TransUTFCoding(nodeTable.xCoord));
+    sql.append(",");
+    sql.append(TransUTFCoding(nodeTable.yCoord));
+    sql.append(" from public.\"");
+    sql.append(TransUTFCoding(RESIVOIR));
+    sql.append("\"");
 
     if (!execSql(sql))
     {
@@ -676,13 +593,15 @@ bool CivPgConn::getParameter(std::vector<CivParameter>& params)
 {
     CivParametorTableTemp::ParametorTable restemTable;
 
-    char sql[512] = "select ";
-    strcat_s(sql, restemTable.name.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, restemTable.val.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, restemTable.type.c_str());
-    strcat_s(sql, " from  public.\"__parameter__\"");
+    std::string sql = "select ";
+    sql.append(restemTable.name);
+    sql.append(",");
+    sql.append(restemTable.val);
+    sql.append(",");
+    sql.append(restemTable.type);
+    sql.append(" from  public.\"");
+    sql.append(OPTIONTTABLE);
+    sql.append("\"");
 
     std::string utf8Sql = TransUTFCoding(sql);
     if (!execSql(utf8Sql))
@@ -728,13 +647,15 @@ bool CivPgConn::getPatterns(CivPatterns& patterns)
 {
     CivPatternTableTemp::PatternTable patternTable;
 
-    char sql[512] = "select ";
-    strcat_s(sql, patternTable.modelName.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, patternTable.modelData.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, patternTable.modelType.c_str());
-    strcat_s(sql, " from  public.\"__pattern__\"");
+    std::string sql= "select ";
+    sql.append(patternTable.modelName);
+    sql.append(",");
+    sql.append(patternTable.modelData);
+    sql.append(",");
+    sql.append(patternTable.modelType);
+    sql.append(" from  public.\"");
+    sql.append(PATTERNTABLE);
+    sql.append("\"");
 
     std::string utf8Sql = TransUTFCoding(sql);
     if (!execSql(utf8Sql))
@@ -766,13 +687,15 @@ bool CivPgConn::getCurves(CivCurves& curves)
 {
     CivCurveTableTemp::CurveTable curveTable;
 
-    char sql[512] = "select ";
-    strcat_s(sql, curveTable.CurveName.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, curveTable.CurveType.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, curveTable.CurveData.c_str());
-    strcat_s(sql, " from  public.\"__curve__\"");
+    std::string sql = "select ";
+    sql.append(curveTable.CurveName);
+    sql.append(",");
+    sql.append(curveTable.CurveType);
+    sql.append(",");
+    sql.append(curveTable.CurveData);
+    sql.append(" from  public.\"");
+    sql.append(CURVETABLE);
+    sql.append("\"");
 
     std::string utf8Sql = TransUTFCoding(sql);
     if (!execSql(utf8Sql))
@@ -813,12 +736,12 @@ bool CivPgConn::getQuality(CivQuality& quality)
 {
     CivJunctionTableTemp::JunctionTable nodeTable;
 
-    char sql[256] = "select ";
-    strcat_s(sql, nodeTable.thePoint.c_str());
-    strcat_s(sql, ",");
-    strcat_s(sql, nodeTable.initQuality.c_str());
-    strcat_s(sql, " from ");
-    strcat_s(sql, PIPENODE.c_str());
+    std::string sql = "select ";
+    sql.append(nodeTable.thePoint);
+    sql.append(",");
+    sql.append(nodeTable.initQuality);
+    sql.append(" from ");
+    sql.append(PIPENODE);
 
     std::string utf8Sql = TransUTFCoding(sql);
     if (!execSql(utf8Sql))

pandaDbManager/CivPgConn.h

@@ -68,8 +68,6 @@ public:
 	 *@paramfieldValue：字段值
 	 */
 	 bool deleteByField(StrQuote table, StrQuote filedName, StrQuote fieldValue) override;
-	 bool updateNodeByInterval(StrQuote currDate, StrQuote interval) override;
-	 bool updateLinkByInterval(StrQuote currDate, StrQuote interval) override;
 
 	 /**
 	  *@brief 更新点表数据

pandaDbManager/CivSimuResDbHelper.cpp

+#include "CivSimuResDbHelper.h"
+
+CivSimuResDbHelper::CivSimuResDbHelper()
+{
+
+}
+
+bool CivSimuResDbHelper::saveNode()
+{
+	return true;
+}
+
+bool CivSimuResDbHelper::saveLink()
+{
+	return true;
+}
\ No newline at end of file

pandaDbManager/CivSimuResDbHelper.h

+#pragma once
+#include<string>
+
+class CivConnection;
+/**
+ ģ洢
+*/
+class CivSimuResDbHelper
+{
+public:
+
+	CivSimuResDbHelper();
+
+	CivConnection* getConnection(const std::string& uri);
+
+	bool saveNode();
+
+	bool saveLink();
+private:
+
+};

pandaDbManager/pandaDbManager.vcxproj

@@ -161,12 +161,14 @@ copy CivDbConn.h $(OutDir)..\include  /y
     <ClInclude Include="CivCommonUtils.h" />
     <ClInclude Include="CivConnection.h" />
     <ClInclude Include="CivDbConn.h" />
+    <ClInclude Include="CivDbUtils.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="CivSimuResDbHelper.h" />
     <ClInclude Include="CivTableTemp.h" />
     <ClInclude Include="CivTrackingResultCache.h" />
     <ClInclude Include="CivTypes.h" />
@@ -176,12 +178,14 @@ copy CivDbConn.h $(OutDir)..\include  /y
     <ClCompile Include="CivCommonUtils.cpp" />
     <ClCompile Include="CivConnection.cpp" />
     <ClCompile Include="CivDbConn.cpp" />
+    <ClCompile Include="CivDbUtils.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="CivSimuResDbHelper.cpp" />
     <ClCompile Include="CivTableTemp.cpp" />
     <ClCompile Include="CivTrackingResultCache.cpp" />
   </ItemGroup>

pandaDbManager/pandaDbManager.vcxproj.filters

@@ -48,6 +48,18 @@
     <ClInclude Include="CivInpDbHelper.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="CivInpHelperAbs.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="CivProjInpDbHelper.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="CivSimuResDbHelper.h">
+      <Filter>源文件</Filter>
+    </ClInclude>
+    <ClInclude Include="CivDbUtils.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="CivTableTemp.cpp">
@@ -80,5 +92,17 @@
     <ClCompile Include="CivInpDbHelper.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
+    <ClCompile Include="CivInpHelperAbs.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="CivProjInpDbHelper.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="CivSimuResDbHelper.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="CivDbUtils.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file

建模文档/Workspace.sws

@@ -4,7 +4,8 @@
 
 <Workspace>
 	<Local Expanded="Yes">
-		<Model Expanded="Yes" ID="{580FE8E0-39C2-4622-A220-B5F2A502195E}" Name="数据库表" Selected="Yes" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" URL="../../水力模型文档/数据库表.pdm"/>
+		<Model Expanded="Yes" ID="{580FE8E0-39C2-4622-A220-B5F2A502195E}" Name="数据库表" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" URL="数据库表.pdm"/>
+		<Model Expanded="Yes" ID="{86B7DF8B-722D-43D4-BE7C-02CA3D801BF9}" Name="方案管理类结构" Type="{18112060-1A4B-11D1-83D9-444553540000}" URL="方案管理类结构.oom"/>
 	</Local>
 	<BrowserModule Name="Repository"/>
 </Workspace>

建模文档/方案管理类结构.oob

 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{86B7DF8B-722D-43D4-BE7C-02CA3D801BF9}" Label="" LastModificationDate="1596592410" Name="方案管理类结构" Objects="79" Symbols="3" Target="C++" TargetLink="Reference" Type="{18112060-1A4B-11D1-83D9-444553540000}" signature="CLD_OBJECT_MODEL" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{86B7DF8B-722D-43D4-BE7C-02CA3D801BF9}" Label="" LastModificationDate="1596593839" Name="方案管理类结构" Objects="107" Symbols="7" Target="C++" TargetLink="Reference" Type="{18112060-1A4B-11D1-83D9-444553540000}" signature="CLD_OBJECT_MODEL" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -12,7 +12,7 @@
 <a:Code>方案管理类结构</a:Code>
 <a:CreationDate>1596590660</a:CreationDate>
 <a:Creator>mr.liu</a:Creator>
-<a:ModificationDate>1596592120</a:ModificationDate>
+<a:ModificationDate>1596593756</a:ModificationDate>
 <a:Modifier>mr.liu</a:Modifier>
 <a:PackageOptionsText>[FolderOptions]
 
@@ -971,7 +971,7 @@ ColnFKNameUse=No</a:ModelOptionsText>
 <a:Code>ClassDiagram_1</a:Code>
 <a:CreationDate>1596590660</a:CreationDate>
 <a:Creator>mr.liu</a:Creator>
-<a:ModificationDate>1596592120</a:ModificationDate>
+<a:ModificationDate>1596593756</a:ModificationDate>
 <a:Modifier>mr.liu</a:Modifier>
 <a:DisplayPreferences>[DisplayPreferences]
 
@@ -1456,11 +1456,33 @@ Shadow=0</a:DisplayPreferences>
 <a:PageOrientation>1</a:PageOrientation>
 <a:PaperSource>15</a:PaperSource>
 <c:Symbols>
-<o:ClassSymbol Id="o5">
+<o:AssociationSymbol Id="o5">
+<a:CreationDate>1596593756</a:CreationDate>
+<a:ModificationDate>1596593839</a:ModificationDate>
+<a:DestinationTextWidth>1919</a:DestinationTextWidth>
+<a:Rect>((-9367,5808), (4441,10549))</a:Rect>
+<a:ListOfPoints>((3691,6208),(3691,9659),(-8967,9659))</a:ListOfPoints>
+<a:CornerStyle>1</a:CornerStyle>
+<a:ArrowStyle>3592</a:ArrowStyle>
+<a:LineColor>16744448</a:LineColor>
+<a:ShadowColor>12632256</a:ShadowColor>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N</a:FontList>
+<c:SourceSymbol>
+<o:ClassSymbol Ref="o6"/>
+</c:SourceSymbol>
+<c:DestinationSymbol>
+<o:ClassSymbol Ref="o7"/>
+</c:DestinationSymbol>
+<c:Object>
+<o:Association Ref="o8"/>
+</c:Object>
+</o:AssociationSymbol>
+<o:ClassSymbol Id="o7">
 <a:CreationDate>1596590671</a:CreationDate>
 <a:ModificationDate>1596590671</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-22931,6510), (-9173,12808))</a:Rect>
+<a:Rect>((-23137,6510), (-8967,12808))</a:Rect>
 <a:LineColor>16744448</a:LineColor>
 <a:FillColor>16770222</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -1476,14 +1498,14 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:GradientFillMode>65</a:GradientFillMode>
 <a:GradientEndColor>16777215</a:GradientEndColor>
 <c:Object>
-<o:Class Ref="o6"/>
+<o:Class Ref="o9"/>
 </c:Object>
 </o:ClassSymbol>
-<o:ClassSymbol Id="o7">
+<o:ClassSymbol Id="o6">
 <a:CreationDate>1596592113</a:CreationDate>
-<a:ModificationDate>1596592113</a:ModificationDate>
+<a:ModificationDate>1596593828</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((1682,6060), (8580,9659))</a:Rect>
+<a:Rect>((-6000,-3690), (13382,6208))</a:Rect>
 <a:LineColor>16744448</a:LineColor>
 <a:FillColor>16770222</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -1499,7 +1521,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:GradientFillMode>65</a:GradientFillMode>
 <a:GradientEndColor>16777215</a:GradientEndColor>
 <c:Object>
-<o:Class Ref="o8"/>
+<o:Class Ref="o10"/>
 </c:Object>
 </o:ClassSymbol>
 </c:Symbols>
@@ -1509,18 +1531,34 @@ LABL 0 新宋体,8,N</a:FontList>
 <o:ClassDiagram Ref="o4"/>
 </c:DefaultDiagram>
 <c:Classes>
-<o:Class Id="o6">
+<o:Class Id="o9">
 <a:ObjectID>54F5867D-9817-4788-8E9F-2E59CF290C0A</a:ObjectID>
 <a:Name>CivProjSimulation</a:Name>
 <a:Code>CivProjSimulation</a:Code>
 <a:CreationDate>1596590671</a:CreationDate>
 <a:Creator>mr.liu</a:Creator>
-<a:ModificationDate>1596592005</a:ModificationDate>
+<a:ModificationDate>1596593808</a:ModificationDate>
 <a:Modifier>mr.liu</a:Modifier>
 <a:Comment>方案模拟类</a:Comment>
 <a:UseParentNamespace>0</a:UseParentNamespace>
+<c:Attributes>
+<o:Attribute Id="o11">
+<a:ObjectID>3CD4AC38-64C6-4B4D-8675-BCAF1CE07D7D</a:ObjectID>
+<a:Name>mConvertor</a:Name>
+<a:Code>mConvertor</a:Code>
+<a:CreationDate>1596593770</a:CreationDate>
+<a:Creator>mr.liu</a:Creator>
+<a:ModificationDate>1596593808</a:ModificationDate>
+<a:Modifier>mr.liu</a:Modifier>
+<a:DataType>CivInpConvertor</a:DataType>
+<a:Attribute.Visibility>-</a:Attribute.Visibility>
+<c:ObjectDataType>
+<o:Class Ref="o10"/>
+</c:ObjectDataType>
+</o:Attribute>
+</c:Attributes>
 <c:Operations>
-<o:Operation Id="o9">
+<o:Operation Id="o12">
 <a:ObjectID>6622AEFD-22CC-4599-9141-89D206EAC344</a:ObjectID>
 <a:Name>simulationProj</a:Name>
 <a:Code>simulationProj</a:Code>
@@ -1532,7 +1570,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ReturnType>bool</a:ReturnType>
 <a:TemplateBody>%DefaultBody%</a:TemplateBody>
 </o:Operation>
-<o:Operation Id="o10">
+<o:Operation Id="o13">
 <a:ObjectID>E37711F2-5799-43B2-A85C-4F54458582F5</a:ObjectID>
 <a:Name>averPressureChange</a:Name>
 <a:Code>averPressureChange</a:Code>
@@ -1544,7 +1582,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ReturnType>bool</a:ReturnType>
 <a:TemplateBody>%DefaultBody%</a:TemplateBody>
 </o:Operation>
-<o:Operation Id="o11">
+<o:Operation Id="o14">
 <a:ObjectID>E2A6ECE9-3A92-4A1D-8E17-15B7844F69A6</a:ObjectID>
 <a:Name>averFlowChange</a:Name>
 <a:Code>averFlowChange</a:Code>
@@ -1556,7 +1594,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ReturnType>bool</a:ReturnType>
 <a:TemplateBody>%DefaultBody%</a:TemplateBody>
 </o:Operation>
-<o:Operation Id="o12">
+<o:Operation Id="o15">
 <a:ObjectID>288FF005-BA61-48FF-83FF-286AB2355CE1</a:ObjectID>
 <a:Name>flowChangeDMA</a:Name>
 <a:Code>flowChangeDMA</a:Code>
@@ -1570,20 +1608,185 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Operation>
 </c:Operations>
 </o:Class>
-<o:Class Id="o8">
+<o:Class Id="o10">
 <a:ObjectID>56B1C6C8-76DB-4AB5-9633-199C592CDEA8</a:ObjectID>
 <a:Name>CivInpConvertor</a:Name>
 <a:Code>CivInpConvertor</a:Code>
 <a:CreationDate>1596592113</a:CreationDate>
 <a:Creator>mr.liu</a:Creator>
-<a:ModificationDate>1596592410</a:ModificationDate>
+<a:ModificationDate>1596593808</a:ModificationDate>
 <a:Modifier>mr.liu</a:Modifier>
 <a:Comment>管网数据库数据转inp文件转换器</a:Comment>
 <a:UseParentNamespace>0</a:UseParentNamespace>
+<c:Attributes>
+<o:Attribute Id="o16">
+<a:ObjectID>AE2FB3DA-18EB-47E8-8169-075C468F452E</a:ObjectID>
+<a:Name>mInpFile</a:Name>
+<a:Code>mInpFile</a:Code>
+<a:CreationDate>1596592550</a:CreationDate>
+<a:Creator>mr.liu</a:Creator>
+<a:ModificationDate>1596592612</a:ModificationDate>
+<a:Modifier>mr.liu</a:Modifier>
+<a:DataType>std::string</a:DataType>
+<a:Attribute.Visibility>-</a:Attribute.Visibility>
+</o:Attribute>
+<o:Attribute Id="o17">
+<a:ObjectID>8356215D-4448-4C5C-A566-D5C80621AE04</a:ObjectID>
+<a:Name>mRptFile</a:Name>
+<a:Code>mRptFile</a:Code>
+<a:CreationDate>1596592550</a:CreationDate>
+<a:Creator>mr.liu</a:Creator>
+<a:ModificationDate>1596592612</a:ModificationDate>
+<a:Modifier>mr.liu</a:Modifier>
+<a:DataType>std::string</a:DataType>
+<a:Attribute.Visibility>-</a:Attribute.Visibility>
+</o:Attribute>
+<o:Attribute Id="o18">
+<a:ObjectID>3E706BEF-DC5F-4FFC-AF51-F3364A38EC6D</a:ObjectID>
+<a:Name>mBinFile</a:Name>
+<a:Code>mBinFile</a:Code>
+<a:CreationDate>1596592550</a:CreationDate>
+<a:Creator>mr.liu</a:Creator>
+<a:ModificationDate>1596592612</a:ModificationDate>
+<a:Modifier>mr.liu</a:Modifier>
+<a:DataType>std::string</a:DataType>
+<a:Attribute.Visibility>-</a:Attribute.Visibility>
+</o:Attribute>
+</c:Attributes>
+<c:Operations>
+<o:Operation Id="o19">
+<a:ObjectID>35FB2EAD-CE41-4008-814B-3688001DBB16</a:ObjectID>
+<a:Name>setInpFile</a:Name>
+<a:Code>setInpFile</a:Code>
+<a:CreationDate>1596592612</a:CreationDate>
+<a:Creator>mr.liu</a:Creator>
+<a:ModificationDate>1596592874</a:ModificationDate>
+<a:Modifier>mr.liu</a:Modifier>
+<a:Comment>设置inp文件名</a:Comment>
+<a:ReturnType>void</a:ReturnType>
+<a:TemplateBody>%DefaultBody%</a:TemplateBody>
+<c:Parameters>
+<o:Parameter Id="o20">
+<a:ObjectID>43929EBC-DED8-47FB-8756-5004AC3C23C1</a:ObjectID>
+<a:Name>inpFile</a:Name>
+<a:Code>inpFile</a:Code>
+<a:CreationDate>1596592786</a:CreationDate>
+<a:Creator>mr.liu</a:Creator>
+<a:ModificationDate>1596592812</a:ModificationDate>
+<a:Modifier>mr.liu</a:Modifier>
+<a:Parameter.DataType>std::string</a:Parameter.DataType>
+<a:ParameterType>I</a:ParameterType>
+</o:Parameter>
+</c:Parameters>
+</o:Operation>
+<o:Operation Id="o21">
+<a:ObjectID>7B07E84F-D600-4B10-9EE9-7B52D88D4469</a:ObjectID>
+<a:Name>setRptFile</a:Name>
+<a:Code>setRptFile</a:Code>
+<a:CreationDate>1596592612</a:CreationDate>
+<a:Creator>mr.liu</a:Creator>
+<a:ModificationDate>1596592892</a:ModificationDate>
+<a:Modifier>mr.liu</a:Modifier>
+<a:Comment>设置报告文件名</a:Comment>
+<a:ReturnType>void</a:ReturnType>
+<a:TemplateBody>%DefaultBody%</a:TemplateBody>
+<c:Parameters>
+<o:Parameter Id="o22">
+<a:ObjectID>297765AD-4209-43B6-860D-E3C7C18B3FF2</a:ObjectID>
+<a:Name>rptFiled</a:Name>
+<a:Code>rptFiled</a:Code>
+<a:CreationDate>1596592816</a:CreationDate>
+<a:Creator>mr.liu</a:Creator>
+<a:ModificationDate>1596592829</a:ModificationDate>
+<a:Modifier>mr.liu</a:Modifier>
+<a:Parameter.DataType>std::string</a:Parameter.DataType>
+<a:ParameterType>I</a:ParameterType>
+</o:Parameter>
+</c:Parameters>
+</o:Operation>
+<o:Operation Id="o23">
+<a:ObjectID>BC00252E-790A-4394-A62B-23DFC9F33D88</a:ObjectID>
+<a:Name>setBinFile</a:Name>
+<a:Code>setBinFile</a:Code>
+<a:CreationDate>1596592612</a:CreationDate>
+<a:Creator>mr.liu</a:Creator>
+<a:ModificationDate>1596592904</a:ModificationDate>
+<a:Modifier>mr.liu</a:Modifier>
+<a:Comment>设置二进制文件名</a:Comment>
+<a:ReturnType>void</a:ReturnType>
+<a:TemplateBody>%DefaultBody%</a:TemplateBody>
+<c:Parameters>
+<o:Parameter Id="o24">
+<a:ObjectID>CB278C12-1EFA-4823-9081-C5E14EA185D1</a:ObjectID>
+<a:Name>binFile</a:Name>
+<a:Code>binFile</a:Code>
+<a:CreationDate>1596592835</a:CreationDate>
+<a:Creator>mr.liu</a:Creator>
+<a:ModificationDate>1596592847</a:ModificationDate>
+<a:Modifier>mr.liu</a:Modifier>
+<a:Parameter.DataType>std::string</a:Parameter.DataType>
+<a:ParameterType>I</a:ParameterType>
+</o:Parameter>
+</c:Parameters>
+</o:Operation>
+<o:Operation Id="o25">
+<a:ObjectID>91245E6E-9A36-418C-ADD8-C580A6F45B71</a:ObjectID>
+<a:Name>getRptFile</a:Name>
+<a:Code>getRptFile</a:Code>
+<a:CreationDate>1596592612</a:CreationDate>
+<a:Creator>mr.liu</a:Creator>
+<a:ModificationDate>1596592746</a:ModificationDate>
+<a:Modifier>mr.liu</a:Modifier>
+<a:ReturnType>char*</a:ReturnType>
+<a:TemplateBody>%DefaultBody%</a:TemplateBody>
+</o:Operation>
+<o:Operation Id="o26">
+<a:ObjectID>85074C26-B807-43BD-B2A1-D85DFE1ADE6B</a:ObjectID>
+<a:Name>getInpFile</a:Name>
+<a:Code>getInpFile</a:Code>
+<a:CreationDate>1596592612</a:CreationDate>
+<a:Creator>mr.liu</a:Creator>
+<a:ModificationDate>1596592746</a:ModificationDate>
+<a:Modifier>mr.liu</a:Modifier>
+<a:ReturnType>char*</a:ReturnType>
+<a:TemplateBody>%DefaultBody%</a:TemplateBody>
+</o:Operation>
+<o:Operation Id="o27">
+<a:ObjectID>ACC3AD80-1DCC-42B8-9736-189A6DE5D799</a:ObjectID>
+<a:Name>getBinFile</a:Name>
+<a:Code>getBinFile</a:Code>
+<a:CreationDate>1596592612</a:CreationDate>
+<a:Creator>mr.liu</a:Creator>
+<a:ModificationDate>1596592746</a:ModificationDate>
+<a:Modifier>mr.liu</a:Modifier>
+<a:ReturnType>char*</a:ReturnType>
+<a:TemplateBody>%DefaultBody%</a:TemplateBody>
+</o:Operation>
+</c:Operations>
 </o:Class>
 </c:Classes>
+<c:Associations>
+<o:Association Id="o8">
+<a:ObjectID>E76C5D2B-0C9D-470D-BC2E-547710968B56</a:ObjectID>
+<a:Name>Association_1</a:Name>
+<a:Code>Association_1</a:Code>
+<a:CreationDate>1596593756</a:CreationDate>
+<a:Creator>mr.liu</a:Creator>
+<a:ModificationDate>1596593756</a:ModificationDate>
+<a:Modifier>mr.liu</a:Modifier>
+<a:RoleAIndicator>C</a:RoleAIndicator>
+<a:RoleAMultiplicity>0..1</a:RoleAMultiplicity>
+<a:RoleBMultiplicity>0..*</a:RoleBMultiplicity>
+<c:Object1>
+<o:Class Ref="o9"/>
+</c:Object1>
+<c:Object2>
+<o:Class Ref="o10"/>
+</c:Object2>
+</o:Association>
+</c:Associations>
 <c:TargetModels>
-<o:TargetModel Id="o13">
+<o:TargetModel Id="o28">
 <a:ObjectID>A1B33AC7-73B2-4C8C-885B-B721A5B6DA19</a:ObjectID>
 <a:Name>C++</a:Name>
 <a:Code>C++</a:Code>

建模文档/方案管理类结构.oom

 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{86B7DF8B-722D-43D4-BE7C-02CA3D801BF9}" Label="" LastModificationDate="1596593839" Name="方案管理类结构" Objects="107" Symbols="7" Target="C++" TargetLink="Reference" Type="{18112060-1A4B-11D1-83D9-444553540000}" signature="CLD_OBJECT_MODEL" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{86B7DF8B-722D-43D4-BE7C-02CA3D801BF9}" Label="" LastModificationDate="1596594333" Name="方案管理类结构" Objects="107" Symbols="4" Target="C++" TargetLink="Reference" Type="{18112060-1A4B-11D1-83D9-444553540000}" signature="CLD_OBJECT_MODEL" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -12,7 +12,7 @@
 <a:Code>方案管理类结构</a:Code>
 <a:CreationDate>1596590660</a:CreationDate>
 <a:Creator>mr.liu</a:Creator>
-<a:ModificationDate>1596593756</a:ModificationDate>
+<a:ModificationDate>1596594325</a:ModificationDate>
 <a:Modifier>mr.liu</a:Modifier>
 <a:PackageOptionsText>[FolderOptions]
 
@@ -971,7 +971,7 @@ ColnFKNameUse=No</a:ModelOptionsText>
 <a:Code>ClassDiagram_1</a:Code>
 <a:CreationDate>1596590660</a:CreationDate>
 <a:Creator>mr.liu</a:Creator>
-<a:ModificationDate>1596593756</a:ModificationDate>
+<a:ModificationDate>1596594325</a:ModificationDate>
 <a:Modifier>mr.liu</a:Modifier>
 <a:DisplayPreferences>[DisplayPreferences]
 
@@ -1456,33 +1456,11 @@ Shadow=0</a:DisplayPreferences>
 <a:PageOrientation>1</a:PageOrientation>
 <a:PaperSource>15</a:PaperSource>
 <c:Symbols>
-<o:AssociationSymbol Id="o5">
-<a:CreationDate>1596593756</a:CreationDate>
-<a:ModificationDate>1596593839</a:ModificationDate>
-<a:DestinationTextWidth>1919</a:DestinationTextWidth>
-<a:Rect>((-9367,5808), (4441,10549))</a:Rect>
-<a:ListOfPoints>((3691,6208),(3691,9659),(-8967,9659))</a:ListOfPoints>
-<a:CornerStyle>1</a:CornerStyle>
-<a:ArrowStyle>3592</a:ArrowStyle>
-<a:LineColor>16744448</a:LineColor>
-<a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList>CENTER 0 新宋体,8,N
-SOURCE 0 新宋体,8,N</a:FontList>
-<c:SourceSymbol>
-<o:ClassSymbol Ref="o6"/>
-</c:SourceSymbol>
-<c:DestinationSymbol>
-<o:ClassSymbol Ref="o7"/>
-</c:DestinationSymbol>
-<c:Object>
-<o:Association Ref="o8"/>
-</c:Object>
-</o:AssociationSymbol>
-<o:ClassSymbol Id="o7">
+<o:ClassSymbol Id="o5">
 <a:CreationDate>1596590671</a:CreationDate>
-<a:ModificationDate>1596590671</a:ModificationDate>
+<a:ModificationDate>1596594333</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-23137,6510), (-8967,12808))</a:Rect>
+<a:Rect>((-16477,6450), (-2307,12748))</a:Rect>
 <a:LineColor>16744448</a:LineColor>
 <a:FillColor>16770222</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -1498,14 +1476,14 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:GradientFillMode>65</a:GradientFillMode>
 <a:GradientEndColor>16777215</a:GradientEndColor>
 <c:Object>
-<o:Class Ref="o9"/>
+<o:Class Ref="o6"/>
 </c:Object>
 </o:ClassSymbol>
-<o:ClassSymbol Id="o6">
+<o:ClassSymbol Id="o7">
 <a:CreationDate>1596592113</a:CreationDate>
-<a:ModificationDate>1596593828</a:ModificationDate>
+<a:ModificationDate>1596594331</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-6000,-3690), (13382,6208))</a:Rect>
+<a:Rect>((3660,870), (23042,10768))</a:Rect>
 <a:LineColor>16744448</a:LineColor>
 <a:FillColor>16770222</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -1521,7 +1499,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:GradientFillMode>65</a:GradientFillMode>
 <a:GradientEndColor>16777215</a:GradientEndColor>
 <c:Object>
-<o:Class Ref="o10"/>
+<o:Class Ref="o8"/>
 </c:Object>
 </o:ClassSymbol>
 </c:Symbols>
@@ -1531,7 +1509,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <o:ClassDiagram Ref="o4"/>
 </c:DefaultDiagram>
 <c:Classes>
-<o:Class Id="o9">
+<o:Class Id="o6">
 <a:ObjectID>54F5867D-9817-4788-8E9F-2E59CF290C0A</a:ObjectID>
 <a:Name>CivProjSimulation</a:Name>
 <a:Code>CivProjSimulation</a:Code>
@@ -1542,7 +1520,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>方案模拟类</a:Comment>
 <a:UseParentNamespace>0</a:UseParentNamespace>
 <c:Attributes>
-<o:Attribute Id="o11">
+<o:Attribute Id="o9">
 <a:ObjectID>3CD4AC38-64C6-4B4D-8675-BCAF1CE07D7D</a:ObjectID>
 <a:Name>mConvertor</a:Name>
 <a:Code>mConvertor</a:Code>
@@ -1553,12 +1531,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>CivInpConvertor</a:DataType>
 <a:Attribute.Visibility>-</a:Attribute.Visibility>
 <c:ObjectDataType>
-<o:Class Ref="o10"/>
+<o:Class Ref="o8"/>
 </c:ObjectDataType>
 </o:Attribute>
 </c:Attributes>
 <c:Operations>
-<o:Operation Id="o12">
+<o:Operation Id="o10">
 <a:ObjectID>6622AEFD-22CC-4599-9141-89D206EAC344</a:ObjectID>
 <a:Name>simulationProj</a:Name>
 <a:Code>simulationProj</a:Code>
@@ -1570,7 +1548,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ReturnType>bool</a:ReturnType>
 <a:TemplateBody>%DefaultBody%</a:TemplateBody>
 </o:Operation>
-<o:Operation Id="o13">
+<o:Operation Id="o11">
 <a:ObjectID>E37711F2-5799-43B2-A85C-4F54458582F5</a:ObjectID>
 <a:Name>averPressureChange</a:Name>
 <a:Code>averPressureChange</a:Code>
@@ -1582,7 +1560,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ReturnType>bool</a:ReturnType>
 <a:TemplateBody>%DefaultBody%</a:TemplateBody>
 </o:Operation>
-<o:Operation Id="o14">
+<o:Operation Id="o12">
 <a:ObjectID>E2A6ECE9-3A92-4A1D-8E17-15B7844F69A6</a:ObjectID>
 <a:Name>averFlowChange</a:Name>
 <a:Code>averFlowChange</a:Code>
@@ -1594,7 +1572,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ReturnType>bool</a:ReturnType>
 <a:TemplateBody>%DefaultBody%</a:TemplateBody>
 </o:Operation>
-<o:Operation Id="o15">
+<o:Operation Id="o13">
 <a:ObjectID>288FF005-BA61-48FF-83FF-286AB2355CE1</a:ObjectID>
 <a:Name>flowChangeDMA</a:Name>
 <a:Code>flowChangeDMA</a:Code>
@@ -1608,7 +1586,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Operation>
 </c:Operations>
 </o:Class>
-<o:Class Id="o10">
+<o:Class Id="o8">
 <a:ObjectID>56B1C6C8-76DB-4AB5-9633-199C592CDEA8</a:ObjectID>
 <a:Name>CivInpConvertor</a:Name>
 <a:Code>CivInpConvertor</a:Code>
@@ -1619,7 +1597,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>管网数据库数据转inp文件转换器</a:Comment>
 <a:UseParentNamespace>0</a:UseParentNamespace>
 <c:Attributes>
-<o:Attribute Id="o16">
+<o:Attribute Id="o14">
 <a:ObjectID>AE2FB3DA-18EB-47E8-8169-075C468F452E</a:ObjectID>
 <a:Name>mInpFile</a:Name>
 <a:Code>mInpFile</a:Code>
@@ -1630,7 +1608,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>std::string</a:DataType>
 <a:Attribute.Visibility>-</a:Attribute.Visibility>
 </o:Attribute>
-<o:Attribute Id="o17">
+<o:Attribute Id="o15">
 <a:ObjectID>8356215D-4448-4C5C-A566-D5C80621AE04</a:ObjectID>
 <a:Name>mRptFile</a:Name>
 <a:Code>mRptFile</a:Code>
@@ -1641,7 +1619,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>std::string</a:DataType>
 <a:Attribute.Visibility>-</a:Attribute.Visibility>
 </o:Attribute>
-<o:Attribute Id="o18">
+<o:Attribute Id="o16">
 <a:ObjectID>3E706BEF-DC5F-4FFC-AF51-F3364A38EC6D</a:ObjectID>
 <a:Name>mBinFile</a:Name>
 <a:Code>mBinFile</a:Code>
@@ -1654,7 +1632,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Attribute>
 </c:Attributes>
 <c:Operations>
-<o:Operation Id="o19">
+<o:Operation Id="o17">
 <a:ObjectID>35FB2EAD-CE41-4008-814B-3688001DBB16</a:ObjectID>
 <a:Name>setInpFile</a:Name>
 <a:Code>setInpFile</a:Code>
@@ -1666,7 +1644,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ReturnType>void</a:ReturnType>
 <a:TemplateBody>%DefaultBody%</a:TemplateBody>
 <c:Parameters>
-<o:Parameter Id="o20">
+<o:Parameter Id="o18">
 <a:ObjectID>43929EBC-DED8-47FB-8756-5004AC3C23C1</a:ObjectID>
 <a:Name>inpFile</a:Name>
 <a:Code>inpFile</a:Code>
@@ -1679,7 +1657,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Parameter>
 </c:Parameters>
 </o:Operation>
-<o:Operation Id="o21">
+<o:Operation Id="o19">
 <a:ObjectID>7B07E84F-D600-4B10-9EE9-7B52D88D4469</a:ObjectID>
 <a:Name>setRptFile</a:Name>
 <a:Code>setRptFile</a:Code>
@@ -1691,7 +1669,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ReturnType>void</a:ReturnType>
 <a:TemplateBody>%DefaultBody%</a:TemplateBody>
 <c:Parameters>
-<o:Parameter Id="o22">
+<o:Parameter Id="o20">
 <a:ObjectID>297765AD-4209-43B6-860D-E3C7C18B3FF2</a:ObjectID>
 <a:Name>rptFiled</a:Name>
 <a:Code>rptFiled</a:Code>
@@ -1704,7 +1682,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Parameter>
 </c:Parameters>
 </o:Operation>
-<o:Operation Id="o23">
+<o:Operation Id="o21">
 <a:ObjectID>BC00252E-790A-4394-A62B-23DFC9F33D88</a:ObjectID>
 <a:Name>setBinFile</a:Name>
 <a:Code>setBinFile</a:Code>
@@ -1716,7 +1694,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ReturnType>void</a:ReturnType>
 <a:TemplateBody>%DefaultBody%</a:TemplateBody>
 <c:Parameters>
-<o:Parameter Id="o24">
+<o:Parameter Id="o22">
 <a:ObjectID>CB278C12-1EFA-4823-9081-C5E14EA185D1</a:ObjectID>
 <a:Name>binFile</a:Name>
 <a:Code>binFile</a:Code>
@@ -1729,7 +1707,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Parameter>
 </c:Parameters>
 </o:Operation>
-<o:Operation Id="o25">
+<o:Operation Id="o23">
 <a:ObjectID>91245E6E-9A36-418C-ADD8-C580A6F45B71</a:ObjectID>
 <a:Name>getRptFile</a:Name>
 <a:Code>getRptFile</a:Code>
@@ -1740,7 +1718,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ReturnType>char*</a:ReturnType>
 <a:TemplateBody>%DefaultBody%</a:TemplateBody>
 </o:Operation>
-<o:Operation Id="o26">
+<o:Operation Id="o24">
 <a:ObjectID>85074C26-B807-43BD-B2A1-D85DFE1ADE6B</a:ObjectID>
 <a:Name>getInpFile</a:Name>
 <a:Code>getInpFile</a:Code>
@@ -1751,7 +1729,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ReturnType>char*</a:ReturnType>
 <a:TemplateBody>%DefaultBody%</a:TemplateBody>
 </o:Operation>
-<o:Operation Id="o27">
+<o:Operation Id="o25">
 <a:ObjectID>ACC3AD80-1DCC-42B8-9736-189A6DE5D799</a:ObjectID>
 <a:Name>getBinFile</a:Name>
 <a:Code>getBinFile</a:Code>
@@ -1765,28 +1743,8 @@ LABL 0 新宋体,8,N</a:FontList>
 </c:Operations>
 </o:Class>
 </c:Classes>
-<c:Associations>
-<o:Association Id="o8">
-<a:ObjectID>E76C5D2B-0C9D-470D-BC2E-547710968B56</a:ObjectID>
-<a:Name>Association_1</a:Name>
-<a:Code>Association_1</a:Code>
-<a:CreationDate>1596593756</a:CreationDate>
-<a:Creator>mr.liu</a:Creator>
-<a:ModificationDate>1596593756</a:ModificationDate>
-<a:Modifier>mr.liu</a:Modifier>
-<a:RoleAIndicator>C</a:RoleAIndicator>
-<a:RoleAMultiplicity>0..1</a:RoleAMultiplicity>
-<a:RoleBMultiplicity>0..*</a:RoleBMultiplicity>
-<c:Object1>
-<o:Class Ref="o9"/>
-</c:Object1>
-<c:Object2>
-<o:Class Ref="o10"/>
-</c:Object2>
-</o:Association>
-</c:Associations>
 <c:TargetModels>
-<o:TargetModel Id="o28">
+<o:TargetModel Id="o26">
 <a:ObjectID>A1B33AC7-73B2-4C8C-885B-B721A5B6DA19</a:ObjectID>
 <a:Name>C++</a:Name>
 <a:Code>C++</a:Code>