设备导入导出优化

project_data/sql/0.1.1/soc/soc.sql

@@ -1054,3 +1054,8 @@ INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_cla
 INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (1, '使用中', '1', 'asset_status', null, 'default', 'N', '0', '超级管理员', '2024-09-27 15:59:01', '', null, null);
 INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (2, '移除', '2', 'asset_status', null, 'default', 'N', '0', '超级管理员', '2024-09-27 15:59:11', '', null, null);
 INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (3, '报废', '3', 'asset_status', null, 'default', 'N', '0', '超级管理员', '2024-09-27 15:59:22', '', null, null);
+
+alter table sys_device modify asset_type varchar(225) null comment '资产类别';
+
+alter table sys_device modify device_type varchar(225) null comment '设备类型';
+

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysDevice.java

@@ -48,6 +48,7 @@ public class SysDevice extends BaseEntity {
 
     @ApiModelProperty(value = "设备状态")
     @TableField("device_status")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Integer deviceStatus;
 
     @ApiModelProperty(value = "设备型号")

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeviceController.java

@@ -10,7 +10,6 @@ import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.security.annotation.InnerAuth;
 import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.system.api.domain.SysDevice;
-import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.dto.SysDeviceInnerListDto;
 import com.xunmei.system.dto.SysDevicePageDto;
 import com.xunmei.system.service.ISysDeviceService;
@@ -92,10 +91,6 @@ public class SysDeviceController extends BaseController {
         AjaxResult ajax = AjaxResult.success();
         SysDevice device = sysDeviceService.selectSysDeviceById(id);
         ajax.put("data", device);
-        List<SysDevice> hostByOrgId = sysDeviceService.getHostByOrgId(device.getOrgId(), null);
-        ajax.put("hostList", hostByOrgId);
-        List<SysDictData> deviceTypeByAssetType = dictTypeService.getDeviceTypeByAssetType(device.getAssetType());
-        ajax.put("devices", deviceTypeByAssetType);
         return ajax;
     }
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysMultiLayerDictionaryController.java

@@ -4,6 +4,7 @@ package com.xunmei.system.controller;
 import com.xunmei.common.core.domain.device.vo.DictionaryTreeVo;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.system.service.ISysMultiLayerDictionaryService;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -26,13 +27,19 @@ public class SysMultiLayerDictionaryController {
 
     @Resource
     private ISysMultiLayerDictionaryService sysMultiLayerDictionaryService;
-
-    @GetMapping("/list")
-    private AjaxResult getDictionaryList(){
+    @ApiOperation("字典树")
+    @GetMapping("/tree")
+    private AjaxResult getDicTree(){
         final List<DictionaryTreeVo> list = sysMultiLayerDictionaryService.getDictionaryTree();
         return AjaxResult.success(list);
     }
-
+    @ApiOperation("字典数组,平铺结构")
+    @GetMapping("/list")
+    private AjaxResult getDictList(){
+        final List<DictionaryTreeVo> list = sysMultiLayerDictionaryService.selectList();
+        return AjaxResult.success(list);
+    }
+    @ApiOperation("根据父节点获取字典数据")
     @GetMapping("/getDictTreeByParentId")
     private AjaxResult getDictTreeByParentId(Long parentId){
         final List<DictionaryTreeVo> list = sysMultiLayerDictionaryService.getDictTreeByParentId(parentId);