From 956d615010b848da6feac3140e486d63692691ad Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 25 May 2023 16:38:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E8=81=94=E8=81=94?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=AE=BE=E5=A4=87=E5=85=85=E7=94=B5=E4=B8=AD?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=98=E5=8C=96=E6=8E=A8=E9=80=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/IOrderBasicInfoService.java | 4 +- .../domain/ConnectorChargeStatusInfo.java | 52 ++++++++++------ .../thirdparty/service/LianLianService.java | 7 +++ .../service/impl/LianLianServiceImpl.java | 60 +++++++++++++++++-- 4 files changed, 100 insertions(+), 23 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java index 360db83f3..059235812 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java @@ -153,10 +153,10 @@ public interface IOrderBasicInfoService { /** * 获取充电实时数据 - * @param orderCode 订单编号 + * @param transactionCode 交易流水号 * @return */ - List getChargingRealTimeData(String orderCode); + List getChargingRealTimeData(String transactionCode); /** * 首页订单数据展示 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorChargeStatusInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorChargeStatusInfo.java index 0c34e1e4f..6c204b6b9 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorChargeStatusInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorChargeStatusInfo.java @@ -1,5 +1,6 @@ package com.jsowell.thirdparty.domain; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -19,13 +20,15 @@ public class ConnectorChargeStatusInfo { * 充电订单号 Y * 对接平台系统订单编号 */ - private String StartChargeSeq; + @JSONField(name = "StartChargeSeq") + private String startChargeSeq; /** * 充电设备接口编码 Y * 平台下唯一枪口号 */ - private String ConnectorID; + @JSONField(name = "ConnectorID") + private String connectorID; /** * 充电设备接口状态 Y @@ -35,88 +38,103 @@ public class ConnectorChargeStatusInfo { * 4：占用（预约锁定） * 255：故障 */ - private Integer ConnectorStatus; + @JSONField(name = "ConnectorStatus") + private Integer connectorStatus; /** * 车辆识别码 N * 车辆识别号码或车架号码，由17位英数组成 */ - private String Vin; + @JSONField(name = "Vin") + private String vin; /** * A相电流 Y * 单位：A，默认：0 含直流(输出) */ - private BigDecimal CurrentA; + @JSONField(name = "CurrentA") + private BigDecimal currentA; /** * B相电流 N * 单位：A，默认：0 */ - private BigDecimal CurrentB; + @JSONField(name = "CurrentB") + private BigDecimal currentB; /** * C相电流 N * 单位：A，默认：0 */ - private BigDecimal CurrentC; + @JSONField(name = "CurrentC") + private BigDecimal currentC; /** * A相电压 Y * 单位：V，默认：0含直流(输出) */ - private BigDecimal VoltageA; + @JSONField(name = "VoltageA") + private BigDecimal voltageA; /** * B相电压 N * 单位：V，默认：0 */ - private BigDecimal VoltageB; + @JSONField(name = "VoltageB") + private BigDecimal voltageB; /** * C相电压 N * 单位：V，默认：0 */ - private BigDecimal VoltageC; + @JSONField(name = "VoltageC") + private BigDecimal voltageC; /** * 电池剩余电量(默认：0) Y */ - private BigDecimal Soc; + @JSONField(name = "Soc") + private BigDecimal soc; /** * 开始充电时间 Y * 格式“yyyy-MM-dd HH:mm:ss” */ - private String StartTime; + @JSONField(name = "StartTime") + private String startTime; /** * 本次采样时间 Y * 格式“yyyy-MM-dd HH:mm:ss” */ - private String EndTime; + @JSONField(name = "EndTime") + private String endTime; /** * 累计充电量 Y * 单位：度，小数点后2位 */ - private BigDecimal TotalPower; + @JSONField(name = "TotalPower") + private BigDecimal totalPower; /** * 累计电费 Y * 单位：元，小数点后2位 */ - private BigDecimal ElecMoney; + @JSONField(name = "ElecMoney") + private BigDecimal elecMoney; /** * 累计服务费 Y * 单位：元，小数点后2位 */ - private BigDecimal SeviceMoney; + @JSONField(name = "SeviceMoney") + private BigDecimal seviceMoney; /** * 累计总金额 Y * 单位：元，小数点后2位 */ - private BigDecimal TotalMoney; + @JSONField(name = "TotalMoney") + private BigDecimal totalMoney; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java index b753e3fd7..0fad2558f 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java @@ -142,4 +142,11 @@ public interface LianLianService { * @return */ String pushOrderReconciliationInfo(String orderCode); + + /** + * 设备充电中状态变化推送 + * @param pileConnectorCode + * @return + */ + String pushPileChargeStatusChange(String pileConnectorCode); } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java index 6082e36ac..3a4bcc197 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java @@ -92,7 +92,7 @@ public class LianLianServiceImpl implements LianLianService { } /** - * 根据站点id推送站点信息 + * 根据站点id推送站点信息 notification_stationInfo * @param dto */ @Override @@ -276,7 +276,7 @@ public class LianLianServiceImpl implements LianLianService { // 充电中 ConnectorChargeStatusInfo info = new ConnectorChargeStatusInfo(); OrderBasicInfo orderBasicInfo = orderBasicInfoService.queryChargingByPileConnectorCode(connectorInfoVO.getPileConnectorCode()); - List chargingRealTimeData = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getOrderCode()); + List chargingRealTimeData = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode()); RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0); info.setStartChargeSeq(orderBasicInfo.getOrderCode()); @@ -640,7 +640,7 @@ public class LianLianServiceImpl implements LianLianService { } /** - * 联联平台推送 设备状态变化推送 + * 联联平台推送 设备状态变化推送 notification_stationStatus * @param pileConnectorCode * @param status * @return @@ -683,7 +683,7 @@ public class LianLianServiceImpl implements LianLianService { } /** - * 推送订单信息 + * 推送订单信息 notification_orderInfo * @param orderCode * @return */ @@ -1120,6 +1120,58 @@ public class LianLianServiceImpl implements LianLianService { return result; } + /** + * 设备充电中状态变化推送 notification_connector_charge_status + * @param pileConnectorCode + * @return + */ + @Override + public String pushPileChargeStatusChange(String pileConnectorCode) { + String url = TEST_URL + "notification_connector_charge_status"; + // 根据枪口号查询充电实时状态 + OrderBasicInfo orderBasicInfo = orderBasicInfoService.queryChargingByPileConnectorCode(pileConnectorCode); + List list = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode()); + RealTimeMonitorData realTimeMonitorData = list.get(0); + // 拼装联联参数 + ConnectorChargeStatusInfo info = ConnectorChargeStatusInfo.builder() + .startChargeSeq(orderBasicInfo.getOrderCode()) + .connectorID(pileConnectorCode) + .connectorStatus(Integer.valueOf(realTimeMonitorData.getConnectorStatus())) + .currentA(new BigDecimal(realTimeMonitorData.getOutputCurrent())) + .voltageA(new BigDecimal(realTimeMonitorData.getOutputVoltage())) + .soc(new BigDecimal(realTimeMonitorData.getSOC())) + .startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeStartTime())) + .endTime(DateUtils.getTime()) + .totalPower(new BigDecimal(realTimeMonitorData.getChargingDegree())) + .elecMoney(new BigDecimal("0")) // TODO + .seviceMoney(new BigDecimal("0")) // TODO + .totalMoney(new BigDecimal(realTimeMonitorData.getChargingAmount()).setScale(2, BigDecimal.ROUND_HALF_UP)) + + .build(); + + // 通过站点id查询相关配置信息 + ThirdPartySettingInfo settingInfo = thirdPartySettingInfoService.getInfoByStationId(Long.parseLong(orderBasicInfo.getStationId())); + if (settingInfo == null) { + return null; + } + String operatorId = settingInfo.getOperatorId(); + String operatorSecret = settingInfo.getOperatorSecret(); + String signSecret = settingInfo.getSignSecret(); + String dataSecret = settingInfo.getDataSecret(); + String dataSecretIv = settingInfo.getDataSecretIv(); + + // 获取令牌 + String token = getToken(operatorId, operatorSecret); + if (StringUtils.isBlank(token)){ + return null; + } + String jsonString = JSONObject.toJSONString(info); + // 发送请求 + String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret, dataSecretIv, operatorId, signSecret); + + return result; + } + /** * TODO 请求打印充电小票 */ From e31e19a1bdc3a0a6d8b7518e67f9970778762516 Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 25 May 2023 16:50:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?update=20=E5=90=8E=E7=AE=A1=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=AB=99=E7=82=B9=E4=BA=92=E8=81=94=E4=BA=92=E9=80=9A?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/PileStationInfoController.java | 2 +- jsowell-ui/src/views/pile/station/detail.vue | 37 ++++++++++++------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java index 2d3dd9d68..43cfb4c08 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java @@ -190,7 +190,7 @@ public class PileStationInfoController extends BaseController { */ @PreAuthorize("@ss.hasPermi('pile:station:edit')") @PostMapping("/updateSettingByStationId") - public AjaxResult updateSettingByStationId(ThirdPartySettingInfo info) { + public AjaxResult updateSettingByStationId(@RequestBody ThirdPartySettingInfo info) { return AjaxResult.success(thirdPartySettingInfoService.updateStationSettingInfo(info)); } diff --git a/jsowell-ui/src/views/pile/station/detail.vue b/jsowell-ui/src/views/pile/station/detail.vue index 05c119834..a470f1d9f 100644 --- a/jsowell-ui/src/views/pile/station/detail.vue +++ b/jsowell-ui/src/views/pile/station/detail.vue @@ -57,35 +57,35 @@

互联互通配置

- + - - + + - - + + - - + + - - + + - - + + @@ -125,7 +125,7 @@ import pileList from "./pileList.vue"; import MapContainer from "../../../components/MapContainer/MapContainer.vue"; import stationOrderList from "@/views/pile/station/stationOrderList"; import stationWhiteList from "@/views/pile/station/stationWhiteList"; -import {getStationInfo, updateStationQRCodePrefix} from "@/api/pile/station"; +import {getStationInfo, updateStationQRCodePrefix, getSettingByStationId, updateSettingByStationId} from "@/api/pile/station"; import Whitelist from "@/views/pile/station/stationWhiteList"; export default { @@ -152,7 +152,8 @@ export default { stationName: this.$route.params.stationName, stationDetail: {}, stationLat:null, - stationLng:null + stationLng:null, + stationSettingInfo: {}, }; }, created() { @@ -163,6 +164,7 @@ export default { const route = Object.assign({}, this.$route, { title: `${title}` }) this.$store.dispatch('tagsView/updateVisitedView', route); this.queryStationInfo(); + this.getStationSettingInfo(); }, mounted() { this.initializeData(this.activeName); @@ -199,6 +201,15 @@ export default { }); console.log("queryStationInfo==", this.stationDetail); }, + // 查询站点互联互通配置信息 + getStationSettingInfo() { + getSettingByStationId(this.stationId).then((res) =>{ + console.log("stationId:", this.stationId) + console.log("getSettingByStationId==", res) + this.stationSettingInfo = res.data; + }) + }, + // 配置参数按钮 handleCreate() { this.dialogTitle = '配置参数'; From fd84575155bada4bdea4822e691789f9979425bc Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 25 May 2023 17:23:34 +0800 Subject: [PATCH 3/4] update --- .../ThirdPartySettingInfoServiceImpl.java | 1 + jsowell-ui/src/views/pile/station/detail.vue | 45 +++++++++++++++---- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartySettingInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartySettingInfoServiceImpl.java index 409502256..cba54ed94 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartySettingInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartySettingInfoServiceImpl.java @@ -113,6 +113,7 @@ public class ThirdPartySettingInfoServiceImpl implements IThirdPartySettingInfoS return insertThirdPartySettingInfo(info); }else { // 修改 + info.setId(infoByStationId.getId()); return updateThirdPartySettingInfo(info); } } diff --git a/jsowell-ui/src/views/pile/station/detail.vue b/jsowell-ui/src/views/pile/station/detail.vue index a470f1d9f..4c2d48678 100644 --- a/jsowell-ui/src/views/pile/station/detail.vue +++ b/jsowell-ui/src/views/pile/station/detail.vue @@ -56,41 +56,42 @@

互联互通配置

- - + 编辑参数 + - + - + - + - + - + - 提交 + 提交 + @@ -154,6 +155,7 @@ export default { stationLat:null, stationLng:null, stationSettingInfo: {}, + disableFlag: true, }; }, created() { @@ -210,6 +212,33 @@ export default { }) }, + // 开放编辑按钮 + openEdit(){ + this.disableFlag = false; + }, + + // 提交配置设置 + submitConfigForm() { + const param = { + stationId: this.stationId, + operatorId: this.stationSettingInfo.operatorId, + operatorSecret: this.stationSettingInfo.operatorSecret, + dataSecret: this.stationSettingInfo.dataSecret, + signSecret: this.stationSettingInfo.signSecret, + dataSecretIv: this.stationSettingInfo.dataSecretIv, + } + console.log("param:", param); + this.$refs.stationSettingForm.validate((valid) => { + if(valid){ + updateSettingByStationId(param).then((response) => { + this.$modal.msgSuccess('修改成功') + this.disableFlag = true; + }) + } else{ + return false + } + }) + }, // 配置参数按钮 handleCreate() { this.dialogTitle = '配置参数'; From 7c53e448307c095f560451d8b119c0d749b8d5f3 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 26 May 2023 08:58:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?add=20=E5=90=8E=E7=AE=A1=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=AB=99=E7=82=B9=E4=BF=A1=E6=81=AF=E5=88=B0=E8=81=94=E8=81=94?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/lianlian/LianLianController.java | 11 ++ .../pile/PileStationInfoController.java | 36 ++++ .../test/java/SpringBootTestController.java | 2 +- .../pile/domain/ThirdPartySettingInfo.java | 15 ++ .../pile/ThirdPartySettingInfoMapper.xml | 9 +- .../thirdparty/service/LianLianService.java | 5 +- .../service/impl/LianLianServiceImpl.java | 74 ++++--- jsowell-ui/src/api/pile/station.js | 8 + jsowell-ui/src/views/pile/station/detail.vue | 181 +++++++++++------- 9 files changed, 235 insertions(+), 106 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java b/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java index a895dbccd..d77da75d7 100644 --- a/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java +++ b/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java @@ -3,8 +3,10 @@ package com.jsowell.lianlian; import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.core.controller.BaseController; +import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; +import com.jsowell.common.util.StringUtils; import com.jsowell.pile.dto.LianLianPushStationInfoDTO; import com.jsowell.pile.dto.QueryEquipmentDTO; import com.jsowell.pile.dto.QueryStartChargeDTO; @@ -33,11 +35,20 @@ public class LianLianController extends BaseController { private LianLianService lianLianService; + /** + * 推送充电站信息 notification_stationInfo + * http://localhost:8080/LianLian/pushStationInfo + * @param dto + * @return + */ @PostMapping("/pushStationInfo") public RestApiResponse pushStationInfo(@RequestBody LianLianPushStationInfoDTO dto) { logger.info("推送联联平台充电站信息 params:{}", JSONObject.toJSONString(dto)); RestApiResponse response = null; try { + if (StringUtils.isBlank(String.valueOf(dto.getStationId()))) { + throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); + } lianLianService.pushStationInfo(dto); response = new RestApiResponse<>(); }catch (BusinessException e) { diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java index 43cfb4c08..4d636c92f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java @@ -8,16 +8,19 @@ import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.enums.BusinessType; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; +import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.PileStationInfo; import com.jsowell.pile.domain.ThirdPartySettingInfo; import com.jsowell.pile.dto.FastCreateStationDTO; +import com.jsowell.pile.dto.LianLianPushStationInfoDTO; import com.jsowell.pile.dto.QueryStationDTO; import com.jsowell.pile.service.IPileStationInfoService; import com.jsowell.pile.service.IThirdPartySettingInfoService; import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.service.PileService; +import com.jsowell.thirdparty.service.LianLianService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -43,6 +46,9 @@ public class PileStationInfoController extends BaseController { @Autowired private IThirdPartySettingInfoService thirdPartySettingInfoService; + @Autowired + private LianLianService lianLianService; + /** * 查询充电站信息列表NEW @@ -204,4 +210,34 @@ public class PileStationInfoController extends BaseController { // public AjaxResult insertSettingInfo(ThirdPartySettingInfo info) { // return AjaxResult.success(thirdPartySettingInfoService.insertThirdPartySettingInfo(info)); // } + + + + /** + * 推送充电站信息 notification_stationInfo + * http://localhost:8080/LianLian/pushStationInfo + * @param dto + * @return + */ + @PostMapping("/pushStationInfo") + public RestApiResponse pushStationInfo(@RequestBody LianLianPushStationInfoDTO dto) { + logger.info("推送联联平台充电站信息 params:{}", JSONObject.toJSONString(dto)); + RestApiResponse response = null; + try { + if (StringUtils.isBlank(String.valueOf(dto.getStationId()))) { + throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); + } + lianLianService.pushStationInfo(dto); + response = new RestApiResponse<>(); + }catch (BusinessException e) { + logger.error("推送联联平台充电站信息 error",e); + response = new RestApiResponse<>(e.getCode(), e.getMessage()); + }catch (Exception e) { + logger.error("推送联联平台充电站信息 error", e); + response = new RestApiResponse<>(e); + } + logger.info("推送联联平台充电站信息 result:{}", response); + return response; + } + } diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 7e3666160..8eb74c65d 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -164,7 +164,7 @@ public class SpringBootTestController { // LianLianGetTokenDTO dto = new LianLianGetTokenDTO(); // dto.setOperatorId("MA1JLFUU8"); // dto.setOperatorSecret("Nh62XxlIR5OjAzFj"); - String token = lianLianService.getToken("MA1JLFUU8", "fGwLsxW1HdzLw7jp"); + String token = lianLianService.getToken("", "MA1JLFUU8", "fGwLsxW1HdzLw7jp"); System.out.println("token:" + token); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ThirdPartySettingInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ThirdPartySettingInfo.java index d5967ca86..fddbf3160 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ThirdPartySettingInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ThirdPartySettingInfo.java @@ -25,6 +25,12 @@ public class ThirdPartySettingInfo extends BaseEntity { @Excel(name = "对接类型", readConverterExp = "1=-联联平台") private String type; + /** + * 对接平台url地址 + */ + @Excel(name = "url地址") + private String urlAddress; + /** * 站点id */ @@ -82,6 +88,14 @@ public class ThirdPartySettingInfo extends BaseEntity { return type; } + public String getUrlAddress() { + return urlAddress; + } + + public void setUrlAddress(String urlAddress) { + this.urlAddress = urlAddress; + } + public void setStationId(Long stationId) { this.stationId = stationId; } @@ -143,6 +157,7 @@ public class ThirdPartySettingInfo extends BaseEntity { return new ToStringBuilder(this, ToStringStyle.JSON_STYLE) .append("id", getId()) .append("type", getType()) + .append("urlAddress", getType()) .append("stationId", getStationId()) .append("operatorId", getOperatorId()) .append("operatorSecret", getOperatorSecret()) diff --git a/jsowell-pile/src/main/resources/mapper/pile/ThirdPartySettingInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ThirdPartySettingInfoMapper.xml index 724e84742..312eca9e2 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/ThirdPartySettingInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/ThirdPartySettingInfoMapper.xml @@ -7,6 +7,7 @@ + @@ -21,18 +22,19 @@ - select id, type, station_id, operator_id, operator_secret, sign_secret, data_secret, data_secret_IV, create_time, create_by, update_time, update_by, del_flag from thirdparty_setting_info + select id, type, url_address, station_id, operator_id, operator_secret, sign_secret, data_secret, data_secret_IV, create_time, create_by, update_time, update_by, del_flag from thirdparty_setting_info - id, type, station_id, operator_id, operator_secret, sign_secret, data_secret, data_secret_IV, create_time, create_by, update_time, update_by, del_flag + id, type, url_address, station_id, operator_id, operator_secret, sign_secret, data_secret, data_secret_IV, create_time, create_by, update_time, update_by, del_flag