加字段,设备归属方id

This commit is contained in:
Guoqs
2025-12-04 15:32:41 +08:00
parent 235d938a6d
commit 3fc5a3273f
5 changed files with 35 additions and 9 deletions

View File

@@ -21,14 +21,12 @@ import com.jsowell.pile.dto.amap.EditAmapFlagDTO;
import com.jsowell.pile.dto.lutongyunting.BindParkingPlatformDTO; import com.jsowell.pile.dto.lutongyunting.BindParkingPlatformDTO;
import com.jsowell.pile.service.PileStationInfoService; import com.jsowell.pile.service.PileStationInfoService;
import com.jsowell.pile.service.ThirdPartyParkingConfigService; import com.jsowell.pile.service.ThirdPartyParkingConfigService;
import com.jsowell.pile.service.ThirdPartySettingInfoService;
import com.jsowell.pile.service.ThirdPartyStationRelationService; import com.jsowell.pile.service.ThirdPartyStationRelationService;
import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.pile.vo.web.PileStationVO;
import com.jsowell.pile.vo.web.StationSelectVO; import com.jsowell.pile.vo.web.StationSelectVO;
import com.jsowell.service.PileService; import com.jsowell.service.PileService;
import com.jsowell.thirdparty.amap.service.AMapService; import com.jsowell.thirdparty.amap.service.AMapService;
import com.jsowell.thirdparty.common.CommonService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -51,12 +49,6 @@ public class PileStationInfoController extends BaseController {
@Autowired @Autowired
private PileService pileService; private PileService pileService;
@Autowired
private ThirdPartySettingInfoService thirdPartySettingInfoService;
@Autowired
private CommonService commonService;
@Autowired @Autowired
private AMapService aMapService; private AMapService aMapService;

View File

@@ -39,6 +39,11 @@ public class ThirdPartyStationRelation extends BaseEntity {
@Excel(name = "三方配置类型") @Excel(name = "三方配置类型")
private String thirdPartyType; private String thirdPartyType;
/**
* 设备归属方id
*/
private String equipmentOwnerId;
/** /**
* 启动方式1-我方启动) * 启动方式1-我方启动)
*/ */

View File

@@ -113,5 +113,10 @@ public interface ThirdPartyStationRelationService {
*/ */
List<StationInfoVO> selectStationList(String thirdPlatformType); List<StationInfoVO> selectStationList(String thirdPlatformType);
/**
* 根据站点id查询该站点对接了哪些第三方平台
* @param stationId
* @return
*/
List<ThirdPartyStationRelationVO> getRelationInfoListV2(String stationId); List<ThirdPartyStationRelationVO> getRelationInfoListV2(String stationId);
} }

View File

@@ -10,22 +10,45 @@ import lombok.Data;
*/ */
@Data @Data
public class ThirdPartyStationRelationVO { public class ThirdPartyStationRelationVO {
/**
* 站点id
*/
private String stationId; private String stationId;
/**
* 第三方平台类型
*/
private String thirdPartyType; private String thirdPartyType;
/**
* 第三方平台名称
*/
private String thirdPartyName; private String thirdPartyName;
/**
* 设备所属商户id
*/
private String equipmentOwnerId;
/**
* 启动模式
*/
private String startMode; private String startMode;
/**
* url地址
*/
private String urlAddress; private String urlAddress;
/**
* 密钥信息
*/
private String operatorId; private String operatorId;
private String operatorSecret; private String operatorSecret;
private String signSecret; private String signSecret;
private String dataSecret; private String dataSecret;
private String dataSecretIv; private String dataSecretIv;
/** /**
* 对方平台密钥信息 * 对方平台密钥信息
*/ */

View File

@@ -336,6 +336,7 @@
SELECT SELECT
t1.station_id AS stationId, t1.station_id AS stationId,
t1.third_party_type AS thirdPartyType, t1.third_party_type AS thirdPartyType,
t1.equipment_owner_id as equipmentOwnerId,
t2.platform_name AS thirdPartyName, t2.platform_name AS thirdPartyName,
t2.start_mode AS startMode, t2.start_mode AS startMode,
t2.url_prefix AS urlAddress, t2.url_prefix AS urlAddress,