commit

simulation-resource-scheduler/src/main/resources/bootstrap-aliyun.yaml

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 39.107.58.39:8848
+        namespace: 41b663fb-0996-4b6e-b10b-c369929762d7
+        group: dev
+      config:
+        server-addr: 39.107.58.39:8848
+        namespace: 41b663fb-0996-4b6e-b10b-c369929762d7
+        file-extension: yaml
+        group: dev

simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/scene_library/score_rule/ScoreRuleController.java

@@ -185,7 +185,7 @@ public class ScoreRuleController {
      * 新增场景评价规则
      */
     @PostMapping("/saveSceneEvaluationRule")
-    public ResponseBodyVO<String> saveSceneEvaluationRule(@RequestParam("file") MultipartFile file, @RequestBody SceneEvaluationRulePO sceneEvaluationRulePO) {
+    public ResponseBodyVO<String> saveSceneEvaluationRule(@RequestParam("file") MultipartFile file, @RequestPart("content") SceneEvaluationRulePO sceneEvaluationRulePO) {
         if (ObjectUtil.isNull(sceneEvaluationRulePO.getRuleName())) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数 RulesName 不能为空，请检查");
         }
@@ -216,7 +216,7 @@ public class ScoreRuleController {
     /**
      * 查询复杂度脚本
      */
-    @PostMapping("/querySceneComplexityScript")
+    @GetMapping("/querySceneComplexityScript")
     public ResponseBodyVO<List<SceneEvaluationRuleVO>> querySceneComplexityScript() {
         List<SceneEvaluationRulePO> list = sceneEvaluationRuleService.querySceneComplexityScript();
         List<SceneEvaluationRuleVO> list1 = new ArrayList<>();

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneEvaluationRuleService.java

@@ -86,17 +86,17 @@ public class SceneEvaluationRuleService {
             if (null == originName) {
                 return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "文件名为空，请检查！");
             }
-            String fileName = originName.substring(0, originName.lastIndexOf("."));
             Integer nowTime = TimeUtil.getRq(new Date(), 0);
             String randomCode = StringUtil.getRandomCode();
-            fileName = "/" + DictConstants.SCENE_EVALUATION_RULE_PY_FILE + "/" + nowTime + "/" + randomCode + "/" + fileName;
+            String fileName = "/" + DictConstants.SCENE_EVALUATION_RULE_PY_FILE + "/" + nowTime + "/" + randomCode + "/" + originName;
             ResponseBodyVO<String> response = fileDownService.upload(file, fileName);
             if (response.isStatus()) {
                 String previewUrl = response.getInfo();
-                sceneEvaluationRulePO.setScriptName(fileName);
+                sceneEvaluationRulePO.setScriptName(originName);
                 sceneEvaluationRulePO.setScriptPath(previewUrl);
+            } else {
+                return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "上传失败！");
             }
-            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "上传失败！");
         }
 
         // 判断 ruleId 是否为空

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/SceneEvaluationRuleMapper.java

@@ -21,7 +21,7 @@ public interface SceneEvaluationRuleMapper {
     List<SceneEvaluationRulePO> querySceneEvaluationRuleList(SceneEvaluationRuleParam params);
 
     @Select("<script>" +
-            "select rule_name\n" +
+            "select count(rule_name)\n" +
             "from scene_evaluation_rule\n" +
             "where rule_name = #{ruleName}  \n" +
             "<if test='ruleId != null'>" +