diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index f6075e149..4807c143f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -862,6 +862,10 @@ public class OrderService { UniAppOrderVO.BillingDetails billingDetails = new UniAppOrderVO.BillingDetails(); BeanUtils.copyBeanProp(billingDetails, orderDetail); vo.setBillingDetails(billingDetails); + + // orderDetail.getSharpElectricityPrice() + + } return vo; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java index 294303459..500f9c257 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java @@ -71,4 +71,10 @@ public interface PileStationInfoMapper { * @return 充电站对象集合 */ List queryStationInfos(@Param("stationDTO") QueryStationDTO dto); + + /** + * 查询充电站信息(联联平台,分页使用) + * @return + */ + List getStationInfoForLianLian(); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java index 14b65600f..87de595a9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java @@ -90,4 +90,6 @@ public interface IPileStationInfoService { PileStationVO getStationInfo(String stationId); PileStationVO getStationInfoByPileSn(String pileSn); + + List getStationInfoForLianLian(int pageNum, int pageSize); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index 16548fbfe..da41993a2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -170,6 +170,7 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService { .merchantId(merchantId) .merchantName(pileMerchantInfo.getMerchantName()) .merchantTel(pileMerchantInfo.getServicePhone()) + .organizationCode(pileMerchantInfo.getOrganizationCode()) .deptId(pileMerchantInfo.getDeptId()) .build(); return vo; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index 7f1faecec..2f9a41efa 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -8,10 +8,7 @@ import com.jsowell.common.core.domain.entity.SysDept; import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.core.redis.RedisCache; -import com.jsowell.common.util.DateUtils; -import com.jsowell.common.util.DistanceUtils; -import com.jsowell.common.util.SecurityUtils; -import com.jsowell.common.util.StringUtils; +import com.jsowell.common.util.*; import com.jsowell.common.util.ip.AddressUtils; import com.jsowell.pile.domain.PileStationInfo; import com.jsowell.pile.dto.FastCreateStationDTO; @@ -148,6 +145,12 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService { return stationInfo; } + @Override + public List getStationInfoForLianLian(int pageNum, int pageSize) { + PageUtils.startPage(pageNum, pageSize); + return pileStationInfoMapper.getStationInfoForLianLian(); + } + /** * 查询充电站信息列表 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MerchantInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MerchantInfoVO.java index a3498279d..5f83a220d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MerchantInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MerchantInfoVO.java @@ -25,6 +25,11 @@ public class MerchantInfoVO { */ private String merchantTel; + /** + * 组织结构代码 + */ + private String organizationCode; + /** * 部门id */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml index 2051bbc2c..fc64c36ad 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml @@ -369,4 +369,8 @@ and del_flag = '0' + \ No newline at end of file diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ChargeDetail.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ChargeDetail.java similarity index 96% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ChargeDetail.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ChargeDetail.java index 5e589e323..7996ac42b 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ChargeDetail.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ChargeDetail.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.dto; +package com.jsowell.thirdparty.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorChargeStatusInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorChargeStatusInfo.java similarity index 98% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorChargeStatusInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorChargeStatusInfo.java index 5b71a9bb5..5ca923954 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorChargeStatusInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorChargeStatusInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.dto; +package com.jsowell.thirdparty.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorInfo.java similarity index 97% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorInfo.java index 001e29b8f..f36ea0b16 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.dto; +package com.jsowell.thirdparty.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorStatsInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorStatsInfo.java similarity index 93% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorStatsInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorStatsInfo.java index 8e1e9b956..c1ea7240a 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorStatsInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorStatsInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.dto; +package com.jsowell.thirdparty.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorStatusInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorStatusInfo.java similarity index 95% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorStatusInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorStatusInfo.java index 022d7a06e..ac2e80af2 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorStatusInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorStatusInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.dto; +package com.jsowell.thirdparty.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/OrganizationInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/OperatorInfo.java similarity index 67% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/OrganizationInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/OperatorInfo.java index 85843e512..8a7c2ca89 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/OrganizationInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/OperatorInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.dto; +package com.jsowell.thirdparty.domain; import lombok.AllArgsConstructor; import lombok.Builder; @@ -12,34 +12,34 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor -public class OrganizationInfo { +public class OperatorInfo { /** * 对接平台ID（组织机构代码） Y */ - private String organizationCode; + private String OperatorID; /** * 对接平台名称（机构全称） Y */ - private String organizationName; + private String OperatorName; /** * 对接平台电话（对接平台客服电话1） Y */ - private String ServiceTelNumber1; + private String OperatorTel1; /** * 对接平台电话2（对接平台客服电话2 ） N */ - private String ServiceTelNumber2; + private String OperatorTel2; /** * 对接平台注册地址 N */ - private String registerAddress; + private String OperatorRegAddress; /** * 备注 N */ - private String mark; + private String OperatorNote; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/OrderInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/OrderInfo.java similarity index 98% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/OrderInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/OrderInfo.java index e2234f27b..95e6c2f6b 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/OrderInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/OrderInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.dto; +package com.jsowell.thirdparty.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/PileInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/PileInfo.java similarity index 97% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/PileInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/PileInfo.java index 2eff19696..c08535157 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/PileInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/PileInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.dto; +package com.jsowell.thirdparty.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/StationInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/StationInfo.java similarity index 99% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/StationInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/StationInfo.java index 4849c4e31..d40983624 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/StationInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/StationInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.dto; +package com.jsowell.thirdparty.domain; import lombok.AllArgsConstructor; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/StationStatusInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/StationStatusInfo.java similarity index 93% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/StationStatusInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/StationStatusInfo.java index d7d49398c..6474068d8 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/StationStatusInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/StationStatusInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.dto; +package com.jsowell.thirdparty.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/pileStatsInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/pileStatsInfo.java similarity index 95% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/pileStatsInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/pileStatsInfo.java index c1f8ebe47..4765492f6 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/pileStatsInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/pileStatsInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.dto; +package com.jsowell.thirdparty.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/QueryStationInfoDTO.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/QueryStationInfoDTO.java new file mode 100644 index 000000000..abfb8a96f --- /dev/null +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/QueryStationInfoDTO.java @@ -0,0 +1,31 @@ +package com.jsowell.thirdparty.dto; + +import lombok.Data; + +/** + * 查询站点信息dto + * + * @author JS-ZZA + * @date 2023/4/8 10:02 + */ +@Data +public class QueryStationInfoDTO { + /** + * 上次查询时间 + * 格式“yyyy-MM-dd HH:mm:ss”，可以为空，如果 + * 不填写，则查询所有的充电站信息 + */ + private String LastQueryTime; + + /** + * 查询页码 + * 不填写默认为 1 + */ + private Integer PageNo; + + /** + * 每页数量 + * 不填写默认为 10 + */ + private Integer PageSize; +} 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 c297691f7..0e60c6b8e 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 @@ -1,5 +1,10 @@ package com.jsowell.thirdparty.service; +import com.jsowell.thirdparty.domain.StationInfo; +import com.jsowell.thirdparty.dto.QueryStationInfoDTO; + +import java.util.List; + public interface LianLianService { /** @@ -7,4 +12,6 @@ public interface LianLianService { * @param merchantId */ void pushMerchantInfo(Long merchantId); + + List query_stations_info(QueryStationInfoDTO dto); } 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 464f8f7f7..35b1a8899 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 @@ -1,25 +1,104 @@ package com.jsowell.thirdparty.service.impl; +import com.jsowell.pile.domain.PileStationInfo; import com.jsowell.pile.service.IPileMerchantInfoService; +import com.jsowell.pile.service.IPileStationInfoService; +import com.jsowell.pile.vo.base.MerchantInfoVO; +import com.jsowell.thirdparty.domain.OperatorInfo; +import com.jsowell.thirdparty.domain.StationInfo; +import com.jsowell.thirdparty.dto.QueryStationInfoDTO; import com.jsowell.thirdparty.service.LianLianService; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + @Service public class LianLianServiceImpl implements LianLianService { @Autowired private IPileMerchantInfoService pileMerchantInfoService; + @Autowired + private IPileStationInfoService pileStationInfoService; + @Override public void pushMerchantInfo(Long merchantId) { // 通过id查询运营商信息 - + MerchantInfoVO merchantInfo = pileMerchantInfoService.getMerchantInfo(String.valueOf(merchantId)); // 组装联联平台所需要的数据格式 - + OperatorInfo operatorInfo = OperatorInfo.builder() + .OperatorID(merchantInfo.getOrganizationCode()) // 组织机构代码 + .OperatorName(merchantInfo.getMerchantName()) // 机构全称 + .OperatorTel1(merchantInfo.getMerchantTel()) // 对接平台客服电话1 + .build(); // 调用联联平台接口 } + + /** + * 查询充电站信息 + * 对外接口 query_stations_info + * @return + */ + @Override + public List query_stations_info(QueryStationInfoDTO dto) { + List resultList = new ArrayList<>(); + int pageNo = dto.getPageNo() == 0 ? 1 : dto.getPageNo(); + int pageSize = dto.getPageSize() == 0 ? 10 : dto.getPageSize(); + + List stationInfos = pileStationInfoService.getStationInfoForLianLian(pageNo, pageSize); + if (CollectionUtils.isEmpty(stationInfos)) { + // 未查到数据 + return null; + } + StationInfo stationInfo = null; + for (PileStationInfo pileStationInfo : stationInfos) { + stationInfo = new StationInfo(); + stationInfo.setStationID(String.valueOf(pileStationInfo.getId())); + MerchantInfoVO merchantInfo = pileMerchantInfoService.getMerchantInfo(String.valueOf(pileStationInfo.getMerchantId())); + stationInfo.setOperatorID(merchantInfo.getOrganizationCode()); // 组织结构代码 + stationInfo.setEquipmentOwnerID(String.valueOf(pileStationInfo.getMerchantId())); + stationInfo.setStationName(pileStationInfo.getStationName()); + stationInfo.setIsAloneApply(Integer.valueOf(pileStationInfo.getAloneApply())); + stationInfo.setIsPublicParkingLot(Integer.valueOf(pileStationInfo.getPublicParking())); + stationInfo.setCountryCode(pileStationInfo.getCountryCode()); + stationInfo.setAreaCode(pileStationInfo.getAreaCode()); + stationInfo.setAddress(pileStationInfo.getAddress()); + stationInfo.setServiceTel(pileStationInfo.getServiceTel()); + stationInfo.setStationType(Integer.valueOf(pileStationInfo.getStationType())); + stationInfo.setParkNums(Integer.valueOf(pileStationInfo.getParkNums())); + stationInfo.setStationLng(new BigDecimal(pileStationInfo.getStationLng())); + stationInfo.setStationLat(new BigDecimal(pileStationInfo.getStationLat())); + stationInfo.setConstruction(Integer.valueOf(pileStationInfo.getConstruction())); + stationInfo.setOpenAllDay(Integer.valueOf(pileStationInfo.getOpenAllDay())); + // stationInfo.setMinElectricityPrice(pileStationInfo); // 最低充电电费率 + // stationInfo.setElectricityFee(); // 电费 xx元/度 + // stationInfo.setServiceFee(); // 服务费 xx元/度 + stationInfo.setParkFree(Integer.valueOf(pileStationInfo.getParkFree())); + stationInfo.setPayment(pileStationInfo.getPayment()); + stationInfo.setSupportOrder(Integer.valueOf(pileStationInfo.getSupportOrder())); + // stationInfo.setPileInfos(); // 充电设备信息列表 + // stationInfo.setParkFeeType(pileStationInfo); // 停车收费类型 + stationInfo.setToiletFlag(Integer.valueOf(pileStationInfo.getToiletFlag())); + stationInfo.setStoreFlag(Integer.valueOf(pileStationInfo.getStoreFlag())); + stationInfo.setRestaurantFlag(Integer.valueOf(pileStationInfo.getRestaurantFlag())); + stationInfo.setLoungeFlag(Integer.valueOf(pileStationInfo.getLoungeFlag())); + stationInfo.setCanopyFlag(Integer.valueOf(pileStationInfo.getCanopyFlag())); + stationInfo.setPrinterFlag(Integer.valueOf(pileStationInfo.getPrinterFlag())); + stationInfo.setBarrierFlag(Integer.valueOf(pileStationInfo.getBarrierFlag())); + stationInfo.setParkingLockFlag(Integer.valueOf(pileStationInfo.getParkingLockFlag())); + + resultList.add(stationInfo); + } + + return resultList; + } + + }