update 第三方平台相关接口

jsowell-admin/src/main/java/com/jsowell/thirdparty/zhongdianlian/ZDLController.java

@@ -92,6 +92,7 @@ public class ZDLController extends BaseController {
             // 转换成相应对象
             QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class);
             queryStationInfoDTO.setOperatorId(dto.getOperatorID());
+            queryStationInfoDTO.setAddress("宁波");
             Map<String, String> map = zdlService.queryStationsInfo(queryStationInfoDTO);
 
             return CommonResult.success(0, "查询充电站信息成功！", map.get("Data"), map.get("Sig"));

jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationInfoDTO.java

@@ -69,4 +69,7 @@ public class QueryStationInfoDTO {
 
     @JsonProperty(value = "StationIDs")
     private List<String> stationIds;
+
+
+    private String address;
 }

jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java

@@ -2,6 +2,8 @@ package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.PileStationInfo;
 import com.jsowell.pile.dto.QueryStationDTO;
+import com.jsowell.pile.dto.QueryStationInfoDTO;
+import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
 import com.jsowell.pile.vo.web.PileStationVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -76,7 +78,7 @@ public interface PileStationInfoMapper {
 	 * 查询充电站信息(联联平台,分页使用)
 	 * @return
 	 */
-	List<PileStationInfo> getStationInfoForLianLian();
+	List<ThirdPartyStationInfoVO> getStationInfoForLianLian(@Param("dto") QueryStationInfoDTO dto);
 
 
 	List<PileStationInfo> getStationInfoForAmap();

jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java

@@ -4,7 +4,9 @@ import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.pile.domain.PileStationInfo;
 import com.jsowell.pile.dto.FastCreateStationDTO;
 import com.jsowell.pile.dto.QueryStationDTO;
+import com.jsowell.pile.dto.QueryStationInfoDTO;
 import com.jsowell.pile.dto.lutongyunting.BindParkingPlatformDTO;
+import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
 import com.jsowell.pile.vo.web.PileStationVO;
 
 import java.util.List;
@@ -92,7 +94,7 @@ public interface IPileStationInfoService {
 
 	PileStationVO getStationInfoByPileSn(String pileSn);
 
-	List<PileStationInfo> getStationInfosByThirdParty();
+	List<ThirdPartyStationInfoVO> getStationInfosByThirdParty(QueryStationInfoDTO dto);
 
 	List<PileStationInfo> getStationInfosByAmap();
 

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java

@@ -22,12 +22,14 @@ import com.jsowell.pile.domain.ThirdPartyPlatformConfig;
 import com.jsowell.pile.domain.ThirdpartyParkingConfig;
 import com.jsowell.pile.dto.FastCreateStationDTO;
 import com.jsowell.pile.dto.QueryStationDTO;
+import com.jsowell.pile.dto.QueryStationInfoDTO;
 import com.jsowell.pile.dto.lutongyunting.BindParkingPlatformDTO;
 import com.jsowell.pile.mapper.PileStationInfoMapper;
 import com.jsowell.pile.service.*;
 import com.jsowell.pile.vo.base.MerchantInfoVO;
 import com.jsowell.pile.vo.base.PileInfoVO;
 import com.jsowell.pile.vo.base.StationInfoVO;
+import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
 import com.jsowell.pile.vo.uniapp.CurrentTimePriceDetails;
 import com.jsowell.pile.vo.web.PileStationVO;
 import com.jsowell.system.service.SysDeptService;
@@ -193,9 +195,9 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
 	}
 
 	@Override
-	public List<PileStationInfo> getStationInfosByThirdParty() {
+	public List<ThirdPartyStationInfoVO> getStationInfosByThirdParty(QueryStationInfoDTO dto) {
 		// PageUtils.startPage(pageNum, pageSize);
-		return pileStationInfoMapper.getStationInfoForLianLian();
+		return pileStationInfoMapper.getStationInfoForLianLian(dto);
 	}
 
 	@Override

jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ThirdPartyStationInfoVO.java

@@ -0,0 +1,18 @@
+package com.jsowell.pile.vo.base;
+
+import com.jsowell.pile.domain.PileStationInfo;
+import lombok.Data;
+
+/**
+ * 第三方平台查询站点信息VO
+ *
+ * @author Lemon
+ * @Date 2023/11/10 13:34:18
+ */
+@Data
+public class ThirdPartyStationInfoVO extends PileStationInfo {
+
+    private String merchantName;
+
+    private String organizationCode;
+}

jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml

@@ -405,10 +405,70 @@
         and del_flag = '0'
     </select>
 
-    <select id="getStationInfoForLianLian" resultMap="PileStationInfoResult">
-        <include refid="selectPileStationInfoVo"/>
-        where del_flag = '0'
-            and public_flag = '1'
+    <select id="getStationInfoForLianLian" resultType="com.jsowell.pile.vo.base.ThirdPartyStationInfoVO">
+        SELECT
+        t1.id,
+        t1.merchant_id AS merchantId,
+        t2.merchant_name AS merchantName,
+        t2.organization_code AS origanizationCode,
+        t1.station_name AS stationName,
+        t1.dept_id AS deptId,
+        t1.parking_id AS parkingId,
+        t1.qrcode_prefix AS qrcodePrefix,
+        t1.alone_apply AS aloneApply,
+        t1.account_number AS accountNumber,
+        t1.capacity AS capacity,
+        t1.public_parking AS publicParking,
+        t1.parking_number AS parkingNumber,
+        t1.park_fee_describe AS parkFeeDescribe,
+        t1.country_code AS countryCode,
+        t1.area_code AS areaCode,
+        t1.address AS address,
+        t1.station_tel AS stationTel,
+        t1.service_tel AS serviceTel,
+        t1.station_type AS stationType,
+        t1.station_status AS stationStatus,
+        t1.station_admin_name AS stationAdminName,
+        t1.park_nums AS parkNums,
+        t1.station_lng AS stationLng,
+        t1.station_lat AS stationLat,
+        t1.site_guide AS siteGuide,
+        t1.construction AS construction,
+        t1.pictures AS pictures,
+        t1.match_cars AS matchCars,
+        t1.park_info AS parkInfo,
+        t1.park_owner AS parkOwner,
+        t1.park_manager AS parkManager,
+        t1.open_all_day AS openAllDay,
+        t1.business_hours AS businessHours,
+        t1.park_free AS parkFree,
+        t1.payment AS payment,
+        t1.support_order AS supportOrder,
+        t1.remark AS remark,
+        t1.public_flag AS publicFlag,
+        t1.amap_flag AS amapFlag,
+        t1.open_flag AS openFlag,
+        t1.toilet_flag AS toiletFlag,
+        t1.store_flag AS storeFlag,
+        t1.restaurant_flag AS restaurantFlag,
+        t1.lounge_flag AS loungeFlag,
+        t1.canopy_flag AS canopyFlag,
+        t1.printer_flag AS printerFlag,
+        t1.barrier_flag AS barrierFlag,
+        t1.parking_lock_flag AS parkingLockFlag,
+        t1.create_by AS createBy,
+        t1.create_time AS createTime,
+        t1.update_by AS updateBy,
+        t1.update_time AS updateTime,
+        t1.del_flag AS delFlag
+        FROM
+        pile_station_info t1
+        JOIN pile_merchant_info t2 ON t1.merchant_id = t2.id
+        AND t1.del_flag = '0'
+        and public_flag = '1'
+        <if test="dto.address != null and dto.address != ''">
+            and t1.address like concat('%', #{dto.address}, '%')
+        </if>
     </select>
 
     <select id="queryByStationDeptIds" resultType="java.lang.String">

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java

@@ -33,6 +33,7 @@ import com.jsowell.pile.service.orderlogic.AbstractOrderLogic;
 import com.jsowell.pile.service.orderlogic.OrderLogicFactory;
 import com.jsowell.pile.vo.base.ConnectorInfoVO;
 import com.jsowell.pile.vo.base.MerchantInfoVO;
+import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
 import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
 import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
 import com.jsowell.pile.vo.uniapp.BillingPriceVO;
@@ -266,7 +267,7 @@ public class LianLianServiceImpl implements LianLianService {
         int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
 
         PageUtils.startPage(pageNo, pageSize);
-        List<PileStationInfo> stationInfos = pileStationInfoService.getStationInfosByThirdParty();
+        List<ThirdPartyStationInfoVO> stationInfos = pileStationInfoService.getStationInfosByThirdParty(dto);
         if (CollectionUtils.isEmpty(stationInfos)) {
             // 未查到数据
             return null;
@@ -275,8 +276,8 @@ public class LianLianServiceImpl implements LianLianService {
         if (configInfo == null) {
             return null;
         }
-        PageInfo<PileStationInfo> pageInfo = new PageInfo<>(stationInfos);
-        for (PileStationInfo pileStationInfo : pageInfo.getList()) {
+        PageInfo<ThirdPartyStationInfoVO> pageInfo = new PageInfo<>(stationInfos);
+        for (ThirdPartyStationInfoVO pileStationInfo : pageInfo.getList()) {
             StationInfo stationInfo = new StationInfo();
             stationInfo.setStationID(String.valueOf(pileStationInfo.getId()));
             // MerchantInfoVO merchantInfo = pileMerchantInfoService.getMerchantInfo(String.valueOf(pileStationInfo.getMerchantId()));

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java

@@ -23,6 +23,7 @@ import com.jsowell.pile.dto.QueryStationInfoDTO;
 import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO;
 import com.jsowell.pile.dto.nanrui.PushAlarmInfoDTO;
 import com.jsowell.pile.service.*;
+import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
 import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
 import com.jsowell.pile.vo.nanrui.NROrderInfoVO;
 import com.jsowell.pile.vo.uniapp.CurrentTimePriceDetails;
@@ -236,7 +237,7 @@ public class NRServiceImpl implements NRService {
         int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
 
         PageUtils.startPage(pageNo, pageSize);
-        List<PileStationInfo> stationInfos = pileStationInfoService.getStationInfosByThirdParty();
+        List<ThirdPartyStationInfoVO> stationInfos = pileStationInfoService.getStationInfosByThirdParty(dto);
         if (CollectionUtils.isEmpty(stationInfos)) {
             // 未查到数据
             return null;
@@ -245,8 +246,8 @@ public class NRServiceImpl implements NRService {
         if (configInfo == null) {
             return null;
         }
-        PageInfo<PileStationInfo> pageInfo = new PageInfo<>(stationInfos);
-        for (PileStationInfo pileStationInfo : pageInfo.getList()) {
+        PageInfo<ThirdPartyStationInfoVO> pageInfo = new PageInfo<>(stationInfos);
+        for (ThirdPartyStationInfoVO pileStationInfo : pageInfo.getList()) {
             // 拼装参数
             NRStationInfo nrStationInfo = NRStationInfo.builder()
                     .stationId(String.valueOf(pileStationInfo.getId()))

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java

@@ -12,6 +12,7 @@ import com.jsowell.pile.dto.PushStationInfoDTO;
 import com.jsowell.pile.dto.QueryStationInfoDTO;
 import com.jsowell.pile.service.*;
 import com.jsowell.pile.vo.base.MerchantInfoVO;
+import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
 import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
 import com.jsowell.pile.vo.web.PileModelInfoVO;
 import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO;
@@ -187,6 +188,15 @@ public class ZDLServiceImpl implements ZDLService {
     }
 
     public static void main(String[] args) {
+        String areaCode = "330000,330200,330213";
+        // 根据逗号分组
+        String[] split = StringUtils.split(areaCode, ",");
+        // 只取最后一部分
+        String subAreaCode = split[split.length - 1];
+
+        System.out.println(subAreaCode);
+
+
         String organizationCode = "91310120MAC13L2Q9P";
         String equipmentOwnerId = StringUtils.substring(organizationCode, organizationCode.length() - 10, organizationCode.length() - 1);
         System.out.println(equipmentOwnerId); // MAC13L2Q9
@@ -203,7 +213,7 @@ public class ZDLServiceImpl implements ZDLService {
         int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
 
         PageUtils.startPage(pageNo, pageSize);
-        List<PileStationInfo> stationInfos = pileStationInfoService.getStationInfosByThirdParty();
+        List<ThirdPartyStationInfoVO> stationInfos = pileStationInfoService.getStationInfosByThirdParty(dto);
         if (CollectionUtils.isEmpty(stationInfos)) {
             // 未查到数据
             return null;
@@ -212,15 +222,26 @@ public class ZDLServiceImpl implements ZDLService {
         if (configInfo == null) {
             return null;
         }
-        PageInfo<PileStationInfo> pageInfo = new PageInfo<>(stationInfos);
-        for (PileStationInfo pileStationInfo : pageInfo.getList()) {
+        PageInfo<ThirdPartyStationInfoVO> pageInfo = new PageInfo<>(stationInfos);
+        for (ThirdPartyStationInfoVO pileStationInfo : pageInfo.getList()) {
             ZDLStationInfo stationInfo = new ZDLStationInfo();
             stationInfo.setStationId(String.valueOf(pileStationInfo.getId()));
             stationInfo.setOperatorId(Constants.OPERATORID_JIANG_SU); // 组织机构代码
-            stationInfo.setEquipmentOwnerId(String.valueOf(pileStationInfo.getMerchantId()));
+            String organizationCode = pileStationInfo.getOrganizationCode();
+            if (organizationCode.length() == 18) {
+                String equipmentOwnerId = StringUtils.substring(organizationCode, organizationCode.length() - 10, organizationCode.length() - 1);
+                stationInfo.setEquipmentOwnerId(equipmentOwnerId);
+            }else {
+                stationInfo.setEquipmentOwnerId(Constants.OPERATORID_JIANG_SU);
+            }
             stationInfo.setStationName(pileStationInfo.getStationName());
             stationInfo.setCountryCode(pileStationInfo.getCountryCode());
-            stationInfo.setAreaCode(pileStationInfo.getAreaCode());
+            String areaCode = pileStationInfo.getAreaCode();  // 330000,330200,330213
+            // 根据逗号分组
+            String[] split = StringUtils.split(areaCode, ",");
+            // 只取最后一部分  330213
+            String subAreaCode = split[split.length - 1];
+            stationInfo.setAreaCode(subAreaCode);
             stationInfo.setAddress(pileStationInfo.getAddress());
             stationInfo.setServiceTel(pileStationInfo.getStationTel());
             stationInfo.setStationType(Integer.parseInt(pileStationInfo.getStationType()));