Merge branch 'dev-new' into dev-new-rabbitmq

# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
This commit is contained in:
Guoqs
2024-12-28 15:15:15 +08:00
54 changed files with 4373 additions and 2540 deletions

View File

@@ -95,7 +95,7 @@ public class Constants {
public static final String OPERATORID_LIANLIAN = "MA1JLFUU8";
public static final String OPERATORID_JIANG_SU = "MA1X78KH5";
public static final String OPERATORID_GUI_ZHOU = "MAC9K4RRX";
// public static final String OPERATORID_GUI_ZHOU = "MAC9K4RRX";
public static final String MANUFACTURER_NAME = "举视(江苏)新能源设备制造有限公司";

View File

@@ -28,6 +28,8 @@ public enum ThirdPlatformTypeEnum {
GAN_SU_PLATFORM("17", "甘肃省平台", "MA01H3BQ9"),
GUI_ZHOU_PLATFORM("18", "贵州省平台", "009390404"),
NAN_RUI_PLATFORM("19", "南瑞平台", ""),
GUANG_XI_PLATFORM("20", "广西平台", "450000000"),
;
private String typeCode;

View File

@@ -112,6 +112,24 @@ public enum YKCChargingStopReasonEnum {
*/
UNKNOWN_REASON_STOP_CHARGING(0x90, "未知原因停止"),
/**
* 功率板故障
*/
OUTPUT_UNDER_VOLTAGE(0x92, "功率板告警,输出欠压"),
OUTPUT_OVER_VOLTAGE(0x93, "功率板告警,输出过压故障"),
INPUT_OVER_VOLTAGE(0x94, "功率板告警,输入过压"),
INPUT_UNDER_VOLTAGE(0x95, "功率板告警,输入欠压"),
TRANSFORMER_OVER_TEMPERATURE(0x96, "功率板告警,变压器过温"),
A_OVER_CURRENT(0x97, "功率板告警谐振A过流"),
B_OVER_CURRENT(0x98, "功率板告警谐振B过流"),
OUTPUT_OVER_CURRENT(0x99, "功率板告警,输出过流"),
HARDWARE_OUTPUT_OVER_CURRENT(0x9A, "功率板告警,硬件输出过流"),
AB_OUTPUT_UNBALANCE(0x9B, "功率板告警AB输出不平衡"),
LLC_PFC_COMMUNICATION_FAULT(0x9C, "功率板告警LLC和PFC通信故障"),
LLC_MAIN_CONTROLLER_COMMUNICATION_FAULT(0x9D, "功率板告警LLC和主控通信故障"),
OTHER_EIGHTY_G(0x9E, "预留"),
;