diff --git a/service/src/main/java/com/xiaojukeji/kafka/manager/service/service/OrderService.java b/service/src/main/java/com/xiaojukeji/kafka/manager/service/service/OrderService.java index cbf379e3f35c7d083545b1ca7122e58817b80e95..3d60bfc0b7a82add31cf6fb6431dca56cb23303d 100644 --- a/service/src/main/java/com/xiaojukeji/kafka/manager/service/service/OrderService.java +++ b/service/src/main/java/com/xiaojukeji/kafka/manager/service/service/OrderService.java @@ -45,7 +45,7 @@ public interface OrderService { * @date 19/6/23 * @return Result */ - Result modifyOrderPartition(OrderPartitionDO orderPartitionDO, String operator); + Result modifyOrderPartition(OrderPartitionDO orderPartitionDO, String operator, boolean admin); /** * 查询Topic工单 diff --git a/service/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/JmxServiceImpl.java b/service/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/JmxServiceImpl.java index 48118c9f8b357f0e7e2884dc036a1a2158657924..b781cbbf171c714bb9ae6073610dee84b462e164 100644 --- a/service/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/JmxServiceImpl.java +++ b/service/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/JmxServiceImpl.java @@ -72,6 +72,9 @@ public class JmxServiceImpl implements JmxService { List attributeValueList = null; try { attributeValueList = connection.getAttributes(new ObjectName(mbean.getObjectName()), properties).asList(); + } catch (InstanceNotFoundException e) { + logger.warn("getSpecifiedBrokerMetricsFromJmx@JmxServiceImpl, get metrics fail, objectName:{}.", mbean.getObjectName(), e); + continue; } catch (Exception e) { logger.error("getSpecifiedBrokerMetricsFromJmx@JmxServiceImpl, get metrics fail, objectName:{}.", mbean.getObjectName(), e); continue; diff --git a/service/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/OrderServiceImpl.java b/service/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/OrderServiceImpl.java index d756ebda557ef043e5074436c77602f452c2fefc..f09d9ef05f74057ba1c3619f56a94d25d9b00025 100644 --- a/service/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/OrderServiceImpl.java +++ b/service/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/OrderServiceImpl.java @@ -51,7 +51,7 @@ public class OrderServiceImpl implements OrderService { if (orderPartitionDO != null) { orderPartitionDO.setOrderStatus(OrderStatusEnum.CANCELLED.getCode()); } - return modifyOrderPartition(orderPartitionDO, operator); + return modifyOrderPartition(orderPartitionDO, operator, false); } return new Result(StatusCode.PARAM_ERROR, "order type illegal"); } @@ -74,10 +74,10 @@ public class OrderServiceImpl implements OrderService { } @Override - public Result modifyOrderPartition(OrderPartitionDO newOrderPartitionDO, String operator) { + public Result modifyOrderPartition(OrderPartitionDO newOrderPartitionDO, String operator, boolean admin) { if (newOrderPartitionDO == null) { return new Result(StatusCode.PARAM_ERROR, "param illegal, order not exist"); - } else if (!newOrderPartitionDO.getApplicant().equals(operator)) { + } else if (!admin && !newOrderPartitionDO.getApplicant().equals(operator)) { return new Result(StatusCode.PARAM_ERROR, "without authority to cancel the order"); } OrderPartitionDO oldOrderPartitionDO = orderPartitionDao.getById(newOrderPartitionDO.getId()); diff --git a/web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/OrderController.java b/web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/OrderController.java index be6e66ea89a04b8b9a18098043e02a968f0b77c5..07bfb5036b4d284f2128c86ed26ce87370fc04fd 100644 --- a/web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/OrderController.java +++ b/web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/OrderController.java @@ -325,9 +325,9 @@ public class OrderController { orderPartitionDO.setApprover(username); orderPartitionDO.setOpinion(reqObj.getApprovalOpinions()); orderPartitionDO.setOrderStatus(reqObj.getOrderStatus()); - result = orderService.modifyOrderPartition(orderPartitionDO, username); + result = orderService.modifyOrderPartition(orderPartitionDO, username, true); if (!StatusCode.SUCCESS.equals(result.getCode())) { - return new Result(StatusCode.OPERATION_ERROR, "create topic success, but update order status failed, err:" + result.getMessage()); + return new Result(StatusCode.OPERATION_ERROR, "expand topic success, but update order status failed, err:" + result.getMessage()); } return new Result(); }