车辆共有私有分组

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

@@ -17,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping(value = "/vehicle", name = LogConstants.MODULE_VEHICLE)
@@ -42,7 +43,13 @@ public class VehicleCtrl {
     public ResponseBodyVO<List<VehicleVO>> getMyVehicleList() {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, vehicleService.getMyVehicleList());
     }
-
+    /**
+     * 获取公私有列表
+     */
+    @RequestMapping("/getMyVehicleList")
+    public ResponseBodyVO<Map<String,List<VehicleVO>>> getMyVehicleListNew() {
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, vehicleService.getMyVehicleListNew());
+    }
     /**
      * 根据id获取详情
      */

simulation-resource-server/src/main/java/com/css/simulation/resource/model/mapper/VehicleMapper.java

@@ -37,4 +37,8 @@ public interface VehicleMapper {
 
     @Select("select parameter_type from model_vehicle where id = (select vehicle_id from model_config where id = #{id})")
     String selectParameterTypeById(@Param("id") String id);
+
+    List<VehicleVO> selectPrivateAndPublicByCreateUserIdGy(@Param("createUserId") String createUserId);
+    List<VehicleVO> selectPrivateAndPublicByCreateUserIdSy(@Param("createUserId") String createUserId);
+
 }

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

@@ -19,9 +19,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 @Slf4j
 @Service
@@ -673,4 +671,14 @@ public class VehicleService {
 //        return new CommonsMultipartFile(item);
 //    }
 
+
+    //新增共有、私有
+    public Map<String,List<VehicleVO>> 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;
+    }
 }

simulation-resource-server/src/main/resources/mapper/model/VehicleMapper.xml

@@ -576,4 +576,33 @@
             is_deleted     = #{isDeleted,jdbcType=VARCHAR}
         where id = #{id,jdbcType=VARCHAR}
     </update>
+
+    <select id="selectPrivateAndPublicByCreateUserIdGy" parameterType="api.common.pojo.param.model.VehicleParam"
+            resultMap="VehicleVOMap">
+        select id,
+               vehicle_name,
+               description,
+               vehicle_front_view,
+               vehicle_top_view,
+               parameter_type,
+               share
+        from model_vehicle
+        where is_deleted = '0'
+          and share = '1'
+        order by create_time desc
+    </select>
+    <select id="selectPrivateAndPublicByCreateUserIdSy" parameterType="api.common.pojo.param.model.VehicleParam"
+            resultMap="VehicleVOMap">
+        select id,
+               vehicle_name,
+               description,
+               vehicle_front_view,
+               vehicle_top_view,
+               parameter_type,
+               share
+        from model_vehicle
+        where is_deleted = '0'
+          and share = '0' and create_user_id = #{createUserId}
+        order by create_time desc
+    </select>
 </mapper>