ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

服务器内存类型-计算总内存

This commit is contained in:
tangpeng 2019-06-17 13:33:11 +08:00
parent a17ccccff5
commit 2c174d37f9
4 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-admin/src/main/resources/templates/template/tmplServer/tmplServer.html
View File

@ -114,9 +114,17 @@
sortable: true
},
{
field: 'memoryTotal',
// field: 'memoryTotal',
title: '总内存(G)',
sortable: true
sortable: true,
formatter: function (value, row, index) {
if (row.serverMemorys[index] && row.serverMemorys[index].serverMemoryType) {
var num = row.serverMemorys[index].serverMemoryNum;
var singleVaule = row.serverMemorys[index].serverMemoryType.dictValue;
value = num * singleVaule + "(" + singleVaule + "Gx" + num + ")";
}
return value;
}
},
{
field: 'ipmiPort',

16
ruoyi-system/src/main/java/com/ruoyi/template/domain/TmplServerMemory.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.template.domain;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.system.domain.SysDictData;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@ -26,7 +27,8 @@ public class TmplServerMemory extends BaseEntity {
/**
* 服务器内存类型
*/
private Long serverMemoryType;
// private Long serverMemoryType;
private SysDictData serverMemoryType;
/**
* 服务器内存数量
*/
@ -53,11 +55,19 @@ public class TmplServerMemory extends BaseEntity {
this.serverId = serverId;
}
public Long getServerMemoryType() {
// public Long getServerMemoryType() {
// return serverMemoryType;
// }
// public void setServerMemoryType(Long serverMemoryType) {
// this.serverMemoryType = serverMemoryType;
// }
public SysDictData getServerMemoryType() {
return serverMemoryType;
}
public void setServerMemoryType(Long serverMemoryType) {
public void setServerMemoryType(SysDictData serverMemoryType) {
this.serverMemoryType = serverMemoryType;
}

2
ruoyi-system/src/main/java/com/ruoyi/template/service/impl/TmplServerServiceImpl.java
View File

@ -170,7 +170,7 @@ public class TmplServerServiceImpl implements ITmplServerService {
SysDictData dictData = sysDictDataMapper.selectDictDataById(Convert.toLong(jsonObject.getString("id")));
TmplServerMemory tmplServerMemory = new TmplServerMemory();
tmplServerMemory.setServerId(id);
tmplServerMemory.setServerMemoryType(Convert.toLong(dictData.getDictCode()));
tmplServerMemory.setServerMemoryType(dictData);
tmplServerMemory.setServerMemoryNum(num);
list.add(tmplServerMemory);
}

6
ruoyi-system/src/main/resources/mapper/template/TmplServerMemoryMapper.xml
View File

@ -7,8 +7,10 @@
<resultMap type="TmplServerMemory" id="TmplServerMemoryResult">
<result property="serverMemoryId" column="server_memory_id"/>
<result property="serverId" column="server_id"/>
<result property="serverMemoryType" column="server_memory_type"/>
<result property="serverMemoryNum" column="server_memory_num"/>
<association property="serverMemoryType" column="server_memory_type"
select="com.ruoyi.system.mapper.SysDictDataMapper.selectDictDataById">
</association>
</resultMap>
<sql id="selectTmplServerMemoryVo">
@ -54,7 +56,7 @@
<insert id="batchTmplServerMemory">
insert into tmpl_server_memory(server_id, server_memory_type,server_memory_num) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.serverId},#{item.serverMemoryType},#{item.serverMemoryNum})
(#{item.serverId},#{item.serverMemoryType.dictCode},#{item.serverMemoryNum})
</foreach>
</insert>