From 87eb7a3977d331f637ec21c1499e2286bb3790ab Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 20 Dec 2024 15:50:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=20=E5=8C=BA=E5=88=92?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=A1=E6=81=AF=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E3=80=81Service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/common/constant/Constants.java | 2 +- .../com/jsowell/pile/domain/AreaCodeInfo.java | 203 ++++++++++++++++++ .../pile/mapper/AreaCodeInfoMapper.java | 63 ++++++ .../pile/service/IAreaCodeInfoService.java | 61 ++++++ .../service/impl/AreaCodeInfoServiceImpl.java | 87 ++++++++ .../mapper/pile/AreaCodeInfoMapper.xml | 106 +++++++++ .../impl/GuiZhouPlatformServiceImpl.java | 69 +++--- 7 files changed, 566 insertions(+), 25 deletions(-) create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/domain/AreaCodeInfo.java create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/mapper/AreaCodeInfoMapper.java create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/service/IAreaCodeInfoService.java create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AreaCodeInfoServiceImpl.java create mode 100644 jsowell-pile/src/main/resources/mapper/pile/AreaCodeInfoMapper.xml diff --git a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java index 3981a9934..f90e4bb99 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java +++ b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java @@ -95,7 +95,7 @@ public class Constants { public static final String OPERATORID_LIANLIAN = "MA1JLFUU8"; public static final String OPERATORID_JIANG_SU = "MA1X78KH5"; - public static final String OPERATORID_GUI_ZHOU = "MAC9K4RRX"; + // public static final String OPERATORID_GUI_ZHOU = "MAC9K4RRX"; public static final String MANUFACTURER_NAME = "举视(江苏)新能源设备制造有限公司"; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/AreaCodeInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/AreaCodeInfo.java new file mode 100644 index 000000000..dbd548721 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/AreaCodeInfo.java @@ -0,0 +1,203 @@ +package com.jsowell.pile.domain; + +import java.math.BigDecimal; + +import com.jsowell.common.annotation.Excel; +import com.jsowell.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 中国行政地区对象 area_code_info + * + * @author jsowell + * @date 2024-12-20 + */ +public class AreaCodeInfo extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * $column.columnComment + */ + private Integer id; + + /** + * 层级 + */ + @Excel(name = "层级") + private Integer level; + + /** + * 父级行政代码 + */ + @Excel(name = "父级行政代码") + private Long parentCode; + + /** + * 行政代码 + */ + @Excel(name = "行政代码") + private Long areaCode; + + /** + * 邮政编码 + */ + @Excel(name = "邮政编码") + private Integer zipCode; + + /** + * 区号 + */ + @Excel(name = "区号") + private String cityCode; + + /** + * 名称 + */ + @Excel(name = "名称") + private String name; + + /** + * 简称 + */ + @Excel(name = "简称") + private String shortName; + + /** + * 组合名 + */ + @Excel(name = "组合名") + private String mergerName; + + /** + * 拼音 + */ + @Excel(name = "拼音") + private String pinyin; + + /** + * 经度 + */ + @Excel(name = "经度") + private BigDecimal lng; + + /** + * 纬度 + */ + @Excel(name = "纬度") + private BigDecimal lat; + + public void setId(Integer id) { + this.id = id; + } + + public Integer getId() { + return id; + } + + public void setLevel(Integer level) { + this.level = level; + } + + public Integer getLevel() { + return level; + } + + public void setParentCode(Long parentCode) { + this.parentCode = parentCode; + } + + public Long getParentCode() { + return parentCode; + } + + public void setAreaCode(Long areaCode) { + this.areaCode = areaCode; + } + + public Long getAreaCode() { + return areaCode; + } + + public void setZipCode(Integer zipCode) { + this.zipCode = zipCode; + } + + public Integer getZipCode() { + return zipCode; + } + + public void setCityCode(String cityCode) { + this.cityCode = cityCode; + } + + public String getCityCode() { + return cityCode; + } + + public void setName(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setShortName(String shortName) { + this.shortName = shortName; + } + + public String getShortName() { + return shortName; + } + + public void setMergerName(String mergerName) { + this.mergerName = mergerName; + } + + public String getMergerName() { + return mergerName; + } + + public void setPinyin(String pinyin) { + this.pinyin = pinyin; + } + + public String getPinyin() { + return pinyin; + } + + public void setLng(BigDecimal lng) { + this.lng = lng; + } + + public BigDecimal getLng() { + return lng; + } + + public void setLat(BigDecimal lat) { + this.lat = lat; + } + + public BigDecimal getLat() { + return lat; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.JSON_STYLE) + .append("id", getId()) + .append("level", getLevel()) + .append("parentCode", getParentCode()) + .append("areaCode", getAreaCode()) + .append("zipCode", getZipCode()) + .append("cityCode", getCityCode()) + .append("name", getName()) + .append("shortName", getShortName()) + .append("mergerName", getMergerName()) + .append("pinyin", getPinyin()) + .append("lng", getLng()) + .append("lat", getLat()) + .toString(); + } +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/AreaCodeInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/AreaCodeInfoMapper.java new file mode 100644 index 000000000..c6ebdb1cf --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/AreaCodeInfoMapper.java @@ -0,0 +1,63 @@ +package com.jsowell.pile.mapper; + +import java.util.List; + +import com.jsowell.pile.domain.AreaCodeInfo; +import org.springframework.stereotype.Repository; + +/** + * 中国行政地区Mapper接口 + * + * @author jsowell + * @date 2024-12-20 + */ +@Repository +public interface AreaCodeInfoMapper { + /** + * 查询中国行政地区 + * + * @param id 中国行政地区主键 + * @return 中国行政地区 + */ + public AreaCodeInfo selectAreaCodeInfoById(Integer id); + + /** + * 查询中国行政地区列表 + * + * @param areaCodeInfo 中国行政地区 + * @return 中国行政地区集合 + */ + public List selectAreaCodeInfoList(AreaCodeInfo areaCodeInfo); + + /** + * 新增中国行政地区 + * + * @param areaCodeInfo 中国行政地区 + * @return 结果 + */ + public int insertAreaCodeInfo(AreaCodeInfo areaCodeInfo); + + /** + * 修改中国行政地区 + * + * @param areaCodeInfo 中国行政地区 + * @return 结果 + */ + public int updateAreaCodeInfo(AreaCodeInfo areaCodeInfo); + + /** + * 删除中国行政地区 + * + * @param id 中国行政地区主键 + * @return 结果 + */ + public int deleteAreaCodeInfoById(Integer id); + + /** + * 批量删除中国行政地区 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteAreaCodeInfoByIds(Integer[] ids); +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IAreaCodeInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IAreaCodeInfoService.java new file mode 100644 index 000000000..303eb8144 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IAreaCodeInfoService.java @@ -0,0 +1,61 @@ +package com.jsowell.pile.service; + +import java.util.List; + +import com.jsowell.pile.domain.AreaCodeInfo; + +/** + * 中国行政地区Service接口 + * + * @author jsowell + * @date 2024-12-20 + */ +public interface IAreaCodeInfoService { + /** + * 查询中国行政地区 + * + * @param id 中国行政地区主键 + * @return 中国行政地区 + */ + public AreaCodeInfo selectAreaCodeInfoById(Integer id); + + /** + * 查询中国行政地区列表 + * + * @param areaCodeInfo 中国行政地区 + * @return 中国行政地区集合 + */ + public List selectAreaCodeInfoList(AreaCodeInfo areaCodeInfo); + + /** + * 新增中国行政地区 + * + * @param areaCodeInfo 中国行政地区 + * @return 结果 + */ + public int insertAreaCodeInfo(AreaCodeInfo areaCodeInfo); + + /** + * 修改中国行政地区 + * + * @param areaCodeInfo 中国行政地区 + * @return 结果 + */ + public int updateAreaCodeInfo(AreaCodeInfo areaCodeInfo); + + /** + * 批量删除中国行政地区 + * + * @param ids 需要删除的中国行政地区主键集合 + * @return 结果 + */ + public int deleteAreaCodeInfoByIds(Integer[] ids); + + /** + * 删除中国行政地区信息 + * + * @param id 中国行政地区主键 + * @return 结果 + */ + public int deleteAreaCodeInfoById(Integer id); +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AreaCodeInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AreaCodeInfoServiceImpl.java new file mode 100644 index 000000000..2ba87cbf1 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AreaCodeInfoServiceImpl.java @@ -0,0 +1,87 @@ +package com.jsowell.pile.service.impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.jsowell.pile.mapper.AreaCodeInfoMapper; +import com.jsowell.pile.domain.AreaCodeInfo; +import com.jsowell.pile.service.IAreaCodeInfoService; + +/** + * 中国行政地区Service业务层处理 + * + * @author jsowell + * @date 2024-12-20 + */ +@Service +public class AreaCodeInfoServiceImpl implements IAreaCodeInfoService { + @Autowired + private AreaCodeInfoMapper areaCodeInfoMapper; + + /** + * 查询中国行政地区 + * + * @param id 中国行政地区主键 + * @return 中国行政地区 + */ + @Override + public AreaCodeInfo selectAreaCodeInfoById(Integer id) { + return areaCodeInfoMapper.selectAreaCodeInfoById(id); + } + + /** + * 查询中国行政地区列表 + * + * @param areaCodeInfo 中国行政地区 + * @return 中国行政地区 + */ + @Override + public List selectAreaCodeInfoList(AreaCodeInfo areaCodeInfo) { + return areaCodeInfoMapper.selectAreaCodeInfoList(areaCodeInfo); + } + + /** + * 新增中国行政地区 + * + * @param areaCodeInfo 中国行政地区 + * @return 结果 + */ + @Override + public int insertAreaCodeInfo(AreaCodeInfo areaCodeInfo) { + return areaCodeInfoMapper.insertAreaCodeInfo(areaCodeInfo); + } + + /** + * 修改中国行政地区 + * + * @param areaCodeInfo 中国行政地区 + * @return 结果 + */ + @Override + public int updateAreaCodeInfo(AreaCodeInfo areaCodeInfo) { + return areaCodeInfoMapper.updateAreaCodeInfo(areaCodeInfo); + } + + /** + * 批量删除中国行政地区 + * + * @param ids 需要删除的中国行政地区主键 + * @return 结果 + */ + @Override + public int deleteAreaCodeInfoByIds(Integer[] ids) { + return areaCodeInfoMapper.deleteAreaCodeInfoByIds(ids); + } + + /** + * 删除中国行政地区信息 + * + * @param id 中国行政地区主键 + * @return 结果 + */ + @Override + public int deleteAreaCodeInfoById(Integer id) { + return areaCodeInfoMapper.deleteAreaCodeInfoById(id); + } +} diff --git a/jsowell-pile/src/main/resources/mapper/pile/AreaCodeInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/AreaCodeInfoMapper.xml new file mode 100644 index 000000000..5ea625fe0 --- /dev/null +++ b/jsowell-pile/src/main/resources/mapper/pile/AreaCodeInfoMapper.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + select id, level, parent_code, area_code, zip_code, city_code, name, short_name, merger_name, pinyin, lng, lat from area_code_info + + + + + + + + insert into area_code_info + + level, + parent_code, + area_code, + zip_code, + city_code, + name, + short_name, + merger_name, + pinyin, + lng, + lat, + + + #{level}, + #{parentCode}, + #{areaCode}, + #{zipCode}, + #{cityCode}, + #{name}, + #{shortName}, + #{mergerName}, + #{pinyin}, + #{lng}, + #{lat}, + + + + + update area_code_info + + level = #{level}, + parent_code = #{parentCode}, + area_code = #{areaCode}, + zip_code = #{zipCode}, + city_code = #{cityCode}, + name = #{name}, + short_name = #{shortName}, + merger_name = #{mergerName}, + pinyin = #{pinyin}, + lng = #{lng}, + lat = #{lat}, + + where id = #{id} + + + + delete from area_code_info where id = #{id} + + + + delete from area_code_info where id in + + #{id} + + + \ No newline at end of file diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java index 1eefdf8cf..fc22b3128 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java @@ -95,6 +95,9 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { @Autowired private PileBillingTemplateService pileBillingTemplateService; + @Autowired + private IAreaCodeInfoService areaCodeInfoService; + @Autowired private RedisCache redisCache; @@ -165,8 +168,12 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { } public static void main(String[] args) { - String address = "贵州省黔西南州安龙县社保局后侧"; + // String address = "贵州省黔西南州安龙县社保局后侧"; + // String address = "贵州省遵义市习水县习水伟业汽修"; + String address = "贵州省赤水市元厚镇五柱峰村三组"; GeoCodeInfo geoCode = TermRelationTreeCoordinate.completeGeoCode(address); + String countyName = geoCode.getCountyName(); // 习水县 + } /** @@ -236,7 +243,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { SupStationInfo info = SupStationInfo.builder() .stationID(String.valueOf(pileStationInfo.getId())) .operatorID(Constants.OPERATORID_JIANG_SU) - // .equipmentOwnerID() + .equipmentOwnerID(ThirdPartyPlatformUtils.extractEquipmentOwnerID(pileStationInfo.getOrganizationCode())) .stationName(pileStationInfo.getStationName()) .countryCode(pileStationInfo.getCountryCode()) // .areaCode() @@ -268,8 +275,6 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { String subAreaCode = split[split.length - 1]; info.setAreaCode(subAreaCode); - info.setEquipmentOwnerID(Constants.OPERATORID_GUI_ZHOU); - // 容量 if (StringUtils.isNotBlank(String.valueOf(pileStationInfo.getCapacity()))) { info.setCapacity(pileStationInfo.getCapacity().setScale(2, RoundingMode.HALF_UP)); @@ -285,12 +290,21 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { info.setRatedPower(stationRatedPower); // areaCodeCountryside GeoCodeInfo geoCode = TermRelationTreeCoordinate.completeGeoCode(pileStationInfo.getAddress()); - if (geoCode != null) { + if (geoCode == null) { // String areaCodeCountryside = geoCode.getCounty_code(); - String areaCodeCountryside = "123456789101"; - info.setAreaCodeCountryside(areaCodeCountryside); + info.setAreaCodeCountryside("123456789101"); + }else { + AreaCodeInfo areaCodeInfo = new AreaCodeInfo(); + if (StringUtils.isNotBlank(geoCode.getTownName())) { + String townName = geoCode.getTownName(); + areaCodeInfo.setName(townName); + }else { + String countyName = geoCode.getCountyName(); + areaCodeInfo.setName(countyName); + } + List areaCodeInfoList = areaCodeInfoService.selectAreaCodeInfoList(areaCodeInfo); + info.setAreaCodeCountryside(String.valueOf(areaCodeInfoList.get(0).getAreaCode())); } - info.setAreaCodeCountryside("123456789101"); resultList.add(info); } @@ -299,7 +313,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { map.put("PageCount", pageInfo.getPages()); map.put("ItemSize", pageInfo.getTotal()); map.put("StationInfos", resultList); - logger.info("贵州省平台查询站点信息 resultData:{}", JSON.toJSONString(map)); + // logger.info("贵州省平台查询站点信息 resultData:{}", JSON.toJSONString(map)); Map resultMap = ThirdPartyPlatformUtils.generateResultMapV2(map, thirdPartySecretInfoVO.getOurDataSecret(), thirdPartySecretInfoVO.getOurDataSecretIv(), thirdPartySecretInfoVO.getTheirSigSecret()); return resultMap; @@ -313,6 +327,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { public String notificationStationInfo(String stationId) { // 通过id查询站点相关信息 PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(Long.parseLong(stationId)); + PileMerchantInfoVO pileMerchantInfoVO = pileMerchantInfoService.queryMerchantInfoByStationId(String.valueOf(pileStationInfo.getId())); // 查询第三方平台配置信息 ThirdPartySecretInfoVO thirdPartySecretInfoVO = getGuiZhouPlatformSecretInfo(); @@ -328,7 +343,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { SupStationInfo info = SupStationInfo.builder() .stationID(stationId) .operatorID(operatorId) - // .equipmentOwnerID() + .equipmentOwnerID(ThirdPartyPlatformUtils.extractEquipmentOwnerID(pileMerchantInfoVO.getOrganizationCode())) .stationName(pileStationInfo.getStationName()) .countryCode(pileStationInfo.getCountryCode()) // .areaCode() @@ -360,8 +375,6 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { String subAreaCode = split[split.length - 1]; info.setAreaCode(subAreaCode); - info.setEquipmentOwnerID(Constants.OPERATORID_GUI_ZHOU); - // 容量 if (StringUtils.isNotBlank(String.valueOf(pileStationInfo.getCapacity()))) { info.setCapacity(pileStationInfo.getCapacity().setScale(2, RoundingMode.HALF_UP)); @@ -377,10 +390,20 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { info.setRatedPower(stationRatedPower); // areaCodeCountryside GeoCodeInfo geoCode = TermRelationTreeCoordinate.completeGeoCode(pileStationInfo.getAddress()); - if (geoCode != null) { - String areaCodeCountryside = geoCode.getCounty_code(); - areaCodeCountryside = "123456789101"; - info.setAreaCodeCountryside(areaCodeCountryside); + if (geoCode == null) { + // String areaCodeCountryside = geoCode.getCounty_code(); + info.setAreaCodeCountryside("123456789101"); + }else { + AreaCodeInfo areaCodeInfo = new AreaCodeInfo(); + if (StringUtils.isNotBlank(geoCode.getTownName())) { + String townName = geoCode.getTownName(); + areaCodeInfo.setName(townName); + }else { + String countyName = geoCode.getCountyName(); + areaCodeInfo.setName(countyName); + } + List areaCodeInfoList = areaCodeInfoService.selectAreaCodeInfoList(areaCodeInfo); + info.setAreaCodeCountryside(String.valueOf(areaCodeInfoList.get(0).getAreaCode())); } // 调用平台接口 @@ -422,14 +445,16 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { List voList = entry.getValue(); StationStatusInfo stationStatusInfo = new StationStatusInfo(); + PileStationVO stationInfo = pileStationInfoService.getStationInfo(stationId); + stationStatusInfo.setOperatorId(Constants.OPERATORID_JIANG_SU); - stationStatusInfo.setEquipmentOwnerId(Constants.OPERATORID_GUI_ZHOU); + stationStatusInfo.setEquipmentOwnerId(ThirdPartyPlatformUtils.extractEquipmentOwnerID(stationInfo.getOrganizationCode())); stationStatusInfo.setStationId(stationId); ConnectorStatusInfo connectorStatusInfo; for (ConnectorInfoVO connectorInfoVO : voList) { connectorStatusInfo = ConnectorStatusInfo.builder() .operatorId(Constants.OPERATORID_JIANG_SU) - .equipmentOwnerId(Constants.OPERATORID_GUI_ZHOU) // todo 测试 + .equipmentOwnerId(ThirdPartyPlatformUtils.extractEquipmentOwnerID(stationInfo.getOrganizationCode())) .stationId(connectorInfoVO.getStationId()) .equipmentId(connectorInfoVO.getPileSn()) .connectorID(connectorInfoVO.getPileConnectorCode()) @@ -577,7 +602,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { .build(); - supEquipChargeStatusInfo.setEquipmentOwnerID(Constants.OPERATORID_GUI_ZHOU); // TODO 临时测试使用贵州测试数据 + supEquipChargeStatusInfo.setEquipmentOwnerID(ThirdPartyPlatformUtils.extractEquipmentOwnerID(stationInfo.getOrganizationCode())); String url = urlAddress + "supervise_notification_equip_charge_status"; // 调用平台接口 @@ -619,9 +644,8 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { // 拼装成平台所需格式对象 ChargeOrderInfo orderInfo = transformChargeOrderInfo(orderBasicInfo, orderDetail); - orderInfo.setEquipmentOwnerID(Constants.OPERATORID_GUI_ZHOU); // TODO 临时测试 - List billingList = pileBillingTemplateService.queryBillingPrice(orderBasicInfo.getStationId()); + // List billingList = pileBillingTemplateService.queryBillingPrice(orderBasicInfo.getStationId()); // 先将list按照 尖、峰、平、谷 时段排序 // List collect = billingList.stream().sorted(Comparator.comparing(BillingPriceVO::getTimeType)).collect(Collectors.toList()); // 再循环该list，拼装对应的充电价格、费率 @@ -664,7 +688,6 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { String url = urlAddress + "supervise_notification_charge_order_info_history"; ChargeOrderInfo orderInfo = transformChargeOrderInfo(orderBasicInfo, orderDetail); - orderInfo.setEquipmentOwnerID(Constants.OPERATORID_GUI_ZHOU); // todo 临时测试 List billingList = pileBillingTemplateService.queryBillingPrice(orderBasicInfo.getStationId()); // 先将list按照 尖、峰、平、谷 时段排序 @@ -808,7 +831,6 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { .stationTotalWarningNum(0) .equipmentStatsInfos(equipmentStatsInfoList) .build(); - supStationStatsInfo.setEquipmentOwnerId(Constants.OPERATORID_GUI_ZHOU); JSONObject json = new JSONObject(); List supStationStatsInfoList = new ArrayList<>(); @@ -863,7 +885,6 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { if (StringUtils.isNotBlank(organizationCode) && organizationCode.length() == 18) { supStationPowerInfo.setEquipmentOwnerID(ThirdPartyPlatformUtils.extractEquipmentOwnerID(organizationCode)); } - supStationPowerInfo.setEquipmentOwnerID(Constants.OPERATORID_GUI_ZHOU); // todo 临时测试 // 根据站点id查询桩信息 List pileList = pileBasicInfoService.getPileListByStationId(stationId);