Commit 4989b034 authored by duanruiming's avatar duanruiming

Merge remote-tracking branch 'origin/master'

parents 7ce9682e 5e0a766f
...@@ -97,7 +97,7 @@ public class ControlCommandServiceImpl implements ControlCommandService { ...@@ -97,7 +97,7 @@ public class ControlCommandServiceImpl implements ControlCommandService {
String extendResult = extendPost.selectSingleNode(HttpConstants.SYSTEMSCRIPTION_RESULT).getText(); String extendResult = extendPost.selectSingleNode(HttpConstants.SYSTEMSCRIPTION_RESULT).getText();
if (HttpConstants.RESULT_1.equals(extendResult) || HttpConstants.RESULT_2.equals(extendResult)) { if (HttpConstants.RESULT_1.equals(extendResult) || HttpConstants.RESULT_2.equals(extendResult)) {
return jsonViewObject.success("相位锁定/解锁 - 控制成功"); return jsonViewObject.success("相位锁定/解锁 - 控制成功");
}else { } else {
return jsonViewObject.fail("相位锁定/解锁 - 控制失败"); return jsonViewObject.fail("相位锁定/解锁 - 控制失败");
} }
} }
...@@ -211,7 +211,7 @@ public class ControlCommandServiceImpl implements ControlCommandService { ...@@ -211,7 +211,7 @@ public class ControlCommandServiceImpl implements ControlCommandService {
return jsonViewObject.fail("相位步进 - 控制失败"); return jsonViewObject.fail("相位步进 - 控制失败");
} }
} }
return jsonViewObject.fail("相位步进 - 控制失败"); return jsonViewObject.success("相位步进 - 控制成功");
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment