mlx

simulation-resource-server/src/main/java/com/css/simulation/resource/model/controller/CameraCtrl.java → simulation-resource-server/src/main/java/com/css/simulation/resource/model/controller/CameraController.java

@@ -7,27 +7,39 @@ import api.common.pojo.po.model.CameraPO;
 import api.common.pojo.vo.model.CameraVO;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.model.service.CameraService;
-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 org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.List;
 
-@Controller
+@RestController
 @RequestMapping(value = "/camera", name = LogConstants.MODULE_CAMERA)
-public class CameraCtrl {
+public class CameraController {
 
-    @Autowired
-    CameraService cameraService;
+    @Resource
+    private CameraService cameraService;
+
+
+    //* -------------------------------- 删除摄像头 --------------------------------
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delCameraById")
+    public ResponseBodyVO<String> delCameraById(@RequestBody CameraPO cameraPO) {
+        cameraService.delCameraById(cameraPO);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
+    }
+
+    //* -------------------------------- Comment --------------------------------
 
     /**
      * 获取列表
      */
     @RequestMapping("/getCameraList")
-    @ResponseBody
     public ResponseBodyVO<List<CameraVO>> getCameraList(@RequestBody CameraParam cameraParam) {
         ResponseBodyVO<List<CameraVO>> response = new ResponseBodyVO<List<CameraVO>>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(cameraService.getCameraList(cameraParam));
@@ -38,7 +50,6 @@ public class CameraCtrl {
      * 获取私有列表
      */
     @RequestMapping("/getMyCameraList")
-    @ResponseBody
     public ResponseBodyVO<List<CameraVO>> getMyCameraList(@RequestBody CameraParam cameraParam) {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, cameraService.getMyCameraList(cameraParam));
     }
@@ -48,7 +59,6 @@ public class CameraCtrl {
      * 根据id获取详情
      */
     @RequestMapping("/getCameraInfo")
-    @ResponseBody
     public ResponseBodyVO<CameraVO> getCameraInfo(@RequestBody CameraParam cameraParam) {
         ResponseBodyVO<CameraVO> response = new ResponseBodyVO<CameraVO>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(cameraService.getCameraInfo(cameraParam));
@@ -59,15 +69,14 @@ public class CameraCtrl {
      * 新增、修改、另存为
      */
     @RequestMapping("/saveCamera")
-    @ResponseBody
     public ResponseBodyVO<CameraPO> saveCamera(@RequestBody CameraPO cameraPO) {
         if (ObjectUtil.isNull(cameraPO)) {
-            return new ResponseBodyVO(false, 500, "参数必传！", null);
+            return new ResponseBodyVO<>(false, 500, "参数必传！", null);
         }
         ResponseBodyVO<CameraPO> response = new ResponseBodyVO<CameraPO>(ResponseBodyVO.Response.SUCCESS);
         CameraPO po = cameraService.saveCamera(cameraPO);
         if (ObjectUtil.isNull(po.getId())) {
-            return new ResponseBodyVO(false, 500, "传感器名称重复！", null);
+            return new ResponseBodyVO<>(false, 500, "传感器名称重复！", null);
         }
         response.setInfo(po);
         return response;
@@ -77,7 +86,6 @@ public class CameraCtrl {
      * 分享
      */
     @RequestMapping("/shareCamera")
-    @ResponseBody
     @PreAuthorize("@AuthorityCheck.admin()")
     public ResponseBodyVO<CameraPO> shareCamera(@RequestBody CameraPO cameraPO) {
         if (ObjectUtil.isNull(cameraPO)) {
@@ -92,17 +100,4 @@ public class CameraCtrl {
         return response;
     }
 
-    /**
-     * 删除
-     */
-    @RequestMapping("/delCameraById")
-    @ResponseBody
-    public ResponseBodyVO delCameraById(@RequestBody CameraPO cameraPO) {
-        int i = cameraService.delCameraById(cameraPO);
-        if (i > 0) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
-        } else {
-            return new ResponseBodyVO(false, 500, "删除失败！", null);
-        }
-    }
 }

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

@@ -41,7 +41,7 @@ public class ConfigCtrl {
      */
     @RequestMapping("/getConfigInfo")
     public ResponseBodyVO<ConfigVO> getConfigInfo(@RequestBody ConfigVO configVO) {
-        ResponseBodyVO<ConfigVO> response = new ResponseBodyVO<ConfigVO>(ResponseBodyVO.Response.SUCCESS);
+        ResponseBodyVO<ConfigVO> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(configService.getConfigInfo(configVO));
         return response;
     }

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

@@ -9,26 +9,32 @@ import api.common.pojo.vo.model.GpsVO;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.model.service.GpsService;
 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 org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
 
-@Controller
+@RestController
 @RequestMapping(value = "/gps", name = LogConstants.MODULE_GPS)
 public class GpsCtrl {
 
     @Resource
     private GpsService gpsService;
 
+
+    //* -------------------------------- 删除 GPS --------------------------------
+    @RequestMapping("/delGpsById")
+    public ResponseBodyVO<String> delGpsById(@RequestBody GpsPO gpsPO) {
+        gpsService.delGpsById(gpsPO);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
+    }
+
     /**
      * 获取列表
      */
     @RequestMapping("/getGpsList")
-    @ResponseBody
     public ResponseBodyVO<List<GpsVO>> getGpsList(@RequestBody GpsParam gpsParam) {
         ResponseBodyVO<List<GpsVO>> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(gpsService.getGpsList(gpsParam));
@@ -39,7 +45,6 @@ public class GpsCtrl {
      * 获取私有列表
      */
     @RequestMapping("/getMyGpsList")
-    @ResponseBody
     public ResponseBodyVO<List<GpsVO>> getMyCameraList(@RequestBody GpsParam gpsParam) {
         ResponseBodyVO<List<GpsVO>> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(gpsService.getMyGpsList(gpsParam));
@@ -50,7 +55,6 @@ public class GpsCtrl {
      * 根据id获取详情
      */
     @RequestMapping("/getGpsInfo")
-    @ResponseBody
     public ResponseBodyVO<GpsVO> getGpsInfo(@RequestBody GpsParam gpsParam) {
         ResponseBodyVO<GpsVO> response = new ResponseBodyVO<GpsVO>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(gpsService.getGpsInfo(gpsParam));
@@ -61,7 +65,6 @@ public class GpsCtrl {
      * 新增、修改、另存为
      */
     @RequestMapping("/saveGps")
-    @ResponseBody
     public ResponseBodyVO<GpsPO> saveGps(@RequestBody GpsPO gpsPO) {
         if (ObjectUtil.isNull(gpsPO)) {
             return new ResponseBodyVO(false, 500, "参数必传！", null);
@@ -79,7 +82,6 @@ public class GpsCtrl {
      * 分享
      */
     @RequestMapping("/shareGps")
-    @ResponseBody
     @PreAuthorize("@AuthorityCheck.admin()")
     public ResponseBodyVO<GpsPO> shareGps(@RequestBody GpsPO gpsPO) {
         if (ObjectUtil.isNull(gpsPO)) {
@@ -94,17 +96,5 @@ public class GpsCtrl {
         return response;
     }
 
-    /**
-     * 删除
-     */
-    @RequestMapping("/delGpsById")
-    @ResponseBody
-    public ResponseBodyVO delGpsById(@RequestBody GpsPO gpsPO) {
-        int i = gpsService.delGpsById(gpsPO);
-        if (i > 0) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
-        } else {
-            return new ResponseBodyVO(false, 500, "删除失败！", null);
-        }
-    }
+
 }

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

@@ -10,13 +10,12 @@ 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 org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 
-@Controller
+@RestController
 @RequestMapping(value = "/sensor")
 public class SensorController {
 
@@ -29,11 +28,14 @@ public class SensorController {
     @Resource
     private OgtService ogtService;
 
+    //* -------------------------------- 删除传感器 --------------------------------
+
+    //* -------------------------------- Comment --------------------------------
+
     /**
      * 获取私有列表
      */
     @RequestMapping("/getMySensorList")
-    @ResponseBody
     public ResponseBodyVO<SensorVO> getMySensorList() {
 
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS,

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

@@ -22,5 +22,5 @@ public interface CameraMapper {
 
     void update(CameraPO cameraPO);
 
-    int delCameraById(CameraPO cameraPO);
+    void delCameraById(CameraPO cameraPO);
 }

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

@@ -23,5 +23,5 @@ public interface GpsMapper {
 
     void update(GpsPO gpsPO);
 
-    int delGpsById(GpsPO gpsPO);
+    void delGpsById(GpsPO gpsPO);
 }

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

@@ -107,12 +107,11 @@ public class CameraService {
         return cameraPO;
     }
 
-    public int delCameraById(CameraPO cameraPO) {
+    public void delCameraById(CameraPO cameraPO) {
         cameraPO.setIsDeleted(DictConstants.YES);
         cameraPO.setModifyUserId(AuthUtil.getCurrentUserId());
         cameraPO.setModifyTime(TimeUtil.getNowForMysql());
-        int i = cameraMapper.delCameraById(cameraPO);
+        cameraMapper.delCameraById(cameraPO);
         LogUtil.delete();
-        return i;
     }
 }

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

@@ -63,9 +63,7 @@ public class ConfigService {
             List<ConfigSensorVO> sensorList = configMapper.getConfigSensors(configVO);  // 根据配置 id 获取传感器列表
             Map<String, List<ConfigSensorVO>> configSensors = sensorList.stream().collect(Collectors.groupingBy(ConfigSensorVO::getSensorType));
             Map<String, String> sensorCount = new HashMap<>();
-            configSensors.forEach((sensorType, configSensorVOs) -> {
-                sensorCount.put(sensorType, String.valueOf(configSensorVOs.size()));
-            });
+            configSensors.forEach((sensorType, configSensorVOs) -> sensorCount.put(sensorType, String.valueOf(configSensorVOs.size())));
             configVO.setSensorCount(sensorCount);
         });
         return new PageInfo<>(list);
@@ -77,7 +75,7 @@ public class ConfigService {
         Map<String, List<ConfigSensorVO>> configSensors = sensorList.stream().collect(Collectors.groupingBy(ConfigSensorVO::getSensorType));
         configVO.setConfigSensors(configSensors);
         if (ObjectUtil.isNotNull(configVO.getVehicleArray())) {
-        configVO.setVehicleArrayS(configVO.getVehicleArray().split(","));
+            configVO.setVehicleArrayS(configVO.getVehicleArray().split(","));
         }
         return configVO;
     }
@@ -243,7 +241,7 @@ public class ConfigService {
             VehicleParam vehicleParam = new VehicleParam();
             vehicleParam.setId(configPO.getVehicleId());
             VehicleVO vehicleInfo = vehicleMapper.getVehicleInfo(vehicleParam);
-            if(ObjectUtil.isNotNull(vehicleInfo.getVehicleTypeStr())){
+            if (ObjectUtil.isNotNull(vehicleInfo.getVehicleTypeStr())) {
                 vehicleInfo.setVehicleType(vehicleInfo.getVehicleTypeStr().split(","));
             }
             VehiclePO vehiclePO = vehicleService.shareVehicle(vehicleInfo);

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

@@ -23,16 +23,23 @@ public class GpsService {
     @Resource
     private GpsMapper gpsMapper;
 
+    //* -------------------------------- 删除 GPS --------------------------------
+
+    public void delGpsById(GpsPO gpsPO) {
+        PoUtil.initDelPo(gpsPO);
+        gpsMapper.delGpsById(gpsPO);
+        LogUtil.delete();
+    }
+    //* -------------------------------- Comment --------------------------------
+
     public List<GpsVO> getGpsList(GpsParam gpsParam) {
         gpsParam.setCreateUserId(AuthUtil.getCurrentUserId());
         gpsParam.setShare(null);
-        List<GpsVO> list = gpsMapper.getGpsList(gpsParam);
-        return list;
+        return gpsMapper.getGpsList(gpsParam);
     }
 
     public List<GpsVO> getMyGpsList(GpsParam gpsParam) {
         gpsParam.setCreateUserId(AuthUtil.getCurrentUserId());
-//        gpsParam.setShare(DictConstants.NO);
         gpsParam.setShare(null);
         List<GpsVO> gpsList = gpsMapper.getGpsList(gpsParam);
         gpsList.forEach(gps-> {
@@ -96,10 +103,4 @@ public class GpsService {
         return gpsPO;
     }
 
-    public int delGpsById(GpsPO gpsPO) {
-        PoUtil.initDelPo(gpsPO);
-        int i = gpsMapper.delGpsById(gpsPO);
-        LogUtil.delete();
-        return i;
-    }
 }