diff --git a/cloud-central-control/src/main/java/com/cm/central/control/service/clientexception/impl/ClientExceptionServiceImpl.java b/cloud-central-control/src/main/java/com/cm/central/control/service/clientexception/impl/ClientExceptionServiceImpl.java
index 02cbae2..9ca2be3 100644
--- a/cloud-central-control/src/main/java/com/cm/central/control/service/clientexception/impl/ClientExceptionServiceImpl.java
+++ b/cloud-central-control/src/main/java/com/cm/central/control/service/clientexception/impl/ClientExceptionServiceImpl.java
@@ -272,8 +272,8 @@ public class ClientExceptionServiceImpl extends AbstractService implements IClie
private String getExceptionEmailContent(String leaderName, String noticeContent) {
StringBuilder noticeContentTable = new StringBuilder();
noticeContentTable.append("
").append(leaderName).append(",您好:
");
- noticeContentTable.append("您所负责的项目出现异,请及时处理更新
");
- noticeContentTable.append("异常情况见下表,详细问题请登录管理系统查看:
");
+ noticeContentTable.append("您所负责的项目有异常发生,请及时处理并更新
");
+ noticeContentTable.append("异常情况见下表,详细内容请登录管理系统查看:
");
noticeContentTable.append("");
noticeContentTable.append("系统 | 异常类型 | 异常名称 | 异常时间 | ");
noticeContentTable.append("
");
diff --git a/cloud-central-control/src/main/java/com/cm/central/control/service/socket/offline/impl/OffLineServiceImpl.java b/cloud-central-control/src/main/java/com/cm/central/control/service/socket/offline/impl/OffLineServiceImpl.java
index 18fd9e6..0c21b7c 100644
--- a/cloud-central-control/src/main/java/com/cm/central/control/service/socket/offline/impl/OffLineServiceImpl.java
+++ b/cloud-central-control/src/main/java/com/cm/central/control/service/socket/offline/impl/OffLineServiceImpl.java
@@ -75,7 +75,7 @@ public class OffLineServiceImpl extends BaseService implements IOffLineService {
// 查询客户端负责人
ClientProjectLeaderDTO clientProjectLeaderDTO = projectLeaderService.getProjectLeaderByClientId(socketClientBO.getClientId());
if (clientProjectLeaderDTO == null) {
- LOG.debug("ClientId: {},没有设置项目负责人");
+ LOG.debug("ClientId: {},没有设置项目负责人", socketClientBO.getClientId());
continue;
}
String emailKey = clientProjectLeaderDTO.getLeaderEmail();
@@ -87,6 +87,8 @@ public class OffLineServiceImpl extends BaseService implements IOffLineService {
List noticeList = noticeMap.get(emailKey);
if (noticeList == null) {
noticeList = new ArrayList<>();
+ // 列表的第一个是项目经理
+ noticeList.add(clientProjectLeaderDTO.getLeaderName());
noticeMap.put(emailKey, noticeList);
}
noticeList.add(noticeContentSB.toString());
@@ -109,11 +111,13 @@ public class OffLineServiceImpl extends BaseService implements IOffLineService {
for (Map.Entry> notice : noticeMap.entrySet()) {
String receiverEmail = notice.getKey();
StringBuilder noticeContentTable = new StringBuilder();
- noticeContentTable.append("您好,您所负责的项目出现异常离线情况,请及时处理,如果是主动离线请忽略
");
+ noticeContentTable.append("").append(notice.getValue().get(0)).append(",您好").append("
");
+ noticeContentTable.append("").append("您所负责的项目出现异常离线情况,请及时处理,如果是主动离线请忽略
");
noticeContentTable.append("详细情况见下表:
");
noticeContentTable.append("");
- noticeContentTable.append("系统 | 所属客户 | 服务器IP | 离线时间 | ");
+ noticeContentTable.append("系统 | 所属客户 | 访问地址 | 离线时间 | ");
noticeContentTable.append("
---|
");
+ notice.getValue().remove(0);
for (String tbodyTr : notice.getValue()) {
noticeContentTable.append(tbodyTr);
}
diff --git a/cloud-central-control/src/main/resources/templates/client/get-client-info.html b/cloud-central-control/src/main/resources/templates/client/get-client-info.html
index 42e0d4c..9661a16 100644
--- a/cloud-central-control/src/main/resources/templates/client/get-client-info.html
+++ b/cloud-central-control/src/main/resources/templates/client/get-client-info.html
@@ -111,7 +111,7 @@
min: 0,
max: disk.total,
detail: {formatter: '{value}GB'},
- data: [{value: disk.free, name: '磁盘使用'}]
+ data: [{value: (disk.total - disk.free), name: '磁盘使用'}]
}
]
});