CN103561107A

CN103561107A - Method and device for processing data downloading conflict

Info

Publication number: CN103561107A
Application number: CN201310565745.8A
Authority: CN
Inventors: 赖华贵; 池雷
Original assignee: Beijing Gridsum Technology Co Ltd
Current assignee: Beijing Gridsum Technology Co Ltd
Priority date: 2013-11-13
Filing date: 2013-11-13
Publication date: 2014-02-05

Abstract

The invention discloses a method and device for processing a data downloading conflict. The method for processing the data downloading conflict comprises the steps of receiving a downloading request which is used for requesting to download the data of a server-side; downloading the data from the server-side; detecting whether the downloaded data are in conflict with the local data of a client-side or not; marking the state of the conflict if the fact that the downloaded data are in conflict with the local data of the client-side; outputting corresponding processing options according to the marked conflict state, wherein the processing options are used for processing the conflict. Through the method and device, the effect of flexibly processing the data conflict is achieved.

Description

The processing method of data download conflict and device

Technical field

The present invention relates to internet arena, in particular to a kind of processing method and device of data download conflict.

Background technology

At present, a lot of enterprises are all promoting the business of enterprise with Internet advertising service, and some advertisement service providers are using these enterprises as client, for these enterprises provide advertising service.These advertisement service providers all can provide one to promote management system conventionally, and in this system for different clients provides different advertisement promotion accounts, different clients can be managed the advertisement promotion of oneself.Client can use the account of distributing to oneself to login the advertisement that in Advertising Management System, management oneself is thrown in.These manufacturers are used the relevant information of the advertisement of information system storage client input, such as the information such as advertisement material in advertisement promotion account.These information are referred to as popularization entity.

In order to facilitate customer account management advertisement material, usually, advertisement service provider can provide online popularization management system and the popularization management system of off-line simultaneously.Online popularization management system is directly obtained data from the information system of advertisement service provider, therefore can guarantee whenever any client access to be all the last state of advertisement material, the information system of advertisement service provider can be called server, and the popularization management system of off-line can be called client.The Advertising Management System of off-line is arranged on the computer of promoted account administrative staff use conventionally, and offline advertisement management system stores data in own distinctive information system, for example, in local computer data library file.The data of depositing in the information system of offline advertisement management system come from the information system of advertisement service provider.Promoted account administrative staff can download the advertisement material of up-to-date popularization from the information system of advertisement service provider, the data in the information system of renewal offline advertisement management system.

Because advertisement service provider allows a plurality of operating personnel to operate same advertisement promotion account simultaneously, different operating personnel can make respectively different operations on different computers, finally these operations are submitted to the information system of advertisement service provider.So when the operating personnel of a use offline advertisement management system want to download up-to-date popularization material from the information system of advertisement service provider, because may there is conflict between the latest data of downloading and client terminal local data.Exist conflict to mean that the modification of local data is not that data based on up-to-date are made, or the data mode based on up-to-date, local modification cannot retain.For example operating personnel have revised a advertisement material in this locality, and before not identical revised in the state that this advertisement material download obtains and this locality, so at this time just shows to have occurred conflict.When there is conflict between the latest data of downloading and client terminal local data, need this conflict to process.

At present, the processing of data collision is provided by system default conventionally, the processing mode being provided by system default is single, dumb, when processing mode and the user's request of system rule acquiescence is inconsistent, easily causes the loss of data of user's needs.

Processing mode for data collision in prior art is single, and inflexible problem not yet proposes effective solution at present.

Summary of the invention

Main purpose of the present invention is to provide a kind of processing method and device of data download conflict, easily causes the problem of loss of data with the processing of resolving data conflicts.

To achieve these goals, according to an aspect of the present invention, provide a kind of processing method of data download conflict.According to the processing method of data download conflict of the present invention, comprise: receive download request, this download request is for asking the data of download service end; Download is from the data of service end; Whether detect the data of downloading exists and conflicts with the data of client terminal local; If detect the data of download and the data of client terminal local, exist and conflict, the state that mark conflicts; And by the corresponding Treatment Options of the State-output conflicting, Treatment Options is for the treatment of conflict.

Further, whether the data that detect download exist to conflict with the data of client terminal local and comprise: the data of the data of download and client terminal local are contrasted, obtain existing the data of conflict; Determine the action type of the data that have conflict; And whether the data that judgement is downloaded according to action type exist and conflict with the data of client terminal local.

Further, the data of the data of download and client terminal local are contrasted, obtain existing the data of conflict to comprise: obtain the second data in the data of the first data in the data of download and client terminal local, wherein, the data of the first data for operating in the data of downloading, the data that operated in the data that the second data are client terminal local; Data using the first data and the second data as conflict; The action type of determining the data that have conflict comprises: the action type of being determined the first data by the first data; By the second data, determined the action type of the second data; Whether the data that judgement is downloaded according to action type exist to conflict with the data of client terminal local and comprise: whether the data of downloading according to the action type judgement of the action type of the first data and the second data exist and conflict with the data of client terminal local.

Further, action type comprises newly-increased operation, edit operation and deletion action, whether the data of wherein, downloading according to the action type judgement of the action type of the first data and the second data exist to conflict with the data of client terminal local and comprise: the action type of the action type of the first data and the second data is contrasted;

If the action type of the first data is newly-increased operation, the action type of the second data is newly-increased operation, and the first data after newly-increased and newly-increased after the attribute of the second data identical, determine that the data downloaded and the data existence of client terminal local conflict;

If the action type of the first data is edit operation, the action type of the second data is edit operation or deletion action, and preoperative the first data and preoperative the second data are identical data, determine that the data of downloading exist and conflict with the data of client terminal local;

If the action type of the first data is deletion action, the action type of the second data is edit operation, and preoperative the first data and preoperative the second data are identical data, determines that the data of downloading conflict with the data existence of client terminal local;

If the action type of the first data is deletion action, the action type of the second data is newly-increased operation or edit operation, and the subordinate data that preoperative the second data are preoperative the first data, determine that the data of downloading exist and conflict with the data of client terminal local; And

If the action type of the first data is deletion action, the action type of the second data is deletion action, and preoperative the first data and preoperative the second data are identical data, or the subordinate data that preoperative the second data are preoperative the first data, determine that the data of downloading exist and conflict with the data of client terminal local.

If the action type of the first data is newly-increased operation, the action type of the second data is newly-increased operation, and the first data after newly-increased and increase newly after the attribute of the second data identical, determine that the data of downloading exist and conflict with the data of client terminal local, the state of record conflict is that service end and client are simultaneously newly-increased;

If the action type of the first data is edit operation, the action type of the second data is edit operation, and preoperative the first data and preoperative the second data are identical data, determine that the data of downloading exist and conflict with the data of client terminal local, the state of record conflict is that service end and client are edited simultaneously;

If the action type of the first data is edit operation, the action type of the second data is deletion action, and preoperative the first data and preoperative the second data are identical data, the data of determine downloading exist and conflicts with the data of client terminal local, and the state that record conflicts is service end editor and client deletion;

If the action type of the first data is deletion action, the action type of the second data is edit operation, and preoperative the first data and preoperative the second data are identical data, determine that the data of downloading exist and conflict with the data of client terminal local, the state of record conflict is that service end is deleted and client-side editing;

