Преглед изворни кода

增加根据shortId查询站点信息接口

zuypeng пре 11 месеци
родитељ
комит
aa90e9c199

+ 1 - 1
admin-web/src/views/admin/station/list/index.vue

@@ -124,7 +124,7 @@
         </el-table-column>
       </el-table>
 
-<!--      <ext-page class="page-pager" v-model:value="state.pageQuery" @change="loadData(false)"/>-->
+      <ext-page class="page-pager" v-model="state.pageQuery" @change="loadData(false)"/>
     </el-card>
   </div>
   <StationDialog ref="stationDialogRef" @refresh="loadData(true)"/>

+ 14 - 0
miniapp/src/main/java/com/kym/miniapp/controller/ChargeController.java

@@ -95,6 +95,20 @@ public class ChargeController {
         return R.success(stationService.stationInfo(stationId));
     }
 
+
+    /**
+     * 根据设备短ID获取站点信息(包含充电枪信息)
+     *
+     * @param shortId
+     * @return
+     */
+    @GetMapping("/stationInfoByShortId/{shortId}")
+    @SaIgnore
+    R<?> stationInfoByShortId(@PathVariable String shortId) {
+        return R.success(stationService.stationInfoByShortId(shortId));
+    }
+
+
     /**
      * 充电站状态
      *

+ 2 - 0
service/src/main/java/com/kym/service/admin/StationService.java

@@ -55,4 +55,6 @@ public interface StationService extends MPJBaseService<Station> {
     void importStation(JSONObject data);
 
     PageBean<SimpleStationVo> listStationForApp(StationQueryParam params);
+
+    DetailStationVo stationInfoByShortId(String shortId);
 }

+ 7 - 0
service/src/main/java/com/kym/service/admin/impl/StationServiceImpl.java

@@ -237,6 +237,13 @@ public class StationServiceImpl extends MyBaseServiceImpl<StationMapper, Station
         return new PageBean<>(stationVoList);
     }
 
+    @Override
+    public DetailStationVo stationInfoByShortId(String shortId) {
+        EquipmentRelation equipmentRel = equipmentRelationService.getByShortId(shortId);
+        CommUtil.assertsNonNull(equipmentRel,"该设备信息有误");
+        return stationInfo(equipmentRel.getStationId());
+    }
+
     /**
      * 站点详情
      *