mlx

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/scheduler/ProjectScheduler.java

@@ -40,8 +40,6 @@ public class ProjectScheduler {
     String username;
     @Value("${scheduler.host.password}")
     String password;
-    @Value("${scheduler.linux-path.job-yaml}")
-    String jobYaml;
     // -------------------------------- Comment --------------------------------
     @Resource
     StringRedisTemplate stringRedisTemplate;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/DictCtrl.java

@@ -28,21 +28,20 @@ public class DictCtrl {
 
     /**
      * 通过字典类型dictTypes将字典数据刷新至缓存，当dictTypes值为all时，将刷新所有字典。
+     *
      * @param param
      * @return
-     * @throws JsonProcessingException
      */
     @RequestMapping("/refreshDictsByTypes")
     @ResponseBody
     @PreAuthorize("@AuthorityCheck.admin()")
-    public ResponseBodyVO refreshDictsByTypes(@RequestBody @Validated DictParam param) throws JsonProcessingException {
-        ResponseBodyVO<String> response = new ResponseBodyVO<String>(ResponseBodyVO.Response.SUCCESS);
-        response.setInfo(dictService.refreshDicts(param));
-        return response;
+    public ResponseBodyVO<String> refreshDictsByTypes(@RequestBody @Validated DictParam param) {
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, dictService.refreshDicts(param));
     }
 
     /**
      * 通过字典类型dictTypes从缓存中查询字典数据lists
+     *
      * @param param
      * @return
      * @throws JsonProcessingException
@@ -50,13 +49,14 @@ public class DictCtrl {
     @RequestMapping("/getDictListsByTypes")
     @ResponseBody
     public ResponseBodyVO getDictListsByTypes(@RequestBody @Validated DictParam param) throws JsonProcessingException {
-        ResponseBodyVO<Map<String, List<DictVO>>> response = new ResponseBodyVO<Map<String,List<DictVO>>>(ResponseBodyVO.Response.SUCCESS);
+        ResponseBodyVO<Map<String, List<DictVO>>> response = new ResponseBodyVO<Map<String, List<DictVO>>>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(dictService.getDictListsByTypes(param));
         return response;
     }
 
     /**
      * 通过字典类型dictTypes从缓存中查询字典数据trees
+     *
      * @param param
      * @return
      * @throws JsonProcessingException
@@ -64,13 +64,14 @@ public class DictCtrl {
     @RequestMapping("/getDictTreesByTypes")
     @ResponseBody
     public ResponseBodyVO getDictTreesByTypes(@RequestBody @Validated DictParam param) throws JsonProcessingException {
-        ResponseBodyVO<Map<String, List<DictVO>>> response = new ResponseBodyVO<Map<String,List<DictVO>>>(ResponseBodyVO.Response.SUCCESS);
+        ResponseBodyVO<Map<String, List<DictVO>>> response = new ResponseBodyVO<Map<String, List<DictVO>>>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(dictService.getDictTreesByTypes(param));
         return response;
     }
 
     /**
      * 通过字典类型dictTypes从缓存中查询字典数据maps
+     *
      * @param param
      * @return
      * @throws JsonProcessingException
@@ -78,7 +79,7 @@ public class DictCtrl {
     @RequestMapping("/getDictMapsByTypes")
     @ResponseBody
     public ResponseBodyVO getDictMapsByTypes(@RequestBody @Validated DictParam param) throws JsonProcessingException {
-        ResponseBodyVO<Map<String,Map<String,String>>> response = new ResponseBodyVO<Map<String,Map<String,String>>>(ResponseBodyVO.Response.SUCCESS);
+        ResponseBodyVO<Map<String, Map<String, String>>> response = new ResponseBodyVO<Map<String, Map<String, String>>>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(dictService.getDictMapsByTypes(param));
         return response;
     }

simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/SceneImportCtrl.java

@@ -64,9 +64,7 @@ public class SceneImportCtrl {
     @RequestMapping("/getSceneImporPagetList")
     @ResponseBody
     public ResponseBodyVO<PageInfo<SceneImportPO>> getSceneImporPagetList(@RequestBody SceneImportPageParam param) {
-        ResponseBodyVO<PageInfo<SceneImportPO>> response = new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
-        response.setInfo(sceneImportService.getSceneImporPagetList(param));
-        return response;
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, sceneImportService.getSceneImporPagetList(param));
     }
 
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/DictService.java

@@ -9,10 +9,11 @@ import api.common.util.ObjectUtil;
 import com.css.simulation.resource.feign.RedisService;
 import com.css.simulation.resource.system.mapper.DictMapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -20,13 +21,14 @@ import java.util.stream.Collectors;
 @Service
 public class DictService {
 
-    @Autowired
-    DictMapper dictMapper;
+    @Resource
+    private DictMapper dictMapper;
 
-    @Autowired
-    RedisService redisService;
+    @Resource
+    private RedisService redisService;
 
-    public String refreshDicts(DictParam param) throws JsonProcessingException {
+    @SneakyThrows
+    public String refreshDicts(DictParam param) {
         String dictTypes = param.getDictTypes();
         List<String> dictTypeList = Arrays.asList(dictTypes.split(","));
         if (dictTypeList.size() == 0) {//防止参数为","