diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java new file mode 100644 index 000000000..ce2012d6c --- /dev/null +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java @@ -0,0 +1,105 @@ +package com.jsowell.web.controller.pile; + +import com.jsowell.common.annotation.Log; +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.enums.BusinessType; +import com.jsowell.common.util.poi.ExcelUtil; +import com.jsowell.pile.domain.PileStationWhitelist; +import com.jsowell.pile.service.IPileStationWhitelistService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 站点白名单Controller + * + * @author jsowell + * @date 2023-04-20 + */ +@RestController +@RequestMapping("/pile/whitelist") +public class PileStationWhitelistController extends BaseController +{ + @Autowired + private IPileStationWhitelistService pileStationWhitelistService; + + /** + * 查询站点白名单列表 + */ + @PreAuthorize("@ss.hasPermi('pile:whitelist:list')") + @GetMapping("/list") + public TableDataInfo list(PileStationWhitelist pileStationWhitelist) + { + startPage(); + List list = pileStationWhitelistService.selectPileStationWhitelistList(pileStationWhitelist); + return getDataTable(list); + } + + /** + * 导出站点白名单列表 + */ + @PreAuthorize("@ss.hasPermi('pile:whitelist:export')") + @Log(title = "站点白名单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, PileStationWhitelist pileStationWhitelist) + { + List list = pileStationWhitelistService.selectPileStationWhitelistList(pileStationWhitelist); + ExcelUtil util = new ExcelUtil(PileStationWhitelist.class); + util.exportExcel(response, list, "站点白名单数据"); + } + + /** + * 获取站点白名单详细信息 + */ + @PreAuthorize("@ss.hasPermi('pile:whitelist:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(pileStationWhitelistService.selectPileStationWhitelistById(id)); + } + + /** + * 新增站点白名单 + */ + @PreAuthorize("@ss.hasPermi('pile:whitelist:add')") + @Log(title = "站点白名单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody PileStationWhitelist pileStationWhitelist) + { + return toAjax(pileStationWhitelistService.insertPileStationWhitelist(pileStationWhitelist)); + } + + /** + * 修改站点白名单 + */ + @PreAuthorize("@ss.hasPermi('pile:whitelist:edit')") + @Log(title = "站点白名单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody PileStationWhitelist pileStationWhitelist) + { + return toAjax(pileStationWhitelistService.updatePileStationWhitelist(pileStationWhitelist)); + } + + /** + * 删除站点白名单 + */ + @PreAuthorize("@ss.hasPermi('pile:whitelist:remove')") + @Log(title = "站点白名单", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(pileStationWhitelistService.deletePileStationWhitelistByIds(ids)); + } +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationWhitelist.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationWhitelist.java index a308f4015..04c298d36 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationWhitelist.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationWhitelist.java @@ -31,6 +31,12 @@ public class PileStationWhitelist extends BaseEntity { @Excel(name = "会员id") private String memberId; + /** + * 手机号 + */ + @Excel(name = "手机号") + private String mobileNumber; + /** * 删除标识(0-正常;1-删除) */ @@ -60,6 +66,14 @@ public class PileStationWhitelist extends BaseEntity { return memberId; } + public String getMobileNumber() { + return mobileNumber; + } + + public void setMobileNumber(String mobileNumber) { + this.mobileNumber = mobileNumber; + } + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileStationWhitelistMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileStationWhitelistMapper.xml index e6603ad20..8d9fb6ebb 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileStationWhitelistMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationWhitelistMapper.xml @@ -8,6 +8,7 @@ + @@ -16,7 +17,7 @@ - id, station_id, member_id, create_time, create_by, update_time, update_by, del_flag + id, station_id, member_id, mobile_number, create_time, create_by, update_time, update_by, del_flag @@ -30,6 +31,7 @@ and station_id = #{stationId} and member_id = #{memberId} + and mobile_number = #{mobileNumber} @@ -44,6 +46,7 @@ id, station_id, member_id, + mobile_number, create_time, create_by, update_time, @@ -54,6 +57,7 @@ #{id}, #{stationId}, #{memberId}, + #{mobileNumber}, #{createTime}, #{createBy}, #{updateTime}, @@ -67,6 +71,7 @@ station_id = #{stationId}, member_id = #{memberId}, + mobile_number = #{mobileNumber}, create_time = #{createTime}, create_by = #{createBy}, update_time = #{updateTime}, diff --git a/jsowell-ui/src/api/pile/whitelist.js b/jsowell-ui/src/api/pile/whitelist.js new file mode 100644 index 000000000..291a99f90 --- /dev/null +++ b/jsowell-ui/src/api/pile/whitelist.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询站点白名单列表 +export function listWhitelist(query) { + return request({ + url: '/pile/whitelist/list', + method: 'get', + params: query + }) +} + +// 查询站点白名单详细 +export function getWhitelist(id) { + return request({ + url: '/pile/whitelist/' + id, + method: 'get' + }) +} + +// 新增站点白名单 +export function addWhitelist(data) { + return request({ + url: '/pile/whitelist', + 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' + }) +} diff --git a/jsowell-ui/src/views/pile/station/detail.vue b/jsowell-ui/src/views/pile/station/detail.vue index 5210ef06f..65dbe8d8a 100644 --- a/jsowell-ui/src/views/pile/station/detail.vue +++ b/jsowell-ui/src/views/pile/station/detail.vue @@ -44,22 +44,24 @@ 配置参数 - - - + + + + + + - - - + + @@ -70,16 +72,20 @@ import connectorList from "./connectorList.vue"; import pileList from "./pileList.vue"; import MapContainer from "../../../components/MapContainer/MapContainer.vue"; import stationOrderList from "@/views/pile/station/stationOrderList"; -import {updatePlateNumber} from "@/api/member/info"; +import stationWhiteList from "@/views/pile/station/stationWhiteList"; import {getStationInfo, updateStationQRCodePrefix} from "@/api/pile/station"; +import Whitelist from "@/views/pile/station/stationWhiteList"; + export default { components: { + Whitelist, SiteInfo, pileList, connectorList, Billing, MapContainer, - stationOrderList + stationOrderList, + stationWhiteList }, data() { return { diff --git a/jsowell-ui/src/views/pile/station/stationWhiteList.vue b/jsowell-ui/src/views/pile/station/stationWhiteList.vue new file mode 100644 index 000000000..898337cf0 --- /dev/null +++ b/jsowell-ui/src/views/pile/station/stationWhiteList.vue @@ -0,0 +1,273 @@ + + +