From bf1e675967144c0c5a15082ccd99d3cbaf742468 Mon Sep 17 00:00:00 2001
From: tangpeng <tangpeng@ezsvs.com>
Date: Tue, 18 Jun 2019 01:55:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9F=9C=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/AssetsCabinetController.java       | 179 +++++++++---------
 .../templates/assets/assetsCabinet/add.html   |  46 +++--
 .../templates/assets/assetsCabinet/edit.html  |  36 +++-
 .../template/tmplServer/tmplServer.html       |   1 -
 .../assets/service/IAssetsCabinetService.java |  46 ++---
 .../service/IAssetsMachineRoomService.java    |  46 ++---
 6 files changed, 197 insertions(+), 157 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/assets/AssetsCabinetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/assets/AssetsCabinetController.java
index 98c20f980..fdef89478 100755
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/assets/AssetsCabinetController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/assets/AssetsCabinetController.java
@@ -1,7 +1,9 @@
 package com.ruoyi.web.controller.assets;
 
 import com.ruoyi.assets.domain.AssetsCabinet;
+import com.ruoyi.assets.domain.AssetsMachineRoom;
 import com.ruoyi.assets.service.IAssetsCabinetService;
+import com.ruoyi.assets.service.IAssetsMachineRoomService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -18,107 +20,104 @@ import java.util.List;
 
 /**
  * 机柜类型 信息操作处理
- * 
+ *
  * @author TP
  * @date 2019-06-17
  */
 @Controller
 @RequestMapping("/assets/assetsCabinet")
