From a3ded5d8e0c4f750fb4ad190e165ddeb8446f05a Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 09 八月 2024 16:47:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UnitListQueryDto.java | 2
.gitignore | 5
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserDetailDto.java | 5
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/dto/ApplyChargingRemarkDto.java | 10 +
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserListQueryDto.java | 12
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java | 4
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java | 3
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TEnterpriseUserApplication.java | 6
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java | 8
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java | 2
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserChangeDto.java | 11 +
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TApplyChargingPile.java | 2
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TVehicleRampController.java | 8
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ExchangeOrderFallbackFactory.java | 37 ++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java | 9 +
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 40 ++++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java | 7
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 111 ++++++++++-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TApplyChargingPileController.java | 45 +++++
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java | 4
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TCarportController.java | 7
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/GiveVipDto.java | 14 +
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java | 16 +
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml | 13 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 7
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java | 3
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java | 2
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/PointsQueryDto.java | 15 +
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/dto/ApplyChargingQuery.java | 9 +
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TMonitoringEquipmentController.java | 7
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java | 6
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TFaultMessageController.java | 4
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 7
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TAccountingStrategy.java | 32 +++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java | 37 ++++
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ExchangeOrderClient.java | 24 ++
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/TagListQueryDto.java | 2
37 files changed, 500 insertions(+), 36 deletions(-)
diff --git a/.gitignore b/.gitignore
index c5a7652..3e7af20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,7 @@
generator
.idea
-target
\ No newline at end of file
+target
+
+*.yaml
+*.yml
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/GiveVipDto.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/GiveVipDto.java
new file mode 100644
index 0000000..2a7c132
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/GiveVipDto.java
@@ -0,0 +1,14 @@
+package com.ruoyi.account.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class GiveVipDto {
+ @ApiModelProperty("vipid")
+ private Integer vipId;
+ @ApiModelProperty("1月2季3年")
+ private Integer type;
+ @ApiModelProperty("用户Id")
+ private Long userId;
+}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/PointsQueryDto.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/PointsQueryDto.java
new file mode 100644
index 0000000..09ba2f5
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/PointsQueryDto.java
@@ -0,0 +1,15 @@
+package com.ruoyi.account.api.dto;
+
+import com.ruoyi.common.core.web.domain.BasePojo;
+import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PointsQueryDto extends BasePage {
+ private Long userId;
+ @ApiModelProperty("1收入0支出")
+ private Integer type;
+ @ApiModelProperty("1=签到得，2=充电得，3=好评得，4=邀请好友得，5=添加车辆得，6=兑换商品减")
+ private Integer changeType;
+}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/TagListQueryDto.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/TagListQueryDto.java
index 0b010af..49d0938 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/TagListQueryDto.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/TagListQueryDto.java
@@ -5,5 +5,5 @@
@Data
public class TagListQueryDto extends BasePage {
- String tagName;
+ private String tagName;
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UnitListQueryDto.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UnitListQueryDto.java
index 8fabb09..90d3cdc 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UnitListQueryDto.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UnitListQueryDto.java
@@ -5,5 +5,5 @@
@Data
public class UnitListQueryDto extends BasePage {
- String companyName;
+ private String companyName;
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserChangeDto.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserChangeDto.java
new file mode 100644
index 0000000..ab157d7
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserChangeDto.java
@@ -0,0 +1,11 @@
+package com.ruoyi.account.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class UserChangeDto {
+ private Long userId;
+ @ApiModelProperty("1=正常，2=冻结")
+ private Integer status;
+}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserDetailDto.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserDetailDto.java
index cf8da17..7078961 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserDetailDto.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserDetailDto.java
@@ -8,12 +8,11 @@
import java.util.List;
@Data
public class UserDetailDto extends TAppUser {
- @ApiModelProperty("累计充电数")
- private Long orderCount;
+
@ApiModelProperty("单位名称")
private String unitName;
@ApiModelProperty("车辆列表")
- List<TAppUserCar> carList;
+ private List<TAppUserCar> carList;
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserListQueryDto.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserListQueryDto.java
index 876d173..2605486 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserListQueryDto.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserListQueryDto.java
@@ -5,10 +5,10 @@
@Data
public class UserListQueryDto extends BasePage {
- String userPhone;
- String cityCode;
- Integer status;
- Integer userTagId;
- Integer vipTypeId;
- Integer companyId;
+ private String userPhone;
+ private String cityCode;
+ private Integer status;
+ private Integer userTagId;
+ private Integer vipTypeId;
+ private Integer companyId;
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java
index 0a731d5..decb469 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java
@@ -112,6 +112,9 @@
@ApiModelProperty(value = "vip名称")
@TableField(exist = false)
private String vipName;
+ @ApiModelProperty("累计充电数")
+ @TableField(exist = false)
+ private Long orderCount;
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java
index 60f0015..be1274f 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java
@@ -60,5 +60,9 @@
@TableField("extension")
private String extension;
+ @ApiModelProperty(value = "订单编号")
+ @TableField(exist = false)
+ private String orderNum;
+
}
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/dto/ApplyChargingQuery.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/dto/ApplyChargingQuery.java
new file mode 100644
index 0000000..7559f8c
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/dto/ApplyChargingQuery.java
@@ -0,0 +1,9 @@
+package com.ruoyi.chargingPile.api.dto;
+
+import com.ruoyi.common.core.web.page.BasePage;
+import lombok.Data;
+
+@Data
+public class ApplyChargingQuery extends BasePage {
+ String name;
+}
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/dto/ApplyChargingRemarkDto.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/dto/ApplyChargingRemarkDto.java
new file mode 100644
index 0000000..58092c0
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/dto/ApplyChargingRemarkDto.java
@@ -0,0 +1,10 @@
+package com.ruoyi.chargingPile.api.dto;
+
+import com.ruoyi.common.core.web.page.BasePage;
+import lombok.Data;
+
+@Data
+public class ApplyChargingRemarkDto extends BasePage {
+ Integer id;
+ String remark;
+}
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java
index d2893c3..aad471f 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java
@@ -2,7 +2,10 @@
import com.ruoyi.chargingPile.api.factory.ChargingPileFallbackFactory;
import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.domain.R;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
/**
* 充电桩服务
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TAccountingStrategy.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TAccountingStrategy.java
index a4e89d8..f6c9c95 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TAccountingStrategy.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TAccountingStrategy.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -50,5 +51,36 @@
@TableField("discount")
private BigDecimal discount;
+ @ApiModelProperty(value = "一级审核用户id")
+ @TableField("first_user_id")
+ private Long firstUserId;
+
+ @ApiModelProperty(value = "二级审核用户id")
+ @TableField("two_user_id")
+ private Long twoUserId;
+
+ @ApiModelProperty(value = "一级审核备注")
+ @TableField("first_remark")
+ private String firstRemark;
+
+ @ApiModelProperty(value = "二级审核备注")
+ @TableField("two_remark")
+ private String twoRemark;
+
+ @ApiModelProperty(value = "审核状态（1=待审核一级，2=待审核二级，3=审核通过，4=驳回）")
+ @TableField("audit_status")
+ private Integer auditStatus;
+
+ @ApiModelProperty(value = "一级审核时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("first_audit_time")
+ private LocalDateTime firstAuditTime;
+
+ @ApiModelProperty(value = "二级审核时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("two_audit_time")
+ private LocalDateTime twoAuditTime;
+
+
}
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TApplyChargingPile.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TApplyChargingPile.java
index 01f9bb1..86bd0fc 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TApplyChargingPile.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TApplyChargingPile.java
@@ -8,6 +8,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -38,6 +39,7 @@
private Long appUserId;
@ApiModelProperty(value = "用电地址")
+ @NotBlank(message = "用电地址不能为空")
@TableField("address")
private String address;
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java
index 3f8d2c1..5ad039d 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java
@@ -2,6 +2,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
+import com.ruoyi.order.api.model.TChargingOrder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -27,6 +28,11 @@
return R.fail("订单计数:" + throwable.getMessage());
}
+
+ @Override
+ public R<TChargingOrder> orderDetail(Long orderId) {
+ return R.fail("订单详情:" + throwable.getMessage());
+ }
};
}
}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ExchangeOrderFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ExchangeOrderFallbackFactory.java
new file mode 100644
index 0000000..b120a41
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ExchangeOrderFallbackFactory.java
@@ -0,0 +1,37 @@
+package com.ruoyi.order.api.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.order.api.feignClient.ExchangeOrderClient;
+import com.ruoyi.order.api.feignClient.OrderClient;
+import com.ruoyi.order.api.model.TExchangeOrder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 充电订单服务降级处理
+ *
+ * @author ruoyi
+ */
+@Component
+public class ExchangeOrderFallbackFactory implements FallbackFactory<ExchangeOrderClient>
+{
+ private static final Logger log = LoggerFactory.getLogger(ExchangeOrderFallbackFactory.class);
+
+
+ @Override
+ public ExchangeOrderClient create(Throwable cause) {
+ log.error("商品订单调用失败:{}", cause.getMessage());
+ return new ExchangeOrderClient() {
+
+
+ @Override
+ public R<TExchangeOrder> orderDetail(Long orderId) {
+ return null;
+ }
+ };
+ }
+}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
index 0ad9005..f3f3b95 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
@@ -3,6 +3,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.feignClient.OrderClient;
+import com.ruoyi.order.api.model.TChargingOrder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -26,6 +27,7 @@
log.error("商品订单调用失败:{}", cause.getMessage());
return new OrderClient() {
+
@Override
public R<List<Integer>> getSalesCountByGoodsId(String goodsIds) {
return null;
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
index aa4639f..6a48e86 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
@@ -3,6 +3,7 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.api.factory.ChargingOrderFallbackFactory;
+import com.ruoyi.order.api.model.TChargingOrder;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -16,5 +17,8 @@
@PostMapping(value = "/t-charging-order/useOrderCount")
R<Long> useOrderCount(@RequestParam Long userId);
+ @PostMapping(value = "/t-charging-order/detail")
+ R<TChargingOrder> orderDetail(@RequestParam Long orderId);
+
}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ExchangeOrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ExchangeOrderClient.java
new file mode 100644
index 0000000..ac22284
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ExchangeOrderClient.java
@@ -0,0 +1,24 @@
+package com.ruoyi.order.api.feignClient;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.order.api.factory.ChargingOrderFallbackFactory;
+import com.ruoyi.order.api.factory.ExchangeOrderFallbackFactory;
+import com.ruoyi.order.api.model.TChargingOrder;
+import com.ruoyi.order.api.model.TExchangeOrder;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 充电订单服务
+ * @author ruoyi
+ */
+@FeignClient(contextId = "ChargingOrderClient", value = ServiceNameConstants.CONTRACT_SERVICE, fallbackFactory = ExchangeOrderFallbackFactory.class)
+public interface ExchangeOrderClient {
+
+
+ @PostMapping(value = "/t-exchange-order/detail")
+ R<TExchangeOrder> orderDetail(@RequestParam Long orderId);
+
+}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TEnterpriseUserApplication.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TEnterpriseUserApplication.java
index bae1bb4..32002ab 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TEnterpriseUserApplication.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TEnterpriseUserApplication.java
@@ -7,6 +7,8 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -35,18 +37,22 @@
private Long appUserId;
@ApiModelProperty(value = "公司名称")
+ @NotBlank(message = "公司名称不能为空")
@TableField("company_name")
private String companyName;
@ApiModelProperty(value = "汽车数量")
+ @NotNull(message = "汽车数量不能为空")
@TableField("vehicles_number")
private Integer vehiclesNumber;
@ApiModelProperty(value = "联系人姓名")
+ @NotBlank(message = "联系人姓名不能为空")
@TableField("contact_name")
private String contactName;
@ApiModelProperty(value = "联系人电话")
+ @NotBlank(message = "联系人电话不能为空")
@TableField("phone")
private String phone;
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
index 8377509..3eaf8db 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -3,22 +3,17 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.api.dto.UnitListQueryDto;
-import com.ruoyi.account.api.dto.UserDetailDto;
-import com.ruoyi.account.api.dto.UserListQueryDto;
-import com.ruoyi.account.api.model.TAppUser;
-import com.ruoyi.account.api.model.TAppUserCar;
-import com.ruoyi.account.api.model.TAppUserTag;
-import com.ruoyi.account.api.model.TAppUserVipDetail;
-import com.ruoyi.account.service.TAppUserCarService;
-import com.ruoyi.account.service.TAppUserService;
-import com.ruoyi.account.service.TAppUserTagService;
-import com.ruoyi.account.service.TAppUserVipDetailService;
+import com.ruoyi.account.api.dto.*;
+import com.ruoyi.account.api.model.*;
+import com.ruoyi.account.service.*;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.web.domain.BasePojo;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
+import com.ruoyi.order.api.feignClient.ExchangeOrderClient;
+import com.ruoyi.order.api.model.TChargingOrder;
+import com.ruoyi.order.api.model.TExchangeOrder;
import com.ruoyi.other.api.domain.TCompany;
import com.ruoyi.other.api.domain.TUserTag;
import com.ruoyi.other.api.feignClient.OtherClient;
@@ -63,6 +58,11 @@
@Resource
private TAppUserCarService appUserCarService;
+ @Resource
+ private TAppUserIntegralChangeService integralChangeService;
+
+ @Resource
+ private ExchangeOrderClient exchangeOrderClient;
@ApiOperation(value = "单位管理列表", tags = {"用户管理-单位管理"})
@PostMapping(value = "/unit/page")
public R<Page<TCompany>> unitPage(@RequestBody UnitListQueryDto unitListQueryDto) {
@@ -96,14 +96,10 @@
@PostMapping(value = "/user/page")
public R<Page<TAppUser>> userPage(@RequestBody UserListQueryDto userListQueryDto) {
List<Long> userIds = new ArrayList<>();
-
//如果要筛选标签。用标签获取useids
if (userListQueryDto.getUserTagId() != null){
userIds = appUserTagService.lambdaQuery().eq(TAppUserTag::getUserTagId, userListQueryDto.getUserTagId()).list().stream().map(TAppUserTag::getAppUserId).collect(Collectors.toList());
}
-
-
-
//列表查询
Page<TAppUser> page = appUserService.lambdaQuery()
.like(userListQueryDto.getUserPhone() != null && !"".equals(userListQueryDto.getUserPhone()), TAppUser::getPhone, userListQueryDto.getUserPhone())
@@ -113,7 +109,6 @@
.eq(userListQueryDto.getVipTypeId() != null, TAppUser::getVipId, userListQueryDto.getVipTypeId())
.in(!userIds.isEmpty(),TAppUser::getId,userIds)
.page(Page.of(userListQueryDto.getPageCurr(), userListQueryDto.getPageSize()));
-
if (page.getRecords().isEmpty()){
return R.ok(page);
}
@@ -132,6 +127,10 @@
}
//匹配vipMap的值
appUser.setVipName(vipMap.getData().get(appUser.getVipId()));
+ //累计充电次数
+ R<Long> useOrderCount = chargingOrderClient.useOrderCount(appUser.getId());
+ appUser.setOrderCount(useOrderCount.getData());
+
}
return R.ok(page);
}
@@ -204,5 +203,85 @@
userDetailDto.setTagName(tagMap.getData().values().toString());
return R.ok(userDetailDto);
}
+
+ @ApiOperation(value = "用户详情积分明细", tags = {"用户管理-用户列表"})
+ @PostMapping(value = "/user/points/page")
+ public R<Page<TAppUserIntegralChange>> pointsDetail(@RequestBody PointsQueryDto pointsQueryDto) {
+ List<Integer> types = new ArrayList<>();
+ if (pointsQueryDto.getType()!=null){
+ types.add(1);
+ types.add(2);
+ types.add(3);
+ types.add(4);
+ types.add(5);
+ }
+ Page<TAppUserIntegralChange> page = integralChangeService.lambdaQuery()
+ .eq(TAppUserIntegralChange::getAppUserId, pointsQueryDto.getUserId())
+ .orderByDesc(TAppUserIntegralChange::getCreateTime)
+ .eq(pointsQueryDto.getChangeType() != null, TAppUserIntegralChange::getChangeType, pointsQueryDto.getChangeType())
+ .in(!types.isEmpty(), TAppUserIntegralChange::getChangeType, types).page(Page.of(pointsQueryDto.getPageCurr(), pointsQueryDto.getPageSize()));
+
+ for (TAppUserIntegralChange record : page.getRecords()) {
+ if (record.getChangeType()==2){
+ R<TChargingOrder> tChargingOrderR = chargingOrderClient.orderDetail(Long.valueOf(record.getExtension()));
+ if (tChargingOrderR.getData()!=null) {
+ record.setOrderNum(tChargingOrderR.getData().getCode());
+ }
+ }
+ if (record.getChangeType()==6){
+ R<TExchangeOrder> tExchangeOrderR = exchangeOrderClient.orderDetail(Long.valueOf(record.getExtension()));
+ if (tExchangeOrderR.getData()!=null){
+ record.setOrderNum(tExchangeOrderR.getData().getCode());
+ }
+ }
+ }
+
+ return R.ok(page);
+
+ }
+
+ @ApiOperation(value = "用户详情积分明细", tags = {"用户管理-用户列表"})
+ @PostMapping(value = "/user/status/change")
+ public R pointsDetail(@RequestBody UserChangeDto userChangeDto) {
+ TAppUser appUser = appUserService.getById(userChangeDto.getUserId());
+ appUser.setStatus(userChangeDto.getStatus());
+ appUserService.updateById(appUser);
+ return R.ok();
+ }
+
+
+ @ApiOperation(value = "赠送会员", tags = {"用户管理-用户列表"})
+ @PostMapping(value = "/user/give/vip")
+ public R giveVip(@RequestBody GiveVipDto giveVipDto) {
+ TAppUser nowUser = appUserService.getById(giveVipDto.getUserId());
+
+
+ //如果vipEndTime为空或已过期，直接增加
+ if (nowUser.getVipEndTime()==null||nowUser.getVipEndTime().isBefore(LocalDateTime.now())) {
+ if (giveVipDto.getType() == 1) {
+ nowUser.setVipEndTime(LocalDateTime.now().plusDays(31));
+ //直接增加vipDetail
+ } else if (giveVipDto.getType() == 2) {
+ nowUser.setVipEndTime(LocalDateTime.now().plusDays(93));
+ } else if (giveVipDto.getType() == 3) {
+ nowUser.setVipEndTime(LocalDateTime.now().plusDays(365));
+ }
+ //直接赠送优惠卷
+ }else {
+ if (giveVipDto.getType() == 1) {
+ nowUser.setVipEndTime(nowUser.getVipEndTime().plusDays(31));
+ //如果有这个类型的vip，累加，没有的话，从entTime新增
+ } else if (giveVipDto.getType() == 2) {
+ nowUser.setVipEndTime(nowUser.getVipEndTime().plusDays(93));
+ } else if (giveVipDto.getType() == 3) {
+ nowUser.setVipEndTime(nowUser.getVipEndTime().plusDays(365));
+ }
+ }
+
+
+
+
+ return R.ok();
+ }
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TApplyChargingPileController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TApplyChargingPileController.java
new file mode 100644
index 0000000..50ee1e4
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TApplyChargingPileController.java
@@ -0,0 +1,45 @@
+package com.ruoyi.account.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.api.dto.*;
+import com.ruoyi.account.api.model.*;
+import com.ruoyi.account.service.*;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.ruoyi.common.core.web.domain.BasePojo;
+import com.ruoyi.order.api.feignClient.ChargingOrderClient;
+import com.ruoyi.order.api.feignClient.ExchangeOrderClient;
+import com.ruoyi.order.api.model.TChargingOrder;
+import com.ruoyi.order.api.model.TExchangeOrder;
+import com.ruoyi.other.api.domain.TCompany;
+import com.ruoyi.other.api.domain.TUserTag;
+import com.ruoyi.other.api.feignClient.OtherClient;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@RestController
+@RequestMapping("/t_apply_charging_pile")
+public class TApplyChargingPileController {
+
+
+
+}
+
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
index 5a00f21..d028f09 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.chargingPile.api.dto.TAccountingStrategyDTO;
import com.ruoyi.chargingPile.api.model.TAccountingStrategy;
import com.ruoyi.chargingPile.api.model.TAccountingStrategyDetail;
@@ -14,11 +15,16 @@
import com.ruoyi.chargingPile.service.TAccountingStrategyService;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.log.enums.OperatorType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -36,6 +42,9 @@
private final TAccountingStrategyService accountingStrategyService;
private final TAccountingStrategyDetailService accountingStrategyDetailService;
+
+ @Resource
+ private TokenService tokenService;
@Autowired
public TAccountingStrategyController(TAccountingStrategyService accountingStrategyService, TAccountingStrategyDetailService accountingStrategyDetailService) {
@@ -68,6 +77,7 @@
/**
* 添加计费策略管理
*/
+ @Log(title = "添加计费策略", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "添加计费策略")
@PostMapping(value = "/add")
public AjaxResult<Integer> add(@RequestBody TAccountingStrategyDTO dto) {
@@ -82,6 +92,7 @@
/**
* 修改计费策略
*/
+ @Log(title = "修改计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "修改计费策略")
@PostMapping(value = "/update")
public AjaxResult<Boolean> update(@RequestBody TAccountingStrategyDTO dto) {
@@ -107,6 +118,7 @@
/**
* 删除计费策略
*/
+ @Log(title = "删除计费策略", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略"},value = "删除计费策略")
@DeleteMapping(value = "/deleteById")
public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
@@ -119,6 +131,7 @@
/**
* 批量删除计费策略
*/
+ @Log(title = "批量删除计费策略", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略"},value = "批量删除计费策略")
@DeleteMapping(value = "/deleteByIds")
public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
@@ -135,5 +148,32 @@
List<TAccountingStrategyVO> list = accountingStrategyService.getPlatformAccountingStrategy();
return AjaxResult.success(list);
}
+
+
+
+ @ApiOperation(tags = {"后台-申请表单-计费模板审核"},value = "查询计费审核分页列表")
+ @PostMapping(value = "/auth/pageList")
+ public AjaxResult authPageList(@RequestBody TAccountingStrategyQuery query) {
+ Long userid = tokenService.getLoginUser().getUserid();
+ Page<TAccountingStrategy> page = accountingStrategyService.lambdaQuery()
+ .in(TAccountingStrategy::getFirstUserId, userid)
+ .or().in(TAccountingStrategy::getTwoUserId, userid)
+ .page(Page.of(query.getPageCurr(), query.getPageSize()));
+
+ List<TAccountingStrategy> records = page.getRecords();
+ for (TAccountingStrategy record : records) {
+ if (record.getAuditStatus()==2){
+ if (record.getFirstUserId().equals(userid)){
+ record.setAuditStatus(3);
+ }
+
+ }
+
+ }
+
+
+ return AjaxResult.ok(accountingStrategyService.pageList(query));
+ }
+
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
index 25fac96..8fe2dbc 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -1,6 +1,9 @@
package com.ruoyi.chargingPile.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.chargingPile.api.dto.ApplyChargingQuery;
+import com.ruoyi.chargingPile.api.dto.ApplyChargingRemarkDto;
import com.ruoyi.chargingPile.api.model.TApplyChargingPile;
import com.ruoyi.chargingPile.api.model.TCarport;
import com.ruoyi.chargingPile.api.vo.TCarportVO;
@@ -8,6 +11,9 @@
import com.ruoyi.chargingPile.service.TCarportService;
import com.ruoyi.chargingPile.service.TVehicleRampService;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.log.enums.OperatorType;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -36,6 +42,7 @@
/**
* 建桩申请
*/
+ @Log(title = "建桩申请", businessType = BusinessType.INSERT,operatorType = OperatorType.MOBILE)
@ApiOperation(tags = {"小程序-建桩申请"},value = "建桩申请")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TApplyChargingPile dto) {
@@ -44,5 +51,35 @@
return AjaxResult.ok(applyChargingPileService.save(dto));
}
+ @ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "列表")
+ @PostMapping(value = "/page")
+ public AjaxResult<Page<TApplyChargingPile>> page(ApplyChargingQuery applyChargingQuery) {
+ // TODO 用户id
+ Page<TApplyChargingPile> page = applyChargingPileService.lambdaQuery()
+ .like(applyChargingQuery.getName() != null && !applyChargingQuery.getName().equals(""), TApplyChargingPile::getAgentPhone, applyChargingQuery.getName())
+ .page(Page.of(applyChargingQuery.getPageCurr(), applyChargingQuery.getPageSize()));
+ return AjaxResult.ok(page);
+ }
+
+
+ @ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "详情")
+ @PostMapping(value = "/detail/{id}")
+ public AjaxResult<TApplyChargingPile> detail(@PathVariable Integer id) {
+
+ return AjaxResult.ok(applyChargingPileService.getById(id));
+ }
+
+ @ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "修改备注")
+ @PostMapping(value = "/remark")
+ public AjaxResult<TApplyChargingPile> remark(@RequestBody ApplyChargingRemarkDto applyChargingRemarkDt) {
+ TApplyChargingPile byId = applyChargingPileService.getById(applyChargingRemarkDt.getId());
+ byId.setRemark(applyChargingRemarkDt.getRemark());
+ applyChargingPileService.updateById(byId);
+ return AjaxResult.success();
+ }
+
+
+
+
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TCarportController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TCarportController.java
index ba38bc5..0149ad4 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TCarportController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TCarportController.java
@@ -8,6 +8,9 @@
import com.ruoyi.chargingPile.service.TCarportService;
import com.ruoyi.chargingPile.service.TVehicleRampService;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.log.enums.OperatorType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +53,7 @@
/**
* 添加车库管理
*/
+ @Log(title = "添加车库", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-车库"},value = "添加车库")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TCarport dto) {
@@ -59,6 +63,7 @@
/**
* 修改车库
*/
+ @Log(title = "修改车库", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-车库"},value = "修改车库")
@PostMapping(value = "/update")
public AjaxResult<Boolean> update(@RequestBody TCarport dto) {
@@ -77,6 +82,7 @@
/**
* 删除车库
*/
+ @Log(title = "删除车库", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-车库"},value = "删除车库")
@DeleteMapping(value = "/deleteById")
public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
@@ -89,6 +95,7 @@
/**
* 批量删除车库
*/
+ @Log(title = "批量删除车库", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-车库"},value = "批量删除车库")
@DeleteMapping(value = "/deleteByIds")
public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
index 60ecce0..f65d459 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
@@ -8,6 +8,9 @@
import com.ruoyi.chargingPile.service.TChargingGunService;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.log.enums.OperatorType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +51,7 @@
/**
* 添加充电枪管理
*/
+ @Log(title = "添加充电枪", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"管理后台-充电桩信息"},value = "添加充电枪")
@PostMapping(value = "/add")
public AjaxResult add(@RequestBody TChargingGunDTO dto) {
@@ -57,6 +61,7 @@
/**
* 修改充电枪
*/
+ @Log(title = "修改充电枪", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"管理后台-充电桩信息"},value = "修改充电枪")
@PostMapping(value = "/update")
public AjaxResult update(@RequestBody TChargingGunDTO dto) {
@@ -75,6 +80,7 @@
/**
* 删除充电枪
*/
+ @Log(title = "删除充电枪", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"管理后台-充电桩信息"},value = "删除充电枪")
@DeleteMapping(value = "/deleteById")
public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
@@ -87,6 +93,7 @@
/**
* 批量删除充电枪
*/
+ @Log(title = "批量删除充电枪", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-充电枪"},value = "批量删除充电枪")
@DeleteMapping(value = "/deleteByIds")
public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
@@ -96,6 +103,7 @@
/**
* 结束充电
*/
+ @Log(title = "结束充电", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-充电枪"},value = "结束充电")
@PostMapping(value = "/stopCharging")
public AjaxResult<String> stopCharging() {
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
index e549840..58d7ba1 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
@@ -16,6 +16,9 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.chargingPile.api.query.PageChargingPileList;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.log.enums.OperatorType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -73,6 +76,7 @@
}
@ResponseBody
+ @Log(title = "添加充电桩数据", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@PostMapping("/addChargingPile")
@ApiOperation(value = "添加充电桩数据", tags = {"管理后台-充电桩信息"})
public AjaxResult addChargingPile(@RequestBody TChargingPile chargingPile){
@@ -90,6 +94,7 @@
@ResponseBody
+ @Log(title = "编辑充电桩数据", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@PostMapping("/editChargingPile")
@ApiOperation(value = "编辑充电桩数据", tags = {"管理后台-充电桩信息"})
public AjaxResult editChargingPile(@RequestBody TChargingPile chargingPile){
@@ -100,6 +105,7 @@
@ResponseBody
@DeleteMapping("/delChargingPile/{id}")
+ @Log(title = "删除充电桩", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(value = "删除充电桩", tags = {"管理后台-充电桩信息"})
@ApiImplicitParams({
@ApiImplicitParam(value = "充电桩id", name = "id", dataTypeClass = Integer.class, required = true)
@@ -110,6 +116,7 @@
@ResponseBody
+ @Log(title = "批量设置计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@PostMapping("/batchSetAccountingStrategy")
@ApiOperation(value = "批量设置计费策略", tags = {"管理后台-充电桩信息"})
public AjaxResult batchSetAccountingStrategy(@RequestBody BatchSetAccountingStrategy setAccountingStrategy){
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TFaultMessageController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TFaultMessageController.java
index a37a427..47190e3 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TFaultMessageController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TFaultMessageController.java
@@ -6,6 +6,9 @@
import com.ruoyi.chargingPile.service.TChargingPileService;
import com.ruoyi.chargingPile.service.TFaultMessageService;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.log.enums.OperatorType;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -36,6 +39,7 @@
/**
* 添加故障报修管理
*/
+ @Log(title = "添加故障报修管理", businessType = BusinessType.INSERT,operatorType = OperatorType.MOBILE)
@ApiOperation(tags = {"小程序-故障报修"},value = "添加故障报修管理")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@Validated @RequestBody TFaultMessage dto) {
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TMonitoringEquipmentController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TMonitoringEquipmentController.java
index 38a468c..87a5bef 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TMonitoringEquipmentController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TMonitoringEquipmentController.java
@@ -8,6 +8,9 @@
import com.ruoyi.chargingPile.service.TMonitoringEquipmentService;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.log.enums.OperatorType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +50,7 @@
/**
* 添加监控管理
*/
+ @Log(title = "添加监控", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-监控"},value = "添加监控")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TMonitoringEquipmentDTO dto) {
@@ -56,6 +60,7 @@
/**
* 修改监控
*/
+ @Log(title = "修改监控", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-监控"},value = "修改监控")
@PostMapping(value = "/update")
public AjaxResult<Boolean> update(@RequestBody TMonitoringEquipmentDTO dto) {
@@ -74,6 +79,7 @@
/**
* 删除监控
*/
+ @Log(title = "删除监控", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-监控"},value = "删除监控")
@DeleteMapping(value = "/deleteById")
public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
@@ -83,6 +89,7 @@
/**
* 批量删除监控
*/
+ @Log(title = "批量删除监控", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-监控"},value = "批量删除监控")
@DeleteMapping(value = "/deleteByIds")
public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java
index f840ac9..3945b5c 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java
@@ -13,6 +13,9 @@
import com.ruoyi.chargingPile.service.TVehicleRampService;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.log.enums.OperatorType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -66,6 +69,7 @@
/**
* 添加停车场管理
*/
+ @Log(title = "添加停车场", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "添加停车场")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TParkingLotDTO dto) {
@@ -75,6 +79,7 @@
/**
* 修改停车场
*/
+ @Log(title = "修改停车场", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "修改停车场")
@PostMapping(value = "/update")
public AjaxResult<Boolean> update(@RequestBody TParkingLotDTO dto) {
@@ -93,6 +98,7 @@
/**
* 删除停车场
*/
+ @Log(title = "删除停车场", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "删除停车场")
@DeleteMapping(value = "/deleteById")
public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
@@ -108,6 +114,7 @@
/**
* 批量删除停车场
*/
+ @Log(title = "批量删除停车场", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "批量删除停车场")
@DeleteMapping(value = "/deleteByIds")
public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TVehicleRampController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TVehicleRampController.java
index 11da8dd..e02c00c 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TVehicleRampController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TVehicleRampController.java
@@ -4,6 +4,9 @@
import com.ruoyi.chargingPile.api.model.TVehicleRamp;
import com.ruoyi.chargingPile.service.TVehicleRampService;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.log.enums.OperatorType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +37,7 @@
/**
* 添加车道管理
*/
+ @Log(title = "添加车道", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-车道"},value = "添加车道")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TVehicleRamp dto) {
@@ -43,6 +47,7 @@
/**
* 修改车道
*/
+ @Log(title = "修改车道", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-车道"},value = "修改车道")
@PostMapping(value = "/update")
public AjaxResult<Boolean> update(@RequestBody TVehicleRamp dto) {
@@ -61,6 +66,7 @@
/**
* 删除车道
*/
+ @Log(title = "删除车道", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-车道"},value = "删除车道")
@DeleteMapping(value = "/deleteById")
public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
@@ -70,6 +76,7 @@
/**
* 批量删除车道
*/
+ @Log(title = "批量删除车道", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-车道"},value = "批量删除车道")
@DeleteMapping(value = "/deleteByIds")
public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
@@ -79,6 +86,7 @@
/**
* 开关闸车道
*/
+ @Log(title = "开关闸车道", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-车道"},value = "开关闸车道")
@PostMapping(value = "/openOrDown")
public AjaxResult<String> openOrDown(@RequestBody TVehicleRamp dto) {
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml
index 6830e98..78f3e47 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml
@@ -9,17 +9,24 @@
<result column="`name`" property="name" />
<result column="description" property="description" />
<result column="discount" property="discount" />
+ <result column="first_user_id" property="firstUserId" />
+ <result column="two_user_id" property="twoUserId" />
+ <result column="first_remark" property="firstRemark" />
+ <result column="two_remark" property="twoRemark" />
+ <result column="audit_status" property="auditStatus" />
+ <result column="first_audit_time" property="firstAuditTime" />
+ <result column="two_audit_time" property="twoAuditTime" />
<result column="create_time" property="createTime" />
<result column="del_flag" property="delFlag" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, site_id, `name`, description, discount, create_time, del_flag
+ id, site_id, `name`, description, discount,first_user_id,two_user_id,first_remark,two_remark,audit_status,first_audit_time,two_audit_time, create_time, del_flag
</sql>
<select id="pageList" resultType="com.ruoyi.chargingPile.api.vo.TAccountingStrategyVO">
SELECT
- id, site_id, `name`, description, discount, create_time, del_flag
+ id, site_id, `name`, description, discount,first_user_id,two_user_id,first_remark,two_remark,audit_status,first_audit_time,two_audit_time, create_time, del_flag
FROM t_accounting_strategy
<where>
<if test="query.name != null and query.name != ''">
@@ -34,7 +41,7 @@
<select id="getPlatformAccountingStrategy" resultType="com.ruoyi.chargingPile.api.vo.TAccountingStrategyVO">
SELECT
- id, site_id, `name`, description, discount, create_time, del_flag
+ id, site_id, `name`, description, discount,first_user_id,two_user_id,first_remark,two_remark,audit_status,first_audit_time,two_audit_time, create_time, del_flag
FROM t_accounting_strategy where del_flag = 0 and site_id is not null order by create_time desc
</select>
</mapper>
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 2c37b8b..8d13b9d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -27,13 +27,18 @@
@Resource
private TChargingOrderService chargingOrderService;
-
+ //用户订单数量
@PostMapping(value = "/useOrderCount")
public R<Long> useOrderCount(@RequestParam Long userId) {
Long count = chargingOrderService.lambdaQuery().eq(TChargingOrder::getAppUserId, userId).count();
return R.ok(count);
}
+ //订单详情
+ @PostMapping(value = "/detail")
+ public R<TChargingOrder> detail(@RequestParam Long orderId) {
+ return R.ok(chargingOrderService.getById(orderId));
+ }
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
index 5b79243..873af59 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TExchangeOrder;
import com.ruoyi.order.api.model.TShoppingOrder;
import com.ruoyi.order.service.TExchangeOrderService;
@@ -12,6 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
@@ -34,6 +36,13 @@
private TShoppingOrderService tShoppingOrderService;
@Autowired
private TExchangeOrderService exchangeOrderService;
+
+ //订单详情
+ @PostMapping(value = "/detail")
+ public R<TExchangeOrder> detail(@RequestParam Long orderId) {
+ return R.ok(exchangeOrderService.getById(orderId));
+ }
+
/**
* 管理后台 根据商品ids 查询对应的销量
* @param goodsIds 订单号-商品类型
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java
index 4cfac38..8bfd455 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java
@@ -5,6 +5,8 @@
import com.ruoyi.common.core.enums.status.AdvertisingStatusEnum;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.other.api.domain.TAdvertising;
import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.api.dto.AdvertisingDTO;
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java
index d64bb4d..f11efbe 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java
@@ -2,16 +2,16 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.other.api.domain.TEnterpriseUserApplication;
import com.ruoyi.other.service.TEnterpriseUserApplicationService;
-import com.sun.xml.internal.bind.v2.TODO;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-
import org.springframework.web.bind.annotation.RestController;
/**
@@ -36,9 +36,17 @@
/**
* 添加计费策略管理
*/
+ @Log(title = "添加集团用户申请", businessType = BusinessType.INSERT)
@ApiOperation(tags = {"小程序-计费策略"},value = "添加集团用户申请")
@PostMapping(value = "/add")
- public AjaxResult<Boolean> add(@RequestBody TEnterpriseUserApplication dto) {
+ public AjaxResult<Boolean> add(@Validated @RequestBody TEnterpriseUserApplication dto) {
+ // TODO 用户id
+ return AjaxResult.ok(enterpriseUserApplicationService.save(dto));
+ }
+
+ @ApiOperation(tags = {"后台-申请表单-集团用户"},value = "集团用户列表")
+ @PostMapping(value = "/page")
+ public AjaxResult<Boolean> page(@RequestBody TEnterpriseUserApplication dto) {
// TODO 用户id
return AjaxResult.ok(enterpriseUserApplicationService.save(dto));
}
--
Gitblit v1.7.1