。。。

code/java/DisasterWarning/.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "java.configuration.updateBuildConfiguration": "automatic",
-    "java.format.settings.url": "D:\\工作文档\\配置备份\\vscode\\eclipse-java-google-style.xml",
+    "java.format.settings.url": "E:\\工作文档\\4、配置备份\\vscode\\eclipse-java-google-style.xml",
     "[java]": {
         "editor.detectIndentation": true
     }

code/java/DisasterWarning/config.json

@@ -4,6 +4,12 @@
     "query_url": "https://devapi.qweather.com/v7/warning/now?",
     "wechat_officalaccount_url": "https://cxxmwx.cpic.com.cn/app/index.php?i=2&c=entry&do=send_group_tpl_api&m=ok_tplmessage",
     "query_interval": 10,
+    "proxy_setting": {
+        "enable": true,
+        "proxy_mode": "http",
+        "proxy_address": "172.16.39.2",
+        "proxy_port": 18080
+    },
     "cities": [
         {
             "city_name": "厦门",

code/java/DisasterWarning/disaster_warning.ipr

@@ -225,11 +225,6 @@
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
   </component>
-  <component name="SwUserDefinedSpecifications">
-    <option name="specTypeByUrl">
-      <map />
-    </option>
-  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
   </component>

code/java/DisasterWarning/pom.xml

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.cpic.xim</groupId>
     <artifactId>disaster_warning</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1</version>
     <dependencies>
         <dependency>
             <groupId>com.oracle</groupId>
@@ -23,20 +25,23 @@
             <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.9.8</version>
-        </dependency>
+        <!--jackson-->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.8</version>
+            <version>2.14.2</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.13.4</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.9.8</version>
+            <version>2.13.4</version>
         </dependency>
     </dependencies>
     <properties>

code/java/DisasterWarning/src/main/java/AppMain.java

@@ -3,7 +3,7 @@
  * @Author: Kane
  * @Date: 2022-04-22 10:53:49
  * @LastEditors: Kane
- * @LastEditTime: 2022-06-07 13:16:35
+ * @LastEditTime: 2022-11-04 11:50:17
  * @FilePath: \DisasterWarning\src\main\java\AppMain.java
  * @Description: 和风天气预警推送厦门太保公众号主程序！
  * 
@@ -22,30 +22,38 @@ import java.sql.SQLException;
 import java.util.Vector;
 import java.util.logging.*;
 
-public class AppMain {
+public class AppMain
+{
     // private final static String LOG_FILE_PATH = "./logs/app%u.log";
 
-    public static void main(String[] args) {
+    public static void main( String[] args )
+    {
         String json;
         WeatherDisasterNotifyConfig config = null;
         QWeatherDisasterWarning warning = null;
         Logger logger = null;
 
         // 配置logger
-        try {
+        try
+        {
             setRootLogger();
 
             logger = Logger.getLogger( "com.cpicxim" );
-        } catch (IOException error) {
+        }
+        catch ( IOException error )
+        {
             System.out.println( "配置logger失败，原因：" + error.getMessage() );
 
             return;
         }
 
         // 读取配置
-        try {
+        try
+        {
             config = AppConfigManager.getConfig();
-        } catch (IOException error) {
+        }
+        catch ( IOException error )
+        {
             System.out.println( "读取配置文件失败！" );
             System.out.println( error.getMessage() );
 
@@ -59,68 +67,90 @@ public class AppMain {
         String userKey = config.getKey();
 
         // 遍历所有城市，查询是否有警报，有则推送。
-        while (true) {
-            for (City city : cities) {
-                try {
+        while (true)
+        {
+            for ( City city : cities )
+            {
+                try
+                {
                     json = WeatherDisasterWarningGrabber.getWeatherDisasterWarningJSON( queryURL,
-                            userKey, city.getCityCode());
+                            userKey, city.getCityCode(), config.getProxySetting() );
                     warning = WeatherDisasterWarningGrabber.convertWeatherDisasterWarning( json );
 
-                    logger.log(Level.INFO, "查询{0}天气预警，结果：{1}。", new Object[] { city.getCityName(), json });
+                    logger.log( Level.INFO, "查询{0}天气预警，结果：{1}。", new Object[]
+                    { city.getCityName(), json} );
 
                     Vector<QWeatherDisasterWarningItem> warningItems = warning.getWarning();
 
                     // 判断是否有警报，没有警报就结束当前城市的处理
-                    if (warningItems.isEmpty() == true) {
-                        logger.log(Level.INFO, "查询{0}天气预警，无警报！。", new Object[] { city.getCityName() });
+                    if ( warningItems.isEmpty() == true)
+                    {
+                        logger.log( Level.INFO, "查询{0}天气预警，无警报！。", new Object[]
+                        { city.getCityName()} );
                         continue;
                     }
 
                     // 有警报，就遍历警报数组
-                    for (QWeatherDisasterWarningItem item : warningItems) {
+                    for ( QWeatherDisasterWarningItem item : warningItems )
+                    {
                         // 先检查是否已经发送过
-                        if (sendMessage.checkWarningHasSended(item.getId()) == false) {
-                            logger.log(Level.INFO, "查询{0}天气预警，ID:{1}，已有发送记录，跳过。",
-                                    new Object[] { city.getCityName(), item.getId() });
+                        if ( sendMessage.checkWarningHasSended( item.getId() ) == false)
+                        {
+                            logger.log( Level.INFO, "查询{0}天气预警，ID:{1}，已有发送记录，跳过。", new Object[]
+                            { city.getCityName(), item.getId()} );
 
                             continue;
                         }
 
                         // 没有发送过
-                        logger.log(Level.INFO, "查询{0}天气预警，发送日志。", new Object[] { city.getCityName() });
+                        logger.log( Level.INFO, "查询{0}天气预警，发送日志。", new Object[]
+                        { city.getCityName()} );
 
                         sendMessage.sendWeatherDisasterWarning( config.getWechatOfficalAccountURL(),
                                 item );
 
-                        logger.log(Level.INFO, "{0}天气预警，日志发送成功。", new Object[] { city.getCityName() });
+                        logger.log( Level.INFO, "{0}天气预警，日志发送成功。", new Object[]
+                        { city.getCityName()} );
 
                         // 将发送的警报，保存起来
                         sendMessage.saveWeatherDisasterWarning( city.getCityName(), item );
                     }
-                } catch (IOException error) {
+                }
+                catch ( IOException error )
+                {
                     System.out.println( "查询" + city.getCityName() + "出现异常！" );
                     System.out.println( error.getMessage() );
 
-                    logger.log(Level.SEVERE, "查询 {0} 出现异常:{1}。",
-                            new Object[] { city.getCityName(), error.getMessage() });
-                } catch (SQLException error) {
-                    logger.log(Level.SEVERE, "查询 {0} 写入数据库失败:{1}。",
-                            new Object[] { city.getCityName(), error.getMessage() });
-                } catch (ClassNotFoundException error) {
-                    logger.log(Level.SEVERE, "查询 {0} 加载oracle驱动失败:{1}。",
-                            new Object[] { city.getCityName(), error.getMessage() });
+                    logger.log( Level.SEVERE, "查询 {0} 出现异常:{1}。", new Object[]
+                    { city.getCityName(), error.getMessage()} );
+                }
+                catch ( SQLException error )
+                {
+                    logger.log( Level.SEVERE, "查询 {0} 写入数据库失败:{1}。", new Object[]
+                    { city.getCityName(), error.getMessage()} );
+                }
+                catch ( ClassNotFoundException error )
+                {
+                    logger.log( Level.SEVERE, "查询 {0} 加载oracle驱动失败:{1}。", new Object[]
+                    { city.getCityName(), error.getMessage()} );
 
-                } catch (Exception error) {
-                    logger.log(Level.SEVERE, "查询 {0} 出现未知错误:{1}。",
-                            new Object[] { city.getCityName(), error.getMessage() });
+                }
+                catch ( Exception error )
+                {
+                    logger.log( Level.SEVERE, "查询 {0} 出现未知错误:{1}。", new Object[]
+                    { city.getCityName(), error.getMessage()} );
                 }
             }
 
-            try {
+            try
+            {
                 logger.log( Level.INFO, "查询结束，休眠{0}分钟。", config.getQueryInterval() );
                 Thread.sleep( config.getQueryInterval() * 1000 * 60 );
-            } catch (InterruptedException error) {
-                logger.log(Level.SEVERE, "线程休眠异常，错误信息:{0}", new Object[] { error.getMessage() });
+            }
+            catch ( InterruptedException error )
+            {
+                logger.log( Level.SEVERE, "线程休眠异常，错误信息:{0}", new Object[]
+                { error.getMessage()} );
             }
         }
     }
@@ -128,7 +158,8 @@ public class AppMain {
     /**
      * 设置JUL的logger。
      */
-    private static void setRootLogger() throws IOException {
+    private static void setRootLogger() throws IOException
+    {
         LogManager logManager = LogManager.getLogManager();
         // 使用外部的配置文件。
         FileInputStream configFile = new FileInputStream( "./logging.properties" );

code/java/DisasterWarning/src/main/java/com/cpic/xim/config/ProxySetting.java

@@ -0,0 +1,116 @@
+/*
+ * @Author: Kane
+ * @Date: 2022-11-04 14:18:19
+ * @LastEditors: Kane
+ * @LastEditTime: 2022-11-04 15:01:58
+ * @FilePath: \DisasterWarning\src\main\java\com\cpic\xim\config\db\ProxySetting.java
+ * @Description: 用于存放代理服务器设置的类。
+ * 
+ * Copyright (c) ${2022} by Kane, All Rights Reserved. 
+ */
+package com.cpic.xim.config;
+
+import com.fasterxml.jackson.annotation.*;;
+
+/*****************************************************
+ * 用于存放代理服务器设置的类。
+ *****************************************************/
+public class ProxySetting
+{
+    public ProxySetting()
+    {}
+
+    public boolean isEnable()
+    {
+        return enable;
+    }
+
+    public void setEnable( boolean enable )
+    {
+        this.enable = enable;
+    }
+
+    public String getProxyMode()
+    {
+        return proxyMode;
+    }
+
+    public void setProxyMode( String proxyMode )
+    {
+        this.proxyMode = proxyMode;
+    }
+
+    public String getProxyAddress()
+    {
+        return proxyAddress;
+    }
+
+    public void setProxyAddress( String proxy_address )
+    {
+        this.proxyAddress = proxy_address;
+    }
+
+    public int getProxyPort()
+    {
+        return proxyPort;
+    }
+
+    public void setProxyPort( int proxy_port )
+    {
+        this.proxyPort = proxy_port;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + (enable ? 1231 : 1237);
+        result = prime * result + ((proxyMode == null) ? 0 : proxyMode.hashCode());
+        result = prime * result + ((proxyAddress == null) ? 0 : proxyAddress.hashCode());
+        result = prime * result + proxyPort;
+        return result;
+    }
+
+    @Override
+    public boolean equals( Object obj )
+    {
+        if ( this == obj)
+            return true;
+        if ( obj == null)
+            return false;
+        if ( getClass() != obj.getClass())
+            return false;
+        ProxySetting other = (ProxySetting) obj;
+        if ( enable != other.enable)
+            return false;
+        if ( proxyMode == null)
+        {
+            if ( other.proxyMode != null)
+                return false;
+        } else if ( !proxyMode.equals( other.proxyMode ))
+            return false;
+        if ( proxyAddress == null)
+        {
+            if ( other.proxyAddress != null)
+                return false;
+        } else if ( !proxyAddress.equals( other.proxyAddress ))
+            return false;
+        if ( proxyPort != other.proxyPort)
+            return false;
+        return true;
+    }
+
+    @JsonProperty( "enable")
+    private boolean enable = true;
+
+    @JsonProperty( "proxy_mode")
+    private String proxyMode = "http";
+
+    @JsonProperty( "proxy_address")
+    private String proxyAddress;
+
+    @JsonProperty( "proxy_port")
+    private int proxyPort;
+
+}

code/java/DisasterWarning/src/main/java/com/cpic/xim/config/WeatherDisasterNotifyConfig.java

@@ -2,7 +2,7 @@
  * @Author: Kane
  * @Date: 2022-04-24 10:21:46
  * @LastEditors: Kane
- * @LastEditTime: 2022-05-10 16:16:28
+ * @LastEditTime: 2022-11-04 15:03:05
  * @FilePath: \DisasterWarning\src\main\java\com\cpic\xim\config\WeatherDisasterNotifyConfig.java
  * @Description: 
  * 
@@ -11,7 +11,6 @@
 package com.cpic.xim.config;
 
 import java.util.Vector;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
@@ -67,6 +66,15 @@ public class WeatherDisasterNotifyConfig
         this.queryInterval = queryInterval;
     }
 
+    public ProxySetting getProxySetting()
+    {
+        return proxySetting;
+    }
+
+    public void setProxySetting( ProxySetting proxySetting )
+    {
+        this.proxySetting = proxySetting;
+    }
 
     public void setCities( Vector<City> cities )
     {
@@ -105,6 +113,9 @@ public class WeatherDisasterNotifyConfig
     @JsonProperty( "query_interval")
     private int queryInterval;
 
+    @JsonProperty( "proxy_setting")
+    private ProxySetting proxySetting;
+
     @JsonProperty( "wechat_officalaccount_url")
     private String wechatOfficalAccountURL;
 

code/java/DisasterWarning/src/main/java/com/cpic/xim/config/db/OracleConfigManager.java

@@ -2,7 +2,7 @@
  * @Author: Kane
  * @Date: 2022-04-25 21:45:12
  * @LastEditors: Kane
- * @LastEditTime: 2022-05-03 22:34:37
+ * @LastEditTime: 2022-11-04 14:51:25
  * @FilePath: \DisasterWarning\src\main\java\com\cpic\xim\config\db\OracleConfigManager.java
  * @Description: oracle数据库配置文件加载类
  * 

code/java/DisasterWarning/src/main/java/com/cpic/xim/httpUtil/HttpUtils.java

@@ -2,7 +2,7 @@
  * @Author: Kane
  * @Date: 2022-04-22 09:54:05
  * @LastEditors: Kane
- * @LastEditTime: 2022-04-22 16:18:17
+ * @LastEditTime: 2022-11-04 11:48:28
  * @FilePath: \DisasterWarning\src\main\java\com\cpic\xim\httpUtil\HttpUtils.java
  * @Description: http相关的工具类。
  * Copyright (c) ${2022} by Kane, All Rights Reserved. 
@@ -22,25 +22,23 @@ import java.nio.charset.StandardCharsets;
 /**
  * Http相关的工具类。
  */
-public class HttpUtils
-{
+public class HttpUtils {
     /**
      * 以POST方式发送http请求！
+     * 
      * @param url     访问的链接字符串
      * @param headers 请求头部参数集合
      * @param params  请求体字符串
      */
     public static String postHttpRequest(String url, HashMap<String, String> headers,
-            String param ) throws MalformedURLException
-    {
+            String param) throws MalformedURLException {
         URL httpURL = null;
         HttpURLConnection conn = null;
         OutputStreamWriter out = null;
         BufferedReader in = null;
         StringBuilder result = new StringBuilder();
 
-        try
-        {
+        try {
             // 获取connection
             httpURL = new URL(url);
             conn = (HttpURLConnection) httpURL.openConnection();
@@ -49,8 +47,7 @@ public class HttpUtils
             conn.setRequestMethod("POST");
 
             // 设置请求头参数
-            for ( HashMap.Entry<String, String> head : headers.entrySet())
-            {
+            for (HashMap.Entry<String, String> head : headers.entrySet()) {
                 conn.setRequestProperty(head.getKey(), head.getValue());
             }
 
@@ -69,38 +66,27 @@ public class HttpUtils
 
             String line = in.readLine();
 
-            while (line != null)
-            {
+            while (line != null) {
                 result.append(line);
 
                 line = in.readLine();
             }
-        }
-        catch (IOException error)
-        {
+        } catch (IOException error) {
 
-        }
-        finally
-        {
-            try
-            {
-                if ( out != null)
-                {
+        } finally {
+            try {
+                if (out != null) {
                     out.close();
                 }
 
-                if ( in != null)
-                {
+                if (in != null) {
                     in.close();
                 }
 
-                if ( conn != null)
-                {
+                if (conn != null) {
                     conn.disconnect();
                 }
-            }
-            catch (Exception error)
-            {
+            } catch (Exception error) {
                 error.printStackTrace();
             }
         }

code/java/DisasterWarning/src/main/java/com/cpic/xim/notify/disaster/QWeatherDisasterWarningItem.java

@@ -1,58 +1,203 @@
 package com.cpic.xim.notify.disaster;
 
 import java.util.Date;
-import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 //import com.fasterxml.jackson.annotation.JsonIgnore;
 
-public class QWeatherDisasterWarningItem {
-    public QWeatherDisasterWarningItem() {
+public class QWeatherDisasterWarningItem
+{
+    public QWeatherDisasterWarningItem()
+    {}
+
+    public String getId()
+    {
+        return id;
     }
 
-    public QWeatherDisasterWarningItem(String id, String sender, Date pubTime, String title, String status,
-            String level, String severity, String severityColor, String type, String typeName, String text,
-            String related, String urgency, String certainty) {
+    public void setId( String id )
+    {
         this.id = id;
+    }
+
+    public String getSender()
+    {
+        return sender;
+    }
+
+    public void setSender( String sender )
+    {
         this.sender = sender;
+    }
+
+    public Date getPubTime()
+    {
+        return pubTime;
+    }
+
+    public void setPubTime( Date pubTime )
+    {
         this.pubTime = pubTime;
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+
+    public void setTitle( String title )
+    {
         this.title = title;
+    }
+
+    public Date getStartTime()
+    {
+        return startTime;
+    }
+
+    public void setStartTime( Date startTime )
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime()
+    {
+        return endTime;
+    }
+
+    public void setEndTime( Date endTime )
+    {
+        this.endTime = endTime;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus( String status )
+    {
         this.status = status;
+    }
+
+    public String getLevel()
+    {
+        return level;
+    }
+
+    public void setLevel( String level )
+    {
         this.level = level;
+    }
+
+    public String getSeverity()
+    {
+        return severity;
+    }
+
+    public void setSeverity( String severity )
+    {
         this.severity = severity;
+    }
+
+    public String getSeverityColor()
+    {
+        return severityColor;
+    }
+
+    public void setSeverityColor( String severityColor )
+    {
         this.severityColor = severityColor;
+    }
+
+    public String getType()
+    {
+        return type;
+    }
+
+    public void setType( String type )
+    {
         this.type = type;
+    }
+
+    public String getTypeName()
+    {
+        return typeName;
+    }
+
+    public void setTypeName( String typeName )
+    {
         this.typeName = typeName;
+    }
+
+    public String getText()
+    {
+        return text;
+    }
+
+    public void setText( String text )
+    {
         this.text = text;
+    }
+
+    public String getRelated()
+    {
+        return related;
+    }
+
+    public void setRelated( String related )
+    {
         this.related = related;
+    }
+
+    public String getUrgency()
+    {
+        return urgency;
+    }
+
+    public void setUrgency( String urgency )
+    {
         this.urgency = urgency;
+    }
+
+    public String getCertainty()
+    {
+        return certainty;
+    }
+
+    public void setCertainty( String certainty )
+    {
         this.certainty = certainty;
     }
 
     @Override
-    public int hashCode() {
+    public int hashCode()
+    {
         final int prime = 31;
         int result = 1;
-        result = prime * result + ((certainty == null) ? 0 : certainty.hashCode());
         result = prime * result + ((id == null) ? 0 : id.hashCode());
-        result = prime * result + ((level == null) ? 0 : level.hashCode());
-        result = prime * result + ((pubTime == null) ? 0 : pubTime.hashCode());
-        result = prime * result + ((related == null) ? 0 : related.hashCode());
         result = prime * result + ((sender == null) ? 0 : sender.hashCode());
+        result = prime * result + ((pubTime == null) ? 0 : pubTime.hashCode());
+        result = prime * result + ((title == null) ? 0 : title.hashCode());
+        result = prime * result + ((startTime == null) ? 0 : startTime.hashCode());
+        result = prime * result + ((endTime == null) ? 0 : endTime.hashCode());
+        result = prime * result + ((status == null) ? 0 : status.hashCode());
+        result = prime * result + ((level == null) ? 0 : level.hashCode());
         result = prime * result + ((severity == null) ? 0 : severity.hashCode());
         result = prime * result + ((severityColor == null) ? 0 : severityColor.hashCode());
-        result = prime * result + ((status == null) ? 0 : status.hashCode());
-        result = prime * result + ((text == null) ? 0 : text.hashCode());
-        result = prime * result + ((title == null) ? 0 : title.hashCode());
         result = prime * result + ((type == null) ? 0 : type.hashCode());
         result = prime * result + ((typeName == null) ? 0 : typeName.hashCode());
+        result = prime * result + ((text == null) ? 0 : text.hashCode());
+        result = prime * result + ((related == null) ? 0 : related.hashCode());
         result = prime * result + ((urgency == null) ? 0 : urgency.hashCode());
+        result = prime * result + ((certainty == null) ? 0 : certainty.hashCode());
         return result;
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals( Object obj )
+    {
         if ( this == obj)
             return true;
         if ( obj == null)
@@ -60,208 +205,153 @@ public class QWeatherDisasterWarningItem {
         if ( getClass() != obj.getClass())
             return false;
         QWeatherDisasterWarningItem other = (QWeatherDisasterWarningItem) obj;
-        if (certainty == null) {
-            if (other.certainty != null)
-                return false;
-        } else if (!certainty.equals(other.certainty))
-            return false;
-        if (id == null) {
+        if ( id == null)
+        {
             if ( other.id != null)
                 return false;
         } else if ( !id.equals( other.id ))
             return false;
-        if (level == null) {
-            if (other.level != null)
-                return false;
-        } else if (!level.equals(other.level))
-            return false;
-        if (pubTime == null) {
-            if (other.pubTime != null)
-                return false;
-        } else if (!pubTime.equals(other.pubTime))
-            return false;
-        if (related == null) {
-            if (other.related != null)
-                return false;
-        } else if (!related.equals(other.related))
-            return false;
-        if (sender == null) {
+        if ( sender == null)
+        {
             if ( other.sender != null)
                 return false;
         } else if ( !sender.equals( other.sender ))
             return false;
-        if (severity == null) {
-            if (other.severity != null)
+        if ( pubTime == null)
+        {
+            if ( other.pubTime != null)
                 return false;
-        } else if (!severity.equals(other.severity))
+        } else if ( !pubTime.equals( other.pubTime ))
             return false;
-        if (severityColor == null) {
-            if (other.severityColor != null)
-                return false;
-        } else if (!severityColor.equals(other.severityColor))
-            return false;
-        if (status == null) {
-            if (other.status != null)
-                return false;
-        } else if (!status.equals(other.status))
-            return false;
-        if (text == null) {
-            if (other.text != null)
-                return false;
-        } else if (!text.equals(other.text))
-            return false;
-        if (title == null) {
+        if ( title == null)
+        {
             if ( other.title != null)
                 return false;
         } else if ( !title.equals( other.title ))
             return false;
-        if (type == null) {
+        if ( startTime == null)
+        {
+            if ( other.startTime != null)
+                return false;
+        } else if ( !startTime.equals( other.startTime ))
+            return false;
+        if ( endTime == null)
+        {
+            if ( other.endTime != null)
+                return false;
+        } else if ( !endTime.equals( other.endTime ))
+            return false;
+        if ( status == null)
+        {
+            if ( other.status != null)
+                return false;
+        } else if ( !status.equals( other.status ))
+            return false;
+        if ( level == null)
+        {
+            if ( other.level != null)
+                return false;
+        } else if ( !level.equals( other.level ))
+            return false;
+        if ( severity == null)
+        {
+            if ( other.severity != null)
+                return false;
+        } else if ( !severity.equals( other.severity ))
+            return false;
+        if ( severityColor == null)
+        {
+            if ( other.severityColor != null)
+                return false;
+        } else if ( !severityColor.equals( other.severityColor ))
+            return false;
+        if ( type == null)
+        {
             if ( other.type != null)
                 return false;
         } else if ( !type.equals( other.type ))
             return false;
-        if (typeName == null) {
+        if ( typeName == null)
+        {
             if ( other.typeName != null)
                 return false;
         } else if ( !typeName.equals( other.typeName ))
             return false;
-        if (urgency == null) {
+        if ( text == null)
+        {
+            if ( other.text != null)
+                return false;
+        } else if ( !text.equals( other.text ))
+            return false;
+        if ( related == null)
+        {
+            if ( other.related != null)
+                return false;
+        } else if ( !related.equals( other.related ))
+            return false;
+        if ( urgency == null)
+        {
             if ( other.urgency != null)
                 return false;
         } else if ( !urgency.equals( other.urgency ))
             return false;
+        if ( certainty == null)
+        {
+            if ( other.certainty != null)
+                return false;
+        } else if ( !certainty.equals( other.certainty ))
+            return false;
         return true;
     }
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getSender() {
-        return sender;
-    }
-
-    public void setSender(String sender) {
-        this.sender = sender;
-    }
-
-    public Date getPubTime() {
-        return pubTime;
-    }
-
-    public void setPubTime(Date pubTime) {
-        this.pubTime = pubTime;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getLevel() {
-        return level;
-    }
-
-    public void setLevel(String level) {
-        this.level = level;
-    }
-
-    public String getSeverity() {
-        return severity;
-    }
-
-    public void setSeverity(String severity) {
-        this.severity = severity;
-    }
-
-    public String getSeverityColor() {
-        return severityColor;
-    }
-
-    public void setSeverityColor(String severityColor) {
-        this.severityColor = severityColor;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getTypeName() {
-        return typeName;
-    }
-
-    public void setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public String getRelated() {
-        return related;
-    }
-
-    public void setRelated(String related) {
-        this.related = related;
-    }
-
-    public String getUrgency() {
-        return urgency;
-    }
-
-    public void setUrgency(String urgency) {
-        this.urgency = urgency;
-    }
-
-    public String getCertainty() {
-        return certainty;
-    }
-
-    public void setCertainty(String certainty) {
-        this.certainty = certainty;
-    }
-
+    @JsonProperty( "id")
     private String id;
+
+    @JsonProperty( "sender")
     private String sender;
 
     @JsonProperty( "pubTime")
     @JsonFormat( shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd\'T\'HH:mmXXX")
     private Date pubTime;
 
+    @JsonProperty( "title")
     private String title;
+
+    @JsonProperty( "startTime")
+    @JsonFormat( shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd\'T\'HH:mmXXX")
+    private Date startTime;
+
+    @JsonProperty( "endTime")
+    @JsonFormat( shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd\'T\'HH:mmXXX")
+    private Date endTime;
+
+    @JsonProperty( "status")
     private String status;
+
+    @JsonProperty( "level")
     private String level;
+
+    @JsonProperty( "severity")
     private String severity;
+
+    @JsonProperty( "severityColor")
     private String severityColor;
 
+    @JsonProperty( "type")
     private String type;
+
+    @JsonProperty( "typeName")
     private String typeName;
+
+    @JsonProperty( "text")
     private String text;
+
+    @JsonProperty( "related")
     private String related;
+
+    @JsonProperty( "urgency")
     private String urgency;
+
+    @JsonProperty( "certainty")
     private String certainty;
 }

code/java/DisasterWarning/src/main/java/com/cpic/xim/notify/disaster/WeatherDisasterWarningGrabber.java

@@ -4,17 +4,18 @@
  */
 package com.cpic.xim.notify.disaster;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.BufferedReader;
-
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.net.HttpURLConnection;
+import java.net.InetSocketAddress;
+import java.net.MalformedURLException;
+import java.net.Proxy;
+import java.net.URL;
 import java.util.zip.GZIPInputStream;
+import com.cpic.xim.config.ProxySetting;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  *
@@ -23,12 +24,12 @@ public class WeatherDisasterWarningGrabber
 {
     /***
      * 从和风天气获取天气警报json字符串
+     * 
      * @param cityCode 城市或区域代码
      * @return 返回警报的json字符串
      */
-    public static String getWeatherDisasterWarningJSON( String queryURL,
-                                                        String userKey,
-                                                        String cityCode )
+    public static String getWeatherDisasterWarningJSON( String queryURL, String userKey,
+            String cityCode, ProxySetting proxySetting )
     {
         // 拼接url字符串
         String json = "";
@@ -44,7 +45,19 @@ public class WeatherDisasterWarningGrabber
         try
         {
             url = new URL( requestURL );
+
+            // 是否要用代理服务器
+            if ( proxySetting.isEnable())
+            {
+                InetSocketAddress proxyAddress = new InetSocketAddress(
+                        proxySetting.getProxyAddress(), proxySetting.getProxyPort() );
+                Proxy proxy = new Proxy( Proxy.Type.HTTP, proxyAddress );
+
+                connection = (HttpURLConnection) url.openConnection( proxy );
+            } else
+            {
                 connection = (HttpURLConnection) url.openConnection();
+            }
 
             connection.setRequestMethod( "GET" );
             connection.setConnectTimeout( 15000 );
@@ -56,7 +69,8 @@ public class WeatherDisasterWarningGrabber
             {
                 // 注意，和风使用了gzip压缩响应体
                 inputStream = new GZIPInputStream( connection.getInputStream() );
-                bufferedReader = new BufferedReader( new InputStreamReader( inputStream, "UTF-8" ) );
+                bufferedReader =
+                        new BufferedReader( new InputStreamReader( inputStream, "UTF-8" ) );
 
                 // 读出数据
                 String temp = bufferedReader.readLine();
@@ -116,6 +130,7 @@ public class WeatherDisasterWarningGrabber
 
     /**
      * 将天气警告的json字符串转换成java对象。
+     * 
      * @param json json字符串
      * @return 返回 QWeatherDisasterWarning 对象。
      * @throws IOException

code/java/DisasterWarning/src/main/java/com/cpic/xim/wechat/officalAccount/sendMessage.java

@@ -2,7 +2,7 @@
  * @Author: Kane
  * @Date: 2022-04-22 10:53:49
  * @LastEditors: Kane
- * @LastEditTime: 2022-05-12 09:51:13
+ * @LastEditTime: 2022-12-16 15:51:36
  * @FilePath: \DisasterWarning\src\main\java\com\cpic\xim\wechat\officalAccount\sendMessage.java
  * @Description: 用来推送公众号消息的程序库。
  *
@@ -37,13 +37,13 @@ public class sendMessage
 {
     private static HashMap<String, String> warningLevel;
 
-    /**
+    /*****************************************************
      * 推送天气灾害预警！接口文档参考 彭奕洁 编写《消息发送接口调用文档》
      * 使用 post 方式，请求体内容以最基础的 post 格式。
      *
      * @param officalAccountURL 产险厦门分公司公众号接口网址
      * @param warningItem       灾害预警对象
-     */
+     *****************************************************/
     public static void sendWeatherDisasterWarning( String officalAccountURL,
             QWeatherDisasterWarningItem warningItem )
     {
@@ -184,10 +184,10 @@ public class sendMessage
         Connection conn = null;
         PreparedStatement stmt = null;
 
-        String sql = new StringBuilder().append( "insert into weather_disaster_notify(notify_id, sender, city," )
+        String sql = new StringBuilder()
+                .append( "insert into weather_disaster_notify(notify_id, sender, city," )
                 .append( "warning_level, warning_type_code, warning_type_name, title," )
-                                        .append( "text, pub_time) values( ?,?,?,?,?,?,?,?,?)" )
-                                        .toString();
+                .append( "text, pub_time) values( ?,?,?,?,?,?,?,?,?)" ).toString();
 
         OracleConfig dbConfig = OracleConfigManager.getOracleConfig();
 
@@ -271,6 +271,7 @@ public class sendMessage
     }
 }
 
+
 class WechatOfficalAccountMessageParameter
 {
 

code/java/DisasterWarning/src/test/java/com/cpic/xim/wechat/officalAccount/sendMessageTest.java

@@ -2,8 +2,8 @@
  * @Author: Kane
  * @Date: 2022-04-22 10:53:49
  * @LastEditors: Kane
- * @LastEditTime: 2022-05-12 09:54:36
- * @FilePath: \DisasterWarning\src\test\java\com\cpic\xim\wechat\officalAccount\sendMessageTest.java
+ * @LastEditTime: 2023-05-15 21:03:21
+ * @FilePath: /DisasterWarning/src/test/java/com/cpic/xim/wechat/officalAccount/sendMessageTest.java
  * @Description:
  *
  * Copyright (c) ${2022} by Kane, All Rights Reserved.
@@ -17,7 +17,7 @@ import com.cpic.xim.httpUtil.*;
 import java.io.IOException;
 
 import java.util.*;
-
+import org.junit.Test;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class sendMessageTest
@@ -25,7 +25,7 @@ public class sendMessageTest
     private static String url =
             "https://cxxmwx.cpic.com.cn/app/index.php?i=2&c=entry&do=send_group_tpl_api&m=ok_tplmessage";
 
-    // @Test
+    @Test
     public void postNotifyMessageJson()
     {
         try
@@ -83,7 +83,7 @@ public class sendMessageTest
         }
     }
 
-    // @Test
+    @Test
     public void testCheckWarningHasSended()
     {
         String warningID = "10123060820220422061200476313081";

数据/和风天气/看格式用.json

@@ -0,0 +1,26 @@
+{
+    "code": "200",
+    "updateTime": "2022-11-04T15:18+08:00",
+    "fxLink": "http://hfx.link/3565",
+    "warning": [
+        {
+            "id": "10123020120221104060100024343791",
+            "sender": "厦门市气象台",
+            "pubTime": "2022-11-04T06:01+08:00",
+            "title": "厦门市气象台发布大风黄色预警[Ⅲ级/较重]",
+            "startTime": "2022-11-04T06:09+08:00",
+            "endTime": "2022-11-05T06:09+08:00",
+            "status": "active",
+            "level": "黄色",
+            "severity": "Moderate",
+            "severityColor": "Yellow",
+            "type": "1006",
+            "typeName": "大风",
+            "urgency": "",
+            "certainty": "",
+            "text": "厦门市气象台2022年11月04日06时01分发布大风黄色预警信号：受冷空气影响，未来12小时思明区、湖里区、集美区、海沧区及海上风力逐渐增强，预计厦门市区东北风最大可达5～6级、阵风7～8级；厦门内海及各大桥、高海拔山区最大可达6～7级、阵风8～9级；崇武到东山沿海最大可达7～8级、阵风9级；台湾海峡南部最大可达7～8级、阵风9～10级。请注意防范。同安区、翔安区请关注属地的预警信号发布情况。",
+            "related": ""
+        }
+    ],
+    "refer": { "sources": ["12379"], "license": ["no commercial use"] }
+}