If the action type of the first data is deletion action, the action type of the second data is newly-increased operation, and the subordinate data that preoperative the second data are preoperative the first data, the data of determine downloading exist and conflicts with the data of client terminal local, and the state of record conflict is service end deletion and client subordinate data increase newly;

If the action type of the first data is deletion action, the action type of the second data is edit operation, and the subordinate data that preoperative the second data are preoperative the first data, determine that the data of downloading exist and conflict with the data of client terminal local, the state of record conflict is that service end is deleted and client subordinate data edition; And

If the action type of the first data is deletion action, the action type of the second data is deletion action, and preoperative the second data and preoperative the first data are identical data, or the subordinate data that preoperative the second data are preoperative the first data, determine that the data of downloading exist and conflict with the data of client terminal local, the state of record conflict is that service end client is deleted simultaneously.

To achieve these goals, according to a further aspect in the invention, provide a kind of processing unit of data download conflict.According to the processing unit of data download conflict of the present invention, comprise: receiving element, for receiving download request, download request is for asking the data of download service end; Download unit, for downloading the data from service end; Whether detecting unit, exist and conflict with the data of client terminal local for detection of the data of downloading; Indexing unit, if exist and conflict, the state that mark conflicts for detecting the data of download and the data of client terminal local; And output unit, for the corresponding Treatment Options of the State-output by conflicting, Treatment Options is for the treatment of conflict.

Further, detecting unit comprises: comparison module, for the data of the data of download and client terminal local are contrasted, obtains existing the data of conflict; Determination module, for determining the action type of the data that have conflict; And judge module, for the data that judgement is downloaded according to action type, whether exist and conflict with the data of client terminal local.

Further, comparison module comprises: obtain submodule, for obtaining first data of data of download and the second data in the data of client terminal local, wherein, the data of the first data for operating in the data of downloading, the data that operated in the data that the second data are client terminal local; Generate submodule, for the data using the first data and the second data as conflict; Determination module comprises: first determines submodule, for determined the action type of the first data by the first data; Second determines submodule, for determined the action type of the second data by the second data; Whether judge module exists and conflicts with the data of client terminal local for the data of downloading according to the action type judgement of the action type of the first data and the second data.

Further, action type comprises newly-increased operation, edit operation and deletion action, and wherein, judge module comprises:

The first comparison sub-module, for contrasting the action type of the action type of the first data and the second data;

The 3rd determines submodule, if the action type for the first data is newly-increased operation, the action type of the second data is newly-increased operation, and the first data after newly-increased and newly-increased after the attribute of the second data identical, determine that the data downloaded and the data existence of client terminal local conflict;

The 4th determines submodule, if the action type for the first data is edit operation, the action type of the second data is edit operation or deletion action, and preoperative the first data and preoperative the second data are identical data, determine that the data of downloading exist and conflict with the data of client terminal local;

The 5th determines submodule, if the action type for the first data is deletion action, the action type of the second data is edit operation, and preoperative the first data and preoperative the second data are identical data, determines that the data of downloading conflict with the data existence of client terminal local;

The 6th determines submodule, if the action type for the first data is deletion action, the action type of the second data is newly-increased operation or edit operation, and the subordinate data that preoperative the second data are preoperative the first data, determine that the data of downloading exist and conflict with the data of client terminal local; And

The 7th determines submodule, if the action type for the first data is deletion action, the action type of the second data is deletion action, and preoperative the first data and preoperative the second data are identical data, or the subordinate data that preoperative the second data are preoperative the first data, determine that the data of downloading exist and conflict with the data of client terminal local.

The second comparison sub-module, for contrasting the action type of the action type of the first data and the second data;

The first record sub module, if the action type for the first data is newly-increased operation, the action type of the second data is newly-increased operation, and the first data after newly-increased and increase newly after the attribute of the second data identical, determine that the data of downloading exist and conflict with the data of client terminal local, the state of record conflict is that service end and client are simultaneously newly-increased;

The second record sub module, if the action type for the first data is edit operation, the action type of the second data is edit operation, and preoperative the first data and preoperative the second data are identical data, determine that the data of downloading exist and conflict with the data of client terminal local, the state of record conflict is that service end and client are edited simultaneously;

The 3rd record sub module, if the action type for the first data is edit operation, the action type of the second data is deletion action, and preoperative the first data and preoperative the second data are identical data, the data of determine downloading exist and conflicts with the data of client terminal local, and the state that record conflicts is service end editor and client deletion;

The 4th record sub module, if the action type for the first data is deletion action, the action type of the second data is edit operation, and preoperative the first data and preoperative the second data are identical data, determine that the data of downloading exist and conflict with the data of client terminal local, the state of record conflict is that service end is deleted and client-side editing;

The 5th record sub module, if the action type for the first data is deletion action, the action type of the second data is newly-increased operation, and the subordinate data that preoperative the second data are preoperative the first data, the data of determine downloading exist and conflicts with the data of client terminal local, and the state of record conflict is service end deletion and client subordinate data increase newly;

The 6th record sub module, if the action type for the first data is deletion action, the action type of the second data is edit operation, and the subordinate data that preoperative the second data are preoperative the first data, determine that the data of downloading exist and conflict with the data of client terminal local, the state of record conflict is that service end is deleted and client subordinate data edition; And

The 7th record sub module, if the action type for the first data is deletion action, the action type of the second data is deletion action, and preoperative the second data and preoperative the first data are identical data, or the subordinate data that preoperative the second data are preoperative the first data, determine that the data of downloading exist and conflict with the data of client terminal local, the state of record conflict is that service end client is deleted simultaneously.

By the present invention, adopt the processing method of data download conflict to comprise: receive download request, download request is for asking the data of download service end, download is from the data of service end, whether detect the data of downloading exists and conflicts with the data of client terminal local, if detecting the data of download and the data of client terminal local exists and conflicts, the state that mark conflicts, by the corresponding Treatment Options of the State-output conflicting, Treatment Options conflicts for the treatment of this, by detecting from the data of service end download and conflicting of client terminal local data, and after detection place conflict, there is the state of conflict in flag data, the corresponding Treatment Options of State-output by the conflict of mark, make operating personnel to producing the data of conflict, to carry out selectivity processing according to the Treatment Options of output, select to retain the data that need, the processing mode of having avoided giving tacit consent in prior art causes the problem of loss of data, solved in prior art the processing mode of data collision single, inflexible problem, and then reached the effect of flexible processing data collision.

Accompanying drawing explanation

The accompanying drawing that forms the application's a part is used to provide a further understanding of the present invention, and schematic description and description of the present invention is used for explaining the present invention, does not form inappropriate limitation of the present invention.In the accompanying drawings:

Fig. 1 is according to the structural representation of the processing unit of the data download conflict of first embodiment of the invention;

Fig. 2 is according to the structural representation of the processing unit of the data download conflict of second embodiment of the invention;

Fig. 3 is according to the flow chart of the processing method of the data download conflict of first embodiment of the invention; And

Fig. 4 is according to the flow chart of the processing method of the data download conflict of second embodiment of the invention.

Embodiment

It should be noted that, in the situation that not conflicting, embodiment and the feature in embodiment in the application can combine mutually.Describe below with reference to the accompanying drawings and in conjunction with the embodiments the present invention in detail.

The embodiment of the present invention provides a kind of processing unit of data download conflict, and the processing unit of this data download conflict can be realized its function by computer equipment.

