|
@@ -1,6 +1,7 @@
|
|
|
package cn.iaun.it.controller;
|
|
package cn.iaun.it.controller;
|
|
|
|
|
|
|
|
import cn.iaun.it.model.*;
|
|
import cn.iaun.it.model.*;
|
|
|
|
|
+import cn.iaun.it.model.vo.monitor.ItMonitorItMonitorResourceDetailsVo;
|
|
|
import cn.iaun.it.model.vo.monitor.ItMonitorItemGroupVo;
|
|
import cn.iaun.it.model.vo.monitor.ItMonitorItemGroupVo;
|
|
|
import cn.iaun.it.model.vo.monitor.controller.*;
|
|
import cn.iaun.it.model.vo.monitor.controller.*;
|
|
|
import cn.iaun.it.service.ItMonitorService;
|
|
import cn.iaun.it.service.ItMonitorService;
|
|
@@ -154,12 +155,12 @@ public class ItMonitorController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("/resource/get/{i}")
|
|
@PostMapping("/resource/get/{i}")
|
|
|
- public Result<List<ItMonitorResource>> getItMonitorResource(@PathVariable String i) {
|
|
|
|
|
|
|
+ public Result<List<ItMonitorItMonitorResourceDetailsVo>> getItMonitorResource(@PathVariable String i) {
|
|
|
if (i.equals("all")) {
|
|
if (i.equals("all")) {
|
|
|
- return new Result<>(ResultCode.SUCCESS, itMonitorService.getAllResource());
|
|
|
|
|
|
|
+ return new Result<>(ResultCode.SUCCESS, itMonitorService.getAllResourceDetails());
|
|
|
}
|
|
}
|
|
|
Long id = Long.parseLong(i);
|
|
Long id = Long.parseLong(i);
|
|
|
- return new Result<>(ResultCode.SUCCESS, itMonitorService.getResourceByGroupId(id));
|
|
|
|
|
|
|
+ return new Result<>(ResultCode.SUCCESS, itMonitorService.getResourceDetailsByGroupId(id));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("/resource/add")
|
|
@PostMapping("/resource/add")
|
|
@@ -224,7 +225,8 @@ public class ItMonitorController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("/item/group/set")
|
|
@PostMapping("/item/group/set")
|
|
|
- public Result<?> setItMonitorItemGroup(ItMonitorItemGroup itMonitorItemGroup) { // 只允许修改名称、间隔、置顶itemId、是否为表格
|
|
|
|
|
|
|
+ public Result<?> setItMonitorItemGroup(@RequestBody ItMonitorItemGroup itMonitorItemGroup) { // 只允许修改名称、间隔、置顶itemId、是否为表格
|
|
|
|
|
+ System.out.println(itMonitorItemGroup);
|
|
|
if (itMonitorItemGroup.getGroupId() == null || itMonitorItemGroup.getGroupName() == null || itMonitorItemGroup.getGroupName().isEmpty()
|
|
if (itMonitorItemGroup.getGroupId() == null || itMonitorItemGroup.getGroupName() == null || itMonitorItemGroup.getGroupName().isEmpty()
|
|
|
|| (itMonitorItemGroup.getTopItemId() != -1 && !itMonitorService.checkItemExistByItemId(itMonitorItemGroup.getTopItemId(), itMonitorItemGroup.getGroupId()))
|
|
|| (itMonitorItemGroup.getTopItemId() != -1 && !itMonitorService.checkItemExistByItemId(itMonitorItemGroup.getTopItemId(), itMonitorItemGroup.getGroupId()))
|
|
|
) {
|
|
) {
|
|
@@ -243,7 +245,8 @@ public class ItMonitorController {
|
|
|
|
|
|
|
|
@PostMapping("/item/add") // TODO: check groupId
|
|
@PostMapping("/item/add") // TODO: check groupId
|
|
|
public Result<?> addItMonitorItem(@Validated @RequestBody ItMonitorItem itMonitorItem) {
|
|
public Result<?> addItMonitorItem(@Validated @RequestBody ItMonitorItem itMonitorItem) {
|
|
|
- if (!itMonitorService.checkItemGroupExistByGroupId(itMonitorItem.getItemGroupId())) {
|
|
|
|
|
|
|
+ if (itMonitorItem.getItemGroupId() == null ||
|
|
|
|
|
+ !itMonitorService.checkItemGroupExistByGroupId(itMonitorItem.getItemGroupId())) {
|
|
|
return new Result<>(ResultCode.FAILED_PARAM_INVALID);
|
|
return new Result<>(ResultCode.FAILED_PARAM_INVALID);
|
|
|
}
|
|
}
|
|
|
itMonitorItem.setItemId(null);
|
|
itMonitorItem.setItemId(null);
|
|
@@ -259,8 +262,10 @@ public class ItMonitorController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("/item/set") // TODO: check groupId
|
|
@PostMapping("/item/set") // TODO: check groupId
|
|
|
- public Result<?> setItMonitorItem(@Validated @RequestBody ItMonitorItem itMonitorItem) {
|
|
|
|
|
- return new Result<>(ResultCode.SUCCESS, itMonitorService.setItem(itMonitorItem));
|
|
|
|
|
|
|
+ public Result<?> setItMonitorItem(@RequestBody ItMonitorItem itMonitorItem) {
|
|
|
|
|
+ itMonitorItem.setItemGroupId(null);
|
|
|
|
|
+ int result = itMonitorService.setItem(itMonitorItem);
|
|
|
|
|
+ return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("/threshold/get")
|
|
@PostMapping("/threshold/get")
|