diff --git a/yudao-module-asset/yudao-module-asset-api/pom.xml b/yudao-module-asset/yudao-module-asset-api/pom.xml
index ae31e55..1e00114 100644
--- a/yudao-module-asset/yudao-module-asset-api/pom.xml
+++ b/yudao-module-asset/yudao-module-asset-api/pom.xml
@@ -34,6 +34,13 @@
spring-boot-starter-validation
true
+
+
+
+ cn.iocoder.cloud
+ yudao-spring-boot-starter-rpc
+ provided
+
diff --git a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/contract/ContractApprovalStatusEnum.java b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/contract/ContractApprovalStatusEnum.java
index 980a2e9..77f5715 100644
--- a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/contract/ContractApprovalStatusEnum.java
+++ b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/contract/ContractApprovalStatusEnum.java
@@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.asset.enums.contract;
-import lombok.Getter;
import java.util.Arrays;
@@ -9,7 +8,6 @@ import java.util.Arrays;
*
* @author 芋道源码
*/
-@Getter
public enum ContractApprovalStatusEnum {
DRAFT(0, "草稿"),
@@ -31,6 +29,13 @@ public enum ContractApprovalStatusEnum {
this.status = status;
this.name = name;
}
+ public Integer getStatus() {
+ return status;
+ }
+
+ public String getName() {
+ return name;
+ }
public static ContractApprovalStatusEnum valueOf(Integer status) {
return Arrays.stream(values())
diff --git a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/contract/ContractStatusEnum.java b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/contract/ContractStatusEnum.java
index 75c1205..b410a86 100644
--- a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/contract/ContractStatusEnum.java
+++ b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/contract/ContractStatusEnum.java
@@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.asset.enums.contract;
-import lombok.Getter;
import java.util.Arrays;
@@ -9,7 +8,6 @@ import java.util.Arrays;
*
* @author 芋道源码
*/
-@Getter
public enum ContractStatusEnum {
DRAFT(0, "草稿"),
@@ -32,6 +30,13 @@ public enum ContractStatusEnum {
this.status = status;
this.name = name;
}
+ public Integer getStatus() {
+ return status;
+ }
+
+ public String getName() {
+ return name;
+ }
public static ContractStatusEnum valueOf(Integer status) {
return Arrays.stream(values())
diff --git a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/contract/ContractTypeEnum.java b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/contract/ContractTypeEnum.java
index 3d9b686..4c6f759 100644
--- a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/contract/ContractTypeEnum.java
+++ b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/contract/ContractTypeEnum.java
@@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.asset.enums.contract;
-import lombok.Getter;
import java.util.Arrays;
@@ -9,7 +8,6 @@ import java.util.Arrays;
*
* @author 芋道源码
*/
-@Getter
public enum ContractTypeEnum {
TRIAL(1, "试用合同"),
@@ -28,6 +26,13 @@ public enum ContractTypeEnum {
this.type = type;
this.name = name;
}
+ public Integer getType() {
+ return type;
+ }
+
+ public String getName() {
+ return name;
+ }
public static ContractTypeEnum valueOf(Integer type) {
return Arrays.stream(values())
diff --git a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/delivery/DeliveryOrderStatusEnum.java b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/delivery/DeliveryOrderStatusEnum.java
index 0d59de1..d7f7b57 100644
--- a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/delivery/DeliveryOrderStatusEnum.java
+++ b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/delivery/DeliveryOrderStatusEnum.java
@@ -1,13 +1,11 @@
package cn.iocoder.yudao.module.asset.enums.delivery;
-import lombok.Getter;
import java.util.Arrays;
/**
* 交车单状态枚举
*/
-@Getter
public enum DeliveryOrderStatusEnum {
PENDING(0, "待完成"),
@@ -20,6 +18,13 @@ public enum DeliveryOrderStatusEnum {
this.status = status;
this.name = name;
}
+ public Integer getStatus() {
+ return status;
+ }
+
+ public String getName() {
+ return name;
+ }
public static DeliveryOrderStatusEnum valueOf(Integer status) {
return Arrays.stream(values())
diff --git a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/delivery/DeliveryStatusEnum.java b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/delivery/DeliveryStatusEnum.java
index ce84e80..dbf2982 100644
--- a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/delivery/DeliveryStatusEnum.java
+++ b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/delivery/DeliveryStatusEnum.java
@@ -1,13 +1,11 @@
package cn.iocoder.yudao.module.asset.enums.delivery;
-import lombok.Getter;
import java.util.Arrays;
/**
* 交车状态枚举
*/
-@Getter
public enum DeliveryStatusEnum {
NOT_DELIVERED(0, "未交车"),
@@ -20,6 +18,13 @@ public enum DeliveryStatusEnum {
this.status = status;
this.name = name;
}
+ public Integer getStatus() {
+ return status;
+ }
+
+ public String getName() {
+ return name;
+ }
public static DeliveryStatusEnum valueOf(Integer status) {
return Arrays.stream(values())
diff --git a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/delivery/DeliveryTaskStatusEnum.java b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/delivery/DeliveryTaskStatusEnum.java
index 682a6b4..f2e300c 100644
--- a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/delivery/DeliveryTaskStatusEnum.java
+++ b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/delivery/DeliveryTaskStatusEnum.java
@@ -1,13 +1,11 @@
package cn.iocoder.yudao.module.asset.enums.delivery;
-import lombok.Getter;
import java.util.Arrays;
/**
* 交车任务状态枚举
*/
-@Getter
public enum DeliveryTaskStatusEnum {
ACTIVE(0, "激活"),
@@ -20,6 +18,13 @@ public enum DeliveryTaskStatusEnum {
this.status = status;
this.name = name;
}
+ public Integer getStatus() {
+ return status;
+ }
+
+ public String getName() {
+ return name;
+ }
public static DeliveryTaskStatusEnum valueOf(Integer status) {
return Arrays.stream(values())
diff --git a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/inspection/InspectionResultEnum.java b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/inspection/InspectionResultEnum.java
index 63fff1a..ffd9ec8 100644
--- a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/inspection/InspectionResultEnum.java
+++ b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/inspection/InspectionResultEnum.java
@@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.asset.enums.inspection;
-import lombok.Getter;
import java.util.Arrays;
@@ -9,7 +8,6 @@ import java.util.Arrays;
*
* @author 芋道源码
*/
-@Getter
public enum InspectionResultEnum {
PASS(1, "通过"),
@@ -29,6 +27,13 @@ public enum InspectionResultEnum {
this.result = result;
this.name = name;
}
+ public Integer getResult() {
+ return result;
+ }
+
+ public String getName() {
+ return name;
+ }
public static InspectionResultEnum valueOf(Integer result) {
return Arrays.stream(values())
diff --git a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/inspection/InspectionSourceTypeEnum.java b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/inspection/InspectionSourceTypeEnum.java
index 01c3e6a..bd32d81 100644
--- a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/inspection/InspectionSourceTypeEnum.java
+++ b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/inspection/InspectionSourceTypeEnum.java
@@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.asset.enums.inspection;
-import lombok.Getter;
import java.util.Arrays;
@@ -9,7 +8,6 @@ import java.util.Arrays;
*
* @author 芋道源码
*/
-@Getter
public enum InspectionSourceTypeEnum {
PREPARE(1, "备车"),
@@ -29,6 +27,13 @@ public enum InspectionSourceTypeEnum {
this.type = type;
this.name = name;
}
+ public Integer getType() {
+ return type;
+ }
+
+ public String getName() {
+ return name;
+ }
public static InspectionSourceTypeEnum valueOf(Integer type) {
return Arrays.stream(values())
diff --git a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/inspection/InspectionStatusEnum.java b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/inspection/InspectionStatusEnum.java
index 3fdc322..e0dc6d7 100644
--- a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/inspection/InspectionStatusEnum.java
+++ b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/inspection/InspectionStatusEnum.java
@@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.asset.enums.inspection;
-import lombok.Getter;
import java.util.Arrays;
@@ -9,7 +8,6 @@ import java.util.Arrays;
*
* @author 芋道源码
*/
-@Getter
public enum InspectionStatusEnum {
PENDING(0, "待检"),
@@ -29,6 +27,13 @@ public enum InspectionStatusEnum {
this.status = status;
this.name = name;
}
+ public Integer getStatus() {
+ return status;
+ }
+
+ public String getName() {
+ return name;
+ }
public static InspectionStatusEnum valueOf(Integer status) {
return Arrays.stream(values())
diff --git a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/prepare/VehiclePrepareStatusEnum.java b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/prepare/VehiclePrepareStatusEnum.java
index 4cb86df..0d178aa 100644
--- a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/prepare/VehiclePrepareStatusEnum.java
+++ b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/prepare/VehiclePrepareStatusEnum.java
@@ -1,13 +1,11 @@
package cn.iocoder.yudao.module.asset.enums.prepare;
-import lombok.Getter;
import java.util.Arrays;
/**
* 备车状态枚举
*/
-@Getter
public enum VehiclePrepareStatusEnum {
DRAFT(0, "待提交"),
@@ -20,6 +18,13 @@ public enum VehiclePrepareStatusEnum {
this.status = status;
this.name = name;
}
+ public Integer getStatus() {
+ return status;
+ }
+
+ public String getName() {
+ return name;
+ }
public static VehiclePrepareStatusEnum valueOf(Integer status) {
return Arrays.stream(values())
diff --git a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/replacement/ReplacementStatusEnum.java b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/replacement/ReplacementStatusEnum.java
index 4539f5e..b136c9d 100644
--- a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/replacement/ReplacementStatusEnum.java
+++ b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/replacement/ReplacementStatusEnum.java
@@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.asset.enums.replacement;
-import lombok.Getter;
import java.util.Arrays;
@@ -9,7 +8,6 @@ import java.util.Arrays;
*
* @author 芋道源码
*/
-@Getter
public enum ReplacementStatusEnum {
DRAFT(0, "草稿"),
@@ -33,6 +31,13 @@ public enum ReplacementStatusEnum {
this.status = status;
this.name = name;
}
+ public Integer getStatus() {
+ return status;
+ }
+
+ public String getName() {
+ return name;
+ }
public static ReplacementStatusEnum valueOf(Integer status) {
return Arrays.stream(values())
diff --git a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/replacement/ReplacementTypeEnum.java b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/replacement/ReplacementTypeEnum.java
index 6cfe1ee..13656c4 100644
--- a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/replacement/ReplacementTypeEnum.java
+++ b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/replacement/ReplacementTypeEnum.java
@@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.asset.enums.replacement;
-import lombok.Getter;
import java.util.Arrays;
@@ -9,7 +8,6 @@ import java.util.Arrays;
*
* @author 芋道源码
*/
-@Getter
public enum ReplacementTypeEnum {
TEMPORARY(1, "临时替换"),
@@ -28,6 +26,13 @@ public enum ReplacementTypeEnum {
this.type = type;
this.name = name;
}
+ public Integer getType() {
+ return type;
+ }
+
+ public String getName() {
+ return name;
+ }
public static ReplacementTypeEnum valueOf(Integer type) {
return Arrays.stream(values())
diff --git a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/returnorder/ReturnOrderStatusEnum.java b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/returnorder/ReturnOrderStatusEnum.java
index 19148b0..0a75e31 100644
--- a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/returnorder/ReturnOrderStatusEnum.java
+++ b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/returnorder/ReturnOrderStatusEnum.java
@@ -1,13 +1,11 @@
package cn.iocoder.yudao.module.asset.enums.returnorder;
-import lombok.Getter;
import java.util.Arrays;
/**
* 还车单状态枚举
*/
-@Getter
public enum ReturnOrderStatusEnum {
PENDING_INSPECTION(0, "待验车"),
@@ -21,6 +19,13 @@ public enum ReturnOrderStatusEnum {
this.status = status;
this.name = name;
}
+ public Integer getStatus() {
+ return status;
+ }
+
+ public String getName() {
+ return name;
+ }
public static ReturnOrderStatusEnum valueOf(Integer status) {
return Arrays.stream(values())
diff --git a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/returnorder/ReturnReasonEnum.java b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/returnorder/ReturnReasonEnum.java
index 5dc01c5..13812b3 100644
--- a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/returnorder/ReturnReasonEnum.java
+++ b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/enums/returnorder/ReturnReasonEnum.java
@@ -1,13 +1,11 @@
package cn.iocoder.yudao.module.asset.enums.returnorder;
-import lombok.Getter;
import java.util.Arrays;
/**
* 还车原因枚举
*/
-@Getter
public enum ReturnReasonEnum {
CONTRACT_EXPIRED("CONTRACT_EXPIRED", "合同到期"),
@@ -21,6 +19,13 @@ public enum ReturnReasonEnum {
this.code = code;
this.name = name;
}
+ public String getCode() {
+ return code;
+ }
+
+ public String getName() {
+ return name;
+ }
public static ReturnReasonEnum valueOfCode(String code) {
return Arrays.stream(values())
diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/EnergyServerApplication.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/EnergyServerApplication.java
index 8d9ffe4..786cb6e 100644
--- a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/EnergyServerApplication.java
+++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/EnergyServerApplication.java
@@ -12,7 +12,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
*/
@SpringBootApplication
@EnableDiscoveryClient
-@EnableFeignClients(basePackages = {"cn.iocoder.yudao.module.infra.api"})
+@EnableFeignClients(basePackages = {"cn.iocoder.yudao.module.infra.api", "cn.iocoder.yudao.module.asset.api"})
public class EnergyServerApplication {
public static void main(String[] args) {