From 09af5e567efebb119b98b7c37fd8dc585a14b38a Mon Sep 17 00:00:00 2001 From: Franklin_Zhang Date: Fri, 12 Jan 2018 11:19:34 +0800 Subject: [PATCH] update service record Signed-off-by: Franklin_Zhang --- include/INxModelServiceRecord.h | 9 +++- src/NxModelServiceRecord.cpp | 67 ++++++++++++++++++++++++++++- src/NxModelServiceRecord.h | 25 +++++++++++ src/NxModelServiceRecordFactory.cpp | 6 +++ src/NxModelServiceRecordFactory.h | 19 ++++++++ src/NxServiceAccess.cpp | 4 +- 6 files changed, 125 insertions(+), 5 deletions(-) create mode 100644 src/NxModelServiceRecordFactory.cpp create mode 100644 src/NxModelServiceRecordFactory.h diff --git a/include/INxModelServiceRecord.h b/include/INxModelServiceRecord.h index f4a038e..5d09ff3 100644 --- a/include/INxModelServiceRecord.h +++ b/include/INxModelServiceRecord.h @@ -38,10 +38,15 @@ namespace NJGIS virtual INjDataConfiguration* getOutputData() = 0; - virtual NjRecordStatus getStatus() = 0; + virtual NjRecordStatus getStatus() = 0; - virtual int getRunningInfo(std::string& stardout, std::string& standerr, std::string& invokeerr) = 0; + virtual const char* getRunningInfo_Standout() = 0; + virtual const char* getRunningInfo_Standerr() = 0; + + virtual const char* getRunningInfo_Invokeerr() = 0; + + //! TODO virtual int getLogs() = 0; virtual int refresh() = 0; diff --git a/src/NxModelServiceRecord.cpp b/src/NxModelServiceRecord.cpp index baa9dce..4e8e846 100644 --- a/src/NxModelServiceRecord.cpp +++ b/src/NxModelServiceRecord.cpp @@ -1 +1,66 @@ -#include "INxModelServiceRecord.h" +#include "NxModelServiceRecord.h" + +const char* NJGIS::SERVICE::NxModelServiceRecord::getID() +{ + throw std::exception("The method or operation is not implemented."); +} + +const char* NJGIS::SERVICE::NxModelServiceRecord::getModelServiceID() +{ + throw std::exception("The method or operation is not implemented."); +} + +INjModelService* NJGIS::SERVICE::NxModelServiceRecord::getModelService() +{ + throw std::exception("The method or operation is not implemented."); +} + +const char* NJGIS::SERVICE::NxModelServiceRecord::getStartDatetime() +{ + throw std::exception("The method or operation is not implemented."); +} + +int NJGIS::SERVICE::NxModelServiceRecord::getTimeSpan() +{ + throw std::exception("The method or operation is not implemented."); +} + +INjDataConfiguration* NJGIS::SERVICE::NxModelServiceRecord::getInputData() +{ + throw std::exception("The method or operation is not implemented."); +} + +INjDataConfiguration* NJGIS::SERVICE::NxModelServiceRecord::getOutputData() +{ + throw std::exception("The method or operation is not implemented."); +} + +NJGIS::SERVICE::NjRecordStatus NJGIS::SERVICE::NxModelServiceRecord::getStatus() +{ + throw std::exception("The method or operation is not implemented."); +} + +const char* NJGIS::SERVICE::NxModelServiceRecord::getRunningInfo_Standout() +{ + throw std::exception("The method or operation is not implemented."); +} + +const char* NJGIS::SERVICE::NxModelServiceRecord::getRunningInfo_Standerr() +{ + throw std::exception("The method or operation is not implemented."); +} + +const char* NJGIS::SERVICE::NxModelServiceRecord::getRunningInfo_Invokeerr() +{ + throw std::exception("The method or operation is not implemented."); +} + +int NJGIS::SERVICE::NxModelServiceRecord::getLogs() +{ + throw std::exception("The method or operation is not implemented."); +} + +int NJGIS::SERVICE::NxModelServiceRecord::refresh() +{ + throw std::exception("The method or operation is not implemented."); +} diff --git a/src/NxModelServiceRecord.h b/src/NxModelServiceRecord.h index 3ff240c..0946483 100644 --- a/src/NxModelServiceRecord.h +++ b/src/NxModelServiceRecord.h @@ -11,6 +11,31 @@ namespace NJGIS class NxModelServiceRecord : public virtual INjModelServiceRecord, public virtual NjService { public: + virtual const char* getID(); + + virtual const char* getModelServiceID(); + + virtual INjModelService* getModelService(); + + virtual const char* getStartDatetime(); + + virtual int getTimeSpan(); + + virtual INjDataConfiguration* getInputData(); + + virtual INjDataConfiguration* getOutputData(); + + virtual NjRecordStatus getStatus(); + + virtual const char* getRunningInfo_Standout(); + + virtual const char* getRunningInfo_Standerr(); + + virtual const char* getRunningInfo_Invokeerr(); + + virtual int getLogs(); + + virtual int refresh(); }; } diff --git a/src/NxModelServiceRecordFactory.cpp b/src/NxModelServiceRecordFactory.cpp new file mode 100644 index 0000000..9177223 --- /dev/null +++ b/src/NxModelServiceRecordFactory.cpp @@ -0,0 +1,6 @@ +#include "NxModelServiceRecordFactory.h" + +NJGIS::SERVICE::INjModelServiceRecord* NJGIS::SERVICE::NjModelServiceRecordFactory::createModelServiceRecordByJSON( Json::Value jMsr, const char* ip, int port ) +{ + return NULL; +} \ No newline at end of file diff --git a/src/NxModelServiceRecordFactory.h b/src/NxModelServiceRecordFactory.h new file mode 100644 index 0000000..19b98b6 --- /dev/null +++ b/src/NxModelServiceRecordFactory.h @@ -0,0 +1,19 @@ +#ifndef __NJGIS_NJMODELSERVICERECORDFACTORY_H__ +#define __NJGIS_NJMODELSERVICERECORDFACTORY_H__ + +#include "json/json.h" +#include "../include/INxModelServiceRecord.h" + +namespace NJGIS +{ + namespace SERVICE + { + class NjModelServiceRecordFactory + { + public: + static INjModelServiceRecord* createModelServiceRecordByJSON(Json::Value jMsr, const char* ip, int port); + }; + } +} + +#endif \ No newline at end of file diff --git a/src/NxServiceAccess.cpp b/src/NxServiceAccess.cpp index 0260f57..c58345c 100644 --- a/src/NxServiceAccess.cpp +++ b/src/NxServiceAccess.cpp @@ -49,11 +49,11 @@ NJGIS::SERVICE::INjModelService* NJGIS::SERVICE::NjServiceAccess::getModelServic int NJGIS::SERVICE::NjServiceAccess::getModelServicesByName( const char* name, std::vector &list ) { //! TODO DX - return NULL: + return NULL; } NJGIS::SERVICE::INjData* NJGIS::SERVICE::NjServiceAccess::getDataServiceByID( const char* id ) { // TODO YL - return NULL: + return NULL; } -- Gitee