钟来 / Luhui · 提交

转到一个项目

作者 钟来
提交 51c851ba5aca365584f09ffdbe7c543d2d95c683 1 个父辈 0afc237c

添加内网ip

内嵌 并排对比
正在显示 3 个修改的文件 包含 20 行增加 和 1 行删除
@@ -20,6 +20,7 @@ import com.zhonglai.luhui.admin.qywx.QyWxApplication; @@ -20,6 +20,7 @@ import com.zhonglai.luhui.admin.qywx.QyWxApplication;
20 import com.zhonglai.luhui.admin.qywx.WXBizMsgCrypt; 20 import com.zhonglai.luhui.admin.qywx.WXBizMsgCrypt;
21 import com.zhonglai.luhui.admin.service.SendSysMonitorServerMessge; 21 import com.zhonglai.luhui.admin.service.SendSysMonitorServerMessge;
22 import com.zhonglai.luhui.dao.service.PublicService; 22 import com.zhonglai.luhui.dao.service.PublicService;
  23 +import com.zhonglai.luhui.device.analysis.comm.util.StringUtils;
23 import io.swagger.annotations.Api; 24 import io.swagger.annotations.Api;
24 import io.swagger.annotations.ApiOperation; 25 import io.swagger.annotations.ApiOperation;
25 import org.springframework.beans.factory.annotation.Autowired; 26 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,6 +79,10 @@ public class ServerController extends BaseController @@ -78,6 +79,10 @@ public class ServerController extends BaseController
78 String ip = IpUtils.getIpAddr(ServletUtils.getRequest()); 79 String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
79 SysMonitorServer sysMonitorServer = new SysMonitorServer(); 80 SysMonitorServer sysMonitorServer = new SysMonitorServer();
80 sysMonitorServer.setIp(ip); 81 sysMonitorServer.setIp(ip);
  82 + if(StringUtils.isNotEmpty(monitorServerUploadDto.getLocalip()))
  83 + {
  84 + sysMonitorServer.setIp(ip+"("+monitorServerUploadDto.getLocalip()+")");
  85 + }
81 Long st = publicService.getObjectListTotle(sysMonitorServer, null); 86 Long st = publicService.getObjectListTotle(sysMonitorServer, null);
82 sysMonitorServer.setCpu_usage(new Double(monitorServerUploadDto.getCpu_usage()*100).intValue()); 87 sysMonitorServer.setCpu_usage(new Double(monitorServerUploadDto.getCpu_usage()*100).intValue());
83 sysMonitorServer.setConnection_count(monitorServerUploadDto.getConnection_count()); 88 sysMonitorServer.setConnection_count(monitorServerUploadDto.getConnection_count());
@@ -85,6 +90,7 @@ public class ServerController extends BaseController @@ -85,6 +90,7 @@ public class ServerController extends BaseController
85 sysMonitorServer.setDisk_usage(new Double(monitorServerUploadDto.getDisk_usage()*100).intValue()); 90 sysMonitorServer.setDisk_usage(new Double(monitorServerUploadDto.getDisk_usage()*100).intValue());
86 sysMonitorServer.setCpu_info(tranPsAux(monitorServerUploadDto.getCpu_info())); 91 sysMonitorServer.setCpu_info(tranPsAux(monitorServerUploadDto.getCpu_info()));
87 sysMonitorServer.setMemory_info(tranPsAux(monitorServerUploadDto.getMemory_info())); 92 sysMonitorServer.setMemory_info(tranPsAux(monitorServerUploadDto.getMemory_info()));
  93 +
88 if(st==0) 94 if(st==0)
89 { 95 {
90 sysMonitorServer.setCreate_time(System.currentTimeMillis()); 96 sysMonitorServer.setCreate_time(System.currentTimeMillis());
@@ -19,6 +19,17 @@ public class MonitorServerUploadDto { @@ -19,6 +19,17 @@ public class MonitorServerUploadDto {
19 @ApiModelProperty("cpu信息") 19 @ApiModelProperty("cpu信息")
20 private String cpu_info; 20 private String cpu_info;
21 21
  22 + @ApiModelProperty("本地ip")
  23 + private String localip;
  24 +
  25 + public String getLocalip() {
  26 + return localip;
  27 + }
  28 +
  29 + public void setLocalip(String localip) {
  30 + this.localip = localip;
  31 + }
  32 +
22 public String getMemory_info() { 33 public String getMemory_info() {
23 return memory_info; 34 return memory_info;
24 } 35 }
@@ -36,8 +36,10 @@ get_system_performance() { @@ -36,8 +36,10 @@ get_system_performance() {
36 MEMORY_INFO=\$(echo "\$MEMORY_INFO" | sed 's/"/\\"/g') 36 MEMORY_INFO=\$(echo "\$MEMORY_INFO" | sed 's/"/\\"/g')
37 CPU_INFO=\$(echo "\$CPU_INFO" | sed 's/"/\\"/g') 37 CPU_INFO=\$(echo "\$CPU_INFO" | sed 's/"/\\"/g')
38 38
  39 + # 生成 ip
  40 + IP=\$(hostname -I | awk '{print \$1}')
39 # 构建JSON数据 41 # 构建JSON数据
40 - echo "{\"cpu_usage\": \"\${CPU_USAGE}\", \"memory_usage\": \"\${MEMORY_USAGE}\", \"disk_usage\": \"\${DISK_USAGE}\", \"connection_count\": \"\${CONNECTION_COUNT}\", \"memory_info\": \"\${MEMORY_INFO}\", \"cpu_info\": \"\${CPU_INFO}\"}" 42 + echo "{\"cpu_usage\": \"\${CPU_USAGE}\", \"memory_usage\": \"\${MEMORY_USAGE}\", \"disk_usage\": \"\${DISK_USAGE}\", \"connection_count\": \"\${CONNECTION_COUNT}\", \"memory_info\": \"\${MEMORY_INFO}\", \"cpu_info\": \"\${CPU_INFO}\", \"localip\": \"\${IP}\"}"
41 } 43 }
42 44
43 # 获取当前系统性能数据 45 # 获取当前系统性能数据