From b07147e1b3e5fe3b81202f03e074b4ffa5914ae1 Mon Sep 17 00:00:00 2001
From: wenc000 <450292408@qq.com>
Date: Tue, 11 Aug 2020 20:50:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=82=AE=E4=BB=B6=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=92=8C=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ClientExceptionServiceImpl.java               |  4 ++--
 .../socket/offline/impl/OffLineServiceImpl.java        | 10 +++++++---
 .../resources/templates/client/get-client-info.html    |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

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("<div>").append(leaderName).append("，您好：</div>");
-        noticeContentTable.append("<div>您所负责的项目出现异，请及时处理更新</div><br/>");
-        noticeContentTable.append("<div>异常情况见下表，详细问题请登录管理系统查看：</div><br/>");
+        noticeContentTable.append("<div>您所负责的项目有异常发生，请及时处理并更新</div><br/>");
+        noticeContentTable.append("<div>异常情况见下表，详细内容请登录管理系统查看：</div><br/>");
         noticeContentTable.append("<table border=\"1\" cellspacing=\"0\">");
         noticeContentTable.append("<thead><tr><th>系统</th><th>异常类型</th><th>异常名称</th><th>异常时间</th></thread>");
         noticeContentTable.append("<tbody>");
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<String> 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<String, List<String>> notice : noticeMap.entrySet()) {
             String receiverEmail = notice.getKey();
             StringBuilder noticeContentTable = new StringBuilder();
-            noticeContentTable.append("<div>您好，您所负责的项目出现异常离线情况，请及时处理，如果是主动离线请忽略</div><br/>");
+            noticeContentTable.append("<div>").append(notice.getValue().get(0)).append("，您好").append("</div>");
+            noticeContentTable.append("<div>").append("您所负责的项目出现异常离线情况，请及时处理，如果是主动离线请忽略</div><br/>");
             noticeContentTable.append("<div>详细情况见下表：</div><br/>");
             noticeContentTable.append("<table border=\"1\" cellspacing=\"0\">");
-            noticeContentTable.append("<thead><tr><th>系统</th><th>所属客户</th><th>服务器IP</th><th>离线时间</th></thread>");
+            noticeContentTable.append("<thead><tr><th>系统</th><th>所属客户</th><th>访问地址</th><th>离线时间</th></thread>");
             noticeContentTable.append("<tbody>");
+            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: '磁盘使用'}]
                                 }
                             ]
                         });