diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileSimInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileSimInfoController.java index 3c37a5d21..d1c7a7e43 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileSimInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileSimInfoController.java @@ -63,15 +63,16 @@ public class PileSimInfoController extends BaseController { List simInfoList = pileSimInfoService.getSimInfoList(dto); return getDataTable(simInfoList); } + /** * 导出充电桩SIM卡信息列表 */ @PreAuthorize("@ss.hasPermi('pile:sim:export')") @Log(title = "充电桩SIM卡信息", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, PileSimInfo pileSimInfo) { - List list = pileSimInfoService.selectPileSimInfoList(pileSimInfo); - ExcelUtil util = new ExcelUtil(PileSimInfo.class); + public void export(HttpServletResponse response, QuerySimInfoDTO dto) { + List list = pileSimInfoService.getSimInfoList(dto); + ExcelUtil util = new ExcelUtil<>(SimCardInfoVO.class); util.exportExcel(response, list, "充电桩SIM卡信息数据"); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SimCardInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SimCardInfoVO.java index c48d22e20..d35c8f4cb 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SimCardInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SimCardInfoVO.java @@ -1,5 +1,6 @@ package com.jsowell.pile.vo.web; +import com.jsowell.common.annotation.Excel; import lombok.Data; /** @@ -18,46 +19,55 @@ public class SimCardInfoVO { /** * 套餐名称 */ + @Excel(name = "套餐名称") private String name; /** * 桩编码 */ + @Excel(name = "桩编码") private String pileSn; /** * ICCID */ + @Excel(name = "ICCID") private String iccId; /** * sim卡状态 (0-沉默;1-正在使用;2-正常使用) */ + @Excel(name = "sim卡状态", dictType = "sim_status") private String simCardStatus; /** * 总计流量 */ + @Excel(name = "总计流量") private String totalData; /** * 剩余流量 */ + @Excel(name = "剩余流量") private String surplusData; /** * 到期时间 */ + @Excel(name = "到期时间") private String expireTime; /** * 运营商 */ + @Excel(name = "运营商", dictType = "sim_operator") private String operator; /** * Sim卡供应商 */ + @Excel(name = "Sim卡供应商", dictType = "sim_supplier") private String simSupplier; /** @@ -68,11 +78,13 @@ public class SimCardInfoVO { /** * 站点名称 */ + @Excel(name = "站点名称") private String stationName; /** * 剩余天数 */ + @Excel(name = "剩余天数") private String remainingDays; } diff --git a/jsowell-ui/src/views/pile/sim/index.vue b/jsowell-ui/src/views/pile/sim/index.vue index 34f5b243a..57b728411 100644 --- a/jsowell-ui/src/views/pile/sim/index.vue +++ b/jsowell-ui/src/views/pile/sim/index.vue @@ -316,6 +316,7 @@ export default { operator: null, pileSn: null, simSupplier : null, + stationId: null, }, value: '', // 表单参数