From 4bbf9fda3ec39193aedd6bf23a300ab1719ed324 Mon Sep 17 00:00:00 2001 From: tomsun28 Date: Wed, 8 Dec 2021 14:56:19 +0800 Subject: [PATCH] =?UTF-8?q?[manager]=20bugfix-=E6=97=B6=E9=97=B4=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=9B=B4=E6=96=B0=E6=9C=AA=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/usthe/manager/pojo/entity/Monitor.java | 3 +++ .../java/com/usthe/manager/pojo/entity/Param.java | 3 +++ .../com/usthe/manager/pojo/entity/ParamDefine.java | 2 ++ .../manager/service/impl/MonitorServiceImpl.java | 14 ++------------ .../app/routes/dashboard/dashboard.component.ts | 2 +- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/manager/src/main/java/com/usthe/manager/pojo/entity/Monitor.java b/manager/src/main/java/com/usthe/manager/pojo/entity/Monitor.java index 6fa90e7..b496152 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/entity/Monitor.java +++ b/manager/src/main/java/com/usthe/manager/pojo/entity/Monitor.java @@ -9,6 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.Length; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; @@ -103,12 +104,14 @@ public class Monitor { * 记录创建时间 */ @ApiModelProperty(value = "记录创建时间(毫秒时间戳)", example = "1612198922000", accessMode = READ_ONLY, position = 10) + @Column(insertable = false, updatable = false) private LocalDateTime gmtCreate; /** * 记录最新修改时间 */ @ApiModelProperty(value = "记录最新修改时间(毫秒时间戳)", example = "1612198444000", accessMode = READ_ONLY, position = 11) + @Column(insertable = false, updatable = false) private LocalDateTime gmtUpdate; } diff --git a/manager/src/main/java/com/usthe/manager/pojo/entity/Param.java b/manager/src/main/java/com/usthe/manager/pojo/entity/Param.java index 675884e..b7f0fd4 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/entity/Param.java +++ b/manager/src/main/java/com/usthe/manager/pojo/entity/Param.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.Length; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -74,12 +75,14 @@ public class Param { * 记录创建时间 */ @ApiModelProperty(value = "记录创建时间(毫秒时间戳)", example = "1612198922000", accessMode = READ_ONLY, position = 5) + @Column(insertable = false, updatable = false) private LocalDateTime gmtCreate; /** * 记录最新修改时间 */ @ApiModelProperty(value = "记录最新修改时间(毫秒时间戳)", example = "1612198444000", accessMode = READ_ONLY, position = 6) + @Column(insertable = false, updatable = false) private LocalDateTime gmtUpdate; } diff --git a/manager/src/main/java/com/usthe/manager/pojo/entity/ParamDefine.java b/manager/src/main/java/com/usthe/manager/pojo/entity/ParamDefine.java index 5ec4368..10ddc9e 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/entity/ParamDefine.java +++ b/manager/src/main/java/com/usthe/manager/pojo/entity/ParamDefine.java @@ -126,12 +126,14 @@ public class ParamDefine { * 记录创建时间 */ @ApiModelProperty(value = "记录创建时间(毫秒时间戳)", example = "1612198922000", accessMode = READ_ONLY, position = 11) + @Column(insertable = false, updatable = false) private LocalDateTime gmtCreate; /** * 记录最新修改时间 */ @ApiModelProperty(value = "记录最新修改时间(毫秒时间戳)", example = "1612198444000", accessMode = READ_ONLY, position = 12) + @Column(insertable = false, updatable = false) private LocalDateTime gmtUpdate; @Data diff --git a/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java b/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java index 44a2b0a..a10e8c8 100644 --- a/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java +++ b/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java @@ -96,8 +96,6 @@ public class MonitorServiceImpl implements MonitorService { appDefine.setTimestamp(System.currentTimeMillis()); List configmaps = params.stream().map(param -> { param.setMonitorId(monitorId); - param.setGmtCreate(null); - param.setGmtUpdate(null); return new Configmap(param.getField(), param.getValue(), param.getType()); }).collect(Collectors.toList()); appDefine.setConfigmap(configmaps); @@ -108,8 +106,6 @@ public class MonitorServiceImpl implements MonitorService { monitor.setId(monitorId); monitor.setJobId(jobId); monitor.setStatus(CommonConstants.AVAILABLE); - monitor.setGmtCreate(null); - monitor.setGmtUpdate(null); monitorDao.save(monitor); paramDao.saveAll(params); } catch (Exception e) { @@ -224,12 +220,8 @@ public class MonitorServiceImpl implements MonitorService { appDefine.setInterval(monitor.getIntervals()); appDefine.setCyclic(true); appDefine.setTimestamp(System.currentTimeMillis()); - List configmaps = params.stream().map(param -> { - param.setMonitorId(monitorId); - param.setGmtCreate(null); - param.setGmtUpdate(null); - return new Configmap(param.getField(), param.getValue(), param.getType()); - }).collect(Collectors.toList()); + List configmaps = params.stream().map(param -> + new Configmap(param.getField(), param.getValue(), param.getType())).collect(Collectors.toList()); appDefine.setConfigmap(configmaps); // 更新采集任务 jobScheduling.updateAsyncCollectJob(appDefine); @@ -237,8 +229,6 @@ public class MonitorServiceImpl implements MonitorService { try { monitor.setJobId(preMonitor.getJobId()); monitor.setStatus(preMonitor.getStatus()); - monitor.setGmtCreate(null); - monitor.setGmtUpdate(null); monitorDao.save(monitor); paramDao.saveAll(params); } catch (Exception e) { diff --git a/web-app/src/app/routes/dashboard/dashboard.component.ts b/web-app/src/app/routes/dashboard/dashboard.component.ts index 0b154dc..6db24b3 100644 --- a/web-app/src/app/routes/dashboard/dashboard.component.ts +++ b/web-app/src/app/routes/dashboard/dashboard.component.ts @@ -37,7 +37,7 @@ export class DashboardComponent implements OnInit, OnDestroy { this.refresh(); this.appsCountLoading = false; // https://stackoverflow.com/questions/43908009/why-is-setinterval-in-an-angular-service-only-firing-one-time - this.interval$ = setInterval(this.refresh.bind(this), 10000); + this.interval$ = setInterval(this.refresh.bind(this), 30000); } ngOnDestroy(): void {