Fig. 1 is according to the structural representation of the processing unit of the data download conflict of first embodiment of the invention, as shown in Figure 1, the processing unit of this data download conflict comprises: receiving element 10, download unit 20, detecting unit 30, indexing unit 40 and output unit 50.

Receiving element 10 is for receiving download request, and download request is for asking the data of download service end.The current data that the data of the service end of downloading are service end, also can be called the latest data of service end, and receiving element 10 receives these download requests, to download the latest data of service end.Service end in above-mentioned can be the information system of the advertisement service provider in advertisement material management process, for example, when operating personnel need to manage advertisement material, input download request, receiving element 10 receives this download request, up-to-date popularization data in preparation downloads ad service provider's information system, that is to say latest data.

Download unit 20 is for downloading the data from service end.After receiving element 10 receives download request, the latest data that download unit 20 is downloaded from service end, so that process these data.

Whether detecting unit 30 exists and conflicts with the data of client terminal local for detection of the data of downloading.Because client terminal local has and the corresponding data of service end, these data can be last data from service end, can be also to carry out certain operations data afterwards based on the data of last time from service end.When information system that service end is advertisement service provider, accordingly, client can be the popularization management system of off-line.For example, in advertisement material management process, for the advertisement material informational needs of promoting, change, the popularization management system of operating personnel from service end downloading data to off-line, can these data be increased newly, be edited or the operation such as deletion.When operating personnel have carried out operating (as these data are edited to a certain item number certificate in the data of downloading in the popularization management system of off-line, or delete this data), in the popularization management system of off-line, can preserve in addition the data after this time operates so, in the popularization management system of off-line, two piece of data have been preserved, the data of initial downloaded can be called Backup Data, data after operating can be called local data, or local current data.If operating personnel do not operate data, can not store in addition a piece of data.Whether the data after detecting unit 30 operates with client for detection of the latest data of this download exist is conflicted, for example, between client last downloaded is downloaded to this, service end is carried out edit operation to a certain item number certificate, simultaneously, client has also been carried out edit operation to an item number certificate identical in the data after last downloaded, after this downloads to latest data, this item number in the latest data of downloading according in the data with client more this item number according to meeting, exist and conflict, detecting unit 30 is for detection of this conflict.

If indexing unit 40 exists and conflict, the state that mark conflicts for detecting the data of download and the data of client terminal local.Between last downloaded is downloaded to this, service end and client operate same data, if detecting the latest data of this download, detecting unit 30 conflicts with the data existence after client terminal local operation, the state of this conflict of mark, can know the reason of data collision according to the state of this conflict.For example, service end is carried out edit operation to a certain item number certificate, simultaneously, client has also been carried out edit operation to an item number certificate identical in the data after last downloaded, after this downloads to latest data, this item number in the latest data of download according in the data with client more this item number according to meeting, exist and conflict.After detecting unit 30 detects this conflict, the state of 40 these conflicts of mark of indexing unit is that service end and client are edited simultaneously.

Output unit 50 is for the corresponding Treatment Options of the State-output by conflicting, and this Treatment Options is for the treatment of conflict.When determining that the data of downloading exist and conflict with the data of client terminal local, and after the state of mark conflict, output unit 50 output Treatment Options provide the option that manage conflict corresponding with the state of conflict in Treatment Options.This option can be one, can be also a plurality of, and when only having an option, operating personnel can only view this conflict, and confirms to use this option to manage conflict.When there being a plurality of option operations personnel to select one for managing conflict from a plurality of options according to actual conditions, so that select the data that oneself need to preserve.

According to the embodiment of the present invention, by detecting unit 30, detect from the data of service end download and conflicting of client terminal local data, and after detection place conflict, there is the state of conflict in flag data, again by the corresponding Treatment Options of State-output of the conflict of mark, make operating personnel to producing the data of conflict, to carry out selectivity processing according to the Treatment Options of output, select to retain the data that need, the processing mode of having avoided giving tacit consent in prior art causes the problem of loss of data, solved in prior art the processing mode of data collision single, inflexible problem, and then reached the effect of flexible processing data collision.

It should be noted that, the data download apparatus that the embodiment of the present invention provides can be for client terminal local, data in data downloading process are processed, and client can be the popularization management system of off-line in advertisement material management process, can be also the management system of other off-line.

Fig. 2 is according to the structural representation of the processing unit of the data download conflict of second embodiment of the invention, as shown in Figure 2, the processing unit of this data download conflict comprises: receiving element 10, download unit 20, detecting unit 30 indexing units 40 and output unit 50.Wherein detecting unit 30 comprises: comparison module 301, determination module 302 and judge module 303.Receiving element 10 and download unit 20 have identical function with the receiving element 10 shown in Fig. 1 and download unit 20, do not repeat here.

Comparison module 301, for the data of the data of download and client terminal local are contrasted, obtains existing the data of conflict.Because the data of downloading from service end and the data of client terminal local all comprise a lot of data, the data of the data of download and client terminal local are contrasted, obtain likely existing the data of conflict, likely exist the data of conflict to be the data of carrying out operation.

Determination module 302 is for determining the action type of the data that have conflict.Determination module 302 is for determining the action type of the data that likely existence conflicts that comparison module 301 obtains, and wherein, action type can be newly-built operation, edit operation and deletion action.In these operations, be not that all operations of carrying out all can produce conflict, for example, when service end for newly-increased a certain item number according to time, in client, there is no corresponding data, like this this item number according to only exist with service end in, in therefore downloading, can not produce conflict.

Whether judge module 303 exists and conflicts with the data of client terminal local for the data that judgement is downloaded according to action type.Owing to likely there are the data of conflict, be the data that operate, service end is different with the action type of the data that operate in client, these data or have conflict or do not have conflict, and when the conflict of existence, the state of conflict is difference also.For example, in advertisement material management process, for the newly-increased entity of service end, client is to operate the newly-increased data of service end, and this situation can not clash, and therefore does not need to be labeled as conflict.

Preferably, comparison module 301 comprises: obtain submodule and generate submodule.

Obtain submodule for obtaining first data of data of download and the second data in the data of client terminal local, wherein, the data of the first data for operating in the data of downloading, the data that operated in the data that the second data are client terminal local.The first data are arbitrary the data that had operation the latest data of downloading from service end, and the second data are arbitrary the data that had operation from the data of client terminal local.For example, table 1 is depicted as the promoted account structure of a certain a certain marketing platform of the moment, the account structure comprise some solid datas such as promoted account, popularization plan, popularization group, keyword and intention, wherein, between entity due to promoted account, there is hierarchical structure, be that some entity is the parent of other entity, other entity is subordinated to this entity, the data that are subordinated to a certain entity can be called to the subordinate data of this entity.Each popularization plan is subordinated to a corresponding promoted account, and each popularization group is subordinated to a corresponding popularization plan, and each keyword and intention belong to a corresponding popularization group.

Table 1:

Type	Title	Parent title
			Promoted account	Test promoted account 01	<without higher level>
Popularization plan	Popularization plan 11	Test promoted account 01

Popularization plan	Popularization plan 12	Test promoted account 01
			Popularization group	Popularization group 21	Popularization plan 11
Popularization group	Popularization group 21	Popularization plan 12
			Keyword	Keyword 31	Popularization group 21
Keyword	Keyword 32	Popularization group 21
			Keyword	Keyword 33	Popularization group 21
