From 019c255a8f44e1244aa0c7700ae48c50b478c158 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 20 Nov 2024 10:52:24 +0800 Subject: [PATCH 01/31] =?UTF-8?q?=E9=87=8D=E5=86=99toString?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/dto/BluetoothChargingRecordDTO.java | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/BluetoothChargingRecordDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/BluetoothChargingRecordDTO.java index 1feae3ff2..9bd97a07e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/BluetoothChargingRecordDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/BluetoothChargingRecordDTO.java @@ -2,6 +2,8 @@ package com.jsowell.pile.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 蓝牙充电记录 @@ -135,4 +137,42 @@ public class BluetoothChargingRecordDTO { // 物理卡号 @JsonProperty(value = "PCardID") private String pCardID; + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.JSON_STYLE) + .append("memberId", memberId) + .append("trxSN", trxSN) + .append("pileNo", pileNo) + .append("plugNo", plugNo) + .append("startTime", startTime) + .append("endTime", endTime) + .append("priceSharp", priceSharp) + .append("energySharp", energySharp) + .append("lossKwhSharp", lossKwhSharp) + .append("moneySharp", moneySharp) + .append("pricePeak", pricePeak) + .append("energyPeak", energyPeak) + .append("lossKwhPeak", lossKwhPeak) + .append("moneyPeak", moneyPeak) + .append("priceFlat", priceFlat) + .append("energyFlat", energyFlat) + .append("lossKwhFlat", lossKwhFlat) + .append("moneyFlat", moneyFlat) + .append("priceValley", priceValley) + .append("energyValley", energyValley) + .append("lossKwhValley", lossKwhValley) + .append("moneyValley", moneyValley) + .append("startKwh", startKwh) + .append("stopKwh", stopKwh) + .append("totalEnergy", totalEnergy) + .append("lossTotalKwh", lossTotalKwh) + .append("totalMoney", totalMoney) + .append("vin", vin) + .append("startMode", startMode) + .append("tradeTime", tradeTime) + .append("stopReason", stopReason) + .append("pCardID", pCardID) + .toString(); + } } From 17e646811bf2eaa777100a8a53962ec98c43a8df Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 20 Nov 2024 14:16:25 +0800 Subject: [PATCH 02/31] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/common/util/file/AliyunOssUploadUtils.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/file/AliyunOssUploadUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/file/AliyunOssUploadUtils.java index 892343f6d..4f5e9dc6e 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/file/AliyunOssUploadUtils.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/file/AliyunOssUploadUtils.java @@ -3,7 +3,9 @@ package com.jsowell.common.util.file; import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; import com.aliyun.oss.model.ObjectMetadata; +import com.aliyun.oss.model.PutObjectResult; import com.jsowell.common.config.AliyunOssConfig; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; @@ -14,6 +16,7 @@ import java.io.InputStream; import java.time.LocalDateTime; import java.time.ZoneOffset; +@Slf4j @Component public class AliyunOssUploadUtils { @@ -55,7 +58,8 @@ public class AliyunOssUploadUtils { // 文件路径名称 filePathName = aliyunOssConfig.getFilehost() + "/" + dir_name + randomNumber + filePathName; try { - ossClient.putObject(aliyunOssConfig.getBucketName(), filePathName, file.getInputStream()); + PutObjectResult putObjectResult = ossClient.putObject(aliyunOssConfig.getBucketName(), filePathName, file.getInputStream()); + log.info("上传OSS成功, url:{}", putObjectResult.getResponse().getUri()); } catch (IOException e) { e.printStackTrace(); } finally { From 86023c9e29dbf633952ff9b13df5b0b7f5d8163c Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 20 Nov 2024 14:26:16 +0800 Subject: [PATCH 03/31] =?UTF-8?q?update=20=20=E8=A7=A3=E6=9E=900x17?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE=E5=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParameterConfigurationHandler.java | 12 +- .../platform/domain/ChargeAlgorithmData.java | 234 ++++++++++++++++++ 2 files changed, 245 insertions(+), 1 deletion(-) create mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/ChargeAlgorithmData.java diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ParameterConfigurationHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ParameterConfigurationHandler.java index d63f93704..b939db493 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ParameterConfigurationHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ParameterConfigurationHandler.java @@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.math.BigDecimal; import java.util.Objects; /** @@ -65,23 +66,28 @@ public class ParameterConfigurationHandler extends AbstractYkcHandler { startIndex += length; length = 2; byte[] BMSMaxVoltageByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); + String BMSMaxVoltage = String.valueOf(BytesUtil.bytesToIntLittle(BMSMaxVoltageByteArr) * 0.01); // BMS 最高允许充电电流 0.1 A/位， -400A 偏移量 startIndex += length; byte[] BMSMaxCurrentByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); + String BMSMaxCurrent = String.valueOf(BytesUtil.bytesToIntLittle(BMSMaxCurrentByteArr) * 0.1 - 400); // BMS 动力蓄电池标称总能量 0.1 kWh/位， 0 kWh 偏移量； 数据范围： 0~1000 kWh startIndex += length; byte[] BMSSumEnergyByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); + String BMSSumEnergy = String.valueOf(BytesUtil.bytesToIntLittle(BMSSumEnergyByteArr) * 0.1); // BMS 最高允许充电总电压 0.1 V/位， 0 V 偏移量 startIndex += length; byte[] BMSMaxChargingVoltageByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); + String BMSMaxChargingVoltage = String.valueOf(BytesUtil.bytesToIntLittle(BMSMaxChargingVoltageByteArr) * 0.1); // BMS 最高允许温度 1ºC/位， -50 ºC 偏移量；数据范 围： -50 ºC ~+200 ºC startIndex += length; length = 1; byte[] BMSMaxTemperatureByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); + String BMSMaxTemperature = String.valueOf(BytesUtil.bytesToIntLittle(BMSMaxTemperatureByteArr) - 50); // BMS 整车动力 蓄电池荷电状态(soc) 0.1%/位， 0%偏移量；数据范围： 0~100% startIndex += length; @@ -89,26 +95,30 @@ public class ParameterConfigurationHandler extends AbstractYkcHandler { byte[] BMSSocByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); String soc = YKCUtils.convertVoltageCurrent(BMSSocByteArr); - // BMS 整车动力蓄电池当前电池电压 整车动力蓄电池总电压 startIndex += length; byte[] BMSRealTimeVoltageByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); + String BMSRealTimeVoltage = String.valueOf(BytesUtil.bytesToIntLittle(BMSRealTimeVoltageByteArr) * 0.1); // 电桩最高输出电压 0.1 V /位， 0 V 偏移量 startIndex += length; byte[] pileMaxOutputVoltageByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); + String pileMaxOutputVoltage = String.valueOf(BytesUtil.bytesToIntLittle(pileMaxOutputVoltageByteArr) * 0.1); // 电桩最低输出电压 0.1 V /位， 0 V 偏移量 startIndex += length; byte[] pileMinOutputVoltageByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); + String pileMinOutputVoltage = String.valueOf(BytesUtil.bytesToIntLittle(pileMinOutputVoltageByteArr) * 0.1); // 电桩最大输出电流 0.1 A/位， -400 A 偏移量 startIndex += length; byte[] pileMaxOutputCurrentByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); + String pileMaxOutputCurrent = String.valueOf(BytesUtil.bytesToIntLittle(pileMaxOutputCurrentByteArr) * 0.1 - 400); // 电桩最小输出电流 0.1 A/位， -400 A 偏移量 startIndex += length; byte[] pileMinOutputCurrentByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); + String pileMinOutputCurrent = String.valueOf(BytesUtil.bytesToIntLittle(pileMinOutputCurrentByteArr) * 0.1 - 400); // 查询该订单下信息，将起始soc传入 OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/ChargeAlgorithmData.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/ChargeAlgorithmData.java new file mode 100644 index 000000000..6ed648eae --- /dev/null +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/ChargeAlgorithmData.java @@ -0,0 +1,234 @@ +package com.jsowell.thirdparty.platform.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 充电订单算法Data + * + * @author Lemon + * @Date 2024/11/19 14:02:40 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class ChargeAlgorithmData { + /** + * 订单号 + */ + private String orderCode; + + /** + * 初始SOC + */ + private Integer initSoc; + + /** + * 当前soc + */ + private Integer currentSoc; + + /** + * 告警编码 + */ + private String alarmCode; + + /** + * 累计服务费 + */ + private String currentServiceFee; + + /** + * 总费用 + */ + private String currentTotalFee; + + /** + * 累计充电量 + */ + private String totalCharge; + + /** + * 充电时长 + */ + private Integer totalChargeTime; + + /** + * 剩余充电时间 + */ + private Integer remainChargeTime; + + /** + * 最高允许电流 + */ + private String maxAllowElectricity; + + /** + * 单体最高允许电压 + */ + private String singleMaxAllowVoltage; + + /** + * 直流充电电压 + */ + private String dcv; + + /** + * 直流充电电流 + */ + private String dca; + + /** + * BMS需求电压 + */ + private String bmsDemandVoltage; + + /** + * BMS需求电流 + */ + private String bmsDemandElectricity; + + /** + * BMS充电模式 + */ + private Integer bmsChargeMode; + + /** + * 充电前电表读数 + */ + private String readBeforeCharge; + + /** + * 当前电表读数 + */ + private String readCurrentCharge; + + /** + * 开始充电时间 + */ + private String beginTime; + + /** + * 最高允许温度 + */ + private String maxAllowTemp; + + /** + * 充电功率 + */ + private String chargePower; + + /** + * 电池额定容量 + */ + private String ratedCapacity; + + /** + * 电池标称总能量 + */ + private String nominalEnergy; + + /** + * 电池额定总电压 + */ + private String ratedVoltage; + + /** + * 单体最高电压 + */ + private String singleMaxVoltage; + + /** + * 单体最低电压 + */ + private String singleMinVoltage; + + /** + * 单体最高温度 + */ + private String singleMaxTemp; + + /** + * 单体最低温度 + */ + private String singleMinTemp; + + /** + * 出风口温度 + */ + private String ventTemp; + + /** + * 环境温度 + */ + private String environmentTemp; + + /** + * 充电枪温度 + */ + private String gunTemp; + + /** + * 舱门状态 + */ + private Integer doorStatus; + + /** + * BMS版本 + */ + private String bmsVersion; + + /** + * 车辆测量充电电压 + */ + private String measuringChargeVoltage; + + /** + * 车辆测量充电电流 + */ + private String measuringChargeElectricity; + + /** + * 最高单体电压组号 + */ + private Integer maxSingleVoltageGroupNum; + + /** + * 最高单体电压编号 + */ + private Integer maxSingleVoltageNum; + + /** + * 最高温度点编号 + */ + private Integer maxTempPointNum; + + /** + * 最低温度点编号 + */ + private Integer minTempPointNum; + + /** + * 电池类型 + */ + private String batteryType; + + /** + * 电池绝缘状态 + */ + private Integer batteryInsulation; + + /** + * 最高允许充电总电压 + */ + private String maxAllowTotalVoltage; + + /** + * 充电前总电压 + */ + private String beforeChargeTotalVoltage; + +} From c52e8137f8d05dfb4de409c3aacab2b7e206c286 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 20 Nov 2024 14:31:10 +0800 Subject: [PATCH 04/31] update --- .../handler/yunkuaichong/ParameterConfigurationHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ParameterConfigurationHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ParameterConfigurationHandler.java index b939db493..544e6fd92 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ParameterConfigurationHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ParameterConfigurationHandler.java @@ -61,6 +61,7 @@ public class ParameterConfigurationHandler extends AbstractYkcHandler { startIndex += length; length = 1; byte[] pileConnectorNumByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); + String pileConnectorCode = BytesUtil.bcd2Str(pileConnectorNumByteArr); // BMS 单体动力蓄电池最高允许充电电压 0.01 V/位， 0 V 偏移量； 数据范围： 0~24 V startIndex += length; From 95f4efcdd027c8fb03ec9dbd3fa3112bff65942f Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 20 Nov 2024 16:51:59 +0800 Subject: [PATCH 05/31] =?UTF-8?q?=E6=A1=A9=E5=9B=BA=E4=BB=B6=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=A1=A8=E6=96=B0=E5=A2=9E=20=E2=80=9Curl=E2=80=9D?= =?UTF-8?q?=E3=80=81=E2=80=9C=E4=BD=BF=E7=94=A8=E8=8C=83=E5=9B=B4=E2=80=9D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/PileFirmwareInfoController.java | 18 +++++++++++ .../src/main/resources/application-dev.yml | 2 ++ .../src/main/resources/application-prd.yml | 2 ++ .../src/main/resources/application-pre.yml | 2 ++ .../src/main/resources/application-sit.yml | 2 ++ .../common/config/AliyunOssConfig.java | 31 ++++++++++++++----- .../jsowell/pile/domain/PileFirmwareInfo.java | 31 +++++++++++++------ .../mapper/pile/PileFirmwareInfoMapper.xml | 10 +++++- 8 files changed, 79 insertions(+), 19 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileFirmwareInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileFirmwareInfoController.java index ffa4b6138..7f4ded039 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileFirmwareInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileFirmwareInfoController.java @@ -5,12 +5,15 @@ 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.response.RestApiResponse; +import com.jsowell.common.util.file.AliyunOssUploadUtils; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.PileFirmwareInfo; import com.jsowell.pile.service.PileFirmwareInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -88,4 +91,19 @@ public class PileFirmwareInfoController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(pileFirmwareInfoService.deletePileFirmwareInfoByIds(ids)); } + + + /** + * 上传蓝牙升级程序 + * @param file + * @return + */ + @PostMapping("/uploadBlueToothFile") + public AjaxResult uploadBlueToothFile(@RequestParam("avatarfile") MultipartFile file) { + if (!file.isEmpty()) { + String result = AliyunOssUploadUtils.uploadBlueToothFile(file); + return AjaxResult.success(); + } + return AjaxResult.error("上传文件错误！！"); + } } diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index 92f0dd6a0..5b0f17d88 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -141,6 +141,8 @@ aliyunoss: bucketName: ydc-oss-dev # bucket下文件夹的路径 filehost: img + # 蓝牙小程序文件保存路径 + bluetoothFileHost: bluetooth # 访问域名 # url: https://ydc-oss-dev.oss-cn-shanghai.aliyuncs.com url: http://img.sit.jsowellcloud.com diff --git a/jsowell-admin/src/main/resources/application-prd.yml b/jsowell-admin/src/main/resources/application-prd.yml index d4a8040b7..0c70b27d4 100644 --- a/jsowell-admin/src/main/resources/application-prd.yml +++ b/jsowell-admin/src/main/resources/application-prd.yml @@ -140,6 +140,8 @@ aliyunoss: bucketName: ydc-oss-prod # bucket下文件夹的路径 filehost: img + # 蓝牙小程序文件保存路径 + bluetoothFileHost: bluetooth # 访问域名 # url: https://ydc-oss-prod.oss-cn-shanghai.aliyuncs.com url: https://img.jsowellcloud.com diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml index afe982603..421da02a5 100644 --- a/jsowell-admin/src/main/resources/application-pre.yml +++ b/jsowell-admin/src/main/resources/application-pre.yml @@ -140,6 +140,8 @@ aliyunoss: bucketName: ydc-oss-prod # bucket下文件夹的路径 filehost: img + # 蓝牙小程序文件保存路径 + bluetoothFileHost: bluetooth # 访问域名 # url: https://ydc-oss-prod.oss-cn-shanghai.aliyuncs.com url: https://img.jsowellcloud.com diff --git a/jsowell-admin/src/main/resources/application-sit.yml b/jsowell-admin/src/main/resources/application-sit.yml index fdffe21b0..cc747b44d 100644 --- a/jsowell-admin/src/main/resources/application-sit.yml +++ b/jsowell-admin/src/main/resources/application-sit.yml @@ -140,6 +140,8 @@ aliyunoss: bucketName: ydc-oss-dev # bucket下文件夹的路径 filehost: img + # 蓝牙小程序文件保存路径 + bluetoothFileHost: bluetooth # 访问域名 # url: https://ydc-oss-dev.oss-cn-shanghai.aliyuncs.com url: http://img.sit.jsowellcloud.com diff --git a/jsowell-common/src/main/java/com/jsowell/common/config/AliyunOssConfig.java b/jsowell-common/src/main/java/com/jsowell/common/config/AliyunOssConfig.java index 09b5a9d83..48c7c762d 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/config/AliyunOssConfig.java +++ b/jsowell-common/src/main/java/com/jsowell/common/config/AliyunOssConfig.java @@ -1,5 +1,6 @@ package com.jsowell.common.config; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -31,6 +32,11 @@ public class AliyunOssConfig { */ private String filehost; + /** + * 蓝牙小程序文件路径 + */ + private String bluetoothFileHost; + /** * 访问域名 */ @@ -76,6 +82,14 @@ public class AliyunOssConfig { this.filehost = filehost; } + public String getBluetoothFileHost() { + return bluetoothFileHost; + } + + public void setBluetoothFileHost(String bluetoothFileHost) { + this.bluetoothFileHost = bluetoothFileHost; + } + public String getUrl() { return url; } @@ -86,13 +100,14 @@ public class AliyunOssConfig { @Override public String toString() { - return "AliyunOssConfig{" + - "endpoint='" + endpoint + '\'' + - ", accessKeyId='" + accessKeyId + '\'' + - ", accessKeySecret='" + accessKeySecret + '\'' + - ", bucketName='" + bucketName + '\'' + - ", filehost='" + filehost + '\'' + - ", url='" + url + '\'' + - '}'; + return new ToStringBuilder(this) + .append("endpoint", endpoint) + .append("accessKeyId", accessKeyId) + .append("accessKeySecret", accessKeySecret) + .append("bucketName", bucketName) + .append("filehost", filehost) + .append("bluetoothFileHost", bluetoothFileHost) + .append("url", url) + .toString(); } } \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileFirmwareInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileFirmwareInfo.java index c59f1ed57..a10369ed0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileFirmwareInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileFirmwareInfo.java @@ -47,6 +47,18 @@ public class PileFirmwareInfo extends BaseEntity { @Excel(name = "适用类型") private String applyType; + /** + * 使用范围 + */ + @Excel(name = "使用范围") + private String useRange; + + /** + * 下载链接url + */ + @Excel(name = "下载链接url") + private String downloadUrl; + /** * 删除标识（0-正常；1-删除） */ @@ -54,16 +66,15 @@ public class PileFirmwareInfo extends BaseEntity { @Override public String toString() { - return new ToStringBuilder(this, ToStringStyle.JSON_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("desc", getDescription()) - .append("filePath", getFilePath()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .append("delFlag", getDelFlag()) + return new ToStringBuilder(this) + .append("id", id) + .append("name", name) + .append("description", description) + .append("filePath", filePath) + .append("applyType", applyType) + .append("useRange", useRange) + .append("downloadUrl", downloadUrl) + .append("delFlag", delFlag) .toString(); } } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml index dbc6ccdea..be56640c9 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml @@ -10,6 +10,8 @@ + + @@ -18,7 +20,7 @@ - select id, name, description, file_path, apply_type, create_time, create_by, update_time, update_by, del_flag from pile_firmware_info + select id, name, description, file_path, apply_type, use_range, download_url, create_time, create_by, update_time, update_by, del_flag from pile_firmware_info