添加内网ip

@@ -20,6 +20,7 @@ import com.zhonglai.luhui.admin.qywx.QyWxApplication;
 import com.zhonglai.luhui.admin.qywx.WXBizMsgCrypt;
 import com.zhonglai.luhui.admin.service.SendSysMonitorServerMessge;
 import com.zhonglai.luhui.dao.service.PublicService;
+import com.zhonglai.luhui.device.analysis.comm.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,6 +79,10 @@ public class ServerController extends BaseController
         String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
         SysMonitorServer sysMonitorServer = new SysMonitorServer();
         sysMonitorServer.setIp(ip);
+        if(StringUtils.isNotEmpty(monitorServerUploadDto.getLocalip()))
+        {
+            sysMonitorServer.setIp(ip+"("+monitorServerUploadDto.getLocalip()+")");
+        }
         Long st = publicService.getObjectListTotle(sysMonitorServer, null);
         sysMonitorServer.setCpu_usage(new Double(monitorServerUploadDto.getCpu_usage()*100).intValue());
         sysMonitorServer.setConnection_count(monitorServerUploadDto.getConnection_count());
@@ -85,6 +90,7 @@ public class ServerController extends BaseController
         sysMonitorServer.setDisk_usage(new Double(monitorServerUploadDto.getDisk_usage()*100).intValue());
         sysMonitorServer.setCpu_info(tranPsAux(monitorServerUploadDto.getCpu_info()));
         sysMonitorServer.setMemory_info(tranPsAux(monitorServerUploadDto.getMemory_info()));
+
         if(st==0)
         {
             sysMonitorServer.setCreate_time(System.currentTimeMillis());

@@ -19,6 +19,17 @@ public class MonitorServerUploadDto {
     @ApiModelProperty("cpu信息")
     private String cpu_info;
 
+    @ApiModelProperty("本地ip")
+    private String localip;
+
+    public String getLocalip() {
+        return localip;
+    }
+
+    public void setLocalip(String localip) {
+        this.localip = localip;
+    }
+
     public String getMemory_info() {
         return memory_info;
     }

@@ -36,8 +36,10 @@ get_system_performance() {
     MEMORY_INFO=\$(echo "\$MEMORY_INFO" | sed 's/"/\\"/g')
     CPU_INFO=\$(echo "\$CPU_INFO" | sed 's/"/\\"/g')
 
+    # 生成 ip
+    IP=\$(hostname -I | awk '{print \$1}')
     # 构建JSON数据
-    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}\"}"
+    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}\"}"
 }
 
 # 获取当前系统性能数据