Merge branch 'master' of https://gitee.com/lingxinmeng/simulation-cloud

simulation-resource-server/src/main/java/com/css/simulation/resource/model/controller/VehicleCtrl.java

@@ -5,6 +5,7 @@ import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.model.VehicleParam;
 import api.common.pojo.po.model.VehiclePO;
+import api.common.pojo.vo.model.VehicleGSVO;
 import api.common.pojo.vo.model.VehicleVO;
 import api.common.util.FileUtil;
 import api.common.util.ObjectUtil;
@@ -47,7 +48,7 @@ public class VehicleCtrl {
      * 获取公私有列表
      */
     @RequestMapping("/getMyVehicleListNew")
-    public ResponseBodyVO<Map<String,List<VehicleVO>>> getMyVehicleListNew() {
+    public ResponseBodyVO<List<VehicleGSVO> > getMyVehicleListNew() {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, vehicleService.getMyVehicleListNew());
     }
     /**

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/VehicleService.java

@@ -3,6 +3,7 @@ package com.css.simulation.resource.model.service;
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.VehicleParam;
 import api.common.pojo.po.model.VehiclePO;
+import api.common.pojo.vo.model.VehicleGSVO;
 import api.common.pojo.vo.model.VehicleVO;
 import api.common.util.*;
 import com.css.simulation.resource.common.utils.AuthUtil;
@@ -673,12 +674,18 @@ public class VehicleService {
 
 
     //新增共有、私有
-    public Map<String,List<VehicleVO>> getMyVehicleListNew() {
+    public List<VehicleGSVO>  getMyVehicleListNew() {
         List<VehicleVO> listGy=vehicleMapper.selectPrivateAndPublicByCreateUserIdGy(AuthUtil.getCurrentUserId());
         List<VehicleVO> listSy=vehicleMapper.selectPrivateAndPublicByCreateUserIdSy(AuthUtil.getCurrentUserId());
-        Map<String,List<VehicleVO>> map=new HashMap<>();
-        map.put("listGy",listGy);
-        map.put("listSy",listSy);
-        return map;
+        List<VehicleGSVO>  listAll=new ArrayList<>();
+        VehicleGSVO vo=new VehicleGSVO();
+        vo.setLabel("公有");
+        vo.setOptions(listGy);
+        VehicleGSVO vo1=new VehicleGSVO();
+        vo1.setLabel("私有");
+        vo1.setOptions(listSy);
+        listAll.add(vo);
+        listAll.add(vo1);
+        return listAll;
     }
 }