Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.国网上送接口，映射修改

Browse Source 
2.解决上送时间问题
This commit is contained in:
wr
2023-12-26 17:08:58 +08:00
parent 049ec86f5e
commit fc20579051
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java
View File

@@ -14,27 +14,27 @@ public enum GWSendEnum {
//接收电能质量典型源荷指标统计数据接口 //接收电能质量典型源荷指标统计数据接口
TYPICAL_SOURCE("pqTypicalSourceCreate", "/WMCenter/powerQuality/typicalSource/create"), TYPICAL_SOURCE("pqTypicalSourceCreate", "/WMCenter/powerQuality/typicalSource/create"),
//接收电能质量风电场台账数据接口 //接收电能质量风电场台账数据接口
WIND_CREATE("pqArchivalInformationWindCreate", "/WMCenter/powerQuality/archivalInformation/windCreate"), WIND_CREATE("pqWindCreate", "/WMCenter/powerQuality/archivalInformation/windCreate"),
//接收电能质量光伏电站台账数据接口 //接收电能质量光伏电站台账数据接口
PHOTOVOLTAIC_CREATE("pqArchivalInformationPhotovoltaicCreate", "/WMCenter/powerQuality/archivalInformation/photovoltaicCreate"), PHOTOVOLTAIC_CREATE("pqPhotovoltaicCreate", "/WMCenter/powerQuality/archivalInformation/photovoltaicCreate"),
//接收电能质量重要、敏感用户台账数据接口 //接收电能质量重要、敏感用户台账数据接口
SENSITIVE_USER_CREATE("pqArchivalInformationSensitiveUserCreate", "/WMCenter/powerQuality/archivalInformation/sensitiveUserCreate"), SENSITIVE_USER_CREATE("pqSensitiveUserCreate", "/WMCenter/powerQuality/archivalInformation/sensitiveUserCreate"),
//接收电能质量牵引站台账数据接口 //接收电能质量牵引站台账数据接口
TRACTION_STATION("pqTractionStationCreate", "/WMCenter/powerQuality/tractionStation/create"), TRACTION_STATION("pqTractionStationCreate", "/WMCenter/powerQuality/tractionStation/create"),
//接收电能质量监测点台账数据接口 //接收电能质量监测点台账数据接口
MONITOR("pqMonitorCreate", "/WMCenter/powerQuality/monitor/create"), MONITOR("pqMonitorCreate", "/WMCenter/powerQuality/monitor/create"),
//接收电能质量监测点限值台账数据接口 //接收电能质量监测点限值台账数据接口
LIMIT_CREATE("pqMonitorLimitCreate", "/WMCenter/powerQuality/monitor/limitCreate"), LIMIT_CREATE("pqLimitCreate", "/WMCenter/powerQuality/monitor/limitCreate"),
//接收电能质量主配网监测点统计数据接口 //接收电能质量主配网监测点统计数据接口
STATISTICAL_CREATE("pqMonitorStatisticalCreate", "/WMCenter/powerQuality/monitor/statisticalCreate"), STATISTICAL_CREATE("pqMonitorStatisticalCreate", "/WMCenter/powerQuality/monitor/statisticalCreate"),
//接收电能质量换流站指标汇总统计数据接口 //接收电能质量换流站指标汇总统计数据接口
INDEX_CREATE("pqConverterMonitorIndexCreate", "/WMCenter/powerQuality/converterMonitor/indexCreate"), INDEX_CREATE("pqConverterIndexCreate", "/WMCenter/powerQuality/converterMonitor/indexCreate"),
//接收电能质量换流站指标统计明细数据接口 //接收电能质量换流站指标统计明细数据接口
DETAIL_CREATE("pqConverterMonitorDetailCreate", "/WMCenter/powerQuality/converterMonitor/detailCreate"), DETAIL_CREATE("pqConverterDetailCreate", "/WMCenter/powerQuality/converterMonitor/detailCreate"),
//接收电能质量变电站监测统计数据接口 //接收电能质量变电站监测统计数据接口
SUBSTATION_MONITOR("pqSubstationMonitorCreate", "/WMCenter/powerQuality/substationMonitor/create"), SUBSTATION_MONITOR("pqSubstationMonitorCreate", "/WMCenter/powerQuality/substationMonitor/create"),
//接收其他干扰用户台账数据接口 //接收其他干扰用户台账数据接口
OTHER_USER_CREATE("pqArchivalInformationOtherUserCreate", "/WMCenter/powerQuality/archivalInformation/otherUserCreate"), OTHER_USER_CREATE("pqOtherUserCreate", "/WMCenter/powerQuality/archivalInformation/otherUserCreate"),
; ;

4
pqs-common/common-web/src/main/java/com/njcn/web/utils/GwSendUtil.java
View File

@@ -79,8 +79,8 @@ public class GwSendUtil {
*/ */
public static String LoginToken() { public static String LoginToken() {
String token; String token;
String clientId = "942a9278671711eda2e10ae0b5517f6c"; String clientId = "e512d3940a7d11eeae0cd6fb272b183c";
String clientSecret = "3Psd2VEhsA3dVsSPHW0ll5r/03kAqlA2P4w2IiWPA8UWSadcX0we2wffjyTUYGsK"; String clientSecret = "k8cF9CgXsj/lnuP2C4Vhx8tuNsPwieBIU8n14vHL1EoWSadcX0we2wffjyTUYGsK";
String userUrl = "http://" + GWURL + "/psr-auth/oauth/accessToken?grant_type={grant_type}&client_id={client_id}&client_secret={client_secret}"; String userUrl = "http://" + GWURL + "/psr-auth/oauth/accessToken?grant_type={grant_type}&client_id={client_id}&client_secret={client_secret}";
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();

4
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/OtherUserDto.java
View File

@@ -138,12 +138,12 @@ public class OtherUserDto {
* 创建时间 是否必填:否 * 创建时间 是否必填:否
*/ */
@ExcelProperty(value = "创建时间") @ExcelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 更新时间 是否必填:否 * 更新时间 是否必填:否
*/ */
@ExcelProperty(value = "更新时间") @ExcelProperty(value = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }

4
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/PhotovoltaicDto.java
View File

@@ -128,13 +128,13 @@ public class PhotovoltaicDto extends Unit {
* 创建时间 是否必填: * 创建时间 是否必填:
*/ */
@ExcelProperty(value = "创建时间") @ExcelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 更新时间 是否必填: * 更新时间 是否必填:
*/ */
@ExcelProperty(value = "更新时间") @ExcelProperty(value = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime updateTime; private LocalDateTime updateTime;

4
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/SensitiveUserDto.java
View File

@@ -146,11 +146,11 @@ public class SensitiveUserDto extends Unit {
private String runStatus; private String runStatus;
/*创建时间 是否必填：*/ /*创建时间 是否必填：*/
@ExcelProperty(value = "创建时间") @ExcelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime; private LocalDateTime createTime;
/*更新时间 是否必填：*/ /*更新时间 是否必填：*/
@ExcelProperty(value = "更新时间") @ExcelProperty(value = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime updateTime; private LocalDateTime updateTime;

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java
View File

@@ -122,6 +122,6 @@ public class TractionStationDTO extends Unit {
private String runStatus; private String runStatus;
/*更新时间 是否必填：否*/ /*更新时间 是否必填：否*/
@ExcelProperty(value = "更新时间") @ExcelProperty(value = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }

4
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/WindSourceDto.java
View File

@@ -117,12 +117,12 @@ public class WindSourceDto extends Unit {
private String runStatus; private String runStatus;
@ApiModelProperty(name = "createTime", value = "创建时间") @ApiModelProperty(name = "createTime", value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
@ExcelProperty(value = "创建时间") @ExcelProperty(value = "创建时间")
private LocalDateTime createTime; private LocalDateTime createTime;
@ApiModelProperty(name = "updateTime", value = "更新时间") @ApiModelProperty(name = "updateTime", value = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
@ExcelProperty(value = "更新时间") @ExcelProperty(value = "更新时间")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }