Merge remote-tracking branch 'origin/master'

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

@@ -52,6 +52,13 @@ public class VehicleCtrl {
     public ResponseBodyVO<List<VehicleGSVO>> getMyVehicleListNew() {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, vehicleService.getMyVehicleListNew());
     }
+    /**
+     * 获取公私有列表
+     */
+    @RequestMapping("/getMyVehicleListNew1")
+    public ResponseBodyVO<List> getMyVehicleListNew1() {
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, vehicleService.getMyVehicleListNew1());
+    }
 
     /**
      * 根据id获取详情

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

@@ -684,8 +684,42 @@ public class VehicleService {
         VehicleGSVO vo1=new VehicleGSVO();
         vo1.setLabel("私有");
         vo1.setOptions(listSy);
-        listAll.add(vo);
         listAll.add(vo1);
+        listAll.add(vo);
         return listAll;
     }
+
+    //新增共有、私有
+    public List  getMyVehicleListNew1() {
+        List<Map> treeList = new ArrayList<>();
+        List<VehicleVO> listGy=vehicleMapper.selectPrivateAndPublicByCreateUserIdGy(AuthUtil.getCurrentUserId());
+        List<VehicleVO> listSy=vehicleMapper.selectPrivateAndPublicByCreateUserIdSy(AuthUtil.getCurrentUserId());
+        Map typeMap = new HashMap();
+        typeMap.put("code", "公有");
+        typeMap.put("name", "公有");
+        List<Map> colourList = new LinkedList();
+        listGy.forEach(vo -> {
+            Map colourMap = new HashMap();
+            colourMap.put("code","公有");
+            colourMap.put("name", "公有");
+            colourMap.put("vo", vo);
+            colourList.add(colourMap);
+        });
+        typeMap.put("children", colourList);
+        Map typeMap1 = new HashMap();
+        typeMap1.put("code", "私有");
+        typeMap1.put("name", "私有");
+        List<Map> colourList1 = new LinkedList();
+        listSy.forEach(vo -> {
+            Map colourMap = new HashMap();
+            colourMap.put("code","私有");
+            colourMap.put("name", "私有");
+            colourMap.put("vo", vo);
+            colourList1.add(colourMap);
+        });
+        typeMap1.put("children",colourList1 );
+        treeList.add(typeMap);
+        treeList.add(typeMap1);
+        return treeList;
+    }
 }