-public class AssetsCabinetController extends BaseController
-{
+public class AssetsCabinetController extends BaseController {
     private String prefix = "assets/assetsCabinet";
-	
-	@Autowired
-	private IAssetsCabinetService assetsCabinetService;
-	
-	@RequiresPermissions("assets:assetsCabinet:view")
-	@GetMapping()
-	public String assetsCabinet()
-	{
-	    return prefix + "/assetsCabinet";
-	}
-	
-	/**
-	 * 查询机柜类型列表
-	 */
-	@RequiresPermissions("assets:assetsCabinet:list")
-	@PostMapping("/list")
-	@ResponseBody
-	public TableDataInfo list(AssetsCabinet assetsCabinet)
-	{
-		startPage();
+
+    @Autowired
+    private IAssetsCabinetService assetsCabinetService;
+    @Autowired
+    private IAssetsMachineRoomService assetsMachineRoomService;
+
+    @RequiresPermissions("assets:assetsCabinet:view")
+    @GetMapping()
+    public String assetsCabinet() {
+        return prefix + "/assetsCabinet";
+    }
+
+    /**
+     * 查询机柜类型列表
+     */
+    @RequiresPermissions("assets:assetsCabinet:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(AssetsCabinet assetsCabinet) {
+        startPage();
         List<AssetsCabinet> list = assetsCabinetService.selectAssetsCabinetList(assetsCabinet);
-		return getDataTable(list);
-	}
-	
-	
-	/**
-	 * 导出机柜类型列表
-	 */
-	@RequiresPermissions("assets:assetsCabinet:export")
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 导出机柜类型列表
+     */
+    @RequiresPermissions("assets:assetsCabinet:export")
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(AssetsCabinet assetsCabinet)
-    {
-    	List<AssetsCabinet> list = assetsCabinetService.selectAssetsCabinetList(assetsCabinet);
+    public AjaxResult export(AssetsCabinet assetsCabinet) {
+        List<AssetsCabinet> list = assetsCabinetService.selectAssetsCabinetList(assetsCabinet);
         ExcelUtil<AssetsCabinet> util = new ExcelUtil<AssetsCabinet>(AssetsCabinet.class);
         return util.exportExcel(list, "assetsCabinet");
     }
-	
-	/**
-	 * 新增机柜类型
-	 */
-	@GetMapping("/add")
-	public String add()
-	{
-	    return prefix + "/add";
-	}
-	
-	/**
-	 * 新增保存机柜类型
-	 */
-	@RequiresPermissions("assets:assetsCabinet:add")
-	@Log(title = "机柜类型", businessType = BusinessType.INSERT)
-	@PostMapping("/add")
-	@ResponseBody
-	public AjaxResult addSave(AssetsCabinet assetsCabinet)
-	{		
-		return toAjax(assetsCabinetService.insertAssetsCabinet(assetsCabinet));
-	}
 
-	/**
-	 * 修改机柜类型
-	 */
-	@GetMapping("/edit/{cabinetId}")
-	public String edit(@PathVariable("cabinetId") Integer cabinetId, ModelMap mmap)
-	{
-		AssetsCabinet assetsCabinet = assetsCabinetService.selectAssetsCabinetById(cabinetId);
-		mmap.put("assetsCabinet", assetsCabinet);
-	    return prefix + "/edit";
-	}
-	
-	/**
-	 * 修改保存机柜类型
-	 */
-	@RequiresPermissions("assets:assetsCabinet:edit")
-	@Log(title = "机柜类型", businessType = BusinessType.UPDATE)
-	@PostMapping("/edit")
-	@ResponseBody
-	public AjaxResult editSave(AssetsCabinet assetsCabinet)
-	{		
-		return toAjax(assetsCabinetService.updateAssetsCabinet(assetsCabinet));
-	}
-	
-	/**
-	 * 删除机柜类型
-	 */
-	@RequiresPermissions("assets:assetsCabinet:remove")
-	@Log(title = "机柜类型", businessType = BusinessType.DELETE)
-	@PostMapping( "/remove")
-	@ResponseBody
-	public AjaxResult remove(String ids)
-	{		
-		return toAjax(assetsCabinetService.deleteAssetsCabinetByIds(ids));
-	}
-	
+    /**
+     * 新增机柜类型
+     */
+    @GetMapping("/add")
+    public String add(ModelMap mmap) {
+        List<AssetsMachineRoom> list = assetsMachineRoomService.selectAssetsMachineRoomList(new AssetsMachineRoom());
+        mmap.put("machineRooms",list);
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存机柜类型
+     */
+    @RequiresPermissions("assets:assetsCabinet:add")
+    @Log(title = "机柜类型", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(AssetsCabinet assetsCabinet) {
+        return toAjax(assetsCabinetService.insertAssetsCabinet(assetsCabinet));
+    }
+
+    /**
+     * 修改机柜类型
+     */
+    @GetMapping("/edit/{cabinetId}")
+    public String edit(@PathVariable("cabinetId") Integer cabinetId, ModelMap mmap) {
+        AssetsCabinet assetsCabinet = assetsCabinetService.selectAssetsCabinetById(cabinetId);
+        List<AssetsMachineRoom> list = assetsMachineRoomService.selectAssetsMachineRoomList(new AssetsMachineRoom());
+        mmap.put("machineRooms",list);
+        mmap.put("assetsCabinet", assetsCabinet);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存机柜类型
+     */
+    @RequiresPermissions("assets:assetsCabinet:edit")
+    @Log(title = "机柜类型", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(AssetsCabinet assetsCabinet) {
+        return toAjax(assetsCabinetService.updateAssetsCabinet(assetsCabinet));
+    }
+
+    /**
+     * 删除机柜类型
+     */
+    @RequiresPermissions("assets:assetsCabinet:remove")
+    @Log(title = "机柜类型", businessType = BusinessType.DELETE)
+    @PostMapping("/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        return toAjax(assetsCabinetService.deleteAssetsCabinetByIds(ids));
+    }
+
 }
diff --git a/ruoyi-admin/src/main/resources/templates/assets/assetsCabinet/add.html b/ruoyi-admin/src/main/resources/templates/assets/assetsCabinet/add.html
index 1b2001e7a..5320fb942 100755
--- a/ruoyi-admin/src/main/resources/templates/assets/assetsCabinet/add.html
+++ b/ruoyi-admin/src/main/resources/templates/assets/assetsCabinet/add.html
@@ -6,19 +6,13 @@
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m" id="form-assetsCabinet-add">
-        <!--        <div class="form-group">-->
-        <!--            <label class="col-sm-3 control-label">所属机房：</label>-->
-        <!--            <div class="col-sm-8">-->
-        <!--                <input id="machineRoomId" name="machineRoomId" class="form-control" type="text">-->
-        <!--            </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}">
+                <select id="machineRoom" name="machineRoom.machineRoomId">
+                    <option value="">请选择所属机房</option>
+                    <option th:each="machineRoom : ${machineRooms}" th:text="${machineRoom.machineRoomName}"
+                            th:value="${machineRoom.machineRoomId}">
                     </option>
                 </select>
             </div>
@@ -38,13 +32,13 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">机柜可用U数：</label>
             <div class="col-sm-8">
-                <input id="cabinetAvailU" name="cabinetAvailU" class="form-control" type="text">
+                <input id="cabinetAvailU" name="cabinetAvailU" class="form-control" type="number" min="1">
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">机柜可用电力：</label>
             <div class="col-sm-8">
-                <input id="cabinetAvailElec" name="cabinetAvailElec" class="form-control" type="text">
+                <input id="cabinetAvailElec" name="cabinetAvailElec" class="form-control" type="number" min="1">
             </div>
         </div>
         <div class="form-group">
@@ -57,12 +51,34 @@
 </div>
 <div th:include="include::footer"></div>
 <script type="text/javascript">
-    var prefix = ctx + "assets/assetsCabinet"
+    var prefix = ctx + "assets/assetsCabinet";
     $("#form-assetsCabinet-add").validate({
         rules: {
-            xxxx: {
-                required: true,
+            "machineRoom.machineRoomId": {
+                required: true
             },
+            cabinetName: {
+                required: true,
+                minlength: 1,
+                maxlength: 10
+            },
+            cabinetArea: {
+                required: true,
+                minlength: 1,
+                maxlength: 10
+            },
+            cabinetAvailU: {
+                required: true,
+                minlength: 1,
+                maxlength: 3,
+                min:1,
+            },
+            cabinetAvailElec: {
+                required: true,
+                minlength: 1,
+                maxlength: 5,
+                min:1
+            }
         },
         focusCleanup: true
     });
diff --git a/ruoyi-admin/src/main/resources/templates/assets/assetsCabinet/edit.html b/ruoyi-admin/src/main/resources/templates/assets/assetsCabinet/edit.html
index 28a82f5ce..f7f06e4b2 100755
--- a/ruoyi-admin/src/main/resources/templates/assets/assetsCabinet/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/assets/assetsCabinet/edit.html
@@ -10,9 +10,13 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">所属机房：</label>
             <div class="col-sm-8">
-                <input id="machineRoomId" name="machineRoomId" th:field="*{machineRoom.machineRoomId}"
-                       class="form-control"
-                       type="text">
+                <select id="machineRoom" name="machineRoom.machineRoomId">
+                    <option value="">请选择所属机房</option>
+                    <option th:each="machineRoom : ${machineRooms}" th:text="${machineRoom.machineRoomName}"
+                            th:value="${machineRoom.machineRoomId}"
+                            th:selected="*{machineRoom.machineRoomId} == ${machineRoom.machineRoomId} ? true :false">
+                    </option>
+                </select>
             </div>
         </div>
         <div class="form-group">
@@ -54,9 +58,31 @@
     var prefix = ctx + "assets/assetsCabinet";
     $("#form-assetsCabinet-edit").validate({
         rules: {
-            xxxx: {
-                required: true,
+            "machineRoom.machineRoomId": {
+                required: true
             },
+            cabinetName: {
+                required: true,
+                minlength: 1,
+                maxlength: 10
+            },
+            cabinetArea: {
+                required: true,
+                minlength: 1,
+                maxlength: 10
+            },
+            cabinetAvailU: {
+                required: true,
+                minlength: 1,
+                maxlength: 3,
+                min: 1,
+            },
+            cabinetAvailElec: {
+                required: true,
+                minlength: 1,
+                maxlength: 5,
+                min: 1
+            }
         },
         focusCleanup: true
     });
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 8704dab73..843173a74 100755
--- a/ruoyi-admin/src/main/resources/templates/template/tmplServer/tmplServer.html
+++ b/ruoyi-admin/src/main/resources/templates/template/tmplServer/tmplServer.html
@@ -114,7 +114,6 @@
                     sortable: true
                 },
                 {
-                    // field: 'memoryTotal',
                     title: '总内存(G)',
                     sortable: true,
                     formatter: function (value, row, index) {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/assets/service/IAssetsCabinetService.java b/ruoyi-system/src/main/java/com/ruoyi/assets/service/IAssetsCabinetService.java
index b651e4ed5..a7c583850 100755
--- a/ruoyi-system/src/main/java/com/ruoyi/assets/service/IAssetsCabinetService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/assets/service/IAssetsCabinetService.java
@@ -1,54 +1,54 @@
 package com.ruoyi.assets.service;
 
 import com.ruoyi.assets.domain.AssetsCabinet;
+
 import java.util.List;
 
 /**
  * 机柜类型 服务层
- * 
+ *
  * @author TP
  * @date 2019-06-17
  */
-public interface IAssetsCabinetService 
-{
-	/**
+public interface IAssetsCabinetService {
+    /**
      * 查询机柜类型信息
-     * 
+     *
      * @param cabinetId 机柜类型ID
      * @return 机柜类型信息
      */
-	public AssetsCabinet selectAssetsCabinetById(Integer cabinetId);
-	
-	/**
+    public AssetsCabinet selectAssetsCabinetById(Integer cabinetId);
+
+    /**
      * 查询机柜类型列表
-     * 
+     *
      * @param assetsCabinet 机柜类型信息
      * @return 机柜类型集合
      */
-	public List<AssetsCabinet> selectAssetsCabinetList(AssetsCabinet assetsCabinet);
-	
-	/**
+    public List<AssetsCabinet> selectAssetsCabinetList(AssetsCabinet assetsCabinet);
+
+    /**
      * 新增机柜类型
-     * 
+     *
      * @param assetsCabinet 机柜类型信息
      * @return 结果
      */
-	public int insertAssetsCabinet(AssetsCabinet assetsCabinet);
-	
-	/**
+    public int insertAssetsCabinet(AssetsCabinet assetsCabinet);
+
+    /**
      * 修改机柜类型
-     * 
+     *
      * @param assetsCabinet 机柜类型信息
      * @return 结果
      */
-	public int updateAssetsCabinet(AssetsCabinet assetsCabinet);
-		
-	/**
+    public int updateAssetsCabinet(AssetsCabinet assetsCabinet);
+
+    /**
      * 删除机柜类型信息
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-	public int deleteAssetsCabinetByIds(String ids);
-	
+    public int deleteAssetsCabinetByIds(String ids);
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/assets/service/IAssetsMachineRoomService.java b/ruoyi-system/src/main/java/com/ruoyi/assets/service/IAssetsMachineRoomService.java
index 66979b599..be61d3f0b 100755
--- a/ruoyi-system/src/main/java/com/ruoyi/assets/service/IAssetsMachineRoomService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/assets/service/IAssetsMachineRoomService.java
@@ -1,54 +1,54 @@
 package com.ruoyi.assets.service;
 
 import com.ruoyi.assets.domain.AssetsMachineRoom;
+
 import java.util.List;
 
 /**
  * 机房 服务层
- * 
+ *
  * @author TP
  * @date 2019-06-17
  */
-public interface IAssetsMachineRoomService 
-{
-	/**
+public interface IAssetsMachineRoomService {
+    /**
      * 查询机房信息
-     * 
+     *
      * @param machineRoomId 机房ID
      * @return 机房信息
      */
-	public AssetsMachineRoom selectAssetsMachineRoomById(Integer machineRoomId);
-	
-	/**
+    public AssetsMachineRoom selectAssetsMachineRoomById(Integer machineRoomId);
+
+    /**
      * 查询机房列表
-     * 
+     *
      * @param assetsMachineRoom 机房信息
      * @return 机房集合
      */
-	public List<AssetsMachineRoom> selectAssetsMachineRoomList(AssetsMachineRoom assetsMachineRoom);
-	
-	/**
+    public List<AssetsMachineRoom> selectAssetsMachineRoomList(AssetsMachineRoom assetsMachineRoom);
+
+    /**
      * 新增机房
-     * 
+     *
      * @param assetsMachineRoom 机房信息
      * @return 结果
      */
-	public int insertAssetsMachineRoom(AssetsMachineRoom assetsMachineRoom);
-	
-	/**
+    public int insertAssetsMachineRoom(AssetsMachineRoom assetsMachineRoom);
+
+    /**
      * 修改机房
-     * 
+     *
      * @param assetsMachineRoom 机房信息
      * @return 结果
      */
-	public int updateAssetsMachineRoom(AssetsMachineRoom assetsMachineRoom);
-		
-	/**
+    public int updateAssetsMachineRoom(AssetsMachineRoom assetsMachineRoom);
+
+    /**
      * 删除机房信息
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-	public int deleteAssetsMachineRoomByIds(String ids);
-	
+    public int deleteAssetsMachineRoomByIds(String ids);
+
 }