CN110532021B - Processing method of configuration file of distributed control system, client and service device - Google Patents

Processing method of configuration file of distributed control system, client and service device Download PDF

Info

Publication number
CN110532021B
CN110532021B CN201810516676.4A CN201810516676A CN110532021B CN 110532021 B CN110532021 B CN 110532021B CN 201810516676 A CN201810516676 A CN 201810516676A CN 110532021 B CN110532021 B CN 110532021B
Authority
CN
China
Prior art keywords
configuration file
item
processed
uploaded
information
Prior art date
Legal status (The legal status is an assumption and is not a legal conclusion. Google has not performed a legal analysis and makes no representation as to the accuracy of the status listed.)
Active
Application number
CN201810516676.4A
Other languages
Chinese (zh)
Other versions
CN110532021A (en
Inventor
宋健玮
Current Assignee (The listed assignees may be inaccurate. Google has not performed a legal analysis and makes no representation or warranty as to the accuracy of the list.)
Kyland Technology Co Ltd
Original Assignee
Kyland Technology Co Ltd
Priority date (The priority date is an assumption and is not a legal conclusion. Google has not performed a legal analysis and makes no representation as to the accuracy of the date listed.)
Filing date
Publication date
Application filed by Kyland Technology Co Ltd filed Critical Kyland Technology Co Ltd
Priority to CN201810516676.4A priority Critical patent/CN110532021B/en
Publication of CN110532021A publication Critical patent/CN110532021A/en
Application granted granted Critical
Publication of CN110532021B publication Critical patent/CN110532021B/en
Active legal-status Critical Current
Anticipated expiration legal-status Critical

Links

Classifications

    • GPHYSICS
    • G06COMPUTING; CALCULATING OR COUNTING
    • G06FELECTRIC DIGITAL DATA PROCESSING
    • G06F8/00Arrangements for software engineering
    • G06F8/70Software maintenance or management
    • G06F8/71Version control; Configuration management
    • YGENERAL TAGGING OF NEW TECHNOLOGICAL DEVELOPMENTS; GENERAL TAGGING OF CROSS-SECTIONAL TECHNOLOGIES SPANNING OVER SEVERAL SECTIONS OF THE IPC; TECHNICAL SUBJECTS COVERED BY FORMER USPC CROSS-REFERENCE ART COLLECTIONS [XRACs] AND DIGESTS
    • Y02TECHNOLOGIES OR APPLICATIONS FOR MITIGATION OR ADAPTATION AGAINST CLIMATE CHANGE
    • Y02PCLIMATE CHANGE MITIGATION TECHNOLOGIES IN THE PRODUCTION OR PROCESSING OF GOODS
    • Y02P90/00Enabling technologies with a potential contribution to greenhouse gas [GHG] emissions mitigation
    • Y02P90/02Total factory control, e.g. smart factories, flexible manufacturing systems [FMS] or integrated manufacturing systems [IMS]

Landscapes

  • Engineering & Computer Science (AREA)
  • Software Systems (AREA)
  • General Engineering & Computer Science (AREA)
  • Theoretical Computer Science (AREA)
  • Computer Security & Cryptography (AREA)
  • Physics & Mathematics (AREA)
  • General Physics & Mathematics (AREA)
  • Information Transfer Between Computers (AREA)
  • Management, Administration, Business Operations System, And Electronic Commerce (AREA)
  • Stored Programmes (AREA)

Abstract

The embodiment of the application discloses a processing method, a client and a service device of a configuration file of a distributed control system. The method comprises the steps of obtaining a new project of a distributed control system, wherein the new project comprises at least one project to be processed; acquiring at least one configuration file of each item to be processed based on item information of any item to be processed, wherein the configuration file comprises configuration information required by executing the item to be processed; then, at least one configuration file is sent to the server; when the version information conflict indication message sent by the server is received, the uploaded configuration file of the to-be-processed item in the at least one configuration file and the version information conflict indication message is displayed, and then the modified at least one configuration file is sent to the server, so that the problem of conflict between labor division and cooperation when a plurality of engineers program and configure the same DCS system by using DCS configuration software in the prior art is solved.

Description

Processing method of configuration file of distributed control system, client and service device
Technical Field
The present disclosure relates to the field of computer technologies, and in particular, to a method for processing a configuration file of a distributed control system, a client, and a service device.
Background
The configuration software is a man-machine interface control/monitoring control and data acquisition software. The development of configuration software is rapid at present, and the development of the configuration software is expanded to an enterprise information management system, management and control integration, remote diagnosis and maintenance and a series of data integration on the Internet.
For traditional DCS configuration software, there are tens of operating stations, hundreds (or even thousands) of control stations that need to be deployed. The configuration software of the DCS system is used by an engineer team generally composed of a plurality of engineers to complete the resource allocation and programming configuration of all operation stations, control stations and central stations in the DCS system, wherein the configuration can be understood as "configuration". The programming and configuration of the conventional distributed control system (DistributedControlSystem, DCS) is to divide the whole new project on the main responsible client into a plurality of project modules to be processed (generally, the operation station, the control station and the central station are divided into a module) and then each engineer is responsible for a project module to be processed, and after each engineer finishes the project module to be processed, the engineer station server copies the respective configuration file to the engineer station server after obtaining the configuration file, and then the engineer station server compiles and downloads the complete configuration file set, wherein the processing of the project modules to be processed is completed by the engineer using related software.
However, when multiple engineers use DCS configuration software to program and configure the same DCS system at the same time, a conflict problem of division work and cooperation occurs, including a division work conflict occurring when different engineers simultaneously configure the same operation station or the same control station, for example, different engineers acquire configuration files of the same operation station or the same control station and copy the configuration files to an engineer station server in sequence, coverage of the configuration files occurs, and a cooperation conflict that a program cannot be coupled when different engineers respectively configure the operation station or the control station with a calling relationship, for example, a configuration file of two operation stations or control stations with preset calling relationship cannot realize mutual calling, and the conflict problem of division work and cooperation can seriously affect development of project versions.
Disclosure of Invention
The embodiment of the application provides a processing method, a client and a service device of a configuration file of a distributed control system, which are used for solving the problem of conflict between labor division and cooperation when a plurality of engineers use DCS configuration software to program and configure the same DCS system simultaneously in the prior art.
In a first aspect, a method for processing a configuration file of a distributed control system is provided, where the method may include:
Acquiring at least one configuration file of the to-be-processed item based on item information of any one of the at least one to-be-processed item, wherein the at least one to-be-processed item is a component part of a newly-built item of the distributed control system, and the configuration file comprises configuration information required for executing the to-be-processed item;
sending a first uploading request to a server, wherein the first uploading request comprises version information of an item to be processed and at least one configuration file of the item to be processed, and the version information records version path change information of the at least one configuration file;
when receiving a version information conflict indication message sent by a server, displaying at least one configuration file and an uploaded configuration file of a to-be-processed item in the version information conflict indication message, wherein the version information conflict refers to the phenomenon that version path change information with different sources is overlapped;
and sending a second uploading request to the server, wherein the second uploading request comprises version information of the item to be processed and at least one modified configuration file, and the at least one modified configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file.
According to the scheme, repeated uploading is detected at the server side, so that the problem of conflict between labor division and cooperation when a plurality of engineers use DCS configuration software to program and configure the same DCS system simultaneously in the prior art is solved.
In an alternative implementation, after acquiring the new project of the distributed control system, the method further includes:
sending a new project request to a server, wherein the new project request comprises the new project identifier;
and receiving a new project response sent by the server after the new project request is distributed with storage resources to which the new project identification belongs, wherein the storage resources are used for storing configuration files of the new project, so that the server detects and stores the configuration files sent by clients to which a plurality of engineers belong.
In an alternative implementation, the method further comprises: receiving review indication information sent by a server, wherein the review indication information is used for indicating a review result of an uploaded configuration file, and the uploaded configuration file comprises at least one configuration file or at least one configuration file after modification;
and when the review indication information indicates that the review result is failed, acquiring a modified configuration file of at least one configuration file or acquiring a configuration file of which the modified configuration file is modified again, and returning to execute the step of sending the second uploading request to the server.
The method can carry out code review on the configuration file uploaded each time in real time, overcomes the defects that in the prior art, the code review is affected by personal subjective factors of engineers participating in the project and is slow, the limitation of the execution effect cannot be tracked, accelerates the project completion progress and improves the project completion quality at the same time.
In a second aspect, a method for processing a configuration file of a distributed control system is provided, where the method includes:
acquiring at least one configuration file of the to-be-processed item based on item information of any one of the at least one to-be-processed item, wherein the at least one to-be-processed item is a component part of a newly-built item of the distributed control system, and the configuration file comprises configuration information required for executing the to-be-processed item;
sending an extraction request to a server, wherein the extraction request is used for extracting the uploaded configuration file stored by the server;
when version information in at least one configuration file and version information of the uploaded configuration file do not have version information conflict, a first uploading request is sent to a server, the first uploading request comprises the version information of an item to be processed and the at least one configuration file of the item to be processed, and version information records version change information of the item to be processed;
when version information in at least one configuration file and version information of the uploaded configuration file have version information conflict, a second uploading request is sent to a server, the second uploading request comprises version information of an item to be processed and at least one configuration file after modification, the at least one configuration file after modification is obtained after modification of the at least one configuration file according to the uploaded configuration file, and the version information conflict refers to the phenomenon that version path change information with different sources is overlapped.
According to the scheme, repeated uploading is detected at the client side, so that the problem of conflict between labor division and cooperation when a plurality of engineers use DCS configuration software to program and configure the same DCS system simultaneously in the prior art is solved.
In a third aspect, a method for processing a configuration file of a distributed control system is provided, where the method includes:
receiving a first uploading request sent by a client, wherein the first uploading request comprises version information of items to be processed and at least one configuration file of the items to be processed, the at least one configuration file is obtained by the client according to item information of any one of the at least one items to be processed, the configuration file comprises information required by executing the items to be processed, a new item is a new item of a distributed control system, and the at least one item to be processed is a component part of the new item of the distributed control system;
when version information of the uploaded at least one configuration file does not conflict with version information of the uploaded configuration file, the uploaded configuration file is obtained, and the uploaded configuration file comprises at least one configuration file;
when version information of at least one uploaded configuration file conflicts with version information of the uploaded configuration file, a version information conflict indication message is sent to the client, wherein the version information conflict indication message comprises the uploaded configuration file of the item to be processed;
And based on the second uploading request sent by the receiving client, obtaining an uploaded configuration file, wherein the second uploading request and the uploaded configuration file both comprise at least one modified configuration file and corresponding version information, and the at least one modified configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file.
In an alternative implementation, before obtaining the uploaded configuration file, the method further includes:
outputting first indication information, wherein the first indication information is used for indicating to review the uploaded configuration file, and the uploaded configuration file comprises at least one configuration file or the modified configuration file;
receiving second indication information, wherein the second indication information is used for indicating the review result of each configuration file in the uploaded configuration files;
when the result of the review of the configuration file is passed, the uploaded configuration file is obtained;
and when the result of the review of the configuration file is that the configuration file does not pass, sending review indication information of the failed review to the client, and returning to execute the step of receiving the second uploading request sent by the client.
In an alternative implementation, before receiving the first upload request sent by the client, the method further includes:
Receiving a new project request sent by a client, wherein the new project request comprises a new project identifier;
according to the new project request, distributing storage resources to which the new project identifier belongs;
and sending a new project response to the client, wherein the storage resource is used for storing the configuration file set of the new project.
In a fourth aspect, a client is provided, which may include: the device comprises an acquisition unit, a sending unit and a display unit.
The system comprises an acquisition unit, a configuration file generation unit and a control unit, wherein the acquisition unit is used for acquiring at least one configuration file of a to-be-processed item based on item information of any to-be-processed item in at least one to-be-processed item, the at least one to-be-processed item is a component part of a newly-built item of a distributed control system, and the configuration file comprises configuration information required by executing the to-be-processed item;
the system comprises a sending unit, a server and a processing unit, wherein the sending unit is used for sending a first uploading request to the server, the first uploading request comprises version information of an item to be processed and at least one configuration file, and the version information records version path change information of the at least one configuration file;
the display unit is used for displaying at least one configuration file and the uploaded configuration file of the to-be-processed item in the version information conflict indication message when receiving the version information conflict indication message sent by the server, wherein the version information conflict refers to the phenomenon that version path change information with different sources is overlapped;
The sending unit is further configured to send a second upload request to the server, where the second upload request includes version information of the item to be processed and at least one modified configuration file, and the at least one modified configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file.
In an alternative implementation, the client further comprises a first receiving unit;
the sending unit is further used for sending a new project request to the server after the acquisition unit acquires the new project of the distributed control system, wherein the new project request comprises a new project identifier;
the first receiving unit is used for receiving a new project response sent by the server after the storage resources of the new project identifier are allocated according to the new project request, wherein the storage resources are used for storing the configuration file set of the new project.
In an alternative implementation, the client further comprises a second receiving unit;
the second receiving unit is used for receiving the review indication information sent by the server, wherein the review indication information is used for indicating the review result of the uploaded configuration file, and the uploaded configuration file comprises at least one configuration file or at least one configuration file after modification;
The obtaining unit is further configured to obtain a modified configuration file of the at least one configuration file or obtain a configuration file modified again by the modified at least one configuration file when the review indication information indicates that the review result is failed, and trigger the sending unit to send a second upload request to the server.
In a fifth aspect, there is provided another client, the client comprising: an acquisition unit and a transmission unit.
The device comprises an acquisition unit, a processing unit and a processing unit, wherein the acquisition unit is used for acquiring at least one configuration file of a to-be-processed item based on item information of any to-be-processed item in at least one to-be-processed item, the at least one to-be-processed item is a component part of a newly-built item of a distributed control system, and the configuration file comprises configuration information required for executing the to-be-processed item;
the sending unit is used for sending an extraction request to the server, wherein the extraction request is used for extracting the uploaded configuration file stored by the server;
when version information in at least one configuration file and version information of the uploaded configuration file do not have version information conflict, a first uploading request is sent to the server, the first uploading request comprises version information of an item to be processed and the at least one configuration file of the item to be processed, and version information records version change information of the item to be processed;
When version information in at least one configuration file and version information of the uploaded configuration file have version information conflict, a second uploading request is sent to a server, the second uploading request comprises version information of an item to be processed and at least one configuration file after modification, the at least one configuration file after modification is obtained after modification of the at least one configuration file according to the uploaded configuration file, and the version information conflict refers to the phenomenon that version path change information with different sources is overlapped.
In a sixth aspect, a service apparatus is provided, the apparatus may include: receiving unit, obtaining unit, sending unit.
The receiving unit is used for receiving a first uploading request sent by the client, wherein the first uploading request comprises version information of items to be processed and at least one configuration file of the items to be processed, the at least one configuration file is obtained by the client according to item information of any one of the at least one items to be processed, the configuration file comprises information required by executing the items to be processed, the at least one item to be processed is a component part of a new item of the distributed control system, and the new item is a new item of the distributed control system;
The system comprises an acquisition unit, a processing unit and a processing unit, wherein the acquisition unit is used for acquiring an uploaded configuration file when version information of at least one uploaded configuration file does not conflict with version information of the uploaded configuration file, and the uploaded configuration file comprises at least one configuration file;
the sending unit is used for sending a version information conflict indication message to the client when version information of at least one uploaded configuration file conflicts with version information of the uploaded configuration file, wherein the version information conflict indication message comprises the uploaded configuration file of the item to be processed;
the obtaining unit is further configured to obtain an uploaded configuration file based on a second upload request sent by the receiving client, where the second upload request and the uploaded configuration file each include at least one modified configuration file and corresponding version information, and the at least one modified configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file.
In an alternative implementation, the apparatus may further include an output unit;
the output unit is used for outputting first indication information before the acquisition unit acquires the uploaded configuration file, wherein the first indication information is used for indicating to review the uploaded configuration file, and the uploaded configuration file comprises at least one configuration file or the modified configuration file;
The receiving unit is also used for receiving second indication information, wherein the second indication information is used for indicating the review result of each configuration file in the uploaded configuration files;
the obtaining unit is also used for obtaining the uploaded configuration file when the review result of the configuration file is passed;
and the sending unit is also used for sending the review indication information of failed review to the client when the review result of the configuration file is failed, and triggering the receiving unit to receive the second uploading request sent by the client.
In an alternative implementation, the apparatus further comprises a distribution unit;
the receiving unit is further configured to receive a new project request sent by the client before receiving the first upload request sent by the client, where the new project request includes the new project identifier;
the allocation unit is used for allocating the storage resources to which the new project identifiers belong according to the new project requests, sending new project responses to the clients, and storing the configuration file sets of the new projects by the storage resources.
And the sending unit is also used for sending the new project response to the client.
In a seventh aspect, a terminal is provided, the terminal comprising a processor, a communication interface, a memory and a communication bus, wherein the processor, the communication interface, and the memory are in communication with each other through the communication bus;
A memory for storing a computer program;
a processor configured to implement the method steps of any one of the first or second aspects when executing a program stored on a memory.
In an eighth aspect, a server is provided, the server including a processor, a communication interface, a memory, and a communication bus, wherein the processor, the communication interface, and the memory communicate with each other via the communication bus;
a memory for storing a computer program;
a processor for implementing the method steps of any of the above third aspects when executing a program stored on a memory.
In a ninth aspect, a computer-readable storage medium is provided, in which a computer program is stored, which, when being executed by a processor, carries out the method steps of any of the first, second or third aspects above.
After a client acquires a new project of a distributed control system including at least one project to be processed and at least one configuration file of any project to be processed, the configuration file includes configuration information required by executing the project to be processed, and the configuration file of the project to be processed is uploaded to a server; when receiving the version information conflict indication message sent by the server, the client side displays the uploaded configuration file of the to-be-processed item in the at least one configuration file and the version information conflict indication message, and then sends the modified at least one configuration file to the server; or, the client side obtains the uploaded configuration file currently stored by the server by sending an extraction request to the server before uploading, and uploads the modified at least one configuration file to the server after detecting that the at least one configuration file and the uploaded configuration file have the same configuration file. The modified at least one configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file, so that the problem of conflict between labor division and cooperation when a plurality of engineers program and configure the same DCS system by using DCS configuration software simultaneously in the prior art is solved.
Drawings
Fig. 1 is a schematic diagram of a system architecture of a method for processing configuration files of a distributed control system according to an embodiment of the present invention;
fig. 2 is a flow chart of a configuration file processing method of a distributed control system according to an embodiment of the present invention;
FIG. 3 is a flowchart illustrating another method for processing configuration files of a distributed control system according to an embodiment of the present invention;
FIG. 4 is a flow chart illustrating a configuration file processing method of the distributed control system shown in FIG. 2;
FIG. 5 is a flow chart illustrating a configuration file processing method of the distributed control system shown in FIG. 3;
fig. 6 is a schematic structural diagram of a client according to an embodiment of the present invention;
fig. 7 is a schematic structural diagram of another client according to an embodiment of the present invention;
fig. 8 is a schematic structural diagram of a service device according to an embodiment of the present invention;
fig. 9 is a schematic structural diagram of a terminal according to an embodiment of the present invention;
fig. 10 is a schematic structural diagram of another server according to an embodiment of the present invention.
Detailed Description
The technical solutions in the embodiments of the present application will be clearly and completely described below with reference to the drawings in the embodiments of the present application, and it is obvious that the described embodiments are only some embodiments of the present application, and not all embodiments. All other embodiments, which can be made by one of ordinary skill in the art based on the embodiments of the present application without making any inventive effort, are intended to be within the scope of the present application.
The method for processing the configuration file of the distributed control system provided by the embodiment of the invention is applied to the system architecture shown in fig. 1, and the system architecture is specifically a Client/Server (CS) architecture. The system may include a plurality of terminals, such as terminal 1, terminal 2, and terminal 3, each of which needs to process one small item to be processed among the entire items, including an engineer station client (hereinafter, simply "client"), and an engineer station server (hereinafter, simply "server") in communication with the client.
The Terminal in the embodiment of the invention can be called as User Equipment (UE), mobile Station (MS), mobile Terminal (Mobile Terminal) and the like, and the client can be a DCS configuration software client with a GIT operation function and a configuration file information comparison function.
The GIT operation function supports common GIT operations, such as cloning, submitting, pushing, pulling, acquiring branches, merging and the like. The configuration file information comparison function supports functions such as configuration parameter comparison, picture comparison, algorithm logic comparison and the like.
Optionally, the client may further include an execution unit, such as a DCS simulation running system. After the configuration file set of the whole project is obtained, the configuration file set is processed by an execution unit to obtain an execution file so as to control an operation station and a control station in the DCS system to work.
The server may be a DCS configuration software server having GIT operation functions corresponding to the client, a persistent integration tool such as Jenkins, and a review tool such as Gerrit. Jenkins is an open source continuous integration (Continuous Integration) tool for monitoring continuous repeated work. The development engineers can integrate the items to be processed of each development engineer, each integration is verified through automatic compiling, release and automatic testing, and integration errors are discovered as early as possible through multiple integration. Gerrit is a code review software for open source code that uses a web interface to review program code to determine whether it can commit, rollback, or continue modification.
The processing method of the configuration file of the distributed control system provided by the embodiment of the invention can be completed based on Git, wherein Git is an open-source distributed version control system, namely open-source version control software, which is used for effectively and rapidly processing project version management from small to very large.
The method comprises the steps that a new project of the DCS is obtained through a client, wherein the new project can comprise at least one project to be processed; and acquiring at least one configuration file of each to-be-processed item based on item information of any to-be-processed item in the at least one to-be-processed item, wherein the configuration file comprises information required by executing the to-be-processed item, and then, sending a first uploading request to a server, wherein the first uploading request comprises version information of the to-be-processed item and at least one configuration file of the to-be-processed item, and the version information records version change information of the at least one configuration file.
In order to solve the problem of conflict between labor division and cooperation when a plurality of engineers use DCS configuration software to program and configure the same DCS system at the same time, a server carries out version conflict detection on the version information of the uploaded to-be-processed item, and the version information is used for recording the version change information of the uploaded to-be-processed item.
The method comprises the following steps: when the server detects that the version information of the to-be-processed item does not have a historical uploading record, i.e. the version information of the to-be-processed item is not repeatedly uploaded, the server performs review (such as code review) of the configuration file information of the to-be-processed item, and if the review passes, the server acquires and stores the at least one configuration file of the to-be-processed item. When the server detects that the version information of the to-be-processed item has a historical uploading record, namely the version information of the to-be-processed item is repeatedly uploaded, the version information conflict indication message is sent to the client, and the version information conflict indication message can comprise an uploaded configuration file corresponding to the to-be-processed item. The client displays the uploaded configuration file corresponding to the to-be-processed item in the conflict indication message of the repeated uploaded configuration file and version information in the obtained at least one configuration file to the engineer; and then after the at least one modified configuration file uploaded by the engineer is obtained, sending a second uploading request to the server, wherein the second uploading request comprises the at least one modified configuration file, and the at least one modified configuration file is obtained by modifying the repeated uploading configuration file according to the uploaded configuration file. The server performs review (such as code review) of the configuration file information of the modified configuration file of the item to be processed, and if the review passes, obtains and stores at least one configuration file of the item to be processed after modification. Therefore, at least one configuration file of the corresponding to-be-processed project is uploaded through the plurality of clients, so that the server obtains the configuration file set of the whole newly-built project.
The preferred embodiments of the present application will be described below with reference to the accompanying drawings of the specification, it being understood that the preferred embodiments described herein are for illustration and explanation only, and are not intended to limit the present invention, and the embodiments and features of the embodiments in the present application may be combined with each other without conflict.
Fig. 2 is a flowchart of a configuration file processing method of a distributed control system according to an embodiment of the present invention. As shown in fig. 2, the method may include:
step 210, the client obtains at least one configuration file of the to-be-processed item based on item information of any to-be-processed item in the at least one to-be-processed item.
Since at least one item to be processed is part of a new item of the distributed control system, the client needs to acquire the new item of the distributed control system before performing this step.
The client can obtain a new project of the distributed control system through cloning operation in the GIT operation, and the new project can be a version upgrading project of the target program. The newly-built items comprise items to be processed corresponding to each client in at least one client.
Optionally, after the step is executed, the client sends a new project request to the server, wherein the new project request comprises a new project identifier;
The server allocates storage resources to which the new project identifier belongs according to the new project request, for example, allocates storage resources by automatically executing a 'gitinit' operation, and completes initialization of the new project, wherein the storage resources are used for storing a configuration file set of the new project, so that the server detects and stores configuration files sent by clients to which a plurality of engineers belong. And then sending a new project response to the client.
It should be noted that, the client may be a preset general responsible person client, and the client is configured to receive a new project and send a request for the new project to the server.
The configuration file includes configuration information required for executing the item to be processed, such as control station configuration information, picture configuration information, database configuration information, etc.
For at least one to-be-processed item in the whole newly-built item, each client has its own to-be-processed item, for example, it can be understood that each client is responsible for processing one to-be-processed item in the at least one to-be-processed item.
Further, after the client obtains at least one configuration file of the item to be processed.
Step 220, the client sends a first upload request to the server, where the first upload request includes version information of the item to be processed and at least one configuration file.
The version information is used for recording version change information of the to-be-processed item, for example, version 0 indicates a configuration file of the to-be-processed item which is not modified, version 1 indicates a configuration file of the to-be-processed item which is modified once, version 2 indicates a configuration file of the to-be-processed item which is modified twice, and so on.
The client may send a first upload request to the server through a Push operation of a gitpush instruction.
Optionally, the first upload request may further comprise a pending item identification for uniquely identifying the pending item.
Step 230, when the version information of the uploaded at least one configuration file and the version information of the uploaded configuration file have no version information conflict, the server obtains the uploaded configuration file.
The version information is used for recording version path change information of at least one configuration file of the item to be processed, if the initial version number of the configuration file A is 0, the version number of the configuration file A after the first modification is 1, and the version number of the configuration file A after the second modification is 2, the version path change information of the configuration file A can be expressed as: 0- >1- > 2. The server detects whether at least one configuration file of the item to be processed is repeatedly uploaded.
The server may detect whether there is a version conflict in at least one configuration file of the to-be-processed item by detecting whether the version information of the to-be-processed item is recorded in the historic uploading record, where the version conflict may refer to that there is an overlap in version change paths of the configuration file, for example, when the version information of the to-be-processed item is already stored in the server side as a change path of 0- >1- >2- >3, and when the version information uploaded by the client side is 2- >3 or 0- >1- >2- >3, it may be referred to as that there is a version conflict.
When the uploaded version information of the to-be-processed item is different from the uploaded version information of the to-be-processed item, at least one configuration file of the to-be-processed item is obtained and stored in a storage resource to which the newly-built item identifier belongs, namely, the configuration file in the storage resource is updated.
Step 240, when the uploaded version information of the to-be-processed item is the same as the uploaded version information of the to-be-processed item, the server sends a version information conflict indication message to the client.
The version information conflict indication message comprises an uploaded configuration file corresponding to the version information of the item to be processed.
Step 250, the client sends a second upload request to the server, where the second upload request includes the modified at least one configuration file and the corresponding version information.
Before executing the step, the client displays the uploaded configuration file of the to-be-processed item in the at least one configuration file and version information conflict indication message according to the version information conflict indication message, so that an engineer or a modification tool (such as a written program) modifies the at least one configuration file, and then submits the configuration file to a local git library. The modification mode of the at least one configuration file may include: and carrying out content updating on the target configuration file in the at least one configuration file, adding or deleting the target configuration file in the at least one configuration file, and carrying out content merging on the uploaded configuration file with the at least one configuration file with version conflict, wherein if the uploaded configuration file A is the upper part content of the item to be processed, the at least one configuration file is the lower part content of the item to be processed, merging the upper part content with the lower part content, or adding the lower part content on the basis of the upper part content, and the like.
The client sends a second upload request including the modified configuration file to the server, where the version information records the version change path information of the modified at least one configuration file of the item to be processed, and then returns to execute step 230, where the uploaded configuration file includes the modified at least one configuration file.
Optionally, in order to further improve the accuracy of resolving the conflict problem of division and collaboration, the following steps may be further performed before the uploaded configuration file is acquired:
the server outputs first indication information, wherein the first indication information is used for indicating to review the uploaded configuration files, and the uploaded configuration files comprise at least one configuration file or at least one configuration file after modification;
the review process may be performed by an engineer responsible for the review, and the second indication information is sent to the server after the review is completed.
The server receives second indication information, wherein the second indication information is used for indicating the review result of each configuration file in the uploaded configuration files.
When the review result of the uploaded configuration file is passed, acquiring the uploaded configuration file;
and when the review result of the uploaded configuration file is failed, sending review indication information of failed review to the client.
Therefore, the code review process can be carried out on the configuration file uploaded each time by the reviewer in real time, the defect that the code review is slow due to the influence of personal subjective factors of engineers participating in the project in the prior art and the limitation that the execution effect cannot be tracked is overcome, the project completion progress is accelerated, and the project completion quality is improved.
The client obtains the modified at least one configuration file based on the review indication information that is not passed, and returns to the step of sending the second upload request to the server, for example, the client may send a modification instruction to the engineer according to the review indication information that is not passed, so as to obtain the modified at least one configuration file.
After the uploaded configuration file is obtained, the server performs updating operation on the configuration file of the item to be processed in the storage resource, and the updated configuration file is the configuration file carried in the first uploading request or the second uploading request.
After a client acquires a new project of a distributed control system including at least one project to be processed and at least one configuration file of any project to be processed, the configuration file includes configuration information required by executing the project to be processed, and the configuration file of the project to be processed is uploaded to a server; when receiving the version information conflict indication message sent by the server, the client side displays the uploaded configuration file of the to-be-processed item in the at least one configuration file and version information conflict indication message, and then sends the at least one modified configuration file to the server, wherein the at least one modified configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file, so that the problem of conflict between labor division and cooperation when a plurality of engineers program and configure the same DCS system by using DCS configuration software in the prior art is solved.
It should be noted that, by the method of the embodiment of the present invention, through offline development of configuration files and code review, the problems of low code quality and incapability of synchronous coding in cross-region synchronous development can be solved, and code security can be improved, for example, when a server side is abnormal and the code is lost, at this time, the server side code library can be restored through the local code library of each region developer.
In the above embodiment, the detection of the configuration file version conflict is performed on the server side, in order to further improve the accuracy of resolving the conflict problem of division and collaboration, the following embodiment may perform the detection of the configuration file duplication on the client side, as shown in fig. 3, and the method may include:
step 310, the client obtains at least one configuration file of the to-be-processed item based on the item information of any to-be-processed item in the at least one to-be-processed item.
The implementation process of step 310 is the same as that of step 210, and the embodiments of the present invention are not described herein.
Step 320, the client sends an extraction request to the server.
The extraction request is used for extracting the uploaded configuration file stored by the server. The client may send a fetch request to the server through a pull (pull), or fetch+merge operation.
Step 330, the server sends the uploaded configuration file to the client.
The uploaded configuration file is the uploaded configuration file to which the newly created project stored by the current server belongs.
Optionally, the uploaded configuration file may be an uploaded configuration file of the to-be-processed item processed by the client, or may be all uploaded configuration files stored by the current storage resource of the server.
Step 340, the client detects whether version information of at least one configuration file conflicts with version information of the uploaded configuration file. Step 350, when version information in at least one configuration file and version information of the uploaded configuration file do not have version information conflict, a first upload request is sent to the server, and then step 370 is executed.
Step 360, when version information in at least one configuration file conflicts with version information of the uploaded configuration file, a second upload request is sent to the server, and then step 370 is executed.
When version information of the configuration file in the at least one configuration file conflicts with version information of the uploaded configuration file, the client displays the at least one configuration file and the uploaded configuration file of the to-be-processed item, so that an engineer modifies the at least one configuration file to obtain the modified at least one configuration file.
Optionally, when the extraction request of the client obtains all the uploaded configuration files stored in the current storage resource of the server, the client may call the modified at least one configuration file with all the uploaded configuration files, and test the accuracy of the modified at least one configuration file.
Step 370, the server obtains the uploaded configuration file.
The configuration files of the first upload request, the second upload request and the upload are the same as those of the first upload request, the second upload request and the upload related to fig. 2, and the embodiments of the present invention are not described herein.
According to the technical scheme, after a client obtains a new project of a distributed control system including at least one project to be processed, and at least one configuration file of any project to be processed, the configuration file includes configuration information required by executing the project to be processed, before uploading, the client side obtains an uploaded configuration file currently stored by a server by sending an extraction request to the server, and after detecting whether version information configuration files in the at least one configuration file conflict with version information of the uploaded configuration file, the server uploads the modified at least one configuration file. The modified at least one configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file, so that the problem of conflict between labor division and cooperation when a plurality of engineers program and configure the same DCS system by using DCS configuration software simultaneously in the prior art is solved.
Further, compared with the prior art, in the embodiment of the invention, after the client acquires the new project of the distributed control system, the client can call the git branch operation instruction through the menu interface to create at least one branch for the new project. For example, when multiple schemes in a newly-built project need to be verified, each verification process needs to create a branch; the newly built project needs to be realized in multiple stages, and each stage of realization needs to create branches.
The client then sends a third upload request to the server, the third upload request including an identification of at least one branch and a configuration file of at least one branch.
Fig. 4 is a flow chart illustrating a configuration file processing method of the distributed control system shown in fig. 3. As shown in fig. 4, the method may include:
step 401, a client acquires a new project of a distributed control system, wherein the new project comprises at least one project to be processed.
Step 402, the client sends a new project request to the server, wherein the new project request comprises a new project identifier.
Step 403, the server allocates the storage resource to which the new project identifier belongs according to the new project request.
Step 404, the server sends a new project response to the client.
Step 405, the client obtains at least one configuration file based on item information of a corresponding item to be processed in the at least one item to be processed.
Step 406, the client sends a first upload request to the server.
And the client sends a first uploading request to the server through the gitpush instruction.
The first uploading request comprises version information of at least one configuration file and at least one configuration file of the item to be processed.
Step 407, the server detects whether version information of at least one configuration file of the item to be processed has version conflict with version information of the uploaded configuration file;
if yes, go to step 408;
if not, go to step 411.
Step 408, the server sends a version information conflict indication message to the client.
Step 409, the client displays at least one configuration file and the uploaded configuration file of the item to be processed in the version information conflict indication message according to the version information conflict indication message.
Step 410, the client sends a second upload request to the server.
The second uploading request comprises at least one modified configuration file and corresponding version information, and the at least one modified configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file.
In step 411, the server outputs first indication information, where the first indication information is used to indicate to review the uploaded configuration file.
The uploaded configuration file comprises at least one configuration file of the item to be processed or at least one configuration file of the item to be processed after modification.
Step 412, the server receives second indication information, where the second indication information is used to indicate a review result of each configuration file in the uploaded configuration files.
In step 413, when the result of the review of the configuration file is passing, the server obtains the uploaded configuration file.
And step 414, when the result of the review of the configuration file is failed, the server sends review indication information of failed review to the client.
Step 415, the client obtains at least one modified configuration file based on the review indication information that is not passed.
The client obtains the modified at least one configuration file based on the review indication information that is not passed, for example, the client may send a modification instruction to the engineer according to the review indication information that is not passed, thereby obtaining the modified at least one configuration file, and then returns to step 410.
After a client acquires a new project of a distributed control system including at least one project to be processed and at least one configuration file of any project to be processed, the configuration file includes configuration information required by executing the project to be processed, and the configuration file of the project to be processed is uploaded to a server; when receiving the version information conflict indication message sent by the server, the client side displays the uploaded configuration file of the to-be-processed item in the at least one configuration file and version information conflict indication message, and then sends the at least one modified configuration file to the server, so that the problem of conflict between labor division and cooperation when a plurality of engineers use DCS configuration software to program and configure the same DCS system simultaneously in the prior art is solved.
Fig. 5 is a flow chart of a configuration file processing method of the distributed control system shown in fig. 3. As shown in fig. 5, the method may include:
step 501, a client acquires a new project of a distributed control system, where the new project includes at least one project to be processed.
Step 502, the client sends a new project request to the server, wherein the new project request comprises a new project identifier.
Step 503, the server allocates the storage resource to which the new project identifier belongs according to the new project request.
Step 504, the server sends a new project response to the client.
Step 505, the client obtains at least one configuration file based on the item information of the corresponding item to be processed in the at least one item to be processed.
In step 506, the client sends an extraction request to the server, where the extraction request is used to extract the uploaded configuration file stored by the server.
Step 507, the server sends the uploaded configuration file to the client.
Step 508, the client detects whether version information of at least one configuration file has version conflict with version information of the uploaded configuration file;
if not, go to step 509;
if yes, go to step 510.
Step 509, a first upload request is sent to the server.
The first upload request includes version information of at least one configuration file of the item to be processed and at least one configuration file of the item to be processed.
Step 510, the client displays at least one configuration file and the uploaded configuration file.
Step 511, the client sends a second upload request to the server, and then step 512 is performed.
The second uploading request comprises at least one modified configuration file, and the at least one modified configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file.
Step 512, the server outputs first indication information, where the first indication information is used to indicate to review the uploaded configuration file.
The uploaded configuration file comprises at least one configuration file of the item to be processed or at least one configuration file of the item to be processed after modification.
In step 513, the server receives second indication information, where the second indication information is used to indicate a review result of each of the uploaded configuration files.
Step 514, when the result of the review of the configuration file is passing, the server obtains the uploaded configuration file.
And 515, when the result of the review of the configuration file is failed, the server sends review indication information of failed review to the client.
Step 516, the client obtains at least one modified configuration file based on the review indication information that is not passed.
The client obtains the modified at least one configuration file based on the review indication information that is not passed, for example, the client may send a modification instruction to the engineer according to the review indication information that is not passed, thereby obtaining the modified at least one configuration file, and then returns to step 511.
Steps 512-516 are the same as steps 411-415 shown in fig. 4, and the embodiments of the present invention are not described herein.
According to the technical scheme, after a client obtains a new project of a distributed control system including at least one project to be processed, and at least one configuration file of any project to be processed, the configuration file includes configuration information required by executing the project to be processed, before uploading, the client side obtains an uploaded configuration file currently stored by a server by sending an extraction request to the server, and after detecting whether version information configuration files in the at least one configuration file conflict with version information of the uploaded configuration file, the server uploads the modified at least one configuration file. The modified at least one configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file, so that the problem of conflict between labor division and cooperation when a plurality of engineers program and configure the same DCS system by using DCS configuration software simultaneously in the prior art is solved.
It should be noted that, the foregoing embodiment describes the application in detail with respect to the mutual communication between the client and the server, but this does not mean that the client and the server must be implemented cooperatively, and in fact, when the client side and the server side are implemented separately, the problems existing on the client side and the server side respectively are solved, and only when the two are used in combination, a better technical effect is obtained.
Corresponding to the above method, the embodiment of the present invention further provides a client, as shown in fig. 6, where the client includes: an acquisition unit 610, a transmission unit 620, and a presentation unit 630.
The acquiring unit 610 is configured to acquire at least one configuration file of the to-be-processed item based on item information of any one of the at least one to-be-processed item, where the at least one to-be-processed item is a component of a new item of the distributed control system, and the configuration file includes configuration information required for executing the to-be-processed item;
a sending unit 620, configured to send a first upload request to the server, where the first upload request includes version information of the item to be processed and at least one configuration file, and the version information records version path change information of the at least one configuration file;
The display unit 630 is configured to display, when receiving a version information collision indication message sent by the server, at least one configuration file and an uploaded configuration file of a to-be-processed item in the version information collision indication message, where a version information collision refers to a phenomenon that version path change information with different sources overlaps with each other;
the sending unit 620 is further configured to send a second upload request to the server, where the second upload request includes version information of the item to be processed and at least one modified configuration file, and the at least one modified configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file.
In an alternative implementation, the client further comprises a first receiving unit 640;
the sending unit 620 is further configured to send a new project request to the server after the acquisition unit acquires a new project of the distributed control system, where the new project request includes a new project identifier;
the first receiving unit 640 is configured to receive a new project response sent by the server after allocating a storage resource of a new project identifier according to a new project request, where the storage resource is used to store a configuration file set of the new project.
In an alternative implementation, the client further comprises a second receiving unit 650;
the second receiving unit 650 is configured to receive review indication information sent by the server, where the review indication information is used to indicate a review result of the uploaded configuration file, and the uploaded configuration file includes at least one configuration file or at least one configuration file after modification;
the obtaining unit 610 is further configured to obtain a modified configuration file of the at least one configuration file or obtain a configuration file modified again by the modified at least one configuration file when the review indication information indicates that the review result is failed, and trigger the sending unit to send a second upload request to the server.
After a client acquires a new project of at least one project to be processed and at least one configuration file of any project to be processed, the configuration file comprises configuration information required by executing the project to be processed, and the configuration information is uploaded to a server; when receiving the version information conflict indication message sent by the server, the client side displays the uploaded configuration file of the to-be-processed item in the at least one configuration file and version information conflict indication message, and then sends the modified at least one configuration file to the server. The modified at least one configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file, so that the problem of conflict between labor division and cooperation when a plurality of engineers program and configure the same DCS system by using DCS configuration software simultaneously in the prior art is solved.
Corresponding to the above method, the embodiment of the present invention further provides another client, as shown in fig. 7, where the client includes: acquisition unit 710, transmission unit 720.
An obtaining unit 710, configured to obtain at least one configuration file of the to-be-processed item based on item information of any one of the at least one to-be-processed item, where the at least one to-be-processed item is a component of a new item of the distributed control system, and the configuration file includes configuration information required for executing the to-be-processed item;
a sending unit 720, configured to send an extraction request to a server, where the extraction request is used to extract an uploaded configuration file stored by the server;
when version information in at least one configuration file and version information of the uploaded configuration file do not have version information conflict, a first uploading request is sent to the server, the first uploading request comprises version information of an item to be processed and the at least one configuration file of the item to be processed, and version information records version change information of the item to be processed;
when version information in at least one configuration file and the uploaded version information have version information conflict, a second uploading request is sent to the server, the second uploading request comprises the version information of the item to be processed and at least one configuration file after modification, the at least one configuration file after modification is obtained after modification of the at least one configuration file according to the uploaded configuration file, and the version information conflict refers to the phenomenon that version path change information with different sources is overlapped.
After a client acquires a new project of at least one project to be processed and at least one configuration file of any project to be processed, the configuration file comprises configuration information required by executing the project to be processed, the client side acquires an uploaded configuration file currently stored by a server by sending an extraction request to the server before uploading, and uploads the modified at least one configuration file to the server after detecting whether version information configuration file in the at least one configuration file conflicts with version information of the uploaded configuration file. The modified at least one configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file, so that the problem of conflict between labor division and cooperation when a plurality of engineers program and configure the same DCS system by using DCS configuration software simultaneously in the prior art is solved.
Corresponding to the above method, the embodiment of the present invention further provides a service device, as shown in fig. 8, where the service device includes: a receiving unit 810, an acquiring unit 820, and a transmitting unit 830.
The receiving unit 810 is configured to receive a first upload request sent by a client, where the first upload request includes version information of an item to be processed and at least one configuration file of the item to be processed, where the at least one configuration file is obtained by the client according to item information of any item to be processed of the at least one item to be processed, the configuration file includes information required for executing the item to be processed, a new item is a new item of the distributed control system, and the at least one item to be processed is a component of the new item of the distributed control system;
An obtaining unit 820, configured to obtain an uploaded configuration file when version information of the uploaded configuration file does not have version information conflict with version information of the uploaded configuration file, where the uploaded configuration file includes at least one configuration file;
a sending unit 830, configured to send a version information conflict indication message to the client when version information of the uploaded at least one configuration file conflicts with version information of the uploaded configuration file, where the version information conflict indication message includes the uploaded configuration file of the object to be processed;
the obtaining unit 820 is further configured to obtain an uploaded configuration file based on the second upload request sent by the receiving client, where the second upload request and the uploaded configuration file each include at least one modified configuration file and corresponding version information, and the at least one modified configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file.
In an alternative implementation, the apparatus may further include an output unit 840;
the output unit 840 is configured to output first indication information before the obtaining unit obtains the uploaded configuration file, where the first indication information is used to indicate to review the uploaded configuration file, and the uploaded configuration file includes at least one configuration file or the modified configuration file;
The receiving unit 810 is further configured to receive second indication information, where the second indication information is used to indicate a review result of each of the uploaded configuration files;
the obtaining unit 820 is further configured to obtain the uploaded configuration file when the review result of the configuration file is passed;
the sending unit 830 is further configured to send, when the result of the review of the configuration file is failed, review indication information that the review fails to pass to the client, and trigger the receiving unit 810 to receive the second upload request sent by the client.
In an alternative implementation, the apparatus further comprises a distribution unit 850;
the receiving unit 810 is further configured to receive a new project request sent by the client before receiving the first upload request sent by the client, where the new project request includes the new project identifier;
and the allocation unit 850 is configured to allocate, according to the new project request, a storage resource to which the new project identifier belongs, and send a new project response to the client, where the storage resource is used to store a configuration file set of the new project.
The sending unit 830 is further configured to send a new project response to the client.
After a client acquires a new project of a distributed control system including at least one project to be processed and at least one configuration file of any project to be processed, the configuration file includes configuration information required by executing the project to be processed, and the configuration file of the project to be processed is uploaded to a server; when receiving the version information conflict indication message sent by the service device, the client side displays the uploaded configuration file of the to-be-processed item in the at least one configuration file and the version information conflict indication message, and then sends the modified at least one configuration file to the server; or, the client side sends an extraction request to the service device before uploading, acquires the uploaded configuration file currently stored by the service device, and uploads the modified at least one configuration file to the service device after detecting whether the version information configuration file in the at least one configuration file has version conflict with the version information of the uploaded configuration file. The modified at least one configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file, so that the problem of conflict between labor division and cooperation when a plurality of engineers program and configure the same DCS system by using DCS configuration software simultaneously in the prior art is solved.
The embodiment of the invention also provides a terminal, as shown in fig. 9, which comprises a processor 910, a communication chip 920, a memory 930, a communication bus 940 and a display 950, wherein the processor 910, the communication interface 920 and the memory 930 complete communication with each other through the communication bus 940.
A memory 930 for storing a computer program;
processor 910, when executing a program stored on memory 930, performs the following steps:
acquiring at least one configuration file of the to-be-processed item based on item information of any one of the at least one to-be-processed item, wherein the at least one to-be-processed item is a component part of a newly-built item of the distributed control system, and the configuration file comprises configuration information required for executing the to-be-processed item;
sending a first uploading request to a server, wherein the first uploading request comprises version information of an item to be processed and at least one configuration file of the item to be processed, and the version information records version path change information of the at least one configuration file;
when receiving a version information conflict indication message sent by a server, displaying at least one configuration file and an uploaded configuration file of a to-be-processed item in the version information conflict indication message through a display, wherein the version information conflict refers to the phenomenon that version path change information with different sources is overlapped;
And sending a second uploading request to the server, wherein the second uploading request comprises version information of the item to be processed and at least one modified configuration file, and the at least one modified configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file.
In an alternative implementation, after acquiring the new project of the distributed control system, the method further includes:
sending a new project request to a server, wherein the new project request comprises the new project identifier;
and receiving a new project response sent by the server after the new project request is allocated with a storage resource to which the new project identifier belongs, wherein the storage resource is used for storing a configuration file set of the new project.
In an alternative implementation, the method further comprises: receiving review indication information sent by a server, wherein the review indication information is used for indicating a review result of an uploaded configuration file, and the uploaded configuration file comprises at least one configuration file or at least one configuration file after modification;
and when the review indication information indicates that the review result is failed, acquiring a modified configuration file of at least one configuration file or acquiring a configuration file of which the modified configuration file is modified again, and returning to execute the step of sending the second uploading request to the server.
Alternatively, the processor 910 in the terminal provided by the embodiment of the present invention is further configured to implement the following steps when executing the program stored in the memory 930:
acquiring at least one configuration file of the to-be-processed item based on item information of any one of the at least one to-be-processed item, wherein the at least one to-be-processed item is a component part of a newly-built item of the distributed control system, and the configuration file comprises configuration information required for executing the to-be-processed item;
sending an extraction request to a server, wherein the extraction request is used for extracting the uploaded configuration file stored by the server;
when version information in at least one configuration file and version information of the uploaded configuration file do not have version information conflict, a first uploading request is sent to a server, the first uploading request comprises the version information of an item to be processed and the at least one configuration file of the item to be processed, and version information records version change information of the item to be processed;
when version information in at least one configuration file and version information of the uploaded configuration file have version information conflict, a second uploading request is sent to a server, the second uploading request comprises version information of an item to be processed and at least one configuration file after modification, the at least one configuration file after modification is obtained after modification of the at least one configuration file according to the uploaded configuration file, and the version information conflict refers to the phenomenon that version path change information with different sources is overlapped.
Since the implementation manner and the beneficial effects of the solution to the problem of each device of the terminal in the above embodiment may be implemented by referring to each step of the client in the embodiment shown in fig. 2, the specific working process and the beneficial effects of the terminal provided by the embodiment of the present invention are not repeated herein.
The embodiment of the present invention further provides a server, as shown in fig. 10, including a processor 1010, a communication chip 1020, a memory 1030, a communication bus 1040 and a display 1050, where the processor 1010, the communication interface 1020 and the memory 1030 complete communication with each other through the communication bus 1040.
A memory 1030 for storing a computer program;
processor 1010, when executing a program stored on memory 1030, performs the following steps:
receiving a first uploading request sent by a client, wherein the first uploading request comprises version information of items to be processed and at least one configuration file of the items to be processed, the at least one configuration file is obtained by the client according to item information of any one of the items to be processed of at least one new item, the configuration file comprises information required by executing the items to be processed, the at least one item to be processed is a component part of the new item of the distributed control system, and the version information records version change information of the items to be processed;
When version information of the uploaded at least one configuration file does not conflict with version information of the uploaded configuration file, the uploaded configuration file is obtained, and the uploaded configuration file comprises at least one configuration file;
when version information of at least one uploaded configuration file conflicts with version information of the uploaded configuration file, a version information conflict indication message is sent to the client, wherein the version information conflict indication message comprises the uploaded configuration file of the item to be processed;
and based on the second uploading request sent by the receiving client, obtaining an uploaded configuration file, wherein the second uploading request and the uploaded configuration file both comprise at least one modified configuration file and corresponding version information, and the at least one modified configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file.
Since the implementation manner and the beneficial effects of the solution to the problem of each device of the server in the above embodiment may be implemented by referring to each step of the server in the embodiment shown in fig. 2, the specific working process and the beneficial effects of the server provided in the embodiment of the present invention are not repeated herein.
The communication bus mentioned above may be a peripheral component interconnect standard (Peripheral Component Interconnect, PCI) bus or an extended industry standard architecture (Extended Industry Standard Architecture, EISA) bus, or the like. The communication bus may be classified as an address bus, a data bus, a control bus, or the like. For ease of illustration, the figures are shown with only one bold line, but not with only one bus or one type of bus.
The communication interface is used for communication between the electronic device and other devices.
The Memory may include random access Memory (Random Access Memory, RAM) or may include Non-Volatile Memory (NVM), such as at least one disk Memory. Optionally, the memory may also be at least one memory device located remotely from the aforementioned processor.
The processor may be a general-purpose processor, including a central processing unit (Central Processing Unit, CPU), a network processor (Network Processor, NP), etc.; but also digital signal processors (Digital Signal Processing, DSP), application specific integrated circuits (Application Specific Integrated Circuit, ASIC), field programmable gate arrays (Field-Programmable Gate Array, FPGA) or other programmable logic devices, discrete gate or transistor logic devices, discrete hardware components.
In yet another embodiment of the present invention, a computer readable storage medium is provided, in which instructions are stored, which when run on a computer, cause the computer to perform the processing method of any of the above embodiments.
In a further embodiment of the present invention, there is also provided a computer program product containing instructions which, when run on a computer, cause the computer to perform the processing method of any of the above embodiments.
It will be appreciated by those skilled in the art that embodiments of the present application may be provided as methods, systems, or computer program products. Accordingly, embodiments of the present application may take the form of an entirely hardware embodiment, an entirely software embodiment or an embodiment combining software and hardware aspects. Furthermore, embodiments of the present application may take the form of a computer program product on one or more computer-usable storage media (including, but not limited to, disk storage, CD-ROM, optical storage, etc.) having computer-usable program code embodied therein.
Embodiments of the present application are described with reference to flowchart illustrations and/or block diagrams of methods, apparatus (systems) and computer program products according to embodiments of the application. It will be understood that each flow and/or block of the flowchart illustrations and/or block diagrams, and combinations of flows and/or blocks in the flowchart illustrations and/or block diagrams, can be implemented by computer program instructions. These computer program instructions may be provided to a processor of a general purpose computer, special purpose computer, embedded processor, or other programmable data processing apparatus to produce a machine, such that the instructions, which execute via the processor of the computer or other programmable data processing apparatus, create means for implementing the functions specified in the flowchart flow or flows and/or block diagram block or blocks.
These computer program instructions may also be stored in a computer-readable memory that can direct a computer or other programmable data processing apparatus to function in a particular manner, such that the instructions stored in the computer-readable memory produce an article of manufacture including instruction means which implement the function specified in the flowchart flow or flows and/or block diagram block or blocks.
These computer program instructions may also be loaded onto a computer or other programmable data processing apparatus to cause a series of operational steps to be performed on the computer or other programmable apparatus to produce a computer implemented process such that the instructions which execute on the computer or other programmable apparatus provide steps for implementing the functions specified in the flowchart flow or flows and/or block diagram block or blocks.
While preferred embodiments of the present application have been described, additional variations and modifications in those embodiments may occur to those skilled in the art once they learn of the basic inventive concepts. It is therefore intended that the following claims be interpreted to embrace the preferred embodiments and all such variations and modifications as fall within the scope of the embodiments herein.
It will be apparent to those skilled in the art that various modifications and variations can be made in the embodiments of the present application without departing from the spirit and scope of the embodiments of the present application. Thus, if such modifications and variations of the embodiments in the present application fall within the scope of the claims and the equivalents thereof in the embodiments of the present application, such modifications and variations are also intended to be included in the embodiments of the present application.

Claims (13)

1. A method for processing a configuration file of a distributed control system, the method comprising:
acquiring at least one configuration file of at least one item to be processed based on item information of any item to be processed in the at least one item to be processed, wherein the at least one item to be processed is a component part of a newly built item of a distributed control system, and the configuration file comprises configuration information required for executing the item to be processed;
sending a first uploading request to a server, wherein the first uploading request comprises version information of the item to be processed and the at least one configuration file, and the version information records version path change information of the at least one configuration file;
when receiving a version conflict indication message sent by a server, displaying the at least one configuration file and the uploaded configuration file of the to-be-processed item in the version conflict indication message, wherein the version information conflict refers to the phenomenon that version path change information with different sources is overlapped;
Sending a second uploading request to the server, wherein the second uploading request comprises version information of the item to be processed and at least one modified configuration file, and the at least one modified configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file; the modification mode of the at least one configuration file comprises the following steps: updating the content of a target configuration file in the at least one configuration file, adding or deleting the target configuration file in the at least one configuration file, and merging the uploaded configuration file with the at least one configuration file with version conflict;
the method further comprises the steps of:
receiving evaluation indication information sent by a server, wherein the evaluation indication information is used for indicating an evaluation result of an uploaded configuration file, and the uploaded configuration file comprises the at least one configuration file or the at least one modified configuration file;
and when the review indication information indicates that the review result is failed, acquiring the modified configuration file of the at least one configuration file or acquiring the configuration file of which the at least one configuration file is modified again, and returning to execute the step of sending the second uploading request to the server.
2. The method of claim 1, wherein after acquiring the new project of the distributed control system, the method further comprises:
sending a new project request to a server, wherein the new project request comprises the new project identifier;
and receiving a new project response sent by the server after distributing storage resources to which the new project identifiers belong according to the new project request, wherein the storage resources are used for storing a configuration file set of the new project.
3. A method for processing a configuration file of a distributed control system, the method comprising:
acquiring at least one configuration file of at least one item to be processed based on item information of any item to be processed in the at least one item to be processed, wherein the at least one item to be processed is a component part of a newly built item of a distributed control system, and the configuration file comprises configuration information required for executing the item to be processed;
sending an extraction request to a server, wherein the extraction request is used for extracting an uploaded configuration file stored by the server;
when version information in the at least one configuration file and version information of the uploaded configuration file do not have version information conflict, a first uploading request is sent to the server, the first uploading request comprises version information of the item to be processed and the at least one configuration file of the item to be processed, and the version information records version change information of the item to be processed;
When version information in the at least one configuration file and version information of the uploaded configuration file have version information conflict, a second uploading request is sent to the server, the second uploading request comprises version information of the item to be processed and at least one configuration file after modification, the at least one configuration file after modification is obtained after modification of the at least one configuration file according to the uploaded configuration file, and the version information conflict refers to the phenomenon that version path change information with different sources overlaps; the modification mode of the at least one configuration file comprises the following steps: updating the content of a target configuration file in the at least one configuration file, adding or deleting the target configuration file in the at least one configuration file, and merging the uploaded configuration file with the at least one configuration file with version conflict;
the method further comprises the steps of:
receiving evaluation indication information sent by a server, wherein the evaluation indication information is used for indicating an evaluation result of an uploaded configuration file, and the uploaded configuration file comprises the at least one configuration file or the at least one modified configuration file;
And when the review indication information indicates that the review result is failed, acquiring the modified configuration file of the at least one configuration file or acquiring the configuration file of which the at least one configuration file is modified again, and returning to execute the step of sending the second uploading request to the server.
4. A method for processing a configuration file of a distributed control system, the method comprising:
receiving a first uploading request sent by a client, wherein the first uploading request comprises version information of items to be processed and at least one configuration file of the items to be processed, the at least one configuration file is obtained by the client according to item information of any one of the at least one items to be processed, the configuration file comprises information required by executing the items to be processed, the at least one item to be processed is a component part of a newly-built item of a distributed control system, and the version information records version change information of the items to be processed;
when version information conflict exists between the uploaded version information of the at least one configuration file and the uploaded version information of the configuration file, acquiring the uploaded configuration file, wherein the uploaded configuration file comprises the at least one configuration file;
When version information of the uploaded at least one configuration file conflicts with version information of the uploaded configuration file, a version information conflict indication message is sent to the client, and the version information conflict indication message comprises the uploaded configuration file of the item to be processed;
based on receiving a second uploading request sent by a client, obtaining an uploaded configuration file, wherein the second uploading request and the uploaded configuration file both comprise at least one modified configuration file and corresponding version information, and the at least one modified configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file; the modification mode of the at least one configuration file comprises the following steps: updating the content of a target configuration file in the at least one configuration file, adding or deleting the target configuration file in the at least one configuration file, and merging the uploaded configuration file with the at least one configuration file with version conflict;
before the uploaded configuration file is obtained, the method further comprises the following steps:
outputting first indication information, wherein the first indication information is used for indicating to review the uploaded configuration file, and the uploaded configuration file comprises the at least one configuration file or the modified configuration file;
Receiving second indication information, wherein the second indication information is used for indicating a review result of each configuration file in the uploaded configuration files;
when the result of the review of the configuration file is that the configuration file passes, acquiring the uploaded configuration file;
and when the result of the review of the configuration file is that the configuration file does not pass, sending review indication information of failed review to the client, and returning to execute the step of receiving the second uploading request sent by the client.
5. The method of claim 4, wherein prior to receiving the first upload request sent by the client, the method further comprises:
receiving a new project request sent by a client, wherein the new project request comprises the new project identifier;
according to the new project request, distributing storage resources to which the new project identifier belongs;
and sending a new project response to the client, wherein the storage resource is used for storing the configuration file set of the new project.
6. A client, the client comprising:
the device comprises an acquisition unit, a processing unit and a processing unit, wherein the acquisition unit is used for acquiring at least one configuration file of at least one to-be-processed item based on item information of any to-be-processed item in the at least one to-be-processed item, the at least one to-be-processed item is a component part of a newly-built item of a distributed control system, and the configuration file comprises configuration information required by executing the to-be-processed item;
The sending unit is used for sending a first uploading request to the server, wherein the first uploading request comprises version information of the item to be processed and the at least one configuration file, and the version information records version path change information of the at least one configuration file;
the display unit is used for displaying the at least one configuration file and the uploaded configuration file of the to-be-processed item in the version information conflict indication message when receiving the version information conflict indication message sent by the server, wherein the version information conflict refers to the phenomenon that version path change information with different sources is overlapped;
the sending unit is further configured to send a second upload request to the server, where the second upload request includes version information of the item to be processed and at least one modified configuration file, where the at least one modified configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file; the modification mode of the at least one configuration file comprises the following steps: updating the content of a target configuration file in the at least one configuration file, adding or deleting the target configuration file in the at least one configuration file, and merging the uploaded configuration file with the at least one configuration file with version conflict;
The client also comprises a second receiving unit;
the second receiving unit is configured to receive review indication information sent by the server, where the review indication information is used to indicate a review result of the uploaded configuration file, and the uploaded configuration file includes the at least one configuration file or the modified at least one configuration file;
the obtaining unit is further configured to obtain a modified configuration file of the at least one configuration file or obtain a configuration file modified again by the at least one modified configuration file when the review indication information indicates that the review result is failed, and trigger the sending unit to send a second upload request to the server.
7. The client of claim 6, wherein the client further comprises a first receiving unit;
the sending unit is further configured to send a new project request to a server after the acquisition unit acquires a new project of the distributed control system, where the new project request includes the new project identifier;
the first receiving unit is configured to receive a new project response sent by the server after the server allocates a storage resource to which the new project identifier belongs according to the new project request, where the storage resource is used to store a configuration file set of the new project.
8. A client, the client comprising:
the device comprises an acquisition unit, a processing unit and a processing unit, wherein the acquisition unit is used for acquiring at least one configuration file of at least one to-be-processed item based on item information of any to-be-processed item in the at least one to-be-processed item, the at least one to-be-processed item is a component part of a newly-built item of a distributed control system, and the configuration file comprises configuration information required by executing the to-be-processed item;
the device comprises a sending unit, a server and a configuration file processing unit, wherein the sending unit is used for sending an extraction request to the server, and the extraction request is used for extracting the uploaded configuration file stored by the server;
when version information in the at least one configuration file and version information of the uploaded configuration file do not have version information conflict, a first uploading request is sent to the server, the first uploading request comprises version information of the item to be processed and the at least one configuration file of the item to be processed, and the version information records version change information of the item to be processed;
when version information in the at least one configuration file and version information of the uploaded configuration file have version information conflict, a second uploading request is sent to the server, the second uploading request comprises version information of the item to be processed and at least one configuration file after modification, the at least one configuration file after modification is obtained after modification of the at least one configuration file according to the uploaded configuration file, and the version information conflict refers to the phenomenon that version path change information with different sources overlaps; the modification mode of the at least one configuration file comprises the following steps: updating the content of a target configuration file in the at least one configuration file, adding or deleting the target configuration file in the at least one configuration file, and merging the uploaded configuration file with the at least one configuration file with version conflict;
The obtaining unit is further configured to receive review indication information sent by the server, where the review indication information is used to indicate a review result of the uploaded configuration file, and the uploaded configuration file includes the at least one configuration file or the at least one configuration file after modification; and when the review indication information indicates that the review result is failed, acquiring the modified configuration file of the at least one configuration file or acquiring the configuration file of which the at least one configuration file is modified again, and returning to execute the step of sending the second uploading request to the server.
9. A service apparatus, the apparatus comprising:
the system comprises a receiving unit, a processing unit and a processing unit, wherein the receiving unit is used for receiving a first uploading request sent by a client, the first uploading request comprises version information of items to be processed and at least one configuration file of the items to be processed, the at least one configuration file is obtained by the client according to item information of any one of the at least one items to be processed, the configuration file comprises information required by executing the items to be processed, the at least one item to be processed is a component part of a newly-built item of a distributed control system, and the version information records version change information of the items to be processed;
The system comprises an acquisition unit, a processing unit and a processing unit, wherein the acquisition unit is used for acquiring an uploaded configuration file when version information of the uploaded configuration file does not conflict with version information of the uploaded configuration file, and the uploaded configuration file comprises at least one configuration file;
the sending unit is used for sending a version information conflict indication message to the client when version information of the uploaded at least one configuration file conflicts with version information of the uploaded configuration file, wherein the version information conflict indication message comprises the uploaded configuration file of the object to be processed;
the obtaining unit is further configured to obtain an uploaded configuration file based on a second upload request sent by the receiving client, where the second upload request and the uploaded configuration file each include at least one modified configuration file and corresponding version information, and the at least one modified configuration file is obtained by modifying the at least one configuration file according to the uploaded configuration file; the modification mode of the at least one configuration file comprises the following steps: updating the content of a target configuration file in the at least one configuration file, adding or deleting the target configuration file in the at least one configuration file, and merging the uploaded configuration file with the at least one configuration file with version conflict;
The apparatus further comprises an output unit;
the output unit is configured to output first indication information before the obtaining unit obtains an uploaded configuration file, where the first indication information is used to indicate to review the uploaded configuration file, and the uploaded configuration file includes the at least one configuration file or the modified configuration file;
the receiving unit is further configured to receive second indication information, where the second indication information is used to indicate a review result of each configuration file in the uploaded configuration files;
the obtaining unit is further configured to obtain the uploaded configuration file when the review result of the configuration file is passed;
and the sending unit is further used for sending review indication information of failed review to the client when the review result of the configuration file is failed, and triggering the receiving unit to receive a second uploading request sent by the client.
10. The apparatus of claim 9, wherein the apparatus further comprises a dispensing unit;
the receiving unit is further configured to receive a new project request sent by the client before receiving the first upload request sent by the client, where the new project request includes the new project identifier;
The allocation unit is used for allocating storage resources to which the new project identifier belongs according to the new project request, wherein the storage resources are used for storing a configuration file set of the new project;
the sending unit is further configured to send a new project response to the client.
11. The terminal is characterized by comprising a processor, a communication interface, a memory and a communication bus, wherein the processor, the communication interface and the memory are communicated with each other through the communication bus;
a memory for storing a computer program;
a processor for implementing the method steps of any of claims 1-3 when executing a program stored on a memory.
12. The server is characterized by comprising a processor, a communication interface, a memory and a communication bus, wherein the processor, the communication interface and the memory are communicated with each other through the communication bus;
a memory for storing a computer program;
a processor for implementing the method steps of claim 4 or 5 when executing a program stored on a memory.
13. A computer-readable storage medium, characterized in that the computer-readable storage medium has stored therein a computer program which, when executed by a processor, implements the method steps of any of claims 1-5.
CN201810516676.4A 2018-05-25 2018-05-25 Processing method of configuration file of distributed control system, client and service device Active CN110532021B (en)

Priority Applications (1)

Application Number Priority Date Filing Date Title
CN201810516676.4A CN110532021B (en) 2018-05-25 2018-05-25 Processing method of configuration file of distributed control system, client and service device

Applications Claiming Priority (1)

Application Number Priority Date Filing Date Title
CN201810516676.4A CN110532021B (en) 2018-05-25 2018-05-25 Processing method of configuration file of distributed control system, client and service device

Publications (2)

Publication Number Publication Date
CN110532021A CN110532021A (en) 2019-12-03
CN110532021B true CN110532021B (en) 2024-02-13

Family

ID=68656997

Family Applications (1)

Application Number Title Priority Date Filing Date
CN201810516676.4A Active CN110532021B (en) 2018-05-25 2018-05-25 Processing method of configuration file of distributed control system, client and service device

Country Status (1)

Country Link
CN (1) CN110532021B (en)

Families Citing this family (5)

* Cited by examiner, † Cited by third party
Publication number Priority date Publication date Assignee Title
CN111158690B (en) * 2020-01-02 2023-11-17 北京东土科技股份有限公司 Desktop application framework, construction method, desktop application running method and storage medium
CN113067833A (en) * 2021-03-30 2021-07-02 杭州和利时自动化有限公司 Collaborative configuration service method and related components
CN113110335B (en) * 2021-04-19 2022-03-25 西安热工研究院有限公司 Multi-node picture file synchronization method for DCS (distributed control system)
CN114422533B (en) * 2021-12-29 2023-05-09 成都鲁易科技有限公司 Method and device for processing path conflict in cloud backup and electronic equipment
CN114578774A (en) * 2022-03-07 2022-06-03 浙江中控技术股份有限公司 Configuration control method, device and equipment of distributed control system and storage medium

Citations (4)

* Cited by examiner, † Cited by third party
Publication number Priority date Publication date Assignee Title
CN102299933A (en) * 2010-06-22 2011-12-28 中国国电集团公司 Engineering configuration management method and system for distributed control system (DCS)
CN104134109A (en) * 2014-06-24 2014-11-05 青岛海信网络科技股份有限公司 Engineering configuration method and engineering configuration system integrating version management
EP2985662A1 (en) * 2014-08-11 2016-02-17 Siemens Aktiengesellschaft Automatic creation of hardware configuration in a distributed control system
CN107341646A (en) * 2017-05-31 2017-11-10 北京广利核系统工程有限公司 Configuration software coordination management system and method

Patent Citations (4)

* Cited by examiner, † Cited by third party
Publication number Priority date Publication date Assignee Title
CN102299933A (en) * 2010-06-22 2011-12-28 中国国电集团公司 Engineering configuration management method and system for distributed control system (DCS)
CN104134109A (en) * 2014-06-24 2014-11-05 青岛海信网络科技股份有限公司 Engineering configuration method and engineering configuration system integrating version management
EP2985662A1 (en) * 2014-08-11 2016-02-17 Siemens Aktiengesellschaft Automatic creation of hardware configuration in a distributed control system
CN107341646A (en) * 2017-05-31 2017-11-10 北京广利核系统工程有限公司 Configuration software coordination management system and method

Also Published As

Publication number Publication date
CN110532021A (en) 2019-12-03

Similar Documents

Publication Publication Date Title
CN110532021B (en) Processing method of configuration file of distributed control system, client and service device
CN109726093B (en) Method, apparatus and computer program product for executing test cases
CN105302716B (en) Test method, device under the development mode of interflow
CN107896244B (en) Version file distribution method, client and server
US9547579B1 (en) Method and apparatus for automatically detecting defects
AU2018208685A1 (en) Method and system for automated system migration
CN106886493B (en) Method and device for establishing automatic test system
CN105787364B (en) Automatic testing method, device and system for tasks
CN108874678B (en) Automatic testing method and device for intelligent program
CN107621963B (en) Software deployment method, software deployment system and electronic equipment
CN106557419B (en) Program testing method and device
CN109408309B (en) Multi-terminal testing method and device
CN111651365B (en) Automatic interface testing method and device
CN104836686B (en) A kind of method and device for the configuration file generating server
US11663544B2 (en) System and methods for risk assessment in a multi-tenant cloud environment
CN113032281A (en) Method and device for acquiring code coverage rate in real time
CN112132544B (en) Inspection method and device of business system
CN110618943B (en) Security service test method and device, electronic equipment and readable storage medium
CN112948195A (en) Interface testing method and device, electronic equipment and storage medium
CN112231217A (en) Method and device for implementing function test in copy mode
CN111638905A (en) Version number generation method and device, electronic equipment and readable storage medium
JP2016021161A (en) Simulator system, gateway system test device, and gateway system test method
CN105320512A (en) Method and device for distributing trunk permission
CN111581042A (en) Cluster deployment method, deployment platform and server to be deployed
CN106547679B (en) Script management method and script management platform

Legal Events

Date Code Title Description
PB01 Publication
PB01 Publication
SE01 Entry into force of request for substantive examination
SE01 Entry into force of request for substantive examination
EE01 Entry into force of recordation of patent licensing contract

Application publication date: 20191203

Assignee: Beijing Shuili Intelligent Building Technology Co.,Ltd.

Assignor: KYLAND TECHNOLOGY Co.,Ltd.

Contract record no.: X2022990000047

Denomination of invention: Processing method and device of configuration file of distributed control system

License type: Common License

Record date: 20220121

EE01 Entry into force of recordation of patent licensing contract
GR01 Patent grant
GR01 Patent grant