From 40eb80478096eafe845ac98114bf64f2e7b9b358 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 22 Jul 2019 13:22:15 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=94=B5=E8=A1=A8=E5=AF=BC=E5=87=BA=E6=A8=A1=E6=9D=BF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/device/KwMeterController.java | 21 +++++++++++++--- .../java/com/iformall/domain/po/KwMeter.java | 25 ++++++++++++++++--- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java index 1d757439a..d9b9485e9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java @@ -12,6 +12,7 @@ import com.iformall.enums.EnumBoxStatus; import com.iformall.enums.EnumMeterBindStatus; import com.iformall.enums.EnumMeterStatus; import com.iformall.exception.MallinkException; +import com.iformall.service.ExcelService; import com.iformall.service.kw.KwBoxService; import com.iformall.service.kw.KwMerchantMeterService; import com.iformall.service.kw.KwMeterDataService; @@ -46,6 +47,10 @@ public class KwMeterController extends BaseController { @Autowired private KwMerchantMeterService kwMerchantMeterService; + @Autowired + private ExcelService excelService; + + @ApiOperation("设备列表") @GetMapping("list") @ApiImplicitParams({ @@ -134,10 +139,20 @@ public class KwMeterController extends BaseController { return new ResultData(); } - @RequestMapping("导出模板") + @GetMapping("/exportTemplate") @SystemControllerLog(description = "电表管理-导出模板") public void exportTemplate(HttpServletRequest request, HttpServletResponse response) { - + List meterList = new ArrayList<>(); + KwMeter meter1 = new KwMeter(); + meter1.setAddress("000020492980"); + meter1.setPlace("1栋-3楼-2号电井"); + meter1.setBrand("人民电器"); + meter1.setModel("DS866"); + meter1.setProtocol(0); + meter1.setBandrate(1200); + meter1.setBoxImei("865501040775810"); + meter1.setMerchantName("富茂旗舰店"); + meterList.add(meter1); + excelService.exportExcel(meterList, null, "电表模板", KwMeter.class, "电表模板.xlsx", response, true); } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java index ea1ea75db..669ee3b82 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -35,21 +36,28 @@ public class KwMeter extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") private String tenantId; + + @Excel(name = "电表编号 *", width = 20, orderNum = "1") @io.swagger.annotations.ApiModelProperty(value = "电表编号", name = "address") private String address; + @Excel(name = "位置", width = 20, orderNum = "2") + @io.swagger.annotations.ApiModelProperty(value = "位置", name = "place") + private String place; + + @Excel(name = "品牌", width = 20, orderNum = "3") @io.swagger.annotations.ApiModelProperty(value = "品牌", name = "brand") private String brand; + @Excel(name = "型号", width = 20, orderNum = "4") @io.swagger.annotations.ApiModelProperty(value = "型号", name = "model") private String model; - @io.swagger.annotations.ApiModelProperty(value = "位置", name = "place") - private String place; - + @Excel(name = "协议(0,1-97协议,07协议)", width =30, orderNum = "5") @io.swagger.annotations.ApiModelProperty(value = "协议(0,97协议)(1,07协议)", name = "protocol") private Integer protocol; + @Excel(name = "波特率(1200,2400,9600)", width = 30, orderNum = "6") @io.swagger.annotations.ApiModelProperty(value = "波特率1200,2400,9600", name = "bandrate") private Integer bandrate; @@ -77,12 +85,23 @@ public class KwMeter extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "状态0绑定1未绑定", name = "bindStatus") private Integer bindStatus; + + @Excel(name = "采集设备号", width = 20, orderNum = "7") + @Transient + private String boxImei; + + @Excel(name = "商户", width = 20, orderNum = "8") + @Transient + private String merchantName; + @Transient private Integer merchantMeterStatus; @Transient protected KwMeterData latestRecord; + + public static enum Field { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"),