后管站点管理页面新增查询地锁列表二维码

jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java

@@ -9,6 +9,8 @@ import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.response.RestApiResponse;
 import com.jsowell.common.util.file.AliyunOssUploadUtils;
 import com.jsowell.common.util.file.FileUtils;
+import com.jsowell.pile.service.IPileBasicInfoService;
+import com.jsowell.pile.vo.uniapp.GroundLockInfoVO;
 import com.jsowell.pile.vo.uniapp.PileConnectorVO;
 import com.jsowell.service.PileService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 
 @Anonymous
@@ -26,6 +29,9 @@ public class JumpController extends BaseController {
 	@Autowired
 	private PileService pileService;
 
+	@Autowired
+	private IPileBasicInfoService pileBasicInfoService;
+
 	/**
 	 * 查询充电桩详情
 	 * http://localhost:8080/app-xcx-h5/pile/pileDetail/{pileSn}
@@ -94,4 +100,24 @@ public class JumpController extends BaseController {
 		}
 	}
 
+	/**
+	 * 获取地锁列表信息
+	 * http://localhost:8080/app-xcx-h5/getGroundLockInfo/{stationId}
+	 * @param stationId
+	 * @return
+	 */
+	@GetMapping("/getGroundLockInfo/{stationId}")
+	public RestApiResponse<?> getGroundLockInfo(@PathVariable("stationId") String stationId) {
+		logger.info("获取地锁列表信息 params:{}", stationId);
+		RestApiResponse<?> response = null;
+		try {
+			List<GroundLockInfoVO> list = pileBasicInfoService.getGroundLockInfo(stationId);
+			response = new RestApiResponse<>(list);
+		} catch (Exception e) {
+			logger.error("获取地锁列表信息 error, ", e);
+			response = new RestApiResponse<>(e);
+		}
+		logger.info("获取地锁列表信息 result:{}", response);
+		return response;
+	}
 }

jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java

@@ -38,9 +38,6 @@ public class PileController extends BaseController {
 	@Autowired
 	private IPileConnectorInfoService pileConnectorInfoService;
 
-	@Autowired
-	private IPileBasicInfoService pileBasicInfoService;
-
 	@Autowired
 	private IPileBillingTemplateService pileBillingTemplateService;
 
@@ -152,24 +149,4 @@ public class PileController extends BaseController {
 		return response;
 	}
 
-	/**
-	 * 获取地锁列表信息
-	 * @param stationId
-	 * @return
-	 */
-	@GetMapping("/getGroundLockInfo/{stationId}")
-	public RestApiResponse<?> getGroundLockInfo(@PathVariable("stationId") String stationId) {
-		logger.info("获取地锁列表信息 params:{}", stationId);
-		RestApiResponse<?> response = null;
-		try {
-			List<GroundLockInfoVO> list = pileBasicInfoService.getGroundLockInfo(stationId);
-			response = new RestApiResponse<>(list);
-		} catch (Exception e) {
-			logger.error("获取地锁列表信息 error, ", e);
-			response = new RestApiResponse<>(e);
-		}
-		logger.info("获取地锁列表信息 result:{}", response);
-		return response;
-	}
-
 }

jsowell-ui/src/views/pile/station/detail.vue

@@ -60,7 +60,8 @@
                     <h2>互联互通配置</h2>
                     <el-button icon="el-icon-edit" size="big" @click="openEdit" v-has-permi="['pile:station:edit']">编辑参数
                     </el-button>
-          <el-form ref="stationSettingForm" :model="stationSettingInfo" label-position="right" label-width="200px"
+                    <el-form ref="stationSettingForm" :model="stationSettingInfo" label-position="right"
+                             label-width="200px"
                              style="margin-top:10px">
                         <el-row>
                             <el-col :span="12">
