root 2 years ago
parent
commit
2bae0fa494

+ 4 - 9
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/consumer/ProjectConsumer.java

@@ -253,15 +253,12 @@ public class ProjectConsumer {
                                             .build())
                                     .build())
                             .build();
-
-                    log.info("createTaskAndFixData() 项目 " + projectId + " 将对象转成 json 保存到临时目录等待资源分配后执行:" + taskTO);
                     FileUtil.writeStringToLocalFile(JsonUtil.beanToJson(taskTO), projectPath + taskId + ".json");
-                    log.info("createTaskAndFixData() 项目 " + projectId + " 将对象转成 json 保存到临时目录成功。");
+                    log.info("createTaskAndFixData() 项目 " + projectId + " 将对象转成 json 保存到临时目录等待资源分配后执行:" + taskTO.getInfo().getTask_id());
                 }
             }
-            log.info("createTaskAndFixData() 项目 " + projectId + " 创建任务:" + taskList);
             taskManager.batchInsertTask(taskList);
-            log.info("createTaskAndFixData() 项目 " + projectId + " 任务保存成功。");
+            log.info("createTaskAndFixData() 项目 " + projectId + " 共有" + taskList.size() + "个任务,已保存到数据库");
         } else if ("2".equals(modelType)) {
             log.info("createTaskAndFixData() 项目 " + projectId + " 开始查询模型。");
 
@@ -363,14 +360,12 @@ public class ProjectConsumer {
                                     .build())
                             .build();
 
-                    log.info("createTaskAndFixData() 项目 " + projectId + " 将对象转成 json 保存到临时目录等待资源分配后执行:" + taskTO);
                     FileUtil.writeStringToLocalFile(JsonUtil.beanToJson(taskTO), projectPath + taskId + ".json");
-                    log.info("createTaskAndFixData() 项目 " + projectId + " 将对象转成 json 保存到临时目录成功。");
+                    log.info("createTaskAndFixData() 项目 " + projectId + " 将对象转成 json 保存到临时目录等待资源分配后执行:" + taskTO.getInfo().getTask_id());
                 }
             }
-            log.info("createTaskAndFixData() 项目 " + projectId + " 创建任务:" + taskList);
             taskManager.batchInsertTask(taskList);
-            log.info("createTaskAndFixData() 项目 " + projectId + " 任务保存成功。");
+            log.info("createTaskAndFixData() 项目 " + projectId + " 共有" + taskList.size() + "个任务,已保存到数据库");
         }
 
         //* -------------------------------- 4 开始排队 --------------------------------

+ 4 - 3
simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/SceneGeneralExampleService.java

@@ -216,11 +216,12 @@ public class SceneGeneralExampleService {
         po.setCreateUserId(AuthUtil.getCurrentUserId());
         po.setModifyTime(TimeUtil.getNowForMysql());
         po.setIsDeleted("0");
-        //po.setGeneralizationType(generalizationType);
+        // po.setGeneralizationType(generalizationType);
         exampleMapper.saveSceneGeneralExample(po);
-        Map<String, String> map1 = new HashMap<>();
+        // 暂时不要泛型,前端会报错
+        Map map1 = new HashMap();
         map1.put("exampleId", exampleId);//实例id
-        map1.put("sceneNum", list.size() + "");//场景数量
+        map1.put("sceneNum", list.size());//场景数量
         map1.put("templateId", po.getTemplateId()); //模板id
         map1.put("sceneGeneralizationIds", sceneGeneralizationIds);//泛化场景数组
         map1.put("sublistId", sublistId); //指标id