From 5825b7a929b9cf6100bf0a4037c4dcefc8389ba0 Mon Sep 17 00:00:00 2001
From: Kane Wang <wangkane@qq.com>
Date: Thu, 17 Mar 2022 09:29:35 +0800
Subject: [PATCH] ...

---
 .../QWeatherDisasterWarning.java              | 72 +++++++++++++++++--
 .../QWeatherDisasterWarningRefer.java         | 56 +++++++++++++++
 .../WeatherDisasterWarningGrabber.java        |  6 +-
 3 files changed, 128 insertions(+), 6 deletions(-)
 create mode 100644 code/java/天气灾害预警/src/main/java/com/cpic/xim/disaster_warning/QWeatherDisasterWarningRefer.java

diff --git a/code/java/天气灾害预警/src/main/java/com/cpic/xim/disaster_warning/QWeatherDisasterWarning.java b/code/java/天气灾害预警/src/main/java/com/cpic/xim/disaster_warning/QWeatherDisasterWarning.java
index c83ec94..e45c45c 100644
--- a/code/java/天气灾害预警/src/main/java/com/cpic/xim/disaster_warning/QWeatherDisasterWarning.java
+++ b/code/java/天气灾害预警/src/main/java/com/cpic/xim/disaster_warning/QWeatherDisasterWarning.java
@@ -4,8 +4,72 @@ import java.util.Vector;
 
 public class QWeatherDisasterWarning
 {
-    private String code;
-    private String updateTime;
-    private String flLink;
-    private Vector<QWeatherDisasterWarningItem> warningItems;
+    public QWeatherDisasterWarning( String code,
+                                    String updateTime,
+                                    String flLink,
+                                    Vector<QWeatherDisasterWarningItem> warning,
+                                    QWeatherDisasterWarningRefer refer )
+    {
+        this.code       = code;
+        this.updateTime = updateTime;
+        this.flLink     = flLink;
+        this.warning    = warning;
+        this.refer      = refer;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public void setCode( String code )
+    {
+        this.code = code;
+    }
+
+    public String getUpdateTime()
+    {
+        return updateTime;
+    }
+
+    public void setUpdateTime( String updateTime )
+    {
+        this.updateTime = updateTime;
+    }
+
+    public String getFlLink()
+    {
+        return flLink;
+    }
+
+    public void setFlLink( String flLink )
+    {
+        this.flLink = flLink;
+    }
+
+    public Vector<QWeatherDisasterWarningItem> getWarning()
+    {
+        return warning;
+    }
+
+    public void setWarning( Vector<QWeatherDisasterWarningItem> warning )
+    {
+        this.warning = warning;
+    }
+
+    public QWeatherDisasterWarningRefer getRefer()
+    {
+        return refer;
+    }
+
+    public void setRefer( QWeatherDisasterWarningRefer refer )
+    {
+        this.refer = refer;
+    }
+
+    private String                              code;
+    private String                              updateTime;
+    private String                              flLink;
+    private Vector<QWeatherDisasterWarningItem> warning;
+    private QWeatherDisasterWarningRefer        refer;
 }
diff --git a/code/java/天气灾害预警/src/main/java/com/cpic/xim/disaster_warning/QWeatherDisasterWarningRefer.java b/code/java/天气灾害预警/src/main/java/com/cpic/xim/disaster_warning/QWeatherDisasterWarningRefer.java
new file mode 100644
index 0000000..963e10a
--- /dev/null
+++ b/code/java/天气灾害预警/src/main/java/com/cpic/xim/disaster_warning/QWeatherDisasterWarningRefer.java
@@ -0,0 +1,56 @@
+package com.cpic.xim.disaster_warning;
+
+import java.util.Objects;
+
+public class QWeatherDisasterWarningRefer
+{
+    public QWeatherDisasterWarningRefer( String source, String license )
+    {
+        this.source  = source;
+        this.license = license;
+    }
+
+    public String getSource()
+    {
+        return source;
+    }
+
+    public void setSource( String source )
+    {
+        this.source = source;
+    }
+
+    public String getLicense()
+    {
+        return license;
+    }
+
+    public void setLicense( String license )
+    {
+        this.license = license;
+    }
+
+    @Override
+    public boolean equals( Object o )
+    {
+        if ( this == o )
+        {
+            return true;
+        }
+        if ( o == null || getClass() != o.getClass() )
+        {
+            return false;
+        }
+        QWeatherDisasterWarningRefer that = (QWeatherDisasterWarningRefer) o;
+        return source.equals( that.source ) && license.equals( that.license );
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash( source, license );
+    }
+
+    private String source;
+    private String license;
+}
diff --git a/code/java/天气灾害预警/src/main/java/com/cpic/xim/disaster_warning/WeatherDisasterWarningGrabber.java b/code/java/天气灾害预警/src/main/java/com/cpic/xim/disaster_warning/WeatherDisasterWarningGrabber.java
index 858543a..98fb958 100644
--- a/code/java/天气灾害预警/src/main/java/com/cpic/xim/disaster_warning/WeatherDisasterWarningGrabber.java
+++ b/code/java/天气灾害预警/src/main/java/com/cpic/xim/disaster_warning/WeatherDisasterWarningGrabber.java
@@ -98,8 +98,10 @@ public class WeatherDisasterWarningGrabber
                 }
             }
 
-            assert connection != null;
-            connection.disconnect();
+            if ( connection != null )
+            {
+                connection.disconnect();
+            }
         }
 
         return json;