Merge branch 'develop' of http://cppdisciple.f3322.org:3000/CPICXIM/disaster_warrning into develop

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

@@ -2,7 +2,7 @@
  * @Author: Kane
  * @Date: 2022-04-22 10:53:49
  * @LastEditors: Kane
- * @LastEditTime: 2022-05-10 19:03:56
+ * @LastEditTime: 2022-05-12 09:52:45
  * @FilePath: \DisasterWarning\src\main\java\AppMain.java
  * @Description: 和风天气预警推送厦门太保公众号主程序！
  * 
@@ -111,10 +111,10 @@ public class AppMain
 
                         logger.log( Level.INFO, "{0}天气预警，日志发送成功。", new Object[]
                         { city.getCityName()} );
-                    }
 
-                    // 将发送的警报，保存起来
+                        // 将发送的警报，保存起来
-                    sendMessage.saveWeatherDisasterWarning( city.getCityName(), warning );
+                        sendMessage.saveWeatherDisasterWarning( city.getCityName(), item );
+                    }
                 }
                 catch ( IOException error )
                 {

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-10 19:02:32
+ * @LastEditTime: 2022-05-12 09:51:13
  * @FilePath: \DisasterWarning\src\main\java\com\cpic\xim\wechat\officalAccount\sendMessage.java
  * @Description: 用来推送公众号消息的程序库。
  *
@@ -178,7 +178,8 @@ public class sendMessage
      * @throws IOException            读取数据库配置文件时可能抛出的异常。
      * @throws ClassNotFoundException 加载oracle jdbc驱动时可能抛出的异常。
      */
-    public static void saveWeatherDisasterWarning( String city, QWeatherDisasterWarning warnings )
+    public static void saveWeatherDisasterWarning( String city,
+            QWeatherDisasterWarningItem warning )
             throws SQLException, IOException, ClassNotFoundException
     {
         Connection        conn = null;
@@ -203,23 +204,19 @@ public class sendMessage
 
             conn.setAutoCommit( false );
 
-            for ( QWeatherDisasterWarningItem warning : warnings.getWarning() )
+            java.sql.Timestamp pubTime = new java.sql.Timestamp( warning.getPubTime().getTime() );
-            {
-                java.sql.Timestamp pubTime =
-                        new java.sql.Timestamp( warning.getPubTime().getTime() );
 
-                stmt.setString( 1, warning.getId() );
+            stmt.setString( 1, warning.getId() );
-                stmt.setString( 2, warning.getSender() );
+            stmt.setString( 2, warning.getSender() );
-                stmt.setString( 3, city );
+            stmt.setString( 3, city );
-                stmt.setString( 4, warning.getLevel() );
+            stmt.setString( 4, warning.getLevel() );
-                stmt.setString( 5, warning.getType() );
+            stmt.setString( 5, warning.getType() );
-                stmt.setString( 6, warning.getTypeName() );
+            stmt.setString( 6, warning.getTypeName() );
-                stmt.setString( 7, warning.getTitle() );
+            stmt.setString( 7, warning.getTitle() );
-                stmt.setString( 8, warning.getText() );
+            stmt.setString( 8, warning.getText() );
-                stmt.setTimestamp( 9, pubTime );
+            stmt.setTimestamp( 9, pubTime );
 
-                stmt.execute();
+            stmt.execute();
-            }
 
             // 没有问题就提交
             conn.commit();

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

@@ -2,7 +2,7 @@
  * @Author: Kane
  * @Date: 2022-04-22 10:53:49
  * @LastEditors: Kane
- * @LastEditTime: 2022-05-10 11:33:41
+ * @LastEditTime: 2022-05-12 09:54:36
  * @FilePath: \DisasterWarning\src\test\java\com\cpic\xim\wechat\officalAccount\sendMessageTest.java
  * @Description:
  *
@@ -75,7 +75,7 @@ public class sendMessageTest
             String city = "东山县";
 
 
-            sendMessage.saveWeatherDisasterWarning( city, warning );
+            // sendMessage.saveWeatherDisasterWarning( city, warning );
         }
         catch ( Exception error )
         {

应用/1.0/run.bat

@@ -0,0 +1,2 @@
+java -jar disaster_warning-1.0-SNAPSHOT-jar-with-dependencies.jar
+pause