diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/StationSplitConfigController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/StationSplitConfigController.java index 84f719823..ce918092a 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/StationSplitConfigController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/StationSplitConfigController.java @@ -2,15 +2,16 @@ package com.jsowell.web.controller.pile; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.AjaxResult; +import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.exception.BusinessException; +import com.jsowell.pile.domain.StationSplitConfig; import com.jsowell.pile.dto.SplitConfigDTO; import com.jsowell.pile.service.StationSplitConfigService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import java.util.List; /** * 站点分成配置controller @@ -21,6 +22,16 @@ public class StationSplitConfigController extends BaseController { @Autowired private StationSplitConfigService stationSplitConfigService; + /** + * 根据站点id 查询站点分成配置 + */ + @GetMapping("/list/{stationId}") + public TableDataInfo list(@PathVariable("stationId") String stationId) { + // 权限过滤 + List list = stationSplitConfigService.queryByStationId(stationId); + return getDataTable(list); + } + /** * 设置站点配置 * /station/splitconfig/settingSplitConfig diff --git a/jsowell-ui/src/api/pile/splitConfig.js b/jsowell-ui/src/api/pile/splitConfig.js index 291a99f90..7b6371f6d 100644 --- a/jsowell-ui/src/api/pile/splitConfig.js +++ b/jsowell-ui/src/api/pile/splitConfig.js @@ -1,44 +1,18 @@ import request from '@/utils/request' -// 查询站点白名单列表 -export function listWhitelist(query) { +// 根据站点id 查询站点分成配置 +export function getSplitConfigList(stationId) { return request({ - url: '/pile/whitelist/list', - method: 'get', - params: query - }) -} - -// 查询站点白名单详细 -export function getWhitelist(id) { - return request({ - url: '/pile/whitelist/' + id, + url: '/station/splitconfig/list' + stationId, method: 'get' }) } -// 新增站点白名单 -export function addWhitelist(data) { +// 添加站点分成配置 +export function addSplitConfig(data) { return request({ - url: '/pile/whitelist', + url: '/station/splitconfig/settingSplitConfig', method: 'post', data: data }) } - -// 修改站点白名单 -export function updateWhitelist(data) { - return request({ - url: '/pile/whitelist', - method: 'put', - data: data - }) -} - -// 删除站点白名单 -export function delWhitelist(id) { - return request({ - url: '/pile/whitelist/' + id, - method: 'delete' - }) -}