From fc20579051ad6149bc50ee108508fa01b0f7ea69 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 26 Dec 2023 17:08:58 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=9B=BD=E7=BD=91=E4=B8=8A=E9=80=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=98=A0=E5=B0=84=E4=BF=AE=E6=94=B9=202.?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8A=E9=80=81=E6=97=B6=E9=97=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/njcn/web/enums/GWSendEnum.java | 14 +++++++------- .../main/java/com/njcn/web/utils/GwSendUtil.java | 4 ++-- .../njcn/device/pms/pojo/vo/gw/OtherUserDto.java | 4 ++-- .../device/pms/pojo/vo/gw/PhotovoltaicDto.java | 4 ++-- .../device/pms/pojo/vo/gw/SensitiveUserDto.java | 4 ++-- .../device/pms/pojo/vo/gw/TractionStationDTO.java | 2 +- .../njcn/device/pms/pojo/vo/gw/WindSourceDto.java | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java b/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java index 2b8ea1496..b9183c0f4 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java +++ b/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java @@ -14,27 +14,27 @@ public enum GWSendEnum { //接收电能质量典型源荷指标统计数据接口 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"), //接收电能质量监测点台账数据接口 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"), //接收电能质量换流站指标汇总统计数据接口 - 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"), //接收其他干扰用户台账数据接口 - OTHER_USER_CREATE("pqArchivalInformationOtherUserCreate", "/WMCenter/powerQuality/archivalInformation/otherUserCreate"), + OTHER_USER_CREATE("pqOtherUserCreate", "/WMCenter/powerQuality/archivalInformation/otherUserCreate"), ; diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/utils/GwSendUtil.java b/pqs-common/common-web/src/main/java/com/njcn/web/utils/GwSendUtil.java index e00e70220..67d034a0e 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/utils/GwSendUtil.java +++ b/pqs-common/common-web/src/main/java/com/njcn/web/utils/GwSendUtil.java @@ -79,8 +79,8 @@ public class GwSendUtil { */ public static String LoginToken() { String token; - String clientId = "942a9278671711eda2e10ae0b5517f6c"; - String clientSecret = "3Psd2VEhsA3dVsSPHW0ll5r/03kAqlA2P4w2IiWPA8UWSadcX0we2wffjyTUYGsK"; + String clientId = "e512d3940a7d11eeae0cd6fb272b183c"; + String clientSecret = "k8cF9CgXsj/lnuP2C4Vhx8tuNsPwieBIU8n14vHL1EoWSadcX0we2wffjyTUYGsK"; String userUrl = "http://" + GWURL + "/psr-auth/oauth/accessToken?grant_type={grant_type}&client_id={client_id}&client_secret={client_secret}"; Map map = new HashMap<>(); diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/OtherUserDto.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/OtherUserDto.java index 61b383642..6d9a7e7c5 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/OtherUserDto.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/OtherUserDto.java @@ -138,12 +138,12 @@ public class OtherUserDto { * 创建时间 是否必填:否 */ @ExcelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime createTime; /** * 更新时间 是否必填:否 */ @ExcelProperty(value = "更新时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime updateTime; } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/PhotovoltaicDto.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/PhotovoltaicDto.java index 72924794e..dc5ccda7c 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/PhotovoltaicDto.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/PhotovoltaicDto.java @@ -128,13 +128,13 @@ public class PhotovoltaicDto extends Unit { * 创建时间 是否必填: */ @ExcelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime createTime; /** * 更新时间 是否必填: */ @ExcelProperty(value = "更新时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime updateTime; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/SensitiveUserDto.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/SensitiveUserDto.java index a13eef9f4..7dfb04f2c 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/SensitiveUserDto.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/SensitiveUserDto.java @@ -146,11 +146,11 @@ public class SensitiveUserDto extends Unit { private String runStatus; /*创建时间 是否必填：*/ @ExcelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime createTime; /*更新时间 是否必填：*/ @ExcelProperty(value = "更新时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime updateTime; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java index b5168e030..36c224e31 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java @@ -122,6 +122,6 @@ public class TractionStationDTO extends Unit { private String runStatus; /*更新时间 是否必填：否*/ @ExcelProperty(value = "更新时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime updateTime; } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/WindSourceDto.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/WindSourceDto.java index c94b33af9..86f73b3d5 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/WindSourceDto.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/WindSourceDto.java @@ -117,12 +117,12 @@ public class WindSourceDto extends Unit { private String runStatus; @ApiModelProperty(name = "createTime", value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") @ExcelProperty(value = "创建时间") private LocalDateTime createTime; @ApiModelProperty(name = "updateTime", value = "更新时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") @ExcelProperty(value = "更新时间") private LocalDateTime updateTime; }