diff --git a/src/main/java/org/bdware/server/nodecenter/UnitActions.java b/src/main/java/org/bdware/server/nodecenter/UnitActions.java index 79ff229..97b1f12 100644 --- a/src/main/java/org/bdware/server/nodecenter/UnitActions.java +++ b/src/main/java/org/bdware/server/nodecenter/UnitActions.java @@ -21,18 +21,20 @@ public class UnitActions { public UnitActions(NCManagerAction managerAction) { this.managerAction = managerAction; } - private void simpleReply(ResultCallback resultCallback, String action, Object data){ - Map jsonResult = new HashMap<>(); - jsonResult.put("action", action); - jsonResult.put("data", data); - resultCallback.onResult(jsonResult); - } + private static String convertContractName(String contractID) { ContractDesp desp = NodeCenterActions.getContractByName(contractID); if (desp != null) return desp.contractID; return contractID; } + private void simpleReply(ResultCallback resultCallback, String action, Object data) { + Map jsonResult = new HashMap<>(); + jsonResult.put("action", action); + jsonResult.put("data", data); + resultCallback.onResult(jsonResult); + } + /** * 显示当前用户可见的集群 * @@ -48,7 +50,7 @@ public class UnitActions { && KeyValueDBUtil.instance .getValue(NCTables.ConfigDB.toString(), "__CenterManager__") .contains(pubKey)) { - simpleReply(resultCallback,"onListTrustUnits",allunits); + simpleReply(resultCallback, "onListTrustUnits", allunits); LOGGER.debug("is center manager"); long end = System.currentTimeMillis(); LOGGER.debug("[listTrustUnits:time]" + (end - start)); @@ -63,7 +65,7 @@ public class UnitActions { ciunits.add(kv); } } - simpleReply(resultCallback,"onListTrustUnits",ciunits); + simpleReply(resultCallback, "onListTrustUnits", ciunits); long end = System.currentTimeMillis(); LOGGER.debug("[listTrustUnits:time]" + (end - start)); } @@ -118,7 +120,7 @@ public class UnitActions { nodeunits.add(kv); } } - simpleReply(resultCallback,"onGetNodeTrustUnits",nodeunits); + simpleReply(resultCallback, "onGetNodeTrustUnits", nodeunits); } // @Action(async = true, userPermission = 0) @@ -205,7 +207,7 @@ public class UnitActions { ContractDesp desp = NodeCenterActions.getContractByID(key); if (desp != null) info.add(desp); } - simpleReply(rc,"onListContractProcess",JsonUtil.toJson(info)); + simpleReply(rc, "onListContractProcess", JsonUtil.toJson(info)); } @Action(userPermission = 1 << 6, async = true) @@ -221,7 +223,7 @@ public class UnitActions { ContractDesp desp = NodeCenterActions.getContractByID(key); if (desp != null) info.add(desp); } - simpleReply(resultCallback,"onListMultiPointContractProcess",JsonUtil.toJson(info)); + simpleReply(resultCallback, "onListMultiPointContractProcess", JsonUtil.toJson(info)); } @Action(userPermission = 1 << 6, async = true)