Merge pull request ltsopensource#365 from lusong1986/lusong

修复重复代码和controller 方法名
Ivan-zhang01 · Jul 26, 2017 · 14e9c9c · 14e9c9c
2 parents 402e457 + 74824a7
commit 14e9c9c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/lts-admin/src/main/java/com/github/ltsopensource/admin/web/api/NodeApi.java b/lts-admin/src/main/java/com/github/ltsopensource/admin/web/api/NodeApi.java
@@ -94,7 +94,7 @@ public RestfulResponse delNodeGroup(NodeGroupRequest request) {
     }
 
     @RequestMapping("node-onoffline-log-get")
-    public RestfulResponse delNodeGroup(NodeOnOfflineLogPaginationReq request) {
+    public RestfulResponse getNodeOnofflineLog(NodeOnOfflineLogPaginationReq request) {
         RestfulResponse response = new RestfulResponse();
         Long results = appContext.getBackendNodeOnOfflineLogAccess().count(request);
         response.setResults(results.intValue());

diff --git a/lts-core/src/main/java/com/github/ltsopensource/core/support/JobDomainConverter.java b/lts-core/src/main/java/com/github/ltsopensource/core/support/JobDomainConverter.java
@@ -29,7 +29,6 @@ public static JobPo convert(Job job) {
         jobPo.setPriority(job.getPriority());
         jobPo.setTaskId(job.getTaskId());
         jobPo.setRealTaskId(jobPo.getTaskId());
-        jobPo.setRealTaskId(jobPo.getTaskId());
         jobPo.setGmtCreated(SystemClock.now());
         jobPo.setGmtModified(jobPo.getGmtCreated());
         jobPo.setSubmitNodeGroup(job.getSubmitNodeGroup());