Unverified Commit a851168a authored by Rubik-W's avatar Rubik-W Committed by GitHub
Browse files

fix：Optimize content returned by interface (#2294)

parent 38c965dd

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java

+1 −7
Original line number Diff line number Diff line
@@ -204,14 +204,8 @@ public class ProcessInstanceService extends BaseDAGService { 
            }

        }



        Set<String> exclusionSet = new HashSet<>();

        exclusionSet.add(Constants.CLASS);

        exclusionSet.add("locations");

        exclusionSet.add("connects");

        exclusionSet.add("processInstanceJson");



        pageInfo.setTotalCount((int) processInstanceList.getTotal());

        pageInfo.setLists(CollectionUtils.getListByExclusion(processInstances, exclusionSet));

        pageInfo.setLists(processInstances);

        result.put(Constants.DATA_LIST, pageInfo);

        putMsg(result, Status.SUCCESS);

        return result;

dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml

+3 −1
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ 
        and pd.name = #{processDefinitionName}

    </select>

    <select id="queryDefineListPaging" resultType="org.apache.dolphinscheduler.dao.entity.ProcessDefinition">

        SELECT td.*,sc.schedule_release_state,tu.user_name

        SELECT td.id, td.name, td.version, td.release_state, td.project_id, td.user_id, td.description, td.global_params,

               td.flag, td.receivers, td.receivers_cc, td.timeout, td.tenant_id, td.modify_by, td.update_time, td.create_time,

               sc.schedule_release_state, tu.user_name

        FROM t_ds_process_definition td

        left join (select process_definition_id,release_state as schedule_release_state from t_ds_schedules group by process_definition_id,release_state) sc on sc.process_definition_id = td.id

        left join t_ds_user tu on  td.user_id = tu.id

dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml

+6 −1
Original line number Diff line number Diff line
@@ -66,7 +66,12 @@ 
    </select>



    <select id="queryProcessInstanceListPaging" resultType="org.apache.dolphinscheduler.dao.entity.ProcessInstance">

        select instance.*

        select instance.id, instance.name, instance.process_definition_id, instance.state, instance.recovery, instance.start_time,

               instance.end_time, instance.run_times, instance.host, instance.command_type, instance.command_param, instance.task_depend_type,

               instance.max_try_times, instance.failure_strategy, instance.warning_type, instance.warning_group_id, instance.schedule_time,

               instance.command_start_time, instance.global_params, instance.flag, instance.is_sub_process, instance.executor_id,

               instance.history_cmd, instance.dependence_schedule_times, instance.process_instance_priority, instance.worker_group_id,

               instance.timeout, instance.tenant_id, instance.update_time

        from t_ds_process_instance instance

        join t_ds_process_definition define ON instance.process_definition_id = define.id

        where 1=1