From cf49960128df8e481e670cacceb57ab118371f93 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Mon, 17 Jul 2023 10:55:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9AlertTip=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiannccda/dto/alertTip/AlertTipSaveDTO.java     | 10 +++++++++-
 .../club/joylink/xiannccda/entity/AlertTip.java     | 13 +++++++++----
 .../joylink/xiannccda/mapper/AlertTipMapper.java    |  2 +-
 .../joylink/xiannccda/mapper/xml/AlertTipMapper.xml |  5 +++--
 .../joylink/xiannccda/service/AlertTipService.java  |  3 ++-
 xian-ncc-da-message                                 |  2 +-
 6 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/main/java/club/joylink/xiannccda/dto/alertTip/AlertTipSaveDTO.java b/src/main/java/club/joylink/xiannccda/dto/alertTip/AlertTipSaveDTO.java
index 8602925..63dc02a 100644
--- a/src/main/java/club/joylink/xiannccda/dto/alertTip/AlertTipSaveDTO.java
+++ b/src/main/java/club/joylink/xiannccda/dto/alertTip/AlertTipSaveDTO.java
@@ -16,5 +16,13 @@ public class AlertTipSaveDTO {
 
   private AlertTipLocationType locationType;
 
-  private String infoJson;
+  /**
+   * 行车方面提示信息
+   */
+  private String drivingInfo;
+
+  /**
+   * 信息报送方面提示信息
+   */
+  private String submissionInfo;
 }
diff --git a/src/main/java/club/joylink/xiannccda/entity/AlertTip.java b/src/main/java/club/joylink/xiannccda/entity/AlertTip.java
index 20ce20c..a38d1da 100644
--- a/src/main/java/club/joylink/xiannccda/entity/AlertTip.java
+++ b/src/main/java/club/joylink/xiannccda/entity/AlertTip.java
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author walker-sheng
- * @since 2023-06-28
+ * @since 2023-07-17
  */
 @Getter
 @Setter
@@ -35,8 +35,11 @@ public class AlertTip {
     @Schema(description = "地点定义类型")
     private String locationType;
 
-    @Schema(description = "提示信息的json")
-    private String infoJson;
+    @Schema(description = "行车方面提示信息")
+    private String drivingInfo;
+
+    @Schema(description = "信息报送方面提示信息")
+    private String submissionInfo;
 
     public static final String ID = "id";
 
@@ -46,5 +49,7 @@ public class AlertTip {
 
     public static final String LOCATION_TYPE = "location_type";
 
-    public static final String INFO_JSON = "info_json";
+    public static final String DRIVING_INFO = "driving_info";
+
+    public static final String SUBMISSION_INFO = "submission_info";
 }
diff --git a/src/main/java/club/joylink/xiannccda/mapper/AlertTipMapper.java b/src/main/java/club/joylink/xiannccda/mapper/AlertTipMapper.java
index 2c8e93a..e6ec013 100644
--- a/src/main/java/club/joylink/xiannccda/mapper/AlertTipMapper.java
+++ b/src/main/java/club/joylink/xiannccda/mapper/AlertTipMapper.java
@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author walker-sheng
- * @since 2023-06-28
+ * @since 2023-07-17
  */
 @Mapper
 public interface AlertTipMapper extends BaseMapper<AlertTip> {
diff --git a/src/main/java/club/joylink/xiannccda/mapper/xml/AlertTipMapper.xml b/src/main/java/club/joylink/xiannccda/mapper/xml/AlertTipMapper.xml
index 7bc5ae3..0e19c67 100644
--- a/src/main/java/club/joylink/xiannccda/mapper/xml/AlertTipMapper.xml
+++ b/src/main/java/club/joylink/xiannccda/mapper/xml/AlertTipMapper.xml
@@ -8,12 +8,13 @@
         <result column="alert_type" property="alertType" />
         <result column="time_type" property="timeType" />
         <result column="location_type" property="locationType" />
-        <result column="info_json" property="infoJson" />
+        <result column="driving_info" property="drivingInfo" />
+        <result column="submission_info" property="submissionInfo" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, alert_type, time_type, location_type, info_json
+        id, alert_type, time_type, location_type, driving_info, submission_info
     </sql>
 
 </mapper>
diff --git a/src/main/java/club/joylink/xiannccda/service/AlertTipService.java b/src/main/java/club/joylink/xiannccda/service/AlertTipService.java
index 75ce0bf..92781fe 100644
--- a/src/main/java/club/joylink/xiannccda/service/AlertTipService.java
+++ b/src/main/java/club/joylink/xiannccda/service/AlertTipService.java
@@ -47,7 +47,8 @@ public class AlertTipService {
     if (saveDTO.getLocationType() != null) {
       entity.setLocationType(saveDTO.getLocationType().name());
     }
-    entity.setInfoJson(saveDTO.getInfoJson());
+    entity.setDrivingInfo(saveDTO.getDrivingInfo());
+    entity.setSubmissionInfo(saveDTO.getSubmissionInfo());
     return entity;
   }
 }
diff --git a/xian-ncc-da-message b/xian-ncc-da-message
index 6c23873..874a6fe 160000
--- a/xian-ncc-da-message
+++ b/xian-ncc-da-message
@@ -1 +1 @@
-Subproject commit 6c2387311aa3c744e380e772df9cba6a49ace989
+Subproject commit 874a6fe4fafcda375e7479e7da0d67d1061ab2f1