@@ -108,6 +127,15 @@
minlength: 1,
maxlength: 2
},
+ memoryType: {
+ required: true
+ },
+ memoryNum: {
+ required: true,
+ minlength: 1,
+ maxlength: 2,
+ min: 1
+ },
ipmiPort: {
required: true,
minlength: 1,
@@ -138,11 +166,18 @@
$(".serverDisk").each(function () {
serverDisks.push({"id": $(this).attr("id"), "value": $(this).val()});
});
+ var serverMemorys = [];
+ serverMemorys.push({
+ "id": $("select[name='memoryType']").val(),
+ "value": $("input[name='memoryNum']").val()
+
+ });
var obj = {
"name": "foreignKeyInfo",
"value": JSON.stringify({
"serverNetcards": serverNetcards,
- "serverDisks": serverDisks
+ "serverDisks": serverDisks,
+ "serverMemorys": serverMemorys
})
};
data.push(obj);
diff --git a/ruoyi-admin/src/main/resources/templates/template/tmplServer/tmplServer.html b/ruoyi-admin/src/main/resources/templates/template/tmplServer/tmplServer.html
index 6f8aaec95..8ca5e7e74 100755
--- a/ruoyi-admin/src/main/resources/templates/template/tmplServer/tmplServer.html
+++ b/ruoyi-admin/src/main/resources/templates/template/tmplServer/tmplServer.html
@@ -95,7 +95,7 @@
},
{
field: 'serverBrand',
- title: '服务器品牌',
+ title: '品牌',
sortable: true
},
{
@@ -110,7 +110,12 @@
},
{
field: 'cpuNum',
- title: 'CPU数量',
+ title: 'CPU(核)',
+ sortable: true
+ },
+ {
+ field: 'memoryTotal',
+ title: '总内存(G)',
sortable: true
},
{
@@ -120,7 +125,7 @@
},
{
field: 'powerNum',
- title: '电源数量',
+ title: '电源(个)',
sortable: true
},
{
diff --git a/ruoyi-system/src/main/java/com/ruoyi/template/domain/TmplServer.java b/ruoyi-system/src/main/java/com/ruoyi/template/domain/TmplServer.java
index 15b8d7265..d1946371f 100755
--- a/ruoyi-system/src/main/java/com/ruoyi/template/domain/TmplServer.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/template/domain/TmplServer.java
@@ -55,6 +55,10 @@ public class TmplServer extends BaseEntity {
* 服务器硬盘类型
*/
private List serverDisks;
+ /**
+ * 服务器内存类型
+ */
+ private List serverMemorys;
public Integer getServerId() {
return serverId;
@@ -136,6 +140,14 @@ public class TmplServer extends BaseEntity {
this.serverDisks = serverDisks;
}
+ public List getServerMemorys() {
+ return serverMemorys;
+ }
+
+ public void setServerMemorys(List serverMemorys) {
+ this.serverMemorys = serverMemorys;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/template/domain/TmplServerMemory.java b/ruoyi-system/src/main/java/com/ruoyi/template/domain/TmplServerMemory.java
new file mode 100755
index 000000000..1bee30525
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/template/domain/TmplServerMemory.java
@@ -0,0 +1,90 @@
+package com.ruoyi.template.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.beans.Transient;
+
+/**
+ * 服务器内存类型表 tmpl_server_memory
+ *
+ * @author TP
+ * @date 2019-06-16
+ */
+public class TmplServerMemory extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 服务器内存编号
+ */
+ private Integer serverMemoryId;
+ /**
+ * 服务器编号
+ */
+ private Integer serverId;
+ /**
+ * 服务器内存类型
+ */
+ private Long serverMemoryType;
+ /**
+ * 服务器内存数量
+ */
+ private Integer serverMemoryNum;
+
+ /**
+ * 服务器内存总数 @Transient
+ */
+ private Integer serverMemoryTotal;
+
+ public Integer getServerMemoryId() {
+ return serverMemoryId;
+ }
+
+ public void setServerMemoryId(Integer serverMemoryId) {
+ this.serverMemoryId = serverMemoryId;
+ }
+
+ public Integer getServerId() {
+ return serverId;
+ }
+
+ public void setServerId(Integer serverId) {
+ this.serverId = serverId;
+ }
+
+ public Long getServerMemoryType() {
+ return serverMemoryType;
+ }
+
+ public void setServerMemoryType(Long serverMemoryType) {
+ this.serverMemoryType = serverMemoryType;
+ }
+
+ public Integer getServerMemoryNum() {
+ return serverMemoryNum;
+ }
+
+ public void setServerMemoryNum(Integer serverMemoryNum) {
+ this.serverMemoryNum = serverMemoryNum;
+ }
+
+ @Transient
+ public Integer getServerMemoryTotal() {
+ return serverMemoryTotal;
+ }
+
+ public void setServerMemoryTotal(Integer serverMemoryTotal) {
+ this.serverMemoryTotal = serverMemoryTotal;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("serverMemoryId", getServerMemoryId())
+ .append("serverId", getServerId())
+ .append("serverMemoryType", getServerMemoryType())
+ .append("serverMemoryNum", getServerMemoryNum())
+ .toString();
+ }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/template/mapper/TmplServerMemoryMapper.java b/ruoyi-system/src/main/java/com/ruoyi/template/mapper/TmplServerMemoryMapper.java
new file mode 100755
index 000000000..23f0a0c22
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/template/mapper/TmplServerMemoryMapper.java
@@ -0,0 +1,79 @@
+package com.ruoyi.template.mapper;
+
+import com.ruoyi.template.domain.TmplServerMemory;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 服务器内存类型 数据层
+ *
+ * @author TP
+ * @date 2019-06-16
+ */
+public interface TmplServerMemoryMapper {
+ /**
+ * 查询服务器内存类型信息
+ *
+ * @param serverMemoryId 服务器内存类型ID
+ * @return 服务器内存类型信息
+ */
+ public TmplServerMemory selectTmplServerMemoryById(Integer serverMemoryId);
+
+ /**
+ * 查询服务器内存类型信息
+ *
+ * @param serverId 服务器ID
+ * @return 服务器内存类型信息
+ */
+ public TmplServerMemory selectByServerId(@Param("serverId") Integer serverId);
+
+ /**
+ * 查询服务器内存类型列表
+ *
+ * @param tmplServerMemory 服务器内存类型信息
+ * @return 服务器内存类型集合
+ */
+ public List selectTmplServerMemoryList(TmplServerMemory tmplServerMemory);
+
+ /**
+ * 新增服务器内存类型
+ *
+ * @param tmplServerMemory 服务器内存类型信息
+ * @return 结果
+ */
+ public int insertTmplServerMemory(TmplServerMemory tmplServerMemory);
+
+ /**
+ * 修改服务器内存类型
+ *
+ * @param tmplServerMemory 服务器内存类型信息
+ * @return 结果
+ */
+ public int updateTmplServerMemory(TmplServerMemory tmplServerMemory);
+
+ /**
+ * 删除服务器内存类型
+ *
+ * @param serverMemoryId 服务器内存类型ID
+ * @return 结果
+ */
+ public int deleteTmplServerMemoryById(Integer serverMemoryId);
+
+ /**
+ * 批量删除服务器内存类型
+ *
+ * @param serverMemoryIds 需要删除的数据ID
+ * @return 结果
+ */
+ public int deleteTmplServerMemoryByIds(String[] serverMemoryIds);
+
+ /**
+ * 批量新增服务器内存类型信息
+ *
+ * @param tmplServerMemoryList 服务器内存类型列表
+ * @return 结果
+ */
+ public int batchTmplServerMemory(List tmplServerMemoryList);
+
+}
\ No newline at end of file
diff --git a/ruoyi-system/src/main/java/com/ruoyi/template/service/impl/TmplServerServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/template/service/impl/TmplServerServiceImpl.java
index e3f1d8047..bfa08352b 100755
--- a/ruoyi-system/src/main/java/com/ruoyi/template/service/impl/TmplServerServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/template/service/impl/TmplServerServiceImpl.java
@@ -8,9 +8,11 @@ import com.ruoyi.system.domain.SysDictData;
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.template.domain.TmplServer;
import com.ruoyi.template.domain.TmplServerDisk;
+import com.ruoyi.template.domain.TmplServerMemory;
import com.ruoyi.template.domain.TmplServerNetcard;
import com.ruoyi.template.mapper.TmplServerDiskMapper;
import com.ruoyi.template.mapper.TmplServerMapper;
+import com.ruoyi.template.mapper.TmplServerMemoryMapper;
import com.ruoyi.template.mapper.TmplServerNetcardMapper;
import com.ruoyi.template.service.ITmplServerService;
import org.apache.commons.lang3.StringUtils;
@@ -37,6 +39,8 @@ public class TmplServerServiceImpl implements ITmplServerService {
@Autowired
private TmplServerDiskMapper tmplServerDiskMapper;
@Autowired
+ private TmplServerMemoryMapper tmplServerMemoryMapper;
+ @Autowired
private SysDictDataMapper sysDictDataMapper;
/**
@@ -87,6 +91,10 @@ public class TmplServerServiceImpl implements ITmplServerService {
if (jsonObject.containsKey("serverDisks")) {
saveServerDisk(tmplServer.getServerId(), jsonObject.getJSONArray("serverDisks"));
}
+ //保存内存信息
+ if (jsonObject.containsKey("serverMemorys")) {
+ saveServerMemory(tmplServer.getServerId(), jsonObject.getJSONArray("serverMemorys"));
+ }
}
}
return affectRow;
@@ -136,7 +144,7 @@ public class TmplServerServiceImpl implements ITmplServerService {
TmplServerDisk tmplServerDisk = new TmplServerDisk();
tmplServerDisk.setServerId(id);
tmplServerDisk.setServerDiskType(Convert.toLong(dictData.getDictCode()));
- tmplServerDisk.setServerDiskNum(num);
+ tmplServerDisk.setServerDiskNum(num);
list.add(tmplServerDisk);
}
});
@@ -146,6 +154,33 @@ public class TmplServerServiceImpl implements ITmplServerService {
}
}
+ /**
+ * 新增内存
+ *
+ * @param id
+ * @param jsonArray
+ */
+ private void saveServerMemory(Integer id, JSONArray jsonArray) {
+ List list = new ArrayList<>();
+ jsonArray.forEach((i) -> {
+ JSONObject jsonObject = (JSONObject) i;
+ String valueStr = jsonObject.getString("value");
+ int num = 0;
+ if (StringUtils.isNotBlank(valueStr) && (num = Convert.toInt(valueStr)) > 0) {
+ SysDictData dictData = sysDictDataMapper.selectDictDataById(Convert.toLong(jsonObject.getString("id")));
+ TmplServerMemory tmplServerMemory = new TmplServerMemory();
+ tmplServerMemory.setServerId(id);
+ tmplServerMemory.setServerMemoryType(Convert.toLong(dictData.getDictCode()));
+ tmplServerMemory.setServerMemoryNum(num);
+ list.add(tmplServerMemory);
+ }
+ });
+ int serverDiskNums = list.size() > 0 ? tmplServerMemoryMapper.batchTmplServerMemory(list) : 0;
+ if (serverDiskNums == 0) {
+ throw new BusinessException("至少输入一个内存数量");
+ }
+ }
+
/**
* 修改交换机模板
*
diff --git a/ruoyi-system/src/main/resources/mapper/template/TmplServerMapper.xml b/ruoyi-system/src/main/resources/mapper/template/TmplServerMapper.xml
index 5400f7c88..c354c6db5 100755
--- a/ruoyi-system/src/main/resources/mapper/template/TmplServerMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/template/TmplServerMapper.xml
@@ -20,6 +20,9 @@
+
+
diff --git a/ruoyi-system/src/main/resources/mapper/template/TmplServerMemoryMapper.xml b/ruoyi-system/src/main/resources/mapper/template/TmplServerMemoryMapper.xml
new file mode 100755
index 000000000..893ff1a14
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/template/TmplServerMemoryMapper.xml
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ select server_memory_id, server_id, server_memory_type, server_memory_num from tmpl_server_memory
+
+
+
+
+
+
+
+
+
+ insert into tmpl_server_memory
+
+ server_id,
+ server_memory_type,
+ server_memory_num,
+
+
+ #{serverId},
+ #{serverMemoryType},
+ #{serverMemoryNum},
+
+
+
+
+ insert into tmpl_server_memory(server_id, server_memory_type,server_memory_num) values
+
+ (#{item.serverId},#{item.serverMemoryType},#{item.serverMemoryNum})
+
+
+
+
+ update tmpl_server_memory
+
+ server_id = #{serverId},
+ server_memory_type = #{serverMemoryType},
+ server_memory_num = #{serverMemoryNum},
+
+ where server_memory_id = #{serverMemoryId}
+
+
+
+ delete from tmpl_server_memory where server_memory_id = #{serverMemoryId}
+
+
+
+ delete from tmpl_server_memory where server_memory_id in
+
+ #{serverMemoryId}
+
+
+
+
\ No newline at end of file