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 e3c892192..456bb1020 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 @@ -80,6 +80,18 @@ public class PileStationInfoController extends BaseController { return getDataTable(list); } + /** + * 查询充电站下拉列表 + */ + @PreAuthorize("@ss.hasPermi('pile:station:list')") + @GetMapping("/StationSelectList") + public TableDataInfo getStationSelectList(QueryStationDTO dto) { + logger.info("dto:{}", JSON.toJSONString(dto)); + startPage(); + List list = pileStationInfoService.getStationSelectList(dto); + return getDataTable(list); + } + /** * 快速建站接口 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java index 4b743645a..bbd227601 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java @@ -94,4 +94,11 @@ public interface PileStationInfoMapper { * @param stationId */ int updateParkingPlatform(@Param("parkingId") String parkingId, @Param("stationId") String stationId); + + /** + * 获取站点下拉列表 + * @param dto + * @return + */ + List getStationSelectList(@Param("dto") QueryStationDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java index 2d134d68a..9779727c9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java @@ -112,4 +112,9 @@ public interface IPileStationInfoService { * @param dto */ int bindParkingPlatform(BindParkingPlatformDTO dto); + + /** + * 查询充电站下拉列表 + */ + List getStationSelectList(QueryStationDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index 79abafc4c..571c6b6c9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -533,5 +533,23 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService { return pileStationInfoMapper.updateParkingPlatform(parkingId, stationId); } + /** + * 查询充电站下拉列表 + * @param dto + * @return + */ + @Override + public List getStationSelectList(QueryStationDTO dto) { + AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + if (authorizedMap == null) { + // 为空表示没有权限,返回空数组 + return Lists.newArrayList(); + } + dto.setStationDeptIds(authorizedMap.getStationDeptIds()); + dto.setMerchantDeptIds(authorizedMap.getMerchantDeptIds()); + + return pileStationInfoMapper.getStationSelectList(dto); + } + } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml index 2371f88a4..9980e8237 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml @@ -448,4 +448,26 @@ where id = #{stationId,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/jsowell-ui/src/api/pile/station.js b/jsowell-ui/src/api/pile/station.js index 9e61068fe..b3c991985 100644 --- a/jsowell-ui/src/api/pile/station.js +++ b/jsowell-ui/src/api/pile/station.js @@ -10,6 +10,14 @@ export function listStation(query) { }); } +export function getStationSelectList(query) { + return request({ + url: "/pile/station/StationSelectList", + method: "get", + params: query, + }); +} + // 查询充电站信息详细 export function getStation(id) { return request({ diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue index c9829a1f4..c297eac8c 100644 --- a/jsowell-ui/src/views/order/order/index.vue +++ b/jsowell-ui/src/views/order/order/index.vue @@ -167,7 +167,7 @@ import { totalData, } from "@/api/order/order"; import Template from "@/views/billing/template"; -import { listStation } from "@/api/pile/station"; +import {getStationSelectList, listStation} from "@/api/pile/station"; import { getDay } from "@/utils/common"; export default { @@ -523,10 +523,11 @@ export default { getStationList() { const queryStationParams = { pageNum: 1, - pageSize: 999, + pageSize: 10, }; - listStation(queryStationParams).then((response) => { - // console.log("订单列表页-查询站点列表", response) + console.log("订单列表页-查询站点列表 param", queryStationParams) + getStationSelectList(queryStationParams).then((response) => { + console.log("订单列表页-查询站点列表", response) this.stationList = response.rows; }); },