@@ -88,48 +89,78 @@
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="对接平台url地址:" prop="urlAddress">
-                  <el-input placeholder="请输入" v-model="stationSettingInfo.urlAddress" :disabled="true"/>
+                                    <el-input placeholder="请输入" v-model="stationSettingInfo.urlAddress"
+                                              :disabled="true"/>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="运营商ID(OperatorID):" prop="operatorId">
-                  <el-input placeholder="请输入" v-model="stationSettingInfo.operatorId" :disabled="true"/>
+                                    <el-input placeholder="请输入" v-model="stationSettingInfo.operatorId"
+                                              :disabled="true"/>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="运营商密钥(OperatorSecret):" prop="operatorSecret">
-                  <el-input placeholder="请输入" v-model="stationSettingInfo.operatorSecret" :disabled="true"/>
+                                    <el-input placeholder="请输入" v-model="stationSettingInfo.operatorSecret"
+                                              :disabled="true"/>
                                 </el-form-item>
                             </el-col>
                         </el-row>
                         <el-row>
                             <el-col :span="12">
                                 <el-form-item label="消息Data密钥(DataSecret):" prop="dataSecret">
-                  <el-input placeholder="请输入" v-model="stationSettingInfo.dataSecret" :disabled="true"/>
+                                    <el-input placeholder="请输入" v-model="stationSettingInfo.dataSecret"
+                                              :disabled="true"/>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="签名密钥(SigSecret):" prop="signSecret">
-                  <el-input placeholder="请输入" v-model="stationSettingInfo.signSecret" :disabled="true"/>
+                                    <el-input placeholder="请输入" v-model="stationSettingInfo.signSecret"
+                                              :disabled="true"/>
                                 </el-form-item>
                             </el-col>
                         </el-row>
                         <el-row>
                             <el-col :span="12">
                                 <el-form-item label="消息Data密钥初始化向量(DataSecretIV):" prop="dataSecretIv">
-                  <el-input placeholder="请输入" v-model="stationSettingInfo.dataSecretIv" :disabled="true"/>
+                                    <el-input placeholder="请输入" v-model="stationSettingInfo.dataSecretIv"
+                                              :disabled="true"/>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item>
                                     <!--                  <el-button size="big" @click="submitConfigForm" v-has-permi="['pile:station:edit']">提交</el-button>-->
-                  <el-button size="big" @click="pushStation" v-has-permi="['pile:station:edit']">推送站点信息</el-button>
+                                    <el-button size="big" @click="pushStation" v-has-permi="['pile:station:edit']">
+                                        推送站点信息
+                                    </el-button>
                                     <!--              <el-button icon="el-icon-edit" size="big" @click="openEdit" v-has-permi = "['pile:station:edit']" >编辑参数</el-button>-->
                                 </el-form-item>
                             </el-col>
                         </el-row>
                     </el-form>
                 </el-card>
+
+                <el-card style="margin-bottom:10px">
+                    <h2>地锁二维码</h2>
+                    <el-form label-position="right" label-width="200px" style="margin-top:10px">
+                        <el-row>
+                            <el-col :span="12">
+                                <el-form-item label="查询地锁列表二维码:"/>
+                                <div>
+                                    <vue-qr
+                                        ref="Qrcode"
+                                        :text="queryGroundLockQrCode"
+                                        qid="lockListQrCode"
+                                        :width="150"
+                                        style="margin-left: 190px; margin-top: -10px"
+                                    />
+                                </div>
+                            </el-col>
+
+                        </el-row>
+                    </el-form>
+                </el-card>
+
             </el-tab-pane>
 
             <el-tab-pane label="站点白名单" name="whitelist">
@@ -156,6 +187,7 @@
 </template>
 
 <script>
+import VueQr from "vue-qr";
 import Billing from "./components/billing.vue";
 import SiteInfo from "./components/SiteInfo.vue";
 import connectorList from "./connectorList.vue";
@@ -177,6 +209,7 @@ import OrderReport from './orderReport.vue';
 export default {
     dicts: ["third_party_type"],
     components: {
+        VueQr,
         Whitelist,
         SiteInfo,
         pileList,
@@ -193,6 +226,7 @@ export default {
             form: {
                 prefix: '',
             },
+            queryGroundLockQrCode: '',
             dialogTitle: '',
             qrcodePrefix: '',
             dialogFormVisible: false,
@@ -208,6 +242,7 @@ export default {
     created() {
         // console.log(this.stationId, "充电桩详情 create");
         // const stationId = this.stationId;
+        this.queryGroundLockQrCode = 'https://api.jsowellcloud.com/app-xcx-h5/getGroundLockInfo/' + this.stationId;
         const stationName = this.stationName;
         const title = "【" + stationName + "】站点详情";
         const route = Object.assign({}, this.$route, {title: `${title}`})