mlx

api-common/src/main/java/api/common/pojo/vo/model/CameraVO.java

@@ -1,10 +1,14 @@
 package api.common.pojo.vo.model;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class CameraVO {
 
     //主键id

api-common/src/main/java/api/common/pojo/vo/model/SensorVO.java

@@ -0,0 +1,17 @@
+package api.common.pojo.vo.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SensorVO {
+    private List<CameraVO> camera;
+    private List<GpsVO> gps;
+    private List<LidarVO> lidar;
+    private List<OgtVO> ogt;
+}

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/manager/ProjectManager.java

@@ -74,7 +74,7 @@ public class ProjectManager {
             String replace12 = replace11.replace("namespace-name", kubernetesConfiguration.getNamespace()); // pod 名称包括 projectId 和 随机字符串
             String replace13 = replace12.replace("node-name", nodeName);     // 指定 pod 运行节点
 
-            String replace14 = replace13.replace("cpu-order", nodeName);     // 指定 cpu 编号
+            String replace14 = replace13.replace("cpu-order", cpuOrder + "");     // 指定 cpu 编号
 
             String finalYaml = null;
             if (DictConstants.USE_GPU.equals(isChoiceGpu)) {
@@ -115,7 +115,7 @@ public class ProjectManager {
             String replace17 = replace16.replace("namespace-name", kubernetesConfiguration.getNamespace()); // pod 名称包括 projectId 和 随机字符串
             String replace18 = replace17.replace("node-name", nodeName);     // 指定 pod 运行节点
 
-            String replace19 = replace18.replace("cpu-order", nodeName);     // 指定 cpu 编号
+            String replace19 = replace18.replace("cpu-order", cpuOrder + "");     // 指定 cpu 编号
 
             String finalYaml;
             if (DictConstants.USE_GPU.equals(isChoiceGpu)) {

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

@@ -8,20 +8,20 @@ import api.common.pojo.po.model.GpsPO;
 import api.common.pojo.vo.model.GpsVO;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.model.service.GpsService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 @Controller
 @RequestMapping(value = "/gps", name = LogConstants.MODULE_GPS)
 public class GpsCtrl {
 
-    @Autowired
+    @Resource
     private GpsService gpsService;
 
     /**

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

@@ -8,28 +8,28 @@ import api.common.pojo.po.model.LidarPO;
 import api.common.pojo.vo.model.LidarVO;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.model.service.LidarService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 @Controller
-@RequestMapping(value = "/lidar",name = LogConstants.MODULE_LIDAR)
+@RequestMapping(value = "/lidar", name = LogConstants.MODULE_LIDAR)
 public class LidarCtrl {
 
-    @Autowired
-    LidarService lidarService;
+    @Resource
+    private LidarService lidarService;
 
     /**
      * 获取列表
      */
     @RequestMapping("/getLidarList")
     @ResponseBody
-    public ResponseBodyVO<List<LidarVO>> getLidarList(@RequestBody LidarParam lidarParam){
+    public ResponseBodyVO<List<LidarVO>> getLidarList(@RequestBody LidarParam lidarParam) {
         ResponseBodyVO<List<LidarVO>> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(lidarService.getLidarList(lidarParam));
         return response;
@@ -40,7 +40,7 @@ public class LidarCtrl {
      */
     @RequestMapping("/getMyLidarList")
     @ResponseBody
-    public ResponseBodyVO<List<LidarVO>> getMyLidarList(@RequestBody LidarParam lidarParam){
+    public ResponseBodyVO<List<LidarVO>> getMyLidarList(@RequestBody LidarParam lidarParam) {
         ResponseBodyVO<List<LidarVO>> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(lidarService.getMyLidarList(lidarParam));
         return response;
@@ -51,7 +51,7 @@ public class LidarCtrl {
      */
     @RequestMapping("/getLidarInfo")
     @ResponseBody
-    public ResponseBodyVO<LidarVO> getLidarInfo(@RequestBody LidarParam lidarParam){
+    public ResponseBodyVO<LidarVO> getLidarInfo(@RequestBody LidarParam lidarParam) {
         ResponseBodyVO<LidarVO> response = new ResponseBodyVO<LidarVO>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(lidarService.getLidarInfo(lidarParam));
         return response;
@@ -62,14 +62,14 @@ public class LidarCtrl {
      */
     @RequestMapping("/saveLidar")
     @ResponseBody
-    public ResponseBodyVO<LidarPO> saveLidar(@RequestBody LidarPO lidarPO){
-        if(ObjectUtil.isNull(lidarPO)){
-            return new ResponseBodyVO(false, 500, "参数必传！",null);
+    public ResponseBodyVO<LidarPO> saveLidar(@RequestBody LidarPO lidarPO) {
+        if (ObjectUtil.isNull(lidarPO)) {
+            return new ResponseBodyVO(false, 500, "参数必传！", null);
         }
         ResponseBodyVO<LidarPO> response = new ResponseBodyVO<LidarPO>(ResponseBodyVO.Response.SUCCESS);
         LidarPO po = lidarService.saveLidar(lidarPO);
-        if(ObjectUtil.isNull(po.getId())){
-            return new ResponseBodyVO(false, 500, "传感器名称重复！",null);
+        if (ObjectUtil.isNull(po.getId())) {
+            return new ResponseBodyVO(false, 500, "传感器名称重复！", null);
         }
         response.setInfo(po);
         return response;
@@ -81,14 +81,14 @@ public class LidarCtrl {
     @RequestMapping("/shareLidar")
     @ResponseBody
     @PreAuthorize("@AuthorityCheck.admin()")
-    public ResponseBodyVO<LidarPO> shareLidar(@RequestBody LidarPO lidarPO){
-        if(ObjectUtil.isNull(lidarPO)){
-            return new ResponseBodyVO(false, 500, "参数必传！",null);
+    public ResponseBodyVO<LidarPO> shareLidar(@RequestBody LidarPO lidarPO) {
+        if (ObjectUtil.isNull(lidarPO)) {
+            return new ResponseBodyVO(false, 500, "参数必传！", null);
         }
         ResponseBodyVO<LidarPO> response = new ResponseBodyVO<LidarPO>(ResponseBodyVO.Response.SUCCESS);
         LidarPO po = lidarService.shareLidar(lidarPO);
-        if(ObjectUtil.isNull(po.getId())){
-            return new ResponseBodyVO(false, 500, "传感器名称重复！",null);
+        if (ObjectUtil.isNull(po.getId())) {
+            return new ResponseBodyVO(false, 500, "传感器名称重复！", null);
         }
         response.setInfo(po);
         return response;
@@ -99,12 +99,12 @@ public class LidarCtrl {
      */
     @RequestMapping("/delLidarById")
     @ResponseBody
-    public ResponseBodyVO delLidarById(@RequestBody LidarPO lidarPO){
+    public ResponseBodyVO delLidarById(@RequestBody LidarPO lidarPO) {
         int i = lidarService.delLidarById(lidarPO);
-        if(i>0){
+        if (i > 0) {
             return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
-        }else{
-            return new ResponseBodyVO(false, 500, "删除失败！",null);
+        } else {
+            return new ResponseBodyVO(false, 500, "删除失败！", null);
         }
     }
 }

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

@@ -7,21 +7,21 @@ import api.common.pojo.po.model.OgtPO;
 import api.common.pojo.vo.model.OgtVO;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.model.service.OgtService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 @Controller
 @RequestMapping(value = "/ogt",name = LogConstants.MODULE_OGT)
 public class OgtCtrl {
 
-    @Autowired
-    OgtService ogtService;
+    @Resource
+    private OgtService ogtService;
 
     /**
      * 获取列表
@@ -29,7 +29,7 @@ public class OgtCtrl {
     @RequestMapping("/getOgtList")
     @ResponseBody
     public ResponseBodyVO<List<OgtVO>> getOgtList(@RequestBody OgtParam ogtParam){
-        ResponseBodyVO<List<OgtVO>> response = new ResponseBodyVO<List<OgtVO>>(ResponseBodyVO.Response.SUCCESS);
+        ResponseBodyVO<List<OgtVO>> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(ogtService.getOgtList(ogtParam));
         return response;
     }
@@ -40,7 +40,7 @@ public class OgtCtrl {
     @RequestMapping("/getMyOgtList")
     @ResponseBody
     public ResponseBodyVO<List<OgtVO>> getMyOgtList(@RequestBody OgtParam ogtParam){
-        ResponseBodyVO<List<OgtVO>> response = new ResponseBodyVO<List<OgtVO>>(ResponseBodyVO.Response.SUCCESS);
+        ResponseBodyVO<List<OgtVO>> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(ogtService.getMyOgtList(ogtParam));
         return response;
     }

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

@@ -0,0 +1,50 @@
+package com.css.simulation.resource.model.controller;
+
+import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.param.model.CameraParam;
+import api.common.pojo.param.model.GpsParam;
+import api.common.pojo.param.model.LidarParam;
+import api.common.pojo.param.model.OgtParam;
+import api.common.pojo.vo.model.SensorVO;
+import com.css.simulation.resource.model.service.CameraService;
+import com.css.simulation.resource.model.service.GpsService;
+import com.css.simulation.resource.model.service.LidarService;
+import com.css.simulation.resource.model.service.OgtService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+
+@Controller
+@RequestMapping(value = "/sensor")
+public class SensorController {
+
+    @Resource
+    private CameraService cameraService;
+    @Resource
+    private GpsService gpsService;
+    @Resource
+    private LidarService lidarService;
+    @Resource
+    private OgtService ogtService;
+
+    /**
+     * 获取私有列表
+     */
+    @RequestMapping("/getMySensorList")
+    @ResponseBody
+    public ResponseBodyVO<SensorVO> getMySensorList() {
+
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS,
+                new SensorVO(
+                        cameraService.getMyCameraList(new CameraParam()),
+                        gpsService.getGpsList(new GpsParam()),
+                        lidarService.getMyLidarList(new LidarParam()),
+                        ogtService.getMyOgtList(new OgtParam())
+                )
+        );
+    }
+
+
+}