Keyword	Keyword 34	Popularization group 22
			Intention	Intention 41	Popularization group 21
Intention	Intention 42	Popularization group 22

In this moment client, carried out once downloading, and covered local data, therefore at this time the state of client and the data about in this promoted account in service end are identical.

After this, service end has been carried out once-through operation to this promoted account, as shown in table 2:

Table 2:

Type	Title	Parent title	Action type
				Promoted account	Test promoted account 01	<without higher level>	?
Popularization plan	Popularization plan 11	Test promoted account 01	Editor
				Popularization plan	Popularization plan 12	Test promoted account 01	?
Popularization group	Popularization group 21	Popularization plan 11	?
				Popularization group	Popularization group 22	Popularization plan 12	Delete
Keyword	Keyword 31	Popularization group 21	Editor
				Keyword	Keyword 32	Popularization group 21	?
Keyword	Keyword 33	Popularization group 21	Delete
				Keyword	Keyword 34	Popularization group 22	?

Intention	Intention 41	Popularization group 21	?
				Intention	Intention 42	Popularization group 22	?

Service end has been carried out respectively edit operation, deletion action, edit operation and deletion action to popularization plan 11, popularization group 22, keyword 31 and keyword 33 as shown in Table 2.Therefore using popularization plan 11, popularization group 22, keyword 31 and keyword 33 as the first data.

After this, client has also been carried out once-through operation to this promoted account, as shown in table 3:

Table 3:

Type	Title	Parent title	Action type
				Promoted account	Test promoted account 01	<without higher level>	?
Popularization plan	Popularization plan 11	Test promoted account 01	Editor
				Popularization plan	Popularization plan 12	Test promoted account 01	?
Popularization group	Popularization group 21	Popularization plan 11	?
				Popularization group	Popularization group 22	Popularization plan 12	?
Keyword	Keyword 31	Popularization group 21	Delete
				Keyword	Keyword 32	Popularization group 21	?
Keyword	Keyword 33	Popularization group 21	Editor
				Keyword	Keyword 34	Popularization group 22	Editor
Intention	Intention 41	Popularization group 21	?
				Intention	Intention 42	Popularization group 22	?
Intention	Intention 43	Popularization group 22	Newly-built

Service end has been carried out respectively edit operation, deletion action, edit operation, deletion action and newly-built operation to popularization plan 11, keyword 31, keyword 33, keyword 34 and intention 43 as shown in Table 3.Therefore using popularization plan 11, keyword 31, keyword 33, keyword 34 and intention 43 as second operand certificate.

Generate submodule, for the data using the first data and the second data as conflict.Owing to only carrying out the data of operation, in downloading process, just can clash, the data of not carrying out any operation can not clash.As the popularization plan 11 in the popularization plan 11 in table 2, popularization group 22, keyword 31 and keyword 33 and table 3, keyword 31, keyword 33, keyword 34 and intention 43, using such data as colliding data.

Determination module 302 comprises: first determines submodule, for determined the action type of the first data by the first data; Second determines submodule, for determined the action type of the second data by the second data.The first data before and after operation are contrasted to the action type that can determine the first data.In like manner, the second data before and after operation are contrasted to the action type that can determine the second data.

Preferably, whether judge module 303 also exists and conflicts with the data of client terminal local for the data of downloading according to the action type judgement of the action type of the first data and the second data.Whether the data of downloading according to the action type judgement of the action type of the first data and the second data exist and conflict with the data of client terminal local, that is to say each data of carrying out operating of the data of the data of download and client terminal local are judged item by item.

Preferably, action type comprises newly-increased operation, edit operation and deletion action, wherein, judge module 303 comprises: the first comparison sub-module, the 3rd is determined submodule, the 4th definite submodule, the 5th definite submodule, the 6th definite submodule and the 7th definite submodule.

The first comparison sub-module is for contrasting the action type of the action type of the first data and the second data.When contrasting the action type of the first data and the action type of the second data, also to judge the relation on attributes between the first data and the second data.

If the 3rd determines that submodule is newly-increased operation for the action type of the first data, the action type of the second data is newly-increased operation, and the first data after newly-increased and newly-increased after the attribute of the second data identical, determine that the data downloaded and the data existence of client terminal local conflict.Simultaneously newly-built for service end and client, when the first newly-built data identical with the attribute of the second data, wherein, attribute is identical can be the first data be identical data with the second data, can be also the data that the first data and the second data have same names.

If the 4th determines that submodule is edit operation for the action type of the first data, the action type of the second data is edit operation or deletion action, and preoperative the first data and preoperative the second data are identical data, determine that the data of downloading exist and conflict with the data of client terminal local.

If the 5th determines that submodule is deletion action for the action type of the first data, the action type of the second data is edit operation, and preoperative the first data and preoperative the second data are identical data, determine that the data of downloading exist and conflict with the data of client terminal local.

If the 6th determines that submodule is deletion action for the action type of the first data, the action type of the second data is newly-increased operation or edit operation, and the subordinate data that preoperative the second data are preoperative the first data, determine that the data of downloading exist and conflict with the data of client terminal local.The subordinate data that preoperative the second data are preoperative the first data, that is, preoperative the second data are subordinated to preoperative the first data.

If the 7th determines that submodule is deletion action for the action type of the first data, the action type of the second data is deletion action, and preoperative the first data and preoperative the second data are identical data, or the subordinate data that preoperative the second data are preoperative the first data, determine that the data of downloading exist and conflict with the data of client terminal local.

Alternatively, action type comprises newly-increased operation, edit operation and deletion action, wherein, judge module 303 can also comprise: the second comparison sub-module, the first record sub module, the second record sub module, the 3rd record sub module, the 4th record sub module, the 5th record sub module, the 6th record sub module and the 7th record sub module.

The second comparison sub-module is for contrasting the action type of the action type of the first data and the second data.When contrasting the action type of the first data and the action type of the second data, also to judge the relation on attributes between the first data and the second data.

If the first record sub module is newly-increased operation for the action type of the first data, the action type of the second data is newly-increased operation, and the first data after newly-increased and increase newly after the attribute of the second data identical, determine that the data of downloading exist and conflict with the data of client terminal local, the state of record conflict is that service end and client are simultaneously newly-increased.

If the second record sub module is edit operation for the action type of the first data, the action type of the second data is edit operation, and preoperative the first data and preoperative the second data are identical data, determine that the data of downloading exist and conflict with the data of client terminal local, the state of record conflict is that service end and client are edited simultaneously.

If the 3rd record sub module is edit operation for the action type of the first data, the action type of the second data is deletion action, and preoperative the first data and preoperative the second data are identical data, the data of determine downloading exist and conflicts with the data of client terminal local, and the state that record conflicts is service end editor and client deletion.

If the 4th record sub module is deletion action for the action type of the first data, the action type of the second data is edit operation, and preoperative the first data and preoperative the second data are identical data, determine that the data of downloading exist and conflict with the data of client terminal local, the state of record conflict is that service end is deleted and client-side editing.

If the 5th record sub module is deletion action for the action type of the first data, the action type of the second data is newly-increased operation, and the subordinate data that preoperative the second data are preoperative the first data, the data of determine downloading exist and conflicts with the data of client terminal local, and the state of record conflict is service end deletion and client subordinate data increase newly.

