适配网关状态码TSG-12969

3 files changed, 38 insertions, 50 deletions

diff --git a/config/application.yml b/config/application.yml
index 5c356c8..3562367 100644
--- a/config/application.yml
+++ b/config/application.yml
@@ -2,8 +2,8 @@ nacos:
   config:
     type: yaml #配置集的配置格式
     server-addr: 192.168.44.12:8848 #配置中心地址
-    namespace: dev #命名空间
-    data-id: galaxy-report-service-local # 数据集ID
+    namespace: prod #命名空间
+    data-id: galaxy-report-service.yml # 数据集ID
     auto-refresh: true #开启自动刷新
     group: Galaxy  #配置对应的分组
     username: nacos #Nacos认证用户
diff --git a/pom.xml b/pom.xml
index 16331a8..a6337f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.mesa</groupId>
 	<artifactId>galaxy-report-service</artifactId>
-	<version>22.09.07</version>
+	<version>22.12.07</version>
 	<name>galaxy-report-service</name>
 	<packaging>jar</packaging>
 	<description>Demo project for Spring Boot</description>
@@ -309,7 +309,7 @@
 					<forceTags>true</forceTags>
 
 					<imageTags>
-						<imageTag>22.09.07</imageTag>
+						<imageTag>22.12.07</imageTag>
 					</imageTags>
 					<!--远程docker构建，供dockerfile使用-->
 					<dockerHost>http://192.168.40.153:2375</dockerHost>
diff --git a/src/main/java/com/mesa/reportservice/service/impl/ExcuteProcessServiceImpl.java b/src/main/java/com/mesa/reportservice/service/impl/ExcuteProcessServiceImpl.java
index ba8fa4a..807dcd9 100644
--- a/src/main/java/com/mesa/reportservice/service/impl/ExcuteProcessServiceImpl.java
+++ b/src/main/java/com/mesa/reportservice/service/impl/ExcuteProcessServiceImpl.java
@@ -41,55 +41,43 @@ public class ExcuteProcessServiceImpl implements ExcuteProcessService {
                 je.setStatus(9);
                 je.setExcuteDetail("CANCEL");
             } else {
-                switch (je.getExcute_status()) {
-
-                    case 200666:
-                        Boolean isok = saveToHbase(je);
-                        if (isok) {
-                            je.setExcuteDetail("SUCCESS");
-                            je.setExcuteProcess(100);
-                            je.setStatus(2);
-                            logger.info("success save to hbase query_id="+je.getQuery_id()+" resultid =" + je.getResultId() + " excutesql=" + je.getQuerySql());
-                        } else {
-                            je.setStatus(5);
-                            je.setExcuteDetail("Write Data Error");
-                            mons.addFail();
-                            logger.error("save hbase error query_id="+je.getQuery_id()+" resultid =" + je.getResultId() + " excutesql=" + je.getQuerySql());
-                        }
-                        break;
-
-                    case 400001:
-                        je.setStatus(3);
-                        je.setExcuteDetail("Param Syntax Error");
-                        logger.error("Param Syntax Error query_id="+je.getQuery_id()+" resultid =" + je.getResultId() + " excutesql=" + je.getQuerySql());
-                        break;
-                    case 400010:
-                        je.setStatus(3);
-                        je.setExcuteDetail("SQL Syntax Error");
-                        logger.error("SQL Syntax Error query_id="+je.getQuery_id()+"  resultid =" + je.getResultId() + " excutesql=" + je.getQuerySql());
-                        break;
-                    case 500001:
-                        je.setStatus(4);
-                        je.setExcuteDetail("SQL Execution Error");
-                        logger.error("SQL Execution Error query_id="+je.getQuery_id()+"  resultid =" + je.getResultId() + " excutesql=" + je.getQuerySql());
-                        break;
-                    case 500010:
-                        je.setStatus(6);
-                        je.setExcuteDetail("Engine Statistics Error");
-                        logger.error("Engine Statistics Error query_id="+je.getQuery_id()+"  resultid =" + je.getResultId() + " excutesql=" + je.getQuerySql());
-                        break;
-                    case 555999:
-                        je.setStatus(7);
-                        je.setExcuteDetail("Unknow Error");
-                        logger.error("Unknow Error query_id="+je.getQuery_id()+" resultid =" + je.getResultId() + " excutesql=" + je.getQuerySql());
-                        break;
-                    default:
-                        je.setStatus(8);
-                        je.setExcuteDetail("System Error");
-                        logger.error("System Error query_id="+je.getQuery_id()+" resultid =" + je.getResultId() + " excutesql=" + je.getQuerySql());
+
+
+                if (je.getExcute_status() >= 20000000 && je.getExcute_status() < 30000000) {
+
+                    Boolean isok = saveToHbase(je);
+                    if (isok) {
+                        je.setExcuteDetail("SUCCESS");
+                        je.setExcuteProcess(100);
+                        je.setStatus(2);
+                        logger.info("success save to hbase query_id=" + je.getQuery_id() + " resultid =" + je.getResultId() + " excutesql=" + je.getQuerySql());
+                    } else {
+                        je.setStatus(5);
+                        je.setExcuteDetail("Write Data Error");
+                        mons.addFail();
+                        logger.error("save hbase error "+je.getExcute_status()+" query_id=" + je.getQuery_id() + " resultid =" + je.getResultId() + " excutesql=" + je.getQuerySql());
+                    }
+                } else if (je.getExcute_status() >= 40000000 && je.getExcute_status() < 50000000) {
+
+                    je.setStatus(3);
+                    je.setExcuteDetail("Param Syntax Error");
+                    logger.error("Param Syntax Error "+je.getExcute_status()+" query_id=" + je.getQuery_id() + " resultid =" + je.getResultId() + " excutesql=" + je.getQuerySql());
+
+                } else if (je.getExcute_status() == 50001300) {
+
+                    je.setStatus(4);
+                    je.setExcuteDetail("SQL Execution Error");
+                    logger.error("SQL Execution Error ! ErrorCode  "+je.getExcute_status()+" query_id=" + je.getQuery_id() + "  resultid =" + je.getResultId() + " excutesql=" + je.getQuerySql());
+
+                } else {
+
+                    je.setStatus(7);
+                    je.setExcuteDetail("Unknow Error");
+                    logger.error("Unknow Error ! ErrorCode  "+je.getExcute_status()+" query_id=" + je.getQuery_id() + " resultid =" + je.getResultId() + " excutesql=" + je.getQuerySql());
                 }
 
             }
+
             int number = 0;
             int z = 3;
             do {