From b1d989c9cfb2b92d10b4f09de26b38a32489d13a Mon Sep 17 00:00:00 2001 From: nieziyan Date: Tue, 26 Sep 2023 19:19:01 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9AServer=E7=9B=91=E6=8E=A7=20fix?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=9B=91=E6=8E=A7=E9=A1=B9=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/base/dto/AlarmInfo.java | 16 +++++ .../org/jeecg/modules/base/dto/ServerDto.java | 2 + .../base/entity/postgre/SysServer.java | 39 +---------- .../controller/AlarmItemController.java | 25 +++++-- .../controller/SysServerController.java | 10 ++- .../controller/SystemMonitorController.java | 2 +- .../modules/feignclient/MonitorAlarm.java | 6 +- .../jeecg/modules/mapper/SysServerMapper.java | 10 +-- .../modules/mapper/xml/SysServerMapper.xml | 17 +++-- .../modules/service/IAlarmItemService.java | 2 +- .../modules/service/ISysServerService.java | 2 +- .../service/impl/AlarmItemServiceImpl.java | 68 +++++++++---------- .../impl/CalculateConcServiceImpl.java | 2 +- .../service/impl/SysServerServiceImpl.java | 24 ++++--- .../feignclient/AbnormalAlarmClient.java | 6 +- ...yncItemJob.java => SyncServerItemJob.java} | 11 +-- 16 files changed, 123 insertions(+), 119 deletions(-) create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmInfo.java rename jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/{SyncItemJob.java => SyncServerItemJob.java} (81%) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmInfo.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmInfo.java new file mode 100644 index 00000000..ec7a036d --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmInfo.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.base.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import java.util.Date; + +@Data +public class AlarmInfo { + + private String alarmInfo; + + private String alarmValue; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date alarmStartDate; +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/ServerDto.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/ServerDto.java index 361566fc..f4ff9a1e 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/ServerDto.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/ServerDto.java @@ -13,6 +13,8 @@ public class ServerDto implements Serializable { private String name; + private String hostId; + private boolean online; private String serverInfo; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysServer.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysServer.java index 3022f393..fe399b22 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysServer.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysServer.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.jeecg.common.system.base.entity.JeecgEntity; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; @@ -13,14 +14,7 @@ import java.time.LocalDate; @Data @TableName(value = "sys_server") -public class SysServer implements Serializable { - - /** - * id - */ - @TableId(value = "id", type = IdType.ASSIGN_ID) - private String id; - +public class SysServer extends JeecgEntity implements Serializable { /** * 名称 */ @@ -41,33 +35,4 @@ public class SysServer implements Serializable { @TableField("host_id") private String hostId; - - /** - * 创建时间 - */ - @TableField(value = "create_time") - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; - - /** - * 创建人 - */ - @TableField(value = "create_by") - private String createBy; - - /** - * 修改时间 - */ - @TableField(value = "update_time") - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; - - /** - * 修改人 - */ - @TableField(value = "update_by") - private String updateBy; - } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmItemController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmItemController.java index e23cf7e6..4a31bf15 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmItemController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmItemController.java @@ -2,6 +2,7 @@ package org.jeecg.modules.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.modules.base.entity.postgre.AlarmItem; import org.jeecg.modules.service.IAlarmItemService; @@ -11,15 +12,27 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -@Api(value = "监控项管理",tags = "监控项管理") +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Api(value = "监控项同步及管理",tags = "监控项同步及管理") @RestController @RequestMapping("alarmItem") public class AlarmItemController extends JeecgController { - @GetMapping("syncItem") - @ApiOperation(value = "同步监控项信息",notes = "同步监控项信息") - public boolean syncItem(@RequestParam String type, - @RequestParam String code){ - return service.syncItem(type,code); + @GetMapping("syncServerItem") + @ApiOperation(value = "同步服务器监控项信息",notes = "同步服务器监控项信息") + public boolean syncServerItem(){ + return service.syncServerItem(); + } + + @GetMapping("alarmItems") + @ApiOperation(value = "服务器所有监控项",notes = "服务器所有监控项") + public Result alarmItems(@RequestParam String sourceId){ + List alarmItems = service.alarmItems(sourceId); + Map itemIds = alarmItems.stream() + .collect(Collectors.toMap(AlarmItem::getName, AlarmItem::getId)); + return Result.OK(itemIds); } } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysServerController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysServerController.java index 843623a0..b7fdafba 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysServerController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysServerController.java @@ -73,8 +73,16 @@ public class SysServerController { } @GetMapping("detailsBasicInfo") - @ApiOperation(value = "Server Monitor-Details-BasicInfo",notes = "Server Monitor-Details-BasicInfo") + @ApiOperation(value = "ServerMonitor-Details-BasicInfo",notes = "ServerMonitor-Details-BasicInfo") public Result details_BasicInfo(@RequestParam String hostId){ return sysServerService.details_BasicInfo(hostId); } + + @GetMapping("detailsAlarmInfo") + @ApiOperation(value = "ServerMonitor-Details-AlarmInfo",notes = "ServerMonitor-Details-AlarmInfo") + public Result details_AlarmInfo(@RequestParam String sourceId, + @RequestParam(defaultValue = "1") Integer pageNo, + @RequestParam(defaultValue = "10") Integer pageSize){ + return sysServerService.details_AlarmInfo(sourceId, pageNo, pageSize); + } } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SystemMonitorController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SystemMonitorController.java index c367742d..5d92a47b 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SystemMonitorController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SystemMonitorController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("systemMonitor") -@Api("系统监控信息查询") +@Api("系统监控信息管理") public class SystemMonitorController { @Autowired diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/MonitorAlarm.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/MonitorAlarm.java index 90b2dd54..25bd5204 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/MonitorAlarm.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/MonitorAlarm.java @@ -15,10 +15,10 @@ import org.springframework.web.bind.annotation.RequestParam; public interface MonitorAlarm { // --------------------后端专用------------------- - @GetMapping("list") // 获取指定服务器信息 - Result listBack(@RequestParam("code") String code); + @GetMapping("list") // 获取所有 服务器/数据库服务 信息 + Result listApp(@RequestParam("type") String type); - @GetMapping("list") // 获取所有在线服务器信息 + @GetMapping("list") // 获取所有在线 服务器/数据库服务 信息 Result listOnApp(@RequestParam("status") String status, @RequestParam("type") String type); diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysServerMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysServerMapper.java index 0dcb0ee5..0a637959 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysServerMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysServerMapper.java @@ -2,10 +2,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.base.dto.IdCount; -import org.jeecg.modules.base.dto.ServerDto; -import org.jeecg.modules.base.dto.SourceDto; -import org.jeecg.modules.base.dto.SourceItem; +import org.jeecg.modules.base.dto.*; import org.jeecg.modules.base.entity.postgre.SysServer; import org.jeecg.modules.entity.AlarmHistory; @@ -18,8 +15,7 @@ public interface SysServerMapper extends BaseMapper { List findPage(Map params); - void saveOrUpdateHostId(@Param("hostId") String hostId, - @Param("sourceId") String sourceId); - List pageAll(String itemName); + + List alarmInfo(String sourceId); } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/SysServerMapper.xml b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/SysServerMapper.xml index 9207c1a7..8dceb703 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/SysServerMapper.xml +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/SysServerMapper.xml @@ -35,6 +35,7 @@ SELECT s.ID, s.NAME, + s.host_id, s.ip_address, COUNT (l.id) AS alarms FROM @@ -42,7 +43,7 @@ LEFT JOIN alarm_rule r ON s.ID = r.source_id LEFT JOIN alarm_log l ON r.ID = l.rule_id AND l.alarm_start_date BETWEEN #{startDate} AND #{endDate} - GROUP BY s.ID, s.NAME, s.ip_address + GROUP BY s.ID, s.NAME, s.host_id, s.ip_address LIMIT #{pageSize} OFFSET #{pageStart} @@ -60,7 +61,15 @@ s.status DESC, s.NAME ASC - - UPDATE sys_server SET host_id = #{hostId} WHERE id = #{sourceId} - + \ No newline at end of file diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmItemService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmItemService.java index cd3d779b..92d440d8 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmItemService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmItemService.java @@ -7,7 +7,7 @@ import org.jeecg.modules.base.entity.postgre.AlarmItem; import java.util.List; public interface IAlarmItemService extends IService { - boolean syncItem(String sourceType,String code); + boolean syncServerItem(); List alarmItems(String sourceId); } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysServerService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysServerService.java index d1894d24..82e8d924 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysServerService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysServerService.java @@ -32,5 +32,5 @@ public interface ISysServerService extends IService { Result details_BasicInfo(String hostId); - void saveOrUpdateHostId(String sourceId, String hostId); + Result details_AlarmInfo(String sourceId, Integer pageNo, Integer pageSize); } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmItemServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmItemServiceImpl.java index 3a53ece9..9bf0b772 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmItemServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmItemServiceImpl.java @@ -7,11 +7,13 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.constant.MonitorConstant; import org.jeecg.common.constant.Prompt; import org.jeecg.modules.base.entity.monitor.Host; import org.jeecg.modules.base.entity.monitor.Item; import org.jeecg.modules.base.entity.monitor.Servers; import org.jeecg.modules.base.entity.postgre.AlarmItem; +import org.jeecg.modules.base.entity.postgre.SysServer; import org.jeecg.modules.feignclient.MonitorAlarm; import org.jeecg.modules.mapper.AlarmItemMapper; import org.jeecg.modules.service.IAlarmItemService; @@ -40,42 +42,38 @@ public class AlarmItemServiceImpl extends ServiceImpl hosts = monitorAlarm.listApp(MonitorConstant.SERVER_APP).getResult().getRecords(); + // 获取所有服务器信息 + List servers = serverService.list(); + for (SysServer server : servers) { + String name = server.getName(); + String serverId = server.getId(); + // 批量保存服务器对应的监控项信息 + for (Host host : hosts) { + String code = host.getCode(); + if (!StrUtil.equals(name, code)) + continue; + server.setHostId(host.getHostId()); + List items = ListUtil.toList(host.getItems().values()); + List alarmItems = new ArrayList<>(); + for (Item item : items) { + AlarmItem alarmItem = BeanUtil.copyProperties(item, AlarmItem.class); + alarmItem.setId(item.getItemId()); + alarmItem.setSourceId(serverId); + alarmItems.add(alarmItem); + } + saveOrUpdateBatch(alarmItems); + } } - if (StrUtil.isBlank(sourceId)) - return false; - - Result result = monitorAlarm.listBack(code); - List hosts = result.getResult().getRecords(); - List items = new ArrayList<>(); - String hostId = null; - for (Host host : hosts) { - boolean equals = host.getCode().equals(code); - if(!equals) continue; - items = ListUtil.toList(host.getItems().values()); - hostId = host.getHostId(); - } - if (CollUtil.isEmpty(items)) - return false; - - List alarmItems = new ArrayList<>(); - for (Item item : items) { - AlarmItem alarmItem = BeanUtil.copyProperties(item, AlarmItem.class); - alarmItem.setId(item.getItemId()); - alarmItem.setSourceId(sourceId); - alarmItems.add(alarmItem); - } - serverService.saveOrUpdateHostId(sourceId, hostId); - return saveOrUpdateBatch(alarmItems); + // 添加或更新SysServer的HostId + return serverService.updateBatchById(servers); }catch (Exception e){ e.printStackTrace(); return false; @@ -85,7 +83,7 @@ public class AlarmItemServiceImpl extends ServiceImpl alarmItems(String sourceId) { if (StrUtil.isBlank(sourceId)) - return ListUtil.empty(); + return new ArrayList<>(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(AlarmItem::getSourceId,sourceId); return list(wrapper); diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/CalculateConcServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/CalculateConcServiceImpl.java index cc847da5..ea161754 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/CalculateConcServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/CalculateConcServiceImpl.java @@ -51,8 +51,8 @@ public class CalculateConcServiceImpl implements CalculateConcService { String comma = SymbolConstant.COMMA; List analysisRules = analysisRuleService.allAnalysisRule(); Set nuclideNames = analysisRules.stream() - .filter(rule -> StrUtil.isNotBlank(rule.getNuclides())) .map(AlarmAnalysisRule::getNuclides) + .filter(StrUtil::isNotBlank) .flatMap(nuclides -> ListUtil.toList(nuclides.split(comma)).stream()) .collect(Collectors.toSet()); Map params = new HashMap<>(); diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java index dfbc6f2a..b129992a 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java @@ -18,6 +18,7 @@ import org.jeecg.common.constant.MonitorConstant; import org.jeecg.common.constant.Prompt; import org.jeecg.common.util.NumUtil; import org.jeecg.common.util.PageUtil; +import org.jeecg.modules.base.dto.AlarmInfo; import org.jeecg.modules.base.dto.BasicInfo; import org.jeecg.modules.base.dto.ServerDto; import org.jeecg.modules.base.dto.SourceDto; @@ -65,12 +66,12 @@ public class SysServerServiceImpl extends ServiceImpl hosts = monitorAlarm.listOnApp(MonitorConstant.STATUS_ON, MonitorConstant.SERVER_APP).getResult().getRecords(); for (ServerDto serverDto : serverDtos) { - String name = serverDto.getName(); int alarms = serverDto.getAlarms(); + String hostIdS = serverDto.getHostId(); serverDto.setAlarmRed(alarms > 0); for (Host host : hosts) { - String code = host.getCode(); - if (!StrUtil.equals(name, code)) continue; + String hostId = host.getHostId(); + if (!StrUtil.equals(hostIdS, hostId)) continue; Map items = host.getItems(); // cpu利用率 @@ -246,9 +247,9 @@ public class SysServerServiceImpl extends ServiceImpl items = host.getItems(); - String upTime = items.get(MonitorConstant.ITEM_RUNTIME).getLastValue(); - upTime = StrUtil.isBlank(upTime) ? "--" : - NumUtil.keepStr(Long.parseLong(upTime) / 3600.0, 1) + "h"; + String runTime = items.get(MonitorConstant.ITEM_RUNTIME).getLastValue(); + runTime = StrUtil.isBlank(runTime) ? "--" : + NumUtil.keepStr(Long.parseLong(runTime) / 3600.0, 1) + "h"; String ramSize = items.get(MonitorConstant.ITEM_RAMSIZE).getLastValue(); ramSize = StrUtil.isBlank(ramSize) ? "--" : NumUtil.keepStr(Double.parseDouble(ramSize.replace("MB", "")) / 1024, 1) + "GB"; @@ -285,7 +286,7 @@ public class SysServerServiceImpl extends ServiceImpl details_AlarmInfo(String sourceId, Integer pageNo, Integer pageSize) { + List alarmInfos = baseMapper.alarmInfo(sourceId); + int total = alarmInfos.size(); + Page page = new Page<>(pageNo, pageSize, total); + List records = PageUtil.page(pageNo, pageSize, alarmInfos); + page.setRecords(records); + return Result.OK(page); } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/feignclient/AbnormalAlarmClient.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/feignclient/AbnormalAlarmClient.java index f7412d84..b0ecf721 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/feignclient/AbnormalAlarmClient.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/feignclient/AbnormalAlarmClient.java @@ -1,7 +1,6 @@ package org.jeecg.modules.feignclient; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.postgre.AlarmAnalysisRule; import org.jeecg.modules.base.entity.postgre.AlarmLog; import org.jeecg.modules.base.entity.postgre.SysEmail; import org.springframework.cloud.openfeign.FeignClient; @@ -38,7 +37,6 @@ public interface AbnormalAlarmClient { boolean refreshParam(); /* AlarmItemController下相关接口 */ - @GetMapping("/alarmItem/syncItem") - boolean syncItem(@RequestParam String type, - @RequestParam String code); + @GetMapping("/alarmItem/syncServerItem") + boolean syncServerItem(); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/SyncItemJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/SyncServerItemJob.java similarity index 81% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/SyncItemJob.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/SyncServerItemJob.java index 711dc127..9c27764b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/SyncItemJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/SyncServerItemJob.java @@ -1,10 +1,7 @@ package org.jeecg.modules.quartz.job; -import lombok.NoArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.jeecg.common.config.mqtoken.UserTokenContext; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.modules.base.enums.SourceType; import org.jeecg.modules.feignclient.AbnormalAlarmClient; import org.quartz.*; @@ -14,13 +11,9 @@ import static org.jeecg.common.util.TokenUtils.getTempToken; * 此处的同步是指:当定时任务的执行时间大于任务的时间 * 间隔时会等待第一个任务执行完成才会走第二个任务 */ - -/** - * 监控项信息更新保存 - */ @DisallowConcurrentExecution @PersistJobDataAfterExecution -public class SyncItemJob implements Job { +public class SyncServerItemJob implements Job { private AbnormalAlarmClient alarmClient; @@ -30,7 +23,7 @@ public class SyncItemJob implements Job { public void execute(JobExecutionContext context) throws JobExecutionException { try { init(); - success = alarmClient.syncItem(SourceType.SERVER.getType(), "172.21.60.231"); + success = alarmClient.syncServerItem(); }catch (Exception e){ e.printStackTrace(); success = false;