The 6th record sub module, if the action type for the first data is deletion action, the action type of the second data is edit operation, and the subordinate data that preoperative the second data are preoperative the first data, determine that the data of downloading exist and conflict with the data of client terminal local, the state of record conflict is that service end is deleted and client subordinate data edition.

It should be noted that; the flag state here can have different variations, and for example, " service end delete and client subordinate data edition " can be " service end parent is deleted and client-side editing " etc.; different expressions still all represents the identical meaning, all within protection scope of the present invention.

As shown in data in table 2 and table 3, the state of record conflict after the data collision in judgement promoted account, as shown in table 4:

Table 4:

After detecting, all there is conflict in these data such as popularization plan 11, keyword 31, keyword 33, keyword 34 and intention 43, the state description of the conflict of its correspondence is " service end and client are edited simultaneously ", " deletion of service end editor's client ", " service end is deleted client-side editing ", " under service end, popularization group is deleted client-side editing ", " it is newly-built that under service end, popularization group is deleted client ".According to the state description of this conflict, just enough know the reason of these data collisions, so that these data are processed.

After the conflict situation of each conflict of mark, the output unit 50 of the processing unit of the data download conflict of the embodiment of the present invention is for according to the corresponding Treatment Options of the State-output of each conflict, and for dissimilar conflict, the option of locating of output is different.If there are a plurality of solutions, user need to select a solution according to actual conditions.For example, for the colliding data in table 4 " popularization plan 11 ", its conflict situation is " service end and client are edited simultaneously ", output unit 50 is exported two kinds of Treatment Options so, a kind of is to retain service end to revise, another kind is to retain client to revise, and operating personnel can select one of them amended data to retain according to provide two kinds of options.For the data of the conflict after mark, operating personnel can check this colliding data, and these data are judged, can select to wish that the data that retain retain.

For service end, deleted an entity and all kinds of conflicts that cause, user can only select to accept the deletion of server.User, before accepting deletion, can back up being about to the data of deleted client, so that as a reference by it in the future.

For the conflict type of the data in above-mentioned table 4, its optional solution is as shown in table 5.

Table 5:

The embodiment of the present invention also provides a kind of processing method of data download conflict.The method operates in client.It should be noted that, the processing unit of the data download conflict that the processing method of the data download conflict of the embodiment of the present invention can provide by the embodiment of the present invention is carried out, the processing method of the data download conflict that the processing unit of the data download conflict of the embodiment of the present invention also can provide for the execution embodiment of the present invention.

Fig. 3 is according to the flow chart of the processing method of the data download conflict of first embodiment of the invention.As shown in Figure 3, the processing method of this data download conflict comprises that step is as follows:

Step S101, receives download request, and download request is for asking the data of download service end.The current data that the data of the service end of downloading are service end, also can be called the latest data of service end, and receiving element 10 receives these download requests, to download the latest data of service end.Service end in above-mentioned can be the information system of the advertisement service provider in advertisement material management process, for example, when operating personnel need to manage advertisement material, input download request, receiving element 10 receives this download request, up-to-date popularization data in preparation downloads ad service provider's information system, that is to say latest data.

Step S102, downloads the data from service end.After receiving element 10 receives download request, the latest data that download unit 20 is downloaded from service end, so that process these data.

Whether step S103, detect the data of downloading and exist and conflict with the data of client terminal local.Because client terminal local has and the corresponding data of service end, these data can be last data from service end, can be also to carry out certain operations data afterwards based on the data of last time from service end.When information system that service end is advertisement service provider, accordingly, client can be the popularization management system of off-line.For example, in advertisement material management process, for the advertisement material informational needs of promoting, change, the popularization management system of operating personnel from service end downloading data to off-line, can these data be increased newly, be edited or the operation such as deletion.When operating personnel have carried out operating (as these data are edited to a certain item number certificate in the data of downloading in the popularization management system of off-line, or delete this data), in the popularization management system of off-line, can preserve in addition the data after this time operates so, in the popularization management system of off-line, two piece of data have been preserved, the data of initial downloaded can be called Backup Data, data after operating can be called local data, or local current data.If operating personnel do not operate data, can not store in addition a piece of data.

Step S104, exists and conflict if detect the data of download and the data of client terminal local, the state that mark conflicts.Between last downloaded is downloaded to this, service end and client operate same data, if detecting the latest data of this download, detecting unit 30 conflicts with the data existence after client terminal local operation, the state of this conflict of mark, can know the reason of data collision according to the state of this conflict.For example, service end is carried out edit operation to a certain item number certificate, simultaneously, client has also been carried out edit operation to an item number certificate identical in the data after last downloaded, after this downloads to latest data, this item number in the latest data of download according in the data with client more this item number according to meeting, exist and conflict.After detecting unit 30 detects this conflict, the state of 40 these conflicts of mark of indexing unit is that service end and client are edited simultaneously.

Step S105, by the corresponding Treatment Options of the State-output conflicting, this Treatment Options is for the treatment of conflict.When determining that the data of downloading exist and conflict with the data of client terminal local, and after the state of mark conflict, output Treatment Options provides the option that manage conflict corresponding with the state of conflict in Treatment Options.This option can be one, can be also a plurality of, and when only having an option, operating personnel can only view this conflict, and confirms to use this option to manage conflict.When there being a plurality of option operations personnel to select one for managing conflict from a plurality of options according to actual conditions, so that select the data that oneself need to preserve.

According to the embodiment of the present invention, by detecting from the data of service end download and conflicting of client terminal local data, and after detection place conflict, there is the state of conflict in flag data, again by the corresponding Treatment Options of State-output of the conflict of mark, make operating personnel to producing the data of conflict, to carry out selectivity processing according to the Treatment Options of output, select to retain the data that need, the processing mode of having avoided giving tacit consent in prior art causes the problem of loss of data, solved in prior art the processing mode of data collision single, inflexible problem, and then reached the effect of flexible processing data collision.

Fig. 4 is according to the flow chart of the processing method of the data download conflict of second embodiment of the invention.The processing method of the data download conflict of this embodiment can be used as a kind of preferred implementation of above-described embodiment.As shown in Figure 4, the processing method of this data download conflict comprises that step is as follows:

Step S201, receives download request, and download request is for asking the data of download service end.The current data that the data of the service end of downloading are service end, also can be called the latest data of service end, and receiving element 10 receives these download requests, to download the latest data of service end.Service end in above-mentioned can be the information system of the advertisement service provider in advertisement material management process, for example, when operating personnel need to manage advertisement material, input download request, receiving element 10 receives this download request, up-to-date popularization data in preparation downloads ad service provider's information system, that is to say latest data.

Step S202, downloads the data from service end.After receiving element 10 receives download request, the latest data that download unit 20 is downloaded from service end, so that process these data.

Step S203, contrasts the data of the data of download and client terminal local, obtains existing the data of conflict.Because the data of downloading from service end and the data of client terminal local all comprise a lot of data, the data of the data of download and client terminal local are contrasted, obtain likely existing the data of conflict, likely exist the data of conflict to be the data of carrying out operation.

Preferably, step S203 realizes by following steps:

