Browse Source

设备列表出错

lyhzzz 2 years ago
parent
commit
85599be71d

+ 1 - 0
src/main/java/com/fdkankan/manage/service/impl/SysMenuServiceImpl.java

@@ -133,6 +133,7 @@ public class SysMenuServiceImpl extends ServiceImpl<ISysMenuMapper, SysMenu> imp
     //查询到全部list ,根据parentId组装树形结构
     private List<SysMenuVo> setTreeMenuVo( boolean show ,List<Long> menuIds,Integer notType){
         LambdaQueryWrapper<SysMenu> wrapper = new LambdaQueryWrapper<>();
+        wrapper.orderByAsc(SysMenu::getSort);
         if(show){
             wrapper.eq(SysMenu::getIsShow,1);
         }

+ 1 - 19
src/main/java/com/fdkankan/manage/vo/response/CameraDetailVo.java

@@ -2,6 +2,7 @@ package com.fdkankan.manage.vo.response;
 
 import com.fdkankan.manage.constant.CameraOutTypeEnum;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 @Data
 public class CameraDetailVo {
@@ -16,24 +17,5 @@ public class CameraDetailVo {
     private String companyName;         //客户名称
     private String userName;            //绑定账号
 
-    public String getOutType(){
-        CameraOutTypeEnum cameraOutTypeEnum = CameraOutTypeEnum.getByCode(Integer.parseInt(outType));
-        if(cameraOutTypeEnum != null){
-            return cameraOutTypeEnum.getMsg();
-        }else {
-            return "未出库";
-        }
-    }
-
-    public String getType(){
-        switch (type){
-            case "0" :return "旧双目";
-            case "1" :return "四维看看";
-            case "2" :return "四维看看Lite";
-            case "9" :return "四维看见";
-            case "10" :return "四维深时";
-            default: return "";
-        }
-    }
 
 }