dev selectPreprocessDataList

pdaaphm-admin/src/main/java/com/pdaaphm/system/controller/TDataProcessController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.pdaaphm.common.utils.StringUtils;
+import com.pdaaphm.system.domain.Data;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -48,6 +49,15 @@ public class TDataProcessController extends BaseController
         return getDataTable(list);
     }
 
+    @PreAuthorize("@ss.hasPermi('system:data:list')")
+    @GetMapping("/preprocessList")
+    public TableDataInfo preprocessList(TDataProcess tDataProcess)
+    {
+        startPage();
+        List<TDataProcess> list = tDataProcessService.selectPreprocessDataList(tDataProcess);
+        return getDataTable(list);
+    }
+
     /**
      * 导出数据处理列表
      */

pdaaphm-admin/src/main/java/com/pdaaphm/system/mapper/TDataProcessMapper.java

@@ -58,4 +58,6 @@ public interface TDataProcessMapper
      * @return 结果
      */
     public int deleteTDataProcessByIds(Long[] ids);
+
+    List<TDataProcess> selectPreprocessDataList(TDataProcess tDataProcess);
 }

pdaaphm-admin/src/main/java/com/pdaaphm/system/service/ITDataProcessService.java

@@ -67,4 +67,6 @@ public interface ITDataProcessService
     String runDataProcess(Long id);
 
     public void asyncRunDataProcess(TDataProcess dataProcess, AlgConfig algConfig, Data data, String bizAlgType);
+
+    List<TDataProcess> selectPreprocessDataList(TDataProcess tDataProcess);
 }

pdaaphm-admin/src/main/java/com/pdaaphm/system/service/impl/TDataProcessServiceImpl.java

@@ -78,6 +78,11 @@ public class TDataProcessServiceImpl implements ITDataProcessService
         return tDataProcessMapper.selectTDataProcessList(tDataProcess);
     }
 
+    @Override
+    public List<TDataProcess> selectPreprocessDataList(TDataProcess tDataProcess) {
+        return tDataProcessMapper.selectPreprocessDataList(tDataProcess);
+    }
+
     /**
      * 新增数据处理
      * 

pdaaphm-admin/src/main/resources/mapper/system/TDataProcessMapper.xml

@@ -60,7 +60,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time desc
     </select>
-    
+
+    <select id="selectPreprocessDataList" parameterType="TDataProcess" resultMap="TDataProcessResult">
+        <include refid="selectTDataProcessVo"/>
+        <where>
+            dp.process_type in ('0','1','2')
+            <if test="processType != null  and processType != ''"> and dp.process_type = #{processType}</if>
+            <if test="processAlgId != null "> and dp.process_alg_id = #{processAlgId}</if>
+            <if test="processedDataId != null "> and dp.processed_data_id = #{processedDataId}</if>
+            <if test="resultDataId != null "> and dp.result_data_id = #{resultDataId}</if>
+            <if test="processStatus != null  and processStatus != ''"> and dp.process_status = #{processStatus}</if>
+            <if test="startTime != null "> and dp.start_time = #{startTime}</if>
+            <if test="endTime != null "> and dp.end_time = #{endTime}</if>
+            <if test="log != null  and log != ''"> and dp.log = #{log}</if>
+        </where>
+        order by create_time desc
+    </select>
+
     <select id="selectTDataProcessById" parameterType="Long" resultMap="TDataProcessResult">
         <include refid="selectTDataProcessVo"/>
         where dp.id = #{id}