Step S2031, obtains the second data in the data of the first data in the data of download and client terminal local, wherein, and the data of the first data for operating in the data of downloading, the data that operated in the data that the second data are client terminal local.The first data are arbitrary the data that had operation the latest data of downloading from service end, and the second data are arbitrary the data that had operation from the data of client terminal local.For example, table 1 is depicted as the promoted account structure of a certain a certain marketing platform of the moment, the account structure comprise some solid datas such as promoted account, popularization plan, popularization group, keyword and intention, wherein, between entity due to promoted account, there is hierarchical structure, be that some entity is the parent of other entity, other entity is subordinated to this entity, the data that are subordinated to a certain entity can be called to the subordinate data of this entity.Each popularization plan is subordinated to a corresponding promoted account, and each popularization group is subordinated to a corresponding popularization plan, and each keyword and intention belong to a corresponding popularization group.

Table 1:

Type	Title	Parent title
			Promoted account	Test promoted account 01	<without higher level>
Popularization plan	Popularization plan 11	Test promoted account 01
			Popularization plan	Popularization plan 12	Test promoted account 01
Popularization group	Popularization group 21	Popularization plan 11
			Popularization group	Popularization group 21	Popularization plan 12
Keyword	Keyword 31	Popularization group 21
			Keyword	Keyword 32	Popularization group 21
Keyword	Keyword 33	Popularization group 21
			Keyword	Keyword 34	Popularization group 22
Intention	Intention 41	Popularization group 21
			Intention	Intention 42	Popularization group 22

Table 2:

Type	Title	Parent title	Action type
				Promoted account	Test promoted account 01	<without higher level>	?
Popularization plan	Popularization plan 11	Test promoted account 01	Editor
				Popularization plan	Popularization plan 12	Test promoted account 01	?
Popularization group	Popularization group 21	Popularization plan 11	?
				Popularization group	Popularization group 22	Popularization plan 12	Delete
Keyword	Keyword 31	Popularization group 21	Editor
				Keyword	Keyword 32	Popularization group 21	?
Keyword	Keyword 33	Popularization group 21	Delete
				Keyword	Keyword 34	Popularization group 22	?
Intention	Intention 41	Popularization group 21	?
				Intention	Intention 42	Popularization group 22	?

Service end has been carried out respectively edit operation, deletion action, edit operation and deletion action to popularization plan 11, popularization group 22, keyword 31 and keyword 33 as shown in Table 2.Therefore by popularization plan 11, popularization group 22, keyword 31 and keyword 33 first data.

Table 3:

Type	Title	Parent title	Action type
				Promoted account	Test promoted account 01	<without higher level>	?
Popularization plan	Popularization plan 11	Test promoted account 01	Editor
				Popularization plan	Popularization plan 12	Test promoted account 01	?
Popularization group	Popularization group 21	Popularization plan 11	?
				Popularization group	Popularization group 22	Popularization plan 12	?
Keyword	Keyword 31	Popularization group 21	Delete

Keyword	Keyword 32	Popularization group 21	?
				Keyword	Keyword 33	Popularization group 21	Editor
Keyword	Keyword 34	Popularization group 22	Editor
				Intention	Intention 41	Popularization group 21	?
Intention	Intention 42	Popularization group 22	?
				Intention	Intention 43	Popularization group 22	Newly-built

Step S2032, the data using the first data and the second data as conflict.Owing to only carrying out the data of operation, in downloading process, just can clash, the data of not carrying out any operation can not clash.As the popularization plan 11 in the popularization plan 11 in table 2, popularization group 22, keyword 31 and keyword 33 and table 3, keyword 301, keyword 33, keyword 34 and intention 43, using such data as colliding data.

Step S204, determines the action type that has the data of conflicting.The action type of determining the data of the likely existence conflict obtaining, wherein, action type can be newly-built operation, edit operation and deletion action.In these operations, be not that all operations of carrying out all can produce conflict, for example, when service end for newly-increased a certain item number according to time, in client, there is no corresponding data, like this this item number according to only exist with service end in, in therefore downloading, can not produce conflict.

Step S204 comprises step S2041 and step S2042:

Step S2041, is determined the action type of the first data by the first data.The first data before and after operation are contrasted to the action type that can determine the first data.

Step S2042, is determined the action type of the second data by the second data.In like manner, the second data before and after operation are contrasted to the action type that can determine the second data.

Step S205, whether the data that judgement is downloaded according to action type exist and conflict with the data of client terminal local.Owing to likely there are the data of conflict, be the data that operate, service end is different with the action type of the data that operate in client, these data or have conflict or do not have conflict, and when the conflict of existence, the state of conflict is difference also.For example, in advertisement material management process, for the newly-increased entity of service end, client is to operate the newly-increased data of service end, and this situation can not clash, and therefore does not need to be labeled as conflict.

For the entity of deleting on server, if client was to there being accordingly edit operation, so this situation needs the entity of mark client-side editing to have conflict, because in this case, the modification of client is invalid, because delete at entity corresponding to service end; Other situations can not clash, and therefore do not need to be labeled as conflict.

In addition, between the entity of promoted account, have hierarchical structure, some entity is the parent of other entity, if the deleted so corresponding sub level of the entity of parent is also need to be deleted, wherein, the entity of sub level is subordinated to parent entity.So for the entity of deleting on server, if these entities have sub level entity, so in these sub level entities in the newly-built operation of client, edit operation, all needs to be labeled as conflict.

For the entity of editing on server, by these entities with at these entities of client terminal local and the Backup Data of client terminal local correspondent entity, compare,, contrast with the last data of downloading of client terminal local, if client terminal local has carried out edit operation or deletion action to these data, this entity of client will be marked as conflict so.

Step S205 comprises step S2051, and whether the data of downloading according to the action type judgement of the action type of the first data and the second data exist and conflict with the data of client terminal local.Whether the data of downloading according to the action type judgement of the action type of the first data and the second data exist and conflict with the data of client terminal local, that is to say each data of carrying out operating of the data of the data of download and client terminal local are judged item by item.

Step S206, exists and conflict if detect the data of download and the data of client terminal local, the state that mark conflicts.Between last downloaded is downloaded to this, service end and client operate same data, if detecting the latest data of this download, detecting unit 30 conflicts with the data existence after client terminal local operation, the state of this conflict of mark, can know the reason of data collision according to the state of this conflict.For example, service end is carried out edit operation to a certain item number certificate, simultaneously, client has also been carried out edit operation to an item number certificate identical in the data after last downloaded, after this downloads to latest data, this item number in the latest data of download according in the data with client more this item number according to meeting, exist and conflict.After detecting unit 30 detects this conflict, the state of 40 these conflicts of mark of indexing unit is that service end and client are edited simultaneously.

Step S207, by the corresponding Treatment Options of the State-output conflicting, this Treatment Options is for the treatment of conflict.When determining that the data of downloading exist and conflict with the data of client terminal local, and after the state of mark conflict, output Treatment Options provides the option that manage conflict corresponding with the state of conflict in Treatment Options.This option can be one, can be also a plurality of, and when only having an option, operating personnel can only view this conflict, and confirms to use this option to manage conflict.When there being a plurality of option operations personnel to select one for managing conflict from a plurality of options according to actual conditions, so that select the data that oneself need to preserve.

Preferably, action type comprises newly-increased operation, edit operation and deletion action.Wherein, step S2051 comprises the following steps:

Step S20511, contrasts the action type of the action type of the first data and the second data.When contrasting the action type of the first data and the action type of the second data, also to judge the relation on attributes between the first data and the second data.

