Hu Jie 7 tahun lalu
induk
melakukan
7c580f53c3

+ 10 - 0
src/main/java/com/uas/erp/schedular/listen/ListenDomain.java

@@ -10,6 +10,16 @@ public class ListenDomain {
 
     String name;
 
+    String description;
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     public String getMacAddress() {
         return macAddress;
     }

+ 23 - 2
src/main/java/com/uas/erp/schedular/listen/ListenTask.java

@@ -50,7 +50,12 @@ public class ListenTask {
      * @return
      */
     private String getApiDomain() {
-        String key = "test".equals(ContextHolder.getMaster().getMa_env()) ? "api.b2b.test.url" : "api.b2b.url";
+        String key = null;
+        if (null == ContextHolder.getMaster()) {
+            key = "api.b2b.test.url";
+        } else {
+            key = "test".equals(ContextHolder.getMaster().getMa_env()) ? "api.b2b.test.url" : "api.b2b.url";
+        }
         return settingService.getValue(key);
     }
 
@@ -68,7 +73,16 @@ public class ListenTask {
                 masters = result.getContent();
             }
         } catch (Exception e) {
-            e.printStackTrace();
+
+        } finally {
+            if (CollectionUtils.isEmpty(masters)) {
+                ListenDomain listenDomain = new ListenDomain(DiskUtil.getMacAddress(), "" );
+                List<ListenDomain> listenDomains = new ArrayList<>();
+                listenDomain.setDescription("h2数据库查询异常或oracle数据库设置异常");
+                listenDomains.add(listenDomain);
+                postForList(getApiDomain() + "/erp/listen", ListenDomain.class, dataWrap(listenDomains));
+                return;
+            }
         }
         Iterator<Master> iterator = masters.iterator();
         while (iterator.hasNext()) {
@@ -94,6 +108,13 @@ public class ListenTask {
                 List<ListenDomain> listenDomains = new ArrayList<>();
                 listenDomains.add(listenDomain);
                 postForList(getApiDomain() + "/erp/listen", ListenDomain.class, dataWrap(listenDomains));
+            } else {
+                ListenDomain listenDomain = new ListenDomain(DiskUtil.getMacAddress(), "" );
+                List<ListenDomain> listenDomains = new ArrayList<>();
+                listenDomain.setDescription("oracle查询异常");
+                listenDomains.add(listenDomain);
+                postForList(getApiDomain() + "/erp/listen", ListenDomain.class, dataWrap(listenDomains));
+                return;
             }
             ContextHolder.clear();
         }