fix:优化异常信息描述;修复done_progress字段在job执行期间不更新问题

3 files changed, 5 insertions, 6 deletions

diff --git a/src/main/java/com/mesa/reportservice/service/impl/ExecuteProcessServiceImpl.java b/src/main/java/com/mesa/reportservice/service/impl/ExecuteProcessServiceImpl.java
index a2d4cf5..fb5d452 100644
--- a/src/main/java/com/mesa/reportservice/service/impl/ExecuteProcessServiceImpl.java
+++ b/src/main/java/com/mesa/reportservice/service/impl/ExecuteProcessServiceImpl.java
@@ -124,12 +124,11 @@ public class ExecuteProcessServiceImpl implements ExecuteProcessService {
                     Map map = JSON.parseObject(JSON.toJSONString(listData.get(0)));
                     long readRows = Long.parseLong(map.get("rows_read").toString());
                     float elapsed = Float.parseFloat(map.get("elapsed").toString());
-                    double percent = Double.parseDouble(map.get("percent").toString());
-                    int process = (int) (percent * 100);
+                    float percent = Float.parseFloat(map.get("percent").toString());
                     jobEntity.setElapsed((int) elapsed);
                     jobEntity.setRowsRead(readRows);
-                    if(jobEntity.getDoneProgress()<process){
-                        jobEntity.setDoneProgress(process);
+                    if(jobEntity.getDoneProgress()<percent){
+                        jobEntity.setDoneProgress(percent);
                     }
                     if (jobEntity.getRowsRead() != 0 || jobEntity.getElapsed() != 0) {
                         jobService.updateProcesses(jobEntity);
diff --git a/src/main/java/com/mesa/reportservice/service/impl/ExecuteServiceImpl.java b/src/main/java/com/mesa/reportservice/service/impl/ExecuteServiceImpl.java
index 1cde737..e6ada8c 100644
--- a/src/main/java/com/mesa/reportservice/service/impl/ExecuteServiceImpl.java
+++ b/src/main/java/com/mesa/reportservice/service/impl/ExecuteServiceImpl.java
@@ -74,7 +74,7 @@ public class ExecuteServiceImpl implements ExecuteService {
                 job.setResultMessage(e.getMessage());
                 if (k == 0) {
                     job.setExecuteStatus(Constant.JOB_EXECUTION_TIMEOUT);
-                    job.setResultMessage(Constant.QUERY_TIME_OUT);
+                    job.setResultMessage(Constant.SOCKET_HANG_UP);
                     logger.info("timeout resultId = " + job.getJobId() + " queryId=" + job.getQueryId() + " sql=" + job.getQuerySql());
                 } else {
                     logger.info("Socket warn " + e.getMessage() + "retry time " + (3 - k));
diff --git a/src/main/java/com/mesa/reportservice/util/Constant.java b/src/main/java/com/mesa/reportservice/util/Constant.java
index a81cb82..16662ae 100644
--- a/src/main/java/com/mesa/reportservice/util/Constant.java
+++ b/src/main/java/com/mesa/reportservice/util/Constant.java
@@ -19,7 +19,7 @@ public class Constant {
     public static final String UNKNOWN_ERROR = "Unknown Error";
     public static final String DATABASE_ERROR = "Database Error";
     public static final String RE_EXECUTION = "Re Execution";
-    public static final String QUERY_TIME_OUT = "SQL Execution Error execute query time out";
+    public static final String SOCKET_HANG_UP = "SQL Execution Error socket hang up";
     public static final String RESULT_TOO_LARGE = "Result Too Large";
 
     /**