From 18d5aa02b44e3917120b4520c545adc1e3dcc9dc Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Fri, 27 Sep 2024 10:25:37 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E5=90=8E=E7=AE=A1=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=E6=8E=A8=E9=80=81=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/NotificationService.java           |  1 +
 .../src/views/thirdparty/secret/detail.vue    | 40 ++++++++++++++-----
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/NotificationService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/NotificationService.java
index 27d1558a4..25e6d627d 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/NotificationService.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/NotificationService.java
@@ -263,6 +263,7 @@ public class NotificationService {
 
     /**
      * 充电设备告警信息推送
+     * notification_alarmInfo
      * @param dto
      */
     public void notificationAlarmInfo(NotificationDTO dto) {
diff --git a/jsowell-ui/src/views/thirdparty/secret/detail.vue b/jsowell-ui/src/views/thirdparty/secret/detail.vue
index 333678215..292dc8d12 100644
--- a/jsowell-ui/src/views/thirdparty/secret/detail.vue
+++ b/jsowell-ui/src/views/thirdparty/secret/detail.vue
@@ -104,7 +104,7 @@
                         <el-col :span="24">
                             <el-card class="box-card" style="margin: 0 20px;" shadow="hover">
                                 <div slot="header" class="clearfix">
-                                    <span>推送充电站信息变化</span>
+                                    <span style="font-weight: bold">推送充电站信息变化（notification_stationInfo）</span>
                                     <el-button style="float: right; padding: 3px 0" type="text"
                                         @click="clickNotificationStationInfo">推送</el-button>
                                 </div>
@@ -119,7 +119,7 @@
                         <el-col :span="24">
                             <el-card class="box-card" style="margin: 20px 20px 0 20px;" shadow="hover">
                                 <div slot="header" class="clearfix">
-                                    <span>推送设备状态</span>
+                                    <span style="font-weight: bold">推送设备状态（notification_stationStatus）</span>
                                     <el-button style="float: right; padding: 3px 0" type="text"
                                         @click="clickNotificationStationStatus">推送</el-button>
                                 </div>
@@ -128,7 +128,16 @@
                                         <el-input v-model="notificationForm.pileConnectorCode"></el-input>
                                     </el-form-item>
                                   <el-form-item label="枪口状态" class="getCard">
-                                    <el-input v-model="notificationForm.connectorStatus"></el-input>
+<!--                                    <el-input v-model="notificationForm.connectorStatus"></el-input>-->
+                                    <template slot-scope="scope">
+                                      <el-select v-model="notificationForm.connectorStatus" placeholder="请选择枪口状态" clearable
+                                                 style="width: 160px">
+                                        <el-option v-for="dict in dict.type.connector_status"
+                                                   :key="dict.value"
+                                                   :label="dict.label"
+                                                   :value="dict.value" />
+                                      </el-select>
+                                    </template>
                                   </el-form-item>
                                     <!--<el-form-item>
                                         <el-button type="primary" @click="clickNotificationStationStatus">推送设备状态</el-button>
@@ -142,7 +151,9 @@
                         <el-col :span="24">
                             <el-card class="box-card" style="margin: 20px 20px 0 20px;" shadow="hover">
                                 <div slot="header" class="clearfix">
-                                    <span>推送设备充电中状态</span>
+                                    <span style="font-weight: bold">推送设备充电中状态
+                                      <br>（notification_connector_charge_status、
+                                      <br>notification_equip_charge_status）</span>
                                     <el-button style="float: right; padding: 3px 0" type="text"
                                         @click="clickNotificationConnectorChargeStatus">推送</el-button>
                                 </div>
@@ -162,7 +173,7 @@
                         <el-col :span="24">
                             <el-card class="box-card" style="margin: 20px 20px 0 20px;" shadow="hover">
                                 <div slot="header" class="clearfix">
-                                    <span>推送充电订单信息</span>
+                                    <span style="font-weight: bold">推送充电订单信息（notification_charge_order_info）</span>
                                     <el-button style="float: right; padding: 3px 0" type="text"
                                         @click="clickNotificationChargeOrderInfo">推送</el-button>
                                 </div>
@@ -182,7 +193,7 @@
                         <el-col :span="24">
                             <el-card class="box-card" style="margin: 20px 20px 0 20px;" shadow="hover">
                                 <div slot="header" class="clearfix">
-                                    <span>推送站点费率</span>
+                                    <span style="font-weight: bold">推送站点费率（notification_stationFee）</span>
                                     <el-button style="float: right; padding: 3px 0" type="text"
                                         @click="clickNotificationStationFee">推送</el-button>
                                 </div>
@@ -197,7 +208,7 @@
                     <el-col :span="24">
                       <el-card class="box-card" style="margin: 20px 20px 0 20px;" shadow="hover">
                         <div slot="header" class="clearfix">
-                          <span>推送设备告警信息</span>
+                          <span style="font-weight: bold">推送设备告警信息（notification_alarmInfo）</span>
                           <el-button style="float: right; padding: 3px 0" type="text"
                                      @click="clickNotificationAlarmInfo">推送</el-button>
                         </div>
@@ -206,7 +217,16 @@
                             <el-input v-model="notificationAlarmForm.pileConnectorCode"></el-input>
                           </el-form-item>
                           <el-form-item label="枪口状态" class="getCard">
-                            <el-input v-model="notificationAlarmForm.status"></el-input>
+<!--                            <el-input v-model="notificationAlarmForm.status"></el-input>-->
+                            <template slot-scope="scope">
+                              <el-select v-model="notificationAlarmForm.status" placeholder="请选择枪口状态" clearable
+                                         style="width: 160px">
+                                <el-option v-for="dict in dict.type.connector_status"
+                                           :key="dict.value"
+                                           :label="dict.label"
+                                           :value="dict.value" />
+                              </el-select>
+                            </template>
                           </el-form-item>
                           <!--<el-form-item>
                               <el-button type="primary" @click="clickNotificationStationStatus">推送设备状态</el-button>
@@ -237,7 +257,7 @@ import {
 } from "@/api/thirdParty/notification";
 
 export default {
-    dicts: ["third_party_type"],
+    dicts: ["third_party_type", "connector_status"],
     components: { Template },
     data() {
         return {
@@ -444,7 +464,7 @@ export default {
 }
 
 .getCard {
-    margin-bottom: 0px;
+    margin-bottom: 10px;
 }
 
 .el-descriptions-item_label {