Step S20512, if the action type of the first data is newly-increased operation, the action type of the second data is newly-increased operation, and the first data after newly-increased and newly-increased after the attribute of the second data identical, determine that the data downloaded and the data existence of client terminal local conflict.Simultaneously newly-built for service end and client, when the first newly-built data identical with the attribute of the second data, wherein, attribute is identical can be the first data be identical data with the second data, also can time the first data and the second data there are the data of same names.

Preferably, after determining the data of download and the data collision of client terminal local, also the state of record conflict is that service end and client are simultaneously newly-increased

Step S20513, if the action type of the first data is edit operation, the action type of the second data is edit operation or deletion action, and preoperative the first data and preoperative the second data are identical data, determines the data downloaded and the data collision of client terminal local.

Preferably, after the data of determine downloading and the data collision of client terminal local, also the state of record conflict is that service end and client are edited or service end editor and client deletion simultaneously.

Step S20514, if the action type of the first data is deletion action, the action type of the second data is edit operation, and preoperative the first data and preoperative the second data are identical data, determines the data downloaded and the data collision of client terminal local.

Preferably, after determining the data of download and the data collision of client terminal local, also the state of record conflict is that service end is deleted and client-side editing.

Step S20515, if the action type of the first data is deletion action, the action type of the second data is newly-increased operation or edit operation, and preoperative the second data subordinate data that are preoperative the first data, determines the data downloaded and the data collision of client terminal local.The subordinate data that preoperative the second data are preoperative the first data, that is, preoperative the second data are subordinated to preoperative the first data.

Preferably, after the data of determine downloading and the data collision of client terminal local, also the state of record conflict is that service end is deleted and client subordinate data are newly-increased or service end deletion and client subordinate data edition.

Step S20516, if the action type of the first data is deletion action, the action type of the second data is deletion action, and preoperative the first data and preoperative the second data are identical data, or the subordinate data that preoperative the second data are preoperative the first data, determine that the data of downloading exist and conflict with the data of client terminal local.

Preferably, after the data of determine downloading and the data collision of client terminal local, the state that also records described conflict is that client is deleted simultaneously described in described service end.

Table 4:

After the conflict situation of each conflict of mark, the output unit 50 of the processing unit of the data download conflict of the embodiment of the present invention is for according to the corresponding Treatment Options of the State-output of each conflict, and for dissimilar conflict, the option of locating of output is different.If there are a plurality of solutions, user need to select a solution according to actual conditions.For example, for the colliding data in table 4 " popularization plan 11 ", its conflict situation is " service end and client are edited simultaneously ", export so two kinds of Treatment Options, a kind of is to retain service end to revise, another kind is to retain client to revise, and operating personnel can select one of them amended data to retain according to provide two kinds of options.For the data of the conflict after mark, operating personnel can check this colliding data, and these data are judged, can select to wish that the data that retain retain.

For service end, deleted an entity and all kinds of conflicts that cause, user can only select to accept the deletion of server.User, before accepting deletion, can back up being about to the data of deleted client, so that as a reference by it in the future.For the conflict type of the data in above-mentioned table 4, its optional solution is as shown in table 5.

It should be noted that, in the step shown in the flow chart of accompanying drawing, can in the computer system such as one group of computer executable instructions, carry out, and, although there is shown logical order in flow process, but in some cases, can carry out shown or described step with the order being different from herein.

Obviously, those skilled in the art should be understood that, above-mentioned each module of the present invention or each step can realize with general calculation element, they can concentrate on single calculation element, or be distributed on the network that a plurality of calculation elements form, alternatively, they can be realized with the executable program code of calculation element, thereby, they can be stored in storage device and be carried out by calculation element, or they are made into respectively to each integrated circuit modules, or a plurality of modules in them or step are made into single integrated circuit module to be realized.Like this, the present invention is not restricted to any specific hardware and software combination.

The foregoing is only the preferred embodiments of the present invention, be not limited to the present invention, for a person skilled in the art, the present invention can have various modifications and variations.Within the spirit and principles in the present invention all, any modification of doing, be equal to replacement, improvement etc., within all should being included in protection scope of the present invention.

Claims

1. a processing method for data download conflict, is characterized in that, comprising:

Receive download request, described download request is for asking the data of download service end;

Download is from the data of described service end;

Whether detect the data of downloading exists and conflicts with the data of client terminal local;

If detect the data of described download and the data of described client terminal local, exist and conflict, the state conflicting described in mark; And

By the corresponding Treatment Options of State-output of described conflict, described Treatment Options is for the treatment of described conflict.

2. the processing method of data download conflict according to claim 1, is characterized in that, whether the data that detect download exist to conflict with the data of client terminal local and comprise:

The data of the data of described download and described client terminal local are contrasted, obtain existing the data of conflict;

Determine the action type of the data of described existence conflict; And

According to described action type, judging whether the data of described download and the data of described client terminal local exist conflicts.

3. the processing method of data download conflict according to claim 2, is characterized in that

The data of the data of described download and described client terminal local are contrasted, obtain existing the data of conflict to comprise: obtain the second data in the data of the first data in the data of described download and described client terminal local, wherein, the data that operated in the data that described the first data are described download, the data that operated in the data that described the second data are described client terminal local; Data using described the first data and described the second data as described conflict;

The action type of determining the data of described existence conflict comprises: the action type of being determined described the first data by described the first data; By described the second data, determined the action type of described the second data;

According to described action type, judging whether the data of described download and the data of described client terminal local exist to conflict comprises: according to the action type of the action type of described the first data and described the second data, judge whether the data of described download and the data of described client terminal local exist and conflict.

4. the processing method of data download conflict according to claim 3, it is characterized in that, described action type comprises newly-increased operation, edit operation and deletion action, wherein, according to the action type of the action type of described the first data and described the second data, judging whether the data of described download and the data of described client terminal local exist to conflict comprises:

The action type of the action type of described the first data and described the second data is contrasted;

If the action type of described the first data is described newly-increased operation, the action type of described the second data is described newly-increased operation, and described the first data after newly-increased and newly-increased after the attribute of described the second data identical, determine that the data of described download and the existence of the data of described client terminal local conflict;

If the action type of described the first data is described edit operation, the action type of described the second data is described edit operation or described deletion action, and preoperative described the first data and preoperative described the second data are identical data, determine that the data of described download and the existence of the data of described client terminal local conflict;

If the action type of described the first data is described deletion action, the action type of described the second data is described edit operation, and preoperative described the first data and preoperative described the second data are identical data, determine that the data of described download and the existence of the data of described client terminal local conflict;

If the action type of described the first data is described deletion action, the action type of described the second data is described newly-increased operation or described edit operation, and the subordinate data that preoperative described the second data are preoperative described the first data, determine that the data of described download and the existence of the data of described client terminal local conflict; And

If the action type of described the first data is described deletion action, the action type of described the second data is described deletion action, and preoperative described the first data and preoperative described the second data are identical data, or the subordinate data that preoperative described the second data are preoperative described the first data, determine that the data of described download and the existence of the data of described client terminal local conflict.

5. the processing method of data download conflict according to claim 3, it is characterized in that, described action type comprises newly-increased operation, edit operation and deletion action, wherein, according to the action type of the action type of described the first data and described the second data, judging whether the data of described download and the data of described client terminal local exist to conflict comprises:

