Merge branch 'V0.1.1_test' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.1.1_test

 Conflicts:
	project_data/sql/0.1.1/soc/soc.sql
	soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysMultiLayerDictionaryController.java

project_data/sql/0.1.1/soc/soc.sql

@@ -1055,6 +1055,11 @@ 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 (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 '设备类型';
+
+
 drop table if exists sys_multi_layer_dictionary;
 CREATE TABLE `sys_multi_layer_dictionary` (
       `id` bigint NOT NULL AUTO_INCREMENT,

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

@@ -14,6 +14,11 @@ import com.xunmei.system.service.ISysMultiLayerDictionaryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
@@ -25,7 +30,7 @@ import java.util.stream.Collectors;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author jingYuanChao
@@ -38,21 +43,22 @@ public class SysMultiLayerDictionaryController {
     @Autowired
     private ISysMultiLayerDictionaryService sysMultiLayerDictionaryService;
 
-    @GetMapping("/list")
-    private AjaxResult getDictionaryList(){
+    @ApiOperation("字典树")
+    @GetMapping("/tree")
+    private AjaxResult getDicTree() {
         final List<DictionaryTreeVo> list = sysMultiLayerDictionaryService.getDictionaryTree();
         return AjaxResult.success(list);
     }
 
     @GetMapping("/tree/list")
-    private AjaxResult getDictionaryTreeList(){
+    private AjaxResult getDictionaryTreeList() {
         final List<DictionaryTreeVo> list = sysMultiLayerDictionaryService.getDictionaryTree();
-        List<DictionaryTreeVo> result =new ArrayList<>();
+        List<DictionaryTreeVo> result = new ArrayList<>();
         final Map<String, List<DictionaryTreeVo>> mapCollect = list.stream().collect(Collectors.groupingBy(DictionaryTreeVo::getType));
         for (Map.Entry<String, List<DictionaryTreeVo>> entry : mapCollect.entrySet()) {
             String key = entry.getKey();
             List<DictionaryTreeVo> childrenList = entry.getValue();
-            DictionaryTreeVo root=new DictionaryTreeVo();
+            DictionaryTreeVo root = new DictionaryTreeVo();
             root.setName(childrenList.get(0).getTypeName());
             root.setChildren(childrenList);
             root.setCode(key);
@@ -72,13 +78,11 @@ public class SysMultiLayerDictionaryController {
     public AjaxResult add(@Validated @RequestBody SysMultiLayerDictionary dict) {
         dict.setCreateTime(LocalDateTime.now());
         final SysMultiLayerDictionary parentDict = sysMultiLayerDictionaryService.getById(dict.getParentId());
-        if(parentDict!=null)
-        {
+        if (parentDict != null) {
             dict.setType(parentDict.getType());
             dict.setTypeName(parentDict.getTypeName());
-            dict.setLevel(parentDict.getLevel()+1);
-        }
-        else {
+            dict.setLevel(parentDict.getLevel() + 1);
+        } else {
             dict.setParentId(-1L);
             dict.setLevel(1);
         }
@@ -98,8 +102,18 @@ public class SysMultiLayerDictionaryController {
         return AjaxResult.success(sysMultiLayerDictionaryService.updateById(dict));
     }
 
+
+    @ApiOperation("字典数组,平铺结构")
+    @GetMapping("/list")
+    private AjaxResult getDictList() {
+        final List<DictionaryTreeVo> list = sysMultiLayerDictionaryService.selectList();
+        return AjaxResult.success(list);
+    }
+
+    @ApiOperation("根据父节点获取字典数据")
     @GetMapping("/getDictTreeByParentId")
-    private AjaxResult getDictTreeByParentId(Long parentId){
+
+    private AjaxResult getDictTreeByParentId(Long parentId) {
         final List<DictionaryTreeVo> list = sysMultiLayerDictionaryService.getDictTreeByParentId(parentId);
         return AjaxResult.success(list);
     }