From e31e19a1bdc3a0a6d8b7518e67f9970778762516 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Thu, 25 May 2023 16:50:43 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=90=8E=E7=AE=A1=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=E4=BA=92=E8=81=94=E4=BA=92=E9=80=9A=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/PileStationInfoController.java       |  2 +-
 jsowell-ui/src/views/pile/station/detail.vue  | 37 ++++++++++++-------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java
index 2d3dd9d68..43cfb4c08 100644
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java
@@ -190,7 +190,7 @@ public class PileStationInfoController extends BaseController {
 	 */
 	@PreAuthorize("@ss.hasPermi('pile:station:edit')")
 	@PostMapping("/updateSettingByStationId")
-	public AjaxResult updateSettingByStationId(ThirdPartySettingInfo info) {
+	public AjaxResult updateSettingByStationId(@RequestBody ThirdPartySettingInfo info) {
 		return AjaxResult.success(thirdPartySettingInfoService.updateStationSettingInfo(info));
 	}
 
diff --git a/jsowell-ui/src/views/pile/station/detail.vue b/jsowell-ui/src/views/pile/station/detail.vue
index 05c119834..a470f1d9f 100644
--- a/jsowell-ui/src/views/pile/station/detail.vue
+++ b/jsowell-ui/src/views/pile/station/detail.vue
@@ -57,35 +57,35 @@
       <el-card>
         <h2>互联互通配置</h2>
 
-          <el-form label-position="right" label-width="200px" style="margin-top:10px">
+          <el-form :model="stationSettingInfo" label-position="right" label-width="200px" style="margin-top:10px">
              <el-row>
           <el-col :span="12">
-            <el-form-item label="运营商ID">
-           <el-input placeholder="请输入" />
+            <el-form-item label="运营商ID" prop="operatorId">
+           <el-input placeholder="请输入" v-model="stationSettingInfo.operatorId"/>
         </el-form-item>
           </el-col>
           <el-col :span="12">
-             <el-form-item label="运营商密钥">
-              <el-input placeholder="请输入" />
+             <el-form-item label="运营商密钥" prop="operatorSecret">
+              <el-input placeholder="请输入" v-model="stationSettingInfo.operatorSecret"/>
             </el-form-item>
           </el-col>
         </el-row>
              <el-row>
           <el-col :span="12">
-            <el-form-item label="消息Data密钥:">
-           <el-input placeholder="请输入" />
+            <el-form-item label="消息Data密钥:" prop="dataSecret">
+           <el-input placeholder="请输入" v-model="stationSettingInfo.dataSecret"/>
         </el-form-item>
           </el-col>
           <el-col :span="12">
-             <el-form-item label="签名密钥">
-              <el-input placeholder="请输入" />
+             <el-form-item label="签名密钥" prop="signSecret">
+              <el-input placeholder="请输入" v-model="stationSettingInfo.signSecret"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row >
           <el-col :span="12">
-             <el-form-item label="消息Data密钥初始化向量"> 
-              <el-input placeholder="请输入" />
+             <el-form-item label="消息Data密钥初始化向量" prop="dataSecretIv">
+              <el-input placeholder="请输入" v-model="stationSettingInfo.dataSecretIv"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -125,7 +125,7 @@ import pileList from "./pileList.vue";
 import MapContainer from "../../../components/MapContainer/MapContainer.vue";
 import stationOrderList from "@/views/pile/station/stationOrderList";
 import stationWhiteList from "@/views/pile/station/stationWhiteList";
-import {getStationInfo, updateStationQRCodePrefix} from "@/api/pile/station";
+import {getStationInfo, updateStationQRCodePrefix, getSettingByStationId, updateSettingByStationId} from "@/api/pile/station";
 import Whitelist from "@/views/pile/station/stationWhiteList";
 
 export default {
@@ -152,7 +152,8 @@ export default {
       stationName: this.$route.params.stationName,
       stationDetail: {},
       stationLat:null,
-      stationLng:null
+      stationLng:null,
+      stationSettingInfo: {},
     };
   },
   created() {
@@ -163,6 +164,7 @@ export default {
     const route = Object.assign({}, this.$route, { title: `${title}` })
     this.$store.dispatch('tagsView/updateVisitedView', route);
     this.queryStationInfo();
+    this.getStationSettingInfo();
   },
   mounted() {
     this.initializeData(this.activeName);
@@ -199,6 +201,15 @@ export default {
       });
       console.log("queryStationInfo==", this.stationDetail);
     },
+    // 查询站点互联互通配置信息
+    getStationSettingInfo() {
+      getSettingByStationId(this.stationId).then((res) =>{
+        console.log("stationId:", this.stationId)
+        console.log("getSettingByStationId==", res)
+        this.stationSettingInfo = res.data;
+      })
+    },
+
     // 配置参数按钮
     handleCreate() {
       this.dialogTitle = '配置参数';