Bläddra i källkod

解决打包警告

root 2 år sedan
förälder
incheckning
70269dbde8

+ 1 - 0
api-common/src/main/java/api/common/util/ObjectUtil.java

@@ -16,6 +16,7 @@ import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 
+@SuppressWarnings("all")
 public class ObjectUtil {
 
     /**

+ 7 - 9
simulation-resource-common/src/main/java/com/css/simulation/resource/common/controller/AlgPlatformCtrl.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/controller/AlgorithmPlatformController.java

@@ -9,7 +9,6 @@ import com.css.simulation.resource.common.configuration.algPlatform.ClientDetail
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.SneakyThrows;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,29 +18,28 @@ import javax.annotation.Resource;
 
 @Controller
 @RequestMapping("/algPlatform")
-public class AlgPlatformCtrl {
+public class AlgorithmPlatformController {
 
     private static final String TOKEN_KEY = "ALGPLATFORM:TOKEN";
 
-    @Autowired
-    RedisController redisController;
+    @Resource
+    private RedisController redisController;
 
     @Resource
-    ClientDetail clientDetail;
+    private ClientDetail clientDetail;
 
     @RequestMapping("/getAlgorithmList")
     @ResponseBody
     @SneakyThrows
-    public ResponseBodyVO getAlgorithmList(@RequestBody String param) {
+    public ResponseBodyVO<String> getAlgorithmList(@RequestBody String param) {
         //取得token
         String token = getToken();
         if (ObjectUtil.isNull(token)) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE, "获取算法平台token失败!");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "获取算法平台token失败!");
         }
         String algorithmListUri = clientDetail.getAlgorithmListUri() + "?access_token=" + token + param;
         String result = HttpUtil.get(HttpUtil.getHttpClient(), HttpUtil.getRequestConfig(), algorithmListUri);
-        ResponseBodyVO responseBodyVO = new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, "请求成功!", result);
-        return responseBodyVO;
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, "请求成功!", result);
     }
 
     @RequestMapping("/selectAlgorithmNameByAlgorithmId")

+ 48 - 0
simulation-resource-monitor/src/main/java/com/css/simulation/resource/monitor/controller/ProjectTaskController.java

@@ -0,0 +1,48 @@
+package com.css.simulation.resource.monitor.controller;
+
+import api.common.pojo.common.ResponseBodyVO;
+import com.css.simulation.resource.monitor.scheduler.ProjectScheduler;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("/projectTask")
+public class ProjectTaskController {
+
+    @Resource
+    ProjectScheduler projectScheduler;
+
+    @RequestMapping("/init")
+    public ResponseBodyVO<Integer> init(@RequestBody List<ProjectScheduler.ProjectTask> task) {
+        int count = projectScheduler.init(task);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, count);
+    }
+
+
+    @RequestMapping("/start")
+    public ResponseBodyVO<Void> start(@RequestBody ProjectScheduler.ProjectTask task) {
+        if (projectScheduler.start(task)) {
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
+        }
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE);
+    }
+
+    @RequestMapping("/stop")
+    public ResponseBodyVO<Void> stop(@RequestBody ProjectScheduler.ProjectTask task) {
+        if (projectScheduler.stop(task)) {
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
+        } else {
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE);
+        }
+    }
+
+    @RequestMapping("/destroy")
+    public ResponseBodyVO<Void> destroy() {
+        projectScheduler.destroy();
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
+    }
+}

+ 0 - 54
simulation-resource-monitor/src/main/java/com/css/simulation/resource/monitor/controller/ProjectTaskCtrl.java

@@ -1,54 +0,0 @@
-package com.css.simulation.resource.monitor.controller;
-
-import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.monitor.scheduler.ProjectScheduler;
-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("/projectTask")
-public class ProjectTaskCtrl {
-
-    @Resource
-    ProjectScheduler projectScheduler;
-
-    @RequestMapping("/init")
-    @ResponseBody
-    public ResponseBodyVO init(@RequestBody List<ProjectScheduler.ProjectTask> task){
-        int count = projectScheduler.init(task);
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS,count);
-    }
-
-
-    @RequestMapping("/start")
-    @ResponseBody
-    public ResponseBodyVO<String> start(@RequestBody ProjectScheduler.ProjectTask task){
-        boolean b = projectScheduler.start(task);
-        if(b){
-            return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
-        }
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE);
-    }
-
-    @RequestMapping("/stop")
-    @ResponseBody
-    public ResponseBodyVO stop(@RequestBody ProjectScheduler.ProjectTask task){
-        boolean b = projectScheduler.stop(task);
-        if(b){
-            return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
-        }
-        return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE);
-    }
-
-    @RequestMapping("/destroy")
-    @ResponseBody
-    public ResponseBodyVO destroy(){
-        projectScheduler.destroy();
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
-    }
-}

+ 1 - 1
simulation-resource-monitor/src/main/java/com/css/simulation/resource/monitor/feign/ProjectServiceFallback.java

@@ -9,7 +9,7 @@ import java.util.Map;
 public class ProjectServiceFallback implements ProjectService{
 
     @Override
-    public ResponseBodyVO runProject(Map<String,String> projectParam) {
+    public ResponseBodyVO<String> runProject(Map<String,String> projectParam) {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE);
     }
 }

+ 1 - 1
simulation-resource-scene/src/main/java/com/css/simulation/resource/scene/common/oauth/AuthorizationHolder.java

@@ -4,7 +4,7 @@ import org.springframework.core.NamedInheritableThreadLocal;
 
 public class AuthorizationHolder {
 
-    private static final ThreadLocal<String> inheritableRequestAttributesHolder = new NamedInheritableThreadLocal("Authorization");
+    private static final ThreadLocal<String> inheritableRequestAttributesHolder = new NamedInheritableThreadLocal<>("Authorization");
 
     public static void setAuthorization(String authorization){
         inheritableRequestAttributesHolder.set(authorization);

+ 2 - 2
simulation-resource-server/src/main/java/com/css/simulation/resource/model/controller/SensorGpsController.java

@@ -67,12 +67,12 @@ public class SensorGpsController {
     @RequestMapping("/saveGps")
     public ResponseBodyVO<GpsPO> saveGps(@RequestBody GpsPO gpsPO) {
         if (ObjectUtil.isNull(gpsPO)) {
-            return new ResponseBodyVO(false, 500, "参数必传!", null);
+            return new ResponseBodyVO<>(false, 500, "参数必传!", null);
         }
         ResponseBodyVO<GpsPO> response = new ResponseBodyVO<GpsPO>(ResponseBodyVO.Response.SUCCESS);
         GpsPO po = gpsService.saveGps(gpsPO);
         if (ObjectUtil.isNull(po.getId())) {
-            return new ResponseBodyVO(false, 500, "传感器名称重复!", null);
+            return new ResponseBodyVO<>(false, 500, "传感器名称重复!", null);
         }
         response.setInfo(po);
         return response;

+ 1 - 0
simulation-resource-sms/src/main/java/com/css/simulation/resource/sms/util/JsonUtil.java

@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+@SuppressWarnings("all")
 public class JsonUtil {
 
     private static final ObjectMapper mapper = new ObjectMapper();

+ 6 - 10
simulation-resource-video/src/main/java/com/css/simulation/resource/video/controller/VideoController.java

@@ -4,7 +4,6 @@ import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.po.scene.VehicleTypePO;
 import api.common.util.LinuxUtil;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.video.configuration.redis.CustomRedisClient;
 import com.css.simulation.resource.video.service.VideoService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -25,8 +24,6 @@ public class VideoController {
 
     @Resource
     private VideoService videoService;
-    @Resource
-    private CustomRedisClient customRedisClient;
     @Value("${scheduler.video-test-command}")
     private String testCommand;
 
@@ -97,18 +94,17 @@ public class VideoController {
         File folder = new File(savePath);
         // 判断路径是否存在,不存在则自动创建
         if (!folder.exists()) {
-            folder.mkdirs();
+            final boolean mkdirs = folder.mkdirs();
         }
-        String saveName = originName;
         try {
-            file.transferTo(new File(folder, saveName));
+            file.transferTo(new File(folder, originName));
             Map<String, String> map = new HashMap<>();
-            String filePath = savePath + "/" + saveName;
+            String filePath = savePath + "/" + originName;
             // return new String("文件路径为:" + filePath);
             map.put("filePath", filePath);
-            return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, map);
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, map);
         } catch (IOException e) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE, e.getMessage());
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, e.getMessage());
             //  return new String(e.getMessage());
         }
     }
@@ -117,7 +113,7 @@ public class VideoController {
     @ResponseBody
     public ResponseBodyVO<VehicleTypePO> test1(@RequestBody Map<String, String> map) {
         VehicleTypePO po = videoService.vehicleById(map.get("projectId"), map.get("projectType"));
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, po);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, po);
     }