Merge branch 'dev-zzx' into dev-new

This commit is contained in:
Lemon
2024-12-11 11:26:10 +08:00
19 changed files with 704 additions and 226 deletions

View File

@@ -112,7 +112,6 @@ public interface PileBasicInfoService {
/**
* 通过桩sn查询basic信息
*
* @param id 桩id
* @return 结果集合
*/
PileDetailVO selectPileDetailByPileSn(String pileSn);
@@ -233,7 +232,6 @@ public interface PileBasicInfoService {
/**
* 获取充电桩列表
* 提供给联联平台
* @param pileStationInfo
* @return
*/
// List<EquipmentInfo> getPileList(PileStationInfo pileStationInfo);

View File

@@ -1225,6 +1225,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
String pileSn = pileBasicInfo.getSn();
equipmentInfo.setEquipmentID(pileSn);
equipmentInfo.setEquipmentClassification(1);
equipmentInfo.setManufacturerID(Constants.OPERATORID_LIANLIAN);
equipmentInfo.setManufacturerName(Constants.MANUFACTURER_NAME);
equipmentInfo.setConstructionTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, pileBasicInfo.getCreateTime()));
@@ -1322,6 +1323,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
connectorInfo.setParkNo(pileConnectorInfo.getParkNo());
}
connectorInfo.setVoltageUpperLimits(Integer.valueOf(modelInfo.getRatedVoltage()));
connectorInfo.setEquipmentClassification(1);
connectorInfo.setVoltageLowerLimits(Integer.valueOf(modelInfo.getRatedVoltage()));
connectorInfo.setCurrent(Integer.valueOf(modelInfo.getRatedCurrent()));
connectorInfo.setConnectorName(pileConnectorInfo.getPileConnectorCode());