فهرست منبع

查看项目详情

martin 2 سال پیش
والد
کامیت
ffed84baa0

+ 6 - 0
simulation-resource-scheduler/src/main/resources/kubernetes/template/pod/pod-template.yaml

@@ -23,6 +23,12 @@ spec:
               fieldPath: metadata.name
         - name: LM_LICENSE_FILE
           value: 27500@172.14.1.103
+        - name: KAFKA_IP
+          value: 172.17.0.188:9092
+        - name: MINIO_IP
+          value: 172.17.0.184:9000
+        - name: SIMULATION_CLOUD_IP
+          value: 172.17.0.192
       volumeMounts:
         - name: nvidia0
           mountPath: /dev/nvidia0

+ 3 - 3
simulation-resource-server/src/main/java/com/css/simulation/resource/project/impl/SimulationProjectServiceImpl.java

@@ -423,7 +423,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         //封装要使用到的数据
         SimulationManualProjectPo poParam = new SimulationManualProjectPo();
 
-        if ("1".equals(param.getProjectType())) {
+        if ("1".equals(param.getProjectType())) {   // 手动运行任务
             //项目基本信息
             SimulationManualProjectPo po = simulationProjectMapper.selectProjectById(param);
             if (po == null) {
@@ -890,8 +890,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         //第三方算法平台
         if ("3".equals(algorithmType)) {
             String sort = "algorithmId-desc";
-            Integer page = 1;
-            Integer size = 1;//全部
+            int page = 1;
+            int size = 1;//全部
 
             String urlParam = "&algorithmId" + algorithmId + "&page=" + page + "&size=" + size + "&sort=" + sort;
             List<DropDownVo> otherAlgorithmInfo = getOtherAlgorithmInfo(urlParam);

+ 31 - 3
simulation-resource-server/src/main/resources/mapper/project/SimulationProjectMapper.xml

@@ -166,9 +166,37 @@
     </select>
 
     <!--根据id查询-->
-    <select id="selectProjectById" parameterType="api.common.pojo.param.project.SimulationManualProjectParam"
-            resultType="api.common.pojo.po.project.SimulationManualProjectPo">
-        select *
+    <select id="selectProjectById" parameterType="api.common.pojo.param.project.SimulationManualProjectParam" resultType="api.common.pojo.po.project.SimulationManualProjectPo">
+        select id,
+               project_date,
+               project_num,
+               project_id,
+               project_name,
+               project_describe,
+               algorithm,
+               algorithm_type,
+               vehicle,
+               scene,
+               operation_cycle,
+               parallelism,
+               rule_view,
+               is_choice_gpu,
+               automatic_run_times,
+               last_run_time,
+               automatic_run_state,
+               now_run_state,
+               evaluation_level,
+               start_time,
+               finish_time,
+               max_simulation_time,
+               algorithm_score,
+               task_number,
+               task_completed,
+               create_time,
+               create_user_id,
+               modify_time,
+               modify_user_id,
+               is_deleted
         from simulation_manual_project
         where id = #{id,jdbcType=VARCHAR}
           and is_deleted = '0'