If the action type of described the first data is described newly-increased operation, the action type of described the second data is described newly-increased operation, and described the first data after newly-increased and increase newly after the attribute of described the second data identical, determine that the data of described download and the existence of the data of described client terminal local conflict, the state that records described conflict is that described service end and described client are simultaneously newly-increased;

If the action type of described the first data is described edit operation, the action type of described the second data is described edit operation, and preoperative described the first data and preoperative described the second data are identical data, determine that the data of described download and the existence of the data of described client terminal local conflict, the state that records described conflict is that described service end and described client are edited simultaneously;

If the action type of described the first data is described edit operation, the action type of described the second data is described deletion action, and preoperative described the first data and preoperative described the second data are identical data, determine that the data of described download and the existence of the data of described client terminal local conflict, the state that records described conflict is that the described client of described service end editor is deleted;

If the action type of described the first data is described deletion action, the action type of described the second data is described edit operation, and preoperative described the first data and preoperative described the second data are identical data, determine that the data of described download and the existence of the data of described client terminal local conflict, the state that records described conflict is that described service end is deleted described client-side editing;

If the action type of described the first data is described deletion action, the action type of described the second data is described newly-increased operation, and the subordinate data that preoperative described the second data are preoperative described the first data, determine that the data of described download exist and conflicts with the data of described client terminal local, the state that records described conflict increases newly for the described client subordinate data of described service end deletion;

If the action type of described the first data is described deletion action, the action type of described the second data is described edit operation, and the subordinate data that preoperative described the second data are preoperative described the first data, determine that the data of described download and the existence of the data of described client terminal local conflict, the state that records described conflict is that described service end is deleted described client subordinate data edition; And

If the action type of described the first data is described deletion action, the action type of described the second data is described deletion action, and preoperative described the second data and preoperative described the first data are identical data, or the subordinate data that preoperative described the second data are preoperative described the first data, determine that the data of described download conflict with the existence of the data of described client terminal local, the state that records described conflict is that client is deleted simultaneously described in described service end.

6. a processing unit for data download conflict, is characterized in that, comprising:

Receiving element, for receiving download request, described download request is for asking the data of download service end;

Download unit, for downloading the data from described service end;

Whether detecting unit, exist and conflict with the data of client terminal local for detection of the data of downloading;

Indexing unit, if exist and conflict, the state conflicting described in mark for detecting the data of described download and the data of described client terminal local; And

Output unit, for the corresponding Treatment Options of the State-output by described conflict, described Treatment Options is for the treatment of described conflict.

7. the processing unit of data download conflict according to claim 6, is characterized in that, described detecting unit comprises:

Comparison module, for the data of the data of described download and described client terminal local are contrasted, obtains existing the data of conflict;

Determination module, for determining the action type of the data of described existence conflict; And

Judge module, conflicts for judging according to described action type whether the data of described download and the data of described client terminal local exist.

8. the processing unit of data download conflict according to claim 7, is characterized in that

Described comparison module comprises: obtain submodule, for obtaining first data of data of described download and the second data in the data of described client terminal local, wherein, the data that operated in the data that described the first data are described download, the data that operated in the data that described the second data are described client terminal local; Generate submodule, for the data using described the first data and described the second data as described conflict;

Described determination module comprises: first determines submodule, for determined the action type of described the first data by described the first data; Second determines submodule, for determined the action type of described the second data by described the second data;

Described judge module conflicts for judging according to the action type of the action type of described the first data and described the second data whether the data of described download and the data of described client terminal local exist.

9. the processing unit of data download conflict according to claim 8, is characterized in that, described action type comprises newly-increased operation, edit operation and deletion action, and wherein, described judge module comprises:

The first comparison sub-module, for contrasting the action type of the action type of described the first data and described the second data;

The 3rd determines submodule, if the action type for described the first data is described newly-increased operation, the action type of described the second data is described newly-increased operation, and described the first data after newly-increased and newly-increased after the attribute of described the second data identical, determine that the data of described download and the existence of the data of described client terminal local conflict;

The 4th determines submodule, if the action type for described the first data is described edit operation, the action type of described the second data is described edit operation or described deletion action, and preoperative described the first data and preoperative described the second data are identical data, determine that the data of described download and the existence of the data of described client terminal local conflict;

The 5th determines submodule, if the action type for described the first data is described deletion action, the action type of described the second data is described edit operation, and preoperative described the first data and preoperative described the second data are identical data, determine that the data of described download and the existence of the data of described client terminal local conflict;

The 6th determines submodule, if the action type for described the first data is described deletion action, the action type of described the second data is described newly-increased operation or described edit operation, and the subordinate data that preoperative described the second data are preoperative described the first data, determine that the data of described download and the existence of the data of described client terminal local conflict; And

The 7th determines submodule, if the action type for described the first data is described deletion action, the action type of described the second data is described deletion action, and preoperative described the first data and preoperative described the second data are identical data, or the subordinate data that preoperative described the second data are preoperative described the first data, determine that the data of described download and the existence of the data of described client terminal local conflict.

10. the processing unit of data download conflict according to claim 8, is characterized in that, described action type comprises newly-increased operation, edit operation and deletion action, and wherein, described judge module comprises:

The second comparison sub-module, for contrasting the action type of the action type of described the first data and described the second data;

The first record sub module, if the action type for described the first data is described newly-increased operation, the action type of described the second data is described newly-increased operation, and described the first data after newly-increased and increase newly after the attribute of described the second data identical, determine that the data of described download and the existence of the data of described client terminal local conflict, the state that records described conflict is that described service end and described client are simultaneously newly-increased;

The second record sub module, if the action type for described the first data is described edit operation, the action type of described the second data is described edit operation, and preoperative described the first data and preoperative described the second data are identical data, determine that the data of described download and the existence of the data of described client terminal local conflict, the state that records described conflict is that described service end and described client are edited simultaneously;

The 3rd record sub module, if the action type for described the first data is described edit operation, the action type of described the second data is described deletion action, and preoperative described the first data and preoperative described the second data are identical data, determine that the data of described download and the existence of the data of described client terminal local conflict, the state that records described conflict is that the described client of described service end editor is deleted;

The 4th record sub module, if the action type for described the first data is described deletion action, the action type of described the second data is described edit operation, and preoperative described the first data and preoperative described the second data are identical data, determine that the data of described download and the existence of the data of described client terminal local conflict, the state that records described conflict is that described service end is deleted described client-side editing;

The 5th record sub module, if the action type for described the first data is described deletion action, the action type of described the second data is described newly-increased operation, and the subordinate data that preoperative described the second data are preoperative described the first data, determine that the data of described download exist and conflicts with the data of described client terminal local, the state that records described conflict increases newly for the described client subordinate data of described service end deletion;

The 6th record sub module, if the action type for described the first data is described deletion action, the action type of described the second data is described edit operation, and the subordinate data that preoperative described the second data are preoperative described the first data, determine that the data of described download and the existence of the data of described client terminal local conflict, the state that records described conflict is that described service end is deleted described client subordinate data edition; And

The 7th record sub module, if the action type for described the first data is described deletion action, the action type of described the second data is described deletion action, and preoperative described the second data and preoperative described the first data are identical data, or the subordinate data that preoperative described the second data are preoperative described the first data, determine that the data of described download conflict with the existence of the data of described client terminal local, the state that records described conflict is that client is deleted simultaneously described in described service end.