瀏覽代碼

right join 改为inner join

jxing 6 年之前
父節點
當前提交
fb54c545df

+ 5 - 0
scheduler/src/main/java/cn/sagacloud/mybatis/model/TaskModel.java

@@ -1,6 +1,8 @@
 package cn.sagacloud.mybatis.model;
 
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -9,9 +11,12 @@ public class TaskModel {
     private String task_name;
     private String task_cmd;
     private String task_param;
+    @JSONField(serialize=false)
     private int task_status;
     private String task_result_json;
+    @JSONField(serialize=false)
     private String task_last_client;
+    @JSONField(serialize=false)
     private long task_sent_time;
     private long task_expected_finish_time;
 

+ 4 - 4
scheduler/src/main/resources/mapper/TaskMap.xml

@@ -16,7 +16,7 @@
     <select id="getTasksByIds" resultMap="taskModelList">
         select task.id, task_name, task_cmd, task_param, task_status, task_result_json, task_sent_time, task_last_client,
         task_expected_finish_time, download.id downloadId, task_id, task_url, task_md5
-        from `task` right join `download` on task.id = download.task_id where task.id in
+        from `task` inner join `download` on task.id = download.task_id where task.id in
         <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>;
@@ -25,7 +25,7 @@
     <select id="getTasksByStatus" resultMap="taskModelList">
         select task.id, task_name, task_cmd, task_param, task_status, task_result_json, task_sent_time, task_last_client,
         task_expected_finish_time, download.id downloadId, task_id, task_url, task_md5
-        from `task` right join `download` on task.id = download.task_id where task.task_status in
+        from `task` inner join `download` on task.id = download.task_id where task.task_status in
         <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>;
@@ -34,7 +34,7 @@
     <select id="getTasksMapByIds" resultMap="taskModelList">
         select task.id, task_name, task_cmd, task_param, task_status, task_result_json, task_sent_time, task_last_client,
         task_expected_finish_time, download.id downloadId, task_id, task_url, task_md5
-        from `task` right join `download` on task.id = download.task_id where task.id in
+        from `task` inner join `download` on task.id = download.task_id where task.id in
         <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>;
@@ -43,7 +43,7 @@
     <select id="getTasksMapByStatus" resultMap="taskModelList">
         select task.id, task_name, task_cmd, task_param, task_status, task_result_json, task_sent_time, task_last_client,
         task_expected_finish_time, download.id downloadId, task_id, task_url, task_md5
-        from `task` right join `download` on task.id = download.task_id where task.task_status in
+        from `task` inner join `download` on task.id = download.task_id where task.task_status in
         <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>;