diff --git a/smart-web-server/src/main/java/org/smartdata/server/generated/model/ActionSortDto.java b/smart-web-server/src/main/java/org/smartdata/server/generated/model/ActionSortDto.java index bfb44ebe33..1d883b0534 100644 --- a/smart-web-server/src/main/java/org/smartdata/server/generated/model/ActionSortDto.java +++ b/smart-web-server/src/main/java/org/smartdata/server/generated/model/ActionSortDto.java @@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; + import javax.annotation.Generated; /** @@ -27,28 +28,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public enum ActionSortDto { - + ID("id"), - + EXECHOST("execHost"), - - CREATETIME("createTime"), - - FINISHTIME("finishTime"), - - STATUS("status"), - + + SUBMISSIONTIME("submissionTime"), + + COMPLETIONTIME("completionTime"), + + STATE("state"), + SOURCE("source"), _ID("-id"), - + _EXECHOST("-execHost"), - - _CREATETIME("-createTime"), - - _FINISHTIME("-finishTime"), - - _STATUS("-status"), + + _SUBMISSIONTIME("-submissionTime"), + + _COMPLETIONTIME("-completionTime"), + + _STATE("-state"), _SOURCE("-source"); diff --git a/smart-web-server/src/main/java/org/smartdata/server/generated/model/AuditSortDto.java b/smart-web-server/src/main/java/org/smartdata/server/generated/model/AuditSortDto.java index a969ea60f0..3a9ae7b31e 100644 --- a/smart-web-server/src/main/java/org/smartdata/server/generated/model/AuditSortDto.java +++ b/smart-web-server/src/main/java/org/smartdata/server/generated/model/AuditSortDto.java @@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; + import javax.annotation.Generated; /** @@ -27,33 +28,33 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public enum AuditSortDto { - + ID("id"), - + USERNAME("username"), - + TIMESTAMP("timestamp"), - + OBJECTTYPE("objectType"), - + OBJECTID("objectId"), - + OPERATION("operation"), - + RESULT("result"), - + _ID("-id"), - + _USERNAME("-username"), - + _TIMESTAMP("-timestamp"), - + _OBJECTTYPE("-objectType"), - + _OBJECTID("-objectId"), - + _OPERATION("-operation"), - + _RESULT("-result"); private String value; diff --git a/smart-web-server/src/main/java/org/smartdata/server/generated/model/CachedFileSortDto.java b/smart-web-server/src/main/java/org/smartdata/server/generated/model/CachedFileSortDto.java index 1bfe9f81ca..aa627c58a2 100644 --- a/smart-web-server/src/main/java/org/smartdata/server/generated/model/CachedFileSortDto.java +++ b/smart-web-server/src/main/java/org/smartdata/server/generated/model/CachedFileSortDto.java @@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; + import javax.annotation.Generated; /** @@ -27,25 +28,25 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public enum CachedFileSortDto { - - FID("fid"), - + + ID("id"), + PATH("path"), - + ACCESSCOUNT("accessCount"), - + CACHEDTIME("cachedTime"), - + LASTACCESSTIME("lastAccessTime"), - - _FID("-fid"), - + + _ID("-id"), + _PATH("-path"), - + _ACCESSCOUNT("-accessCount"), - + _CACHEDTIME("-cachedTime"), - + _LASTACCESSTIME("-lastAccessTime"); private String value; diff --git a/smart-web-server/src/main/java/org/smartdata/server/generated/model/ClusterSortDto.java b/smart-web-server/src/main/java/org/smartdata/server/generated/model/ClusterSortDto.java index a62f1f660c..4700d48df9 100644 --- a/smart-web-server/src/main/java/org/smartdata/server/generated/model/ClusterSortDto.java +++ b/smart-web-server/src/main/java/org/smartdata/server/generated/model/ClusterSortDto.java @@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; + import javax.annotation.Generated; /** @@ -27,21 +28,21 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public enum ClusterSortDto { - + ID("id"), - + REGISTRATIONTIME("registrationTime"), - - EXECUTORS("executors"), - + + EXECUTORSCOUNT("executorsCount"), + STATUS("status"), - + _ID("-id"), - + _REGISTRATIONTIME("-registrationTime"), - - _EXECUTORS("-executors"), - + + _EXECUTORSCOUNT("-executorsCount"), + _STATUS("-status"); private String value; diff --git a/smart-web-server/src/main/java/org/smartdata/server/generated/model/CmdletSortDto.java b/smart-web-server/src/main/java/org/smartdata/server/generated/model/CmdletSortDto.java index 86783f8d45..54983e2f84 100644 --- a/smart-web-server/src/main/java/org/smartdata/server/generated/model/CmdletSortDto.java +++ b/smart-web-server/src/main/java/org/smartdata/server/generated/model/CmdletSortDto.java @@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; + import javax.annotation.Generated; /** @@ -27,25 +28,25 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public enum CmdletSortDto { - + ID("id"), - + RULEID("ruleId"), - + STATE("state"), - - GENERATETIME("generateTime"), - + + SUBMISSIONTIME("submissionTime"), + STATECHANGEDTIME("stateChangedTime"), - + _ID("-id"), - + _RULEID("-ruleId"), - + _STATE("-state"), - - _GENERATETIME("-generateTime"), - + + _SUBMISSIONTIME("-submissionTime"), + _STATECHANGEDTIME("-stateChangedTime"); private String value; diff --git a/smart-web-server/src/main/java/org/smartdata/server/generated/model/HotFileSortDto.java b/smart-web-server/src/main/java/org/smartdata/server/generated/model/HotFileSortDto.java index 1ae7407b01..19d5cd2585 100644 --- a/smart-web-server/src/main/java/org/smartdata/server/generated/model/HotFileSortDto.java +++ b/smart-web-server/src/main/java/org/smartdata/server/generated/model/HotFileSortDto.java @@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; + import javax.annotation.Generated; /** @@ -27,18 +28,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public enum HotFileSortDto { - - FID("fid"), - + + ID("id"), + PATH("path"), - - ACCESS_COUNT("access_count"), - - _FID("-fid"), - + + ACCESSCOUNT("accessCount"), + + LASTACCESSTIME("lastAccessTime"), + + _ID("-id"), + _PATH("-path"), - - _ACCESS_COUNT("-access_count"); + + _ACCESSCOUNT("-accessCount"), + + _LASTACCESSTIME("-lastAccessTime"); private String value; diff --git a/smart-web-server/src/main/java/org/smartdata/server/generated/model/RuleSortDto.java b/smart-web-server/src/main/java/org/smartdata/server/generated/model/RuleSortDto.java index 2002b5fc5c..3a962d7bea 100644 --- a/smart-web-server/src/main/java/org/smartdata/server/generated/model/RuleSortDto.java +++ b/smart-web-server/src/main/java/org/smartdata/server/generated/model/RuleSortDto.java @@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; + import javax.annotation.Generated; /** @@ -27,30 +28,30 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public enum RuleSortDto { - + ID("id"), - + SUBMITTIME("submitTime"), - - LASTCHECKTIME("lastCheckTime"), - - CHECKEDCOUNT("checkedCount"), - - GENERATEDCMDLETS("generatedCmdlets"), - - STATUS("status"), - + + LASTACTIVATIONTIME("lastActivationTime"), + + ACTIVATIONCOUNT("activationCount"), + + CMDLETSGENERATED("cmdletsGenerated"), + + STATE("state"), + _ID("-id"), - + _SUBMITTIME("-submitTime"), - - _LASTCHECKTIME("-lastCheckTime"), - - _CHECKEDCOUNT("-checkedCount"), - - _GENERATEDCMDLETS("-generatedCmdlets"), - - _STATUS("-status"); + + _LASTACTIVATIONTIME("-lastActivationTime"), + + _ACTIVATIONCOUNT("-activationCount"), + + _CMDLETSGENERATED("-cmdletsGenerated"), + + _STATE("-state"); private String value; diff --git a/smart-web-server/src/main/java/org/smartdata/server/mappers/pagination/ActionPageRequestMapper.java b/smart-web-server/src/main/java/org/smartdata/server/mappers/pagination/ActionPageRequestMapper.java index 249defe95c..b6b4e19dfb 100644 --- a/smart-web-server/src/main/java/org/smartdata/server/mappers/pagination/ActionPageRequestMapper.java +++ b/smart-web-server/src/main/java/org/smartdata/server/mappers/pagination/ActionPageRequestMapper.java @@ -28,13 +28,14 @@ public interface ActionPageRequestMapper extends BasePageRequestMapper { @ValueMapping(source = "EXECHOST", target = "EXEC_HOST") - @ValueMapping(source = "CREATETIME", target = "CREATE_TIME") - @ValueMapping(source = "FINISHTIME", target = "FINISH_TIME") + @ValueMapping(source = "SUBMISSIONTIME", target = "CREATE_TIME") + @ValueMapping(source = "COMPLETIONTIME", target = "FINISH_TIME") + @ValueMapping(source = "STATE", target = "STATUS") @ValueMapping(source = "_ID", target = "ID") @ValueMapping(source = "_EXECHOST", target = "EXEC_HOST") - @ValueMapping(source = "_CREATETIME", target = "CREATE_TIME") - @ValueMapping(source = "_FINISHTIME", target = "FINISH_TIME") - @ValueMapping(source = "_STATUS", target = "STATUS") + @ValueMapping(source = "_SUBMISSIONTIME", target = "CREATE_TIME") + @ValueMapping(source = "_COMPLETIONTIME", target = "FINISH_TIME") + @ValueMapping(source = "_STATE", target = "STATUS") @ValueMapping(source = "_SOURCE", target = "SOURCE") ActionSortField toSortField(ActionSortDto sortColumn); } diff --git a/smart-web-server/src/main/java/org/smartdata/server/mappers/pagination/ClusterNodePageRequestMapper.java b/smart-web-server/src/main/java/org/smartdata/server/mappers/pagination/ClusterNodePageRequestMapper.java index 264dd3be5a..cfa61d4d75 100644 --- a/smart-web-server/src/main/java/org/smartdata/server/mappers/pagination/ClusterNodePageRequestMapper.java +++ b/smart-web-server/src/main/java/org/smartdata/server/mappers/pagination/ClusterNodePageRequestMapper.java @@ -38,9 +38,10 @@ public interface ClusterNodePageRequestMapper extends BasePageRequestMapper { @ValueMapping(source = "REGISTRATIONTIME", target = "REGISTRATION_TIME") + @ValueMapping(source = "EXECUTORSCOUNT", target = "EXECUTORS") @ValueMapping(source = "_ID", target = "ID") @ValueMapping(source = "_REGISTRATIONTIME", target = "REGISTRATION_TIME") - @ValueMapping(source = "_EXECUTORS", target = "EXECUTORS") + @ValueMapping(source = "_EXECUTORSCOUNT", target = "EXECUTORS") @ValueMapping(source = "STATUS", target = MappingConstants.THROW_EXCEPTION) @ValueMapping(source = "_STATUS", target = MappingConstants.THROW_EXCEPTION) ClusterNodeSortField toSortField(ClusterSortDto sortColumn); diff --git a/smart-web-server/src/main/java/org/smartdata/server/mappers/pagination/CmdletsPageRequestMapper.java b/smart-web-server/src/main/java/org/smartdata/server/mappers/pagination/CmdletsPageRequestMapper.java index 5b7811445f..46ede0fb3a 100644 --- a/smart-web-server/src/main/java/org/smartdata/server/mappers/pagination/CmdletsPageRequestMapper.java +++ b/smart-web-server/src/main/java/org/smartdata/server/mappers/pagination/CmdletsPageRequestMapper.java @@ -27,12 +27,12 @@ public interface CmdletsPageRequestMapper extends BasePageRequestMapper { @ValueMapping(source = "RULEID", target = "RULE_ID") - @ValueMapping(source = "GENERATETIME", target = "GENERATE_TIME") + @ValueMapping(source = "SUBMISSIONTIME", target = "GENERATE_TIME") @ValueMapping(source = "STATECHANGEDTIME", target = "STATE_CHANGED_TIME") @ValueMapping(source = "_ID", target = "ID") @ValueMapping(source = "_RULEID", target = "RULE_ID") @ValueMapping(source = "_STATE", target = "STATE") - @ValueMapping(source = "_GENERATETIME", target = "GENERATE_TIME") + @ValueMapping(source = "_SUBMISSIONTIME", target = "GENERATE_TIME") @ValueMapping(source = "_STATECHANGEDTIME", target = "STATE_CHANGED_TIME") CmdletSortField toSortField(CmdletSortDto sortColumn); } diff --git a/smart-web-server/src/main/java/org/smartdata/server/mappers/pagination/RulesPageRequestMapper.java b/smart-web-server/src/main/java/org/smartdata/server/mappers/pagination/RulesPageRequestMapper.java index 62d99e2ff4..f0bdf57753 100644 --- a/smart-web-server/src/main/java/org/smartdata/server/mappers/pagination/RulesPageRequestMapper.java +++ b/smart-web-server/src/main/java/org/smartdata/server/mappers/pagination/RulesPageRequestMapper.java @@ -28,16 +28,15 @@ public interface RulesPageRequestMapper extends BasePageRequestMapper { @ValueMapping(source = "SUBMITTIME", target = "SUBMIT_TIME") - @ValueMapping(source = "LASTCHECKTIME", target = "LAST_CHECK_TIME") - @ValueMapping(source = "CHECKEDCOUNT", target = "CHECKED_COUNT") - @ValueMapping(source = "GENERATEDCMDLETS", target = "GENERATED_CMDLETS") - @ValueMapping(source = "STATUS", target = "STATE") + @ValueMapping(source = "LASTACTIVATIONTIME", target = "LAST_CHECK_TIME") + @ValueMapping(source = "ACTIVATIONCOUNT", target = "CHECKED_COUNT") + @ValueMapping(source = "CMDLETSGENERATED", target = "GENERATED_CMDLETS") @ValueMapping(source = "_ID", target = "ID") @ValueMapping(source = "_SUBMITTIME", target = "SUBMIT_TIME") - @ValueMapping(source = "_LASTCHECKTIME", target = "LAST_CHECK_TIME") - @ValueMapping(source = "_CHECKEDCOUNT", target = "CHECKED_COUNT") - @ValueMapping(source = "_GENERATEDCMDLETS", target = "GENERATED_CMDLETS") - @ValueMapping(source = "_STATUS", target = "STATE") + @ValueMapping(source = "_LASTACTIVATIONTIME", target = "LAST_CHECK_TIME") + @ValueMapping(source = "_ACTIVATIONCOUNT", target = "CHECKED_COUNT") + @ValueMapping(source = "_CMDLETSGENERATED", target = "GENERATED_CMDLETS") + @ValueMapping(source = "_STATE", target = "STATE") RuleSortField toSortField(RuleSortDto sortColumn); } diff --git a/smart-web-server/src/main/resources/api/parameters/actions/ActionSort.yaml b/smart-web-server/src/main/resources/api/parameters/actions/ActionSort.yaml index bf63ceb37a..4dad365401 100644 --- a/smart-web-server/src/main/resources/api/parameters/actions/ActionSort.yaml +++ b/smart-web-server/src/main/resources/api/parameters/actions/ActionSort.yaml @@ -4,13 +4,13 @@ description: Sort field names prefixed with '-' for descending order enum: - id - execHost - - createTime - - finishTime - - status + - submissionTime + - completionTime + - state - source - -id - -execHost - - -createTime - - -finishTime - - -status + - -submissionTime + - -completionTime + - -state - -source diff --git a/smart-web-server/src/main/resources/api/parameters/cluster/ClusterSort.yaml b/smart-web-server/src/main/resources/api/parameters/cluster/ClusterSort.yaml index b486eee41b..ed96b35fe1 100644 --- a/smart-web-server/src/main/resources/api/parameters/cluster/ClusterSort.yaml +++ b/smart-web-server/src/main/resources/api/parameters/cluster/ClusterSort.yaml @@ -4,9 +4,9 @@ description: Sort field names prefixed with '-' for descending order enum: - id - registrationTime - - executors + - executorsCount - status - -id - -registrationTime - - -executors + - -executorsCount - -status diff --git a/smart-web-server/src/main/resources/api/parameters/cmdlets/CmdletSort.yaml b/smart-web-server/src/main/resources/api/parameters/cmdlets/CmdletSort.yaml index 179d6777ba..f07c23b9af 100644 --- a/smart-web-server/src/main/resources/api/parameters/cmdlets/CmdletSort.yaml +++ b/smart-web-server/src/main/resources/api/parameters/cmdlets/CmdletSort.yaml @@ -5,10 +5,10 @@ enum: - id - ruleId - state - - generateTime + - submissionTime - stateChangedTime - -id - -ruleId - -state - - -generateTime + - -submissionTime - -stateChangedTime diff --git a/smart-web-server/src/main/resources/api/parameters/files/CachedFileSort.yaml b/smart-web-server/src/main/resources/api/parameters/files/CachedFileSort.yaml index f4cba5a749..5ebf744b1b 100644 --- a/smart-web-server/src/main/resources/api/parameters/files/CachedFileSort.yaml +++ b/smart-web-server/src/main/resources/api/parameters/files/CachedFileSort.yaml @@ -2,12 +2,12 @@ title: FilesSort type: string description: Sort field names prefixed with '-' for descending order enum: - - fid + - id - path - accessCount - cachedTime - lastAccessTime - - -fid + - -id - -path - -accessCount - -cachedTime diff --git a/smart-web-server/src/main/resources/api/parameters/files/HotFileSort.yaml b/smart-web-server/src/main/resources/api/parameters/files/HotFileSort.yaml index 3c7fae3dc4..eff1d0c285 100644 --- a/smart-web-server/src/main/resources/api/parameters/files/HotFileSort.yaml +++ b/smart-web-server/src/main/resources/api/parameters/files/HotFileSort.yaml @@ -2,9 +2,11 @@ title: HotFilesSort type: string description: Sort field names prefixed with '-' for descending order enum: - - fid + - id - path - - access_count - - -fid + - accessCount + - lastAccessTime + - -id - -path - - -access_count + - -accessCount + - -lastAccessTime diff --git a/smart-web-server/src/main/resources/api/parameters/rules/RuleSort.yaml b/smart-web-server/src/main/resources/api/parameters/rules/RuleSort.yaml index 89d9d87e39..8fa2b7e1ec 100644 --- a/smart-web-server/src/main/resources/api/parameters/rules/RuleSort.yaml +++ b/smart-web-server/src/main/resources/api/parameters/rules/RuleSort.yaml @@ -4,13 +4,13 @@ description: Sort field names prefixed with '-' for descending order enum: - id - submitTime - - lastCheckTime - - checkedCount - - generatedCmdlets - - status + - lastActivationTime + - activationCount + - cmdletsGenerated + - state - -id - -submitTime - - -lastCheckTime - - -checkedCount - - -generatedCmdlets - - -status + - -lastActivationTime + - -activationCount + - -cmdletsGenerated + - -state diff --git a/smart-web-server/src/main/resources/static/ssm-api.yaml b/smart-web-server/src/main/resources/static/ssm-api.yaml index 3cbcef7709..fb54ebef23 100644 --- a/smart-web-server/src/main/resources/static/ssm-api.yaml +++ b/smart-web-server/src/main/resources/static/ssm-api.yaml @@ -970,16 +970,16 @@ components: enum: - id - submitTime - - lastCheckTime - - checkedCount - - generatedCmdlets - - status + - lastActivationTime + - activationCount + - cmdletsGenerated + - state - -id - -submitTime - - -lastCheckTime - - -checkedCount - - -generatedCmdlets - - -status + - -lastActivationTime + - -activationCount + - -cmdletsGenerated + - -state title: RuleSort type: string RuleState: @@ -1081,12 +1081,12 @@ components: - id - ruleId - state - - generateTime + - submissionTime - stateChangedTime - -id - -ruleId - -state - - -generateTime + - -submissionTime - -stateChangedTime title: CmdletSort type: string @@ -1169,15 +1169,15 @@ components: enum: - id - execHost - - createTime - - finishTime - - status + - submissionTime + - completionTime + - state - source - -id - -execHost - - -createTime - - -finishTime - - -status + - -submissionTime + - -completionTime + - -state - -source title: ActionSort type: string @@ -1285,12 +1285,14 @@ components: HotFileSort: description: Sort field names prefixed with '-' for descending order enum: - - fid + - id - path - - access_count - - -fid + - accessCount + - lastAccessTime + - -id - -path - - -access_count + - -accessCount + - -lastAccessTime title: HotFilesSort type: string FileAccessInfo: @@ -1325,12 +1327,12 @@ components: CachedFileSort: description: Sort field names prefixed with '-' for descending order enum: - - fid + - id - path - accessCount - cachedTime - lastAccessTime - - -fid + - -id - -path - -accessCount - -cachedTime @@ -1377,11 +1379,11 @@ components: enum: - id - registrationTime - - executors + - executorsCount - status - -id - -registrationTime - - -executors + - -executorsCount - -status title: ClusterSort type: string