模板管理功能完成
This commit is contained in:
tangpeng
parent
2c174d37f9
commit
242e08847d
|
|
@ -170,7 +170,6 @@
|
|||
serverMemorys.push({
|
||||
"id": $("select[name='memoryType']").val(),
|
||||
"value": $("input[name='memoryNum']").val()
|
||||
|
||||
});
|
||||
var obj = {
|
||||
"name": "foreignKeyInfo",
|
||||
|
|
|
|||
|
|
@ -31,6 +31,25 @@
|
|||
<input id="cpuNum" name="cpuNum" th:field="*{cpuNum}" class="form-control" min=1 type="number">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">内存类型：</label>
|
||||
<div class="col-sm-8">
|
||||
<select name="memoryType" th:with="type=${@dict.getType('dict_memory_type')}">
|
||||
<option value="">请选择单根内存大小</option>
|
||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
|
||||
th:value="${dict.dictCode}">
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">内存个数：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="memoryNum" type="number"
|
||||
class="form-control"
|
||||
placeholder="单位(个)">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">IPMI端口：</label>
|
||||
<div class="col-sm-8">
|
||||
|
|
@ -138,11 +157,17 @@
|
|||
$(".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);
|
||||
|
|
@ -162,6 +187,11 @@
|
|||
$.each(serverDisks, function (index, disk) {
|
||||
$("#" + disk.serverDiskType).val(disk.serverDiskNum);
|
||||
});
|
||||
var serverMemorys = [[${tmplServer}]].serverMemorys;
|
||||
$.each(serverMemorys, function (index, memory) {
|
||||
$("select[name='memoryType']").val(memory.serverMemoryType.dictCode);
|
||||
$("input[name='memoryNum']").val(memory.serverMemoryNum);
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@ import com.ruoyi.system.domain.SysDictData;
|
|||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
import java.beans.Transient;
|
||||
|
||||
/**
|
||||
* 服务器内存类型表 tmpl_server_memory
|
||||
*
|
||||
|
|
@ -27,18 +25,12 @@ public class TmplServerMemory extends BaseEntity {
|
|||
/**
|
||||
* 服务器内存类型
|
||||
*/
|
||||
// private Long serverMemoryType;
|
||||
private SysDictData serverMemoryType;
|
||||
/**
|
||||
* 服务器内存数量
|
||||
*/
|
||||
private Integer serverMemoryNum;
|
||||
|
||||
/**
|
||||
* 服务器内存总数 @Transient
|
||||
*/
|
||||
private Integer serverMemoryTotal;
|
||||
|
||||
public Integer getServerMemoryId() {
|
||||
return serverMemoryId;
|
||||
}
|
||||
|
|
@ -55,14 +47,6 @@ public class TmplServerMemory extends BaseEntity {
|
|||
this.serverId = serverId;
|
||||
}
|
||||
|
||||
// public Long getServerMemoryType() {
|
||||
// return serverMemoryType;
|
||||
// }
|
||||
|
||||
// public void setServerMemoryType(Long serverMemoryType) {
|
||||
// this.serverMemoryType = serverMemoryType;
|
||||
// }
|
||||
|
||||
public SysDictData getServerMemoryType() {
|
||||
return serverMemoryType;
|
||||
}
|
||||
|
|
@ -79,15 +63,6 @@ public class TmplServerMemory extends BaseEntity {
|
|||
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)
|
||||
|
|
|
|||
|
|
@ -70,6 +70,14 @@ public interface TmplServerDiskMapper {
|
|||
*/
|
||||
public int deleteTmplServerDiskByIds(String[] serverDiskIds);
|
||||
|
||||
/**
|
||||
* 通过服务器ID批量删除服务器硬盘类型
|
||||
*
|
||||
* @param serverId 服务器ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteTmplServerDiskByServerId(Integer serverId);
|
||||
|
||||
/**
|
||||
* 批量新增服务器硬盘类型信息
|
||||
*
|
||||
|
|
|
|||
|
|
@ -60,6 +60,14 @@ public interface TmplServerMemoryMapper {
|
|||
*/
|
||||
public int deleteTmplServerMemoryById(Integer serverMemoryId);
|
||||
|
||||
/**
|
||||
* 通过服务器ID批量删除服务器内存类型
|
||||
*
|
||||
* @param serverId 服务器ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteTmplServerMemoryByServerId(Integer serverId);
|
||||
|
||||
/**
|
||||
* 批量删除服务器内存类型
|
||||
*
|
||||
|
|
|
|||
|
|
@ -189,8 +189,10 @@ public class TmplServerServiceImpl implements ITmplServerService {
|
|||
*/
|
||||
@Override
|
||||
public int updateTmplServer(TmplServer tmplServer) {
|
||||
// 1.清空数据库中已存的值
|
||||
// 1.采取简单的做法直接删除关联的所有外键值(一定不能删除原对象tmplServer!!!)
|
||||
tmplServerNetcardMapper.deleteTmplServerNetcardByServerId(tmplServer.getServerId());
|
||||
tmplServerDiskMapper.deleteTmplServerDiskByServerId(tmplServer.getServerId());
|
||||
tmplServerMemoryMapper.deleteTmplServerMemoryByServerId(tmplServer.getServerId());
|
||||
// 2.更新主表
|
||||
return insertTmplServer(tmplServer);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,6 +71,10 @@
|
|||
delete from tmpl_server_disk where server_disk_id = #{serverDiskId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteTmplServerDiskByServerId" parameterType="Integer">
|
||||
delete from tmpl_server_disk where server_id = #{serverId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteTmplServerDiskByIds" parameterType="String">
|
||||
delete from tmpl_server_disk where server_disk_id in
|
||||
<foreach item="serverDiskId" collection="array" open="(" separator="," close=")">
|
||||
|
|
|
|||
|
|
@ -74,6 +74,10 @@
|
|||
delete from tmpl_server_memory where server_memory_id = #{serverMemoryId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteTmplServerMemoryByServerId" parameterType="Integer">
|
||||
delete from tmpl_server_memory where server_id = #{serverId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteTmplServerMemoryByIds" parameterType="String">
|
||||
delete from tmpl_server_memory where server_memory_id in
|
||||
<foreach item="serverMemoryId" collection="array" open="(" separator="," close=")">
|
||||
|
|
|
|||
Loading…
Reference in New Issue