From 531155f4bce6b9a09fa3167fdd45655c882fb219 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 14 八月 2024 10:16:44 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TEnterpriseUserApplicationMapper.xml | 0
ruoyi-api/ruoyi-api-chargingPile/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 3
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/RuoYiOtherApplication.java | 2
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/GenTableColumnMapper.xml | 0
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLoginLog.java | 90 +++++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java | 3
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/RegionMapper.xml | 16 +
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java | 2
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java | 2
ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml | 45 +++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TVehicleRampController.java | 4
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java | 2
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java | 6
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityStatisticsController.java | 2
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 | 4
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/GenTableMapper.xml | 0
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/RuoYiAccountApplication.java | 2
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/RuoYiIntegrationApplication.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java | 8
ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml | 45 +++
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TVipMapper.xml | 0
ruoyi-service/ruoyi-account/src/main/resources/bootstrap.yml | 44 +++
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java | 4
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java | 2
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TMonitoringEquipmentController.java | 4
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 7
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java | 66 ++---
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml | 46 +++
ruoyi-api/ruoyi-api-account/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 3
ruoyi-api/ruoyi-api-system/pom.xml | 7
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TActivityMapper.xml | 0
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java | 2
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TEvaluationTagMapper.xml | 0
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TIntegralRuleMapper.xml | 0
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java | 8
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java | 4
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TRoleSiteMapper.xml | 0
ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml | 41 ++
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TAdvertisingMapper.xml | 0
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TNoticeMapper.xml | 0
ruoyi-api/ruoyi-api-order/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 3
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 6
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java | 4
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TUserTagMapper.xml | 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java | 3
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TUserSiteMapper.xml | 0
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SysDictTypeMapper.xml | 0
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TInvoiceTypeMapper.xml | 0
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java | 6
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 4
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SysDictDataMapper.xml | 0
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SysNoticeMapper.xml | 0
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java | 6
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/RuoYiOrderApplication.java | 2
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysNotice.java | 2
ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 4
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TSystemConfigurationMapper.xml | 0
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/THtmlMapper.xml | 0
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysLoginLogFallbackFactory.java | 6
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 2
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java | 4
ruoyi-auth/src/main/resources/bootstrap.yml | 45 +++
ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml | 45 +++
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TCompanyMapper.xml | 0
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TCouponMapper.xml | 0
ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml | 46 +++
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java | 2
ruoyi-service/ruoyi-other/pom.xml | 7
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ExchangeOrderClient.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysLoginLogClient.java | 2
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TGoodsMapper.xml | 0
72 files changed, 557 insertions(+), 124 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java
index cec1394..eeabca3 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java
@@ -1,5 +1,6 @@
package com.ruoyi.account.api.factory;
+import com.ruoyi.account.api.dto.GrantCouponDto;
import com.ruoyi.account.api.feignClient.AppCouponClient;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.query.ExchangeRecordGoodsQuery;
@@ -42,6 +43,11 @@
public R<PageInfo<ExchangeRecordVO>> getExchangeRecordByCouponId(ExchangeRecordGoodsQuery couponId) {
return R.fail("根据优惠券id查询领取记录:"+throwable.getMessage());
}
+
+ @Override
+ public R grantCoupon(GrantCouponDto dto) {
+ return R.fail("给用户发放优惠券:"+throwable.getMessage());
+ }
};
}
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-account/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 9743c88..3c87b41 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/ruoyi-api/ruoyi-api-account/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,2 +1,3 @@
com.ruoyi.account.api.factory.AppUserFallbackFactory
-com.ruoyi.account.api.factory.AppCouponFallbackFactory
\ No newline at end of file
+com.ruoyi.account.api.factory.AppCouponFallbackFactory
+com.ruoyi.account.api.factory.AppUserCarFallbackFactory
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-chargingPile/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 7d5f8b3..2a1a113 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,2 +1,3 @@
com.ruoyi.chargingPile.api.factory.ChargingPileFallbackFactory
-com.ruoyi.chargingPile.api.factory.SiteFallbackFactory
\ No newline at end of file
+com.ruoyi.chargingPile.api.factory.SiteFallbackFactory
+com.ruoyi.chargingPile.api.factory.ParkingLotFallbackFactory
\ No newline at end of file
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 3765568..b6fa52e 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
@@ -17,10 +17,10 @@
@FeignClient(contextId = "ChargingOrderClient", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = ChargingOrderFallbackFactory.class)
public interface ChargingOrderClient {
@PostMapping(value = "/t-charging-order/useOrderCount")
- R<Long> useOrderCount(@RequestParam Long userId);
+ R<Long> useOrderCount(@RequestParam("userId") Long userId);
@PostMapping(value = "/t-charging-order/detail")
- R<TChargingOrder> orderDetail(@RequestParam Long orderId);
+ R<TChargingOrder> orderDetail(@RequestParam("orderId") 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
index d690334..9660148 100644
--- 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
@@ -19,6 +19,6 @@
@PostMapping(value = "/t-exchange-order/detail")
- R<TExchangeOrder> orderDetail(@RequestParam Long orderId);
+ R<TExchangeOrder> orderDetail(@RequestParam("orderId") Long orderId);
}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-order/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index cb88519..41989f2 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/ruoyi-api/ruoyi-api-order/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,2 +1,3 @@
com.ruoyi.order.api.factory.ChargingOrderFallbackFactory
-com.ruoyi.order.api.factory.OrderFallbackFactory
\ No newline at end of file
+com.ruoyi.order.api.factory.OrderFallbackFactory
+com.ruoyi.order.api.factory.ExchangeOrderFallbackFactory
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java
index 6502f26..c395dd9 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java
@@ -4,14 +4,18 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author zhibing.pu
* @Date 2024/8/8 11:55
*/
@Data
+@EqualsAndHashCode(callSuper = false)
@TableName("t_region")
+@ApiModel(value="Region对象", description="")
public class Region {
/**
* 主键
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysNotice.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysNotice.java
index 299943e..9d6de53 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysNotice.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysNotice.java
@@ -44,7 +44,7 @@
@ApiModelProperty(value = "公告内容")
@TableField("notice_content")
- private Blob noticeContent;
+ private String noticeContent;
@ApiModelProperty(value = "公告状态（0正常 1关闭）")
@TableField("status")
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
index d07fd62..2fe5930 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
@@ -31,10 +31,10 @@
R unitAddorUpadate(@RequestBody TCompany tCompany);
//单位删除
@PostMapping(value = "/t-company/unit/delete")
- R unitDelete(@RequestParam Integer id);
+ R unitDelete(@RequestParam("id") Integer id);
@PostMapping(value = "/t-company/unit/detail")
- R<TCompany> unitDetail(@RequestParam Integer id);
+ R<TCompany> unitDetail(@RequestParam("id") Integer id);
//标签分页
@PostMapping(value = "/t-user-tag/page")
@@ -45,14 +45,14 @@
R addorUpdateTag(@RequestBody TUserTag tUserTag);
//删除用户标签
@PostMapping(value = "/t-user-tag/delete")
- R deleteTag(@RequestParam Integer id);
+ R deleteTag(@RequestParam("id") Integer id);
//获取标签Map
@PostMapping(value = "/t-user-tag/getTagMap")
R<Map<Integer, String>> getTagMap(@RequestBody List<Integer> ids);
//获取标签
@PostMapping(value = "/t-user-tag/getById")
- R<TUserTag> getByIdTag(@RequestParam Integer id);
+ R<TUserTag> getByIdTag(@RequestParam("id") Integer id);
@PostMapping(value = "/vip/getVipMap")
R<Map<Integer, String>> getVipMap(@RequestBody List<Integer> ids);
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java
index 305c332..763a217 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java
@@ -22,7 +22,7 @@
* @return
*/
@PostMapping(value = "/vip/getVipInfoByType")
- R<TVip> getVipInfoByType(@RequestParam Integer type);
+ R<TVip> getVipInfoByType(@RequestParam("type") Integer type);
/**
* 远程调用
diff --git a/ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 42bb01c..bbbaed4 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,3 +1,5 @@
com.ruoyi.other.api.factory.OtherFallbackFactory
com.ruoyi.other.api.factory.UserSiteFallbackFactory
-com.ruoyi.other.api.factory.RoleSiteFallbackFactory
\ No newline at end of file
+com.ruoyi.other.api.factory.RoleSiteFallbackFactory
+com.ruoyi.other.api.factory.TEvaluationTagFallbackFactory
+com.ruoyi.other.api.factory.VipFallbackFactory
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml
index 723a3c0..2670f57 100644
--- a/ruoyi-api/ruoyi-api-system/pom.xml
+++ b/ruoyi-api/ruoyi-api-system/pom.xml
@@ -28,13 +28,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-modules-system</artifactId>
- <version>3.6.2</version>
- <scope>compile</scope>
- </dependency>
-
</dependencies>
</project>
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLoginLog.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLoginLog.java
new file mode 100644
index 0000000..1c74644
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLoginLog.java
@@ -0,0 +1,90 @@
+package com.ruoyi.system.api.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/8/12 15:38
+ */
+@Data
+@TableName("sys_login_log")
+@ApiModel
+public class SysLoginLog {
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "数据id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 用户id
+ */
+ @TableField("user_id")
+ private Integer userId;
+ /**
+ * 登录账号
+ */
+ @TableField("username")
+ @ApiModelProperty(value = "用户账号")
+ private String username;
+ /**
+ * 登录IP地址
+ */
+ @TableField("ip_address")
+ @ApiModelProperty(value = "登录IP地址")
+ private String ipAddress;
+ /**
+ * 登录地址
+ */
+ @TableField("address")
+ @ApiModelProperty(value = "登录地址")
+ private String address;
+ /**
+ * 浏览器类型
+ */
+ @TableField("browser_type")
+ @ApiModelProperty(value = "浏览器类型")
+ private String browserType;
+ /**
+ * 操作系统
+ */
+ @TableField("operating_system")
+ @ApiModelProperty(value = "操作系统")
+ private String operatingSystem;
+ /**
+ * 登录时间
+ */
+ @TableField("login_time")
+ @ApiModelProperty(value = "登录时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime loginTime;
+ /**
+ * 登录状态（1=成功，2=失败）
+ */
+ @TableField("login_status")
+ private Integer loginStatus;
+ /**
+ * 提示消息
+ */
+ @TableField("message")
+ private String message;
+ /**
+ * 添加时间
+ */
+ @TableField("create_time")
+ private LocalDateTime createTime;
+ /**
+ * 删除状态（0=否，1=是）
+ */
+ @TableField("del_flag")
+ private Integer delFlag;
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysLoginLogFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysLoginLogFallbackFactory.java
index df6782c..633e856 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysLoginLogFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysLoginLogFallbackFactory.java
@@ -1,12 +1,8 @@
package com.ruoyi.system.api.factory;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.domain.SysLoginLog;
import com.ruoyi.system.api.feignClient.SysLoginLogClient;
-import com.ruoyi.system.api.feignClient.SysUserClient;
-import com.ruoyi.system.api.model.*;
-import com.ruoyi.system.domain.SysLoginLog;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysLoginLogClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysLoginLogClient.java
index f4283ec..e7d3e70 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysLoginLogClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysLoginLogClient.java
@@ -2,8 +2,8 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.SysLoginLog;
import com.ruoyi.system.api.factory.SysLoginLogFallbackFactory;
-import com.ruoyi.system.domain.SysLoginLog;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index 85ebf14..ccab699 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -3,13 +3,9 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.system.api.RemoteUserService;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.feignClient.SysLoginLogClient;
import com.ruoyi.system.api.feignClient.SysUserClient;
-import com.ruoyi.system.domain.SysLoginLog;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -27,9 +23,6 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.model.LoginUser;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.time.LocalDateTime;
import java.util.*;
/**
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index acfab13..3223a6b 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -1,6 +1,5 @@
package com.ruoyi.auth.service;
-import com.ruoyi.system.domain.SysLoginLog;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ruoyi.common.core.constant.CacheConstants;
@@ -20,7 +19,6 @@
import com.ruoyi.system.api.model.LoginUser;
import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
/**
* 登录校验方法
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java
index c4230d8..bac3898 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java
@@ -1,7 +1,7 @@
package com.ruoyi.auth.service;
+import com.ruoyi.system.api.domain.SysLoginLog;
import com.ruoyi.system.api.feignClient.SysLoginLogClient;
-import com.ruoyi.system.domain.SysLoginLog;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml
index baad2a4..f3b4cd8 100644
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap.yml
@@ -36,6 +36,51 @@
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+---
+
+seata:
+ enabled: true
+ application-id: ${spring.application.name}
+ tx-service-group: seata_tx_group #此处配置自定义的seata事务分组名称
+ enable-auto-data-source-proxy: true #开启数据库代理
+ service:
+ vgroup-mapping:
+ seata_tx_group: default
+ data-source-proxy-mode: AT
+ config:
+ type: nacos
+ nacos:
+ server-addr: 192.168.110.169:8848
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ group: DEFAULT_GROUP
+ data-id: seata-server.properties
+ username: nacos
+ password: nacos
+ registry:
+ type: nacos
+ nacos:
+ application: seata-server
+ server-addr: 192.168.110.169:8848
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ group: DEFAULT_GROUP
+ username: nacos
+ password: nacos
+ cloud:
+ nacos:
+ discovery:
+ server-addr: 192.168.110.169:8848 # nacos注册中心地址
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+ group: DEFAULT_GROUP
+ application: seata-server #Nacos 中 Seata 名称
+ username: nacos
+ password: nacos
+ sentinel:
+ transport:
+ dashboard: 127.0.0.1:8080 # Sentinel控制台地址
+ eager: true
+
+
---
spring:
config:
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
index 226fdab..c924b0d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
@@ -8,8 +8,7 @@
*
* @author ruoyi
*/
-public interface SysNoticeMapper
-{
+public interface SysNoticeMapper {
/**
* 查询公告信息
*
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java
index 47ce1b7..6047eb7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java
@@ -8,8 +8,7 @@
*
* @author ruoyi
*/
-public interface ISysNoticeService
-{
+public interface ISysNoticeService {
/**
* 查询公告信息
*
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
index 1fc4ed2..8d0b7e7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
@@ -5,8 +5,9 @@
import com.ruoyi.system.domain.SysNotice;
import com.ruoyi.system.mapper.SysNoticeMapper;
import com.ruoyi.system.service.ISysNoticeService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
/**
* 公告 服务层实现
@@ -14,9 +15,8 @@
* @author ruoyi
*/
@Service
-public class SysNoticeServiceImpl implements ISysNoticeService
-{
- @Autowired
+public class SysNoticeServiceImpl implements ISysNoticeService {
+ @Resource
private SysNoticeMapper noticeMapper;
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index 168e58d..f2ea622 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -32,6 +32,52 @@
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+
+---
+
+seata:
+ enabled: true
+ application-id: ${spring.application.name}
+ tx-service-group: seata_tx_group #此处配置自定义的seata事务分组名称
+ enable-auto-data-source-proxy: true #开启数据库代理
+ service:
+ vgroup-mapping:
+ seata_tx_group: default
+ data-source-proxy-mode: AT
+ config:
+ type: nacos
+ nacos:
+ server-addr: 192.168.110.169:8848
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ group: DEFAULT_GROUP
+ data-id: seata-server.properties
+ username: nacos
+ password: nacos
+ registry:
+ type: nacos
+ nacos:
+ application: seata-server
+ server-addr: 192.168.110.169:8848
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ group: DEFAULT_GROUP
+ username: nacos
+ password: nacos
+ cloud:
+ nacos:
+ discovery:
+ server-addr: 192.168.110.169:8848 # nacos注册中心地址
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+ group: DEFAULT_GROUP
+ application: seata-server #Nacos 中 Seata 名称
+ username: nacos
+ password: nacos
+ sentinel:
+ transport:
+ dashboard: 127.0.0.1:8080 # Sentinel控制台地址
+ eager: true
+
+
---
spring:
config:
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/RuoYiAccountApplication.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/RuoYiAccountApplication.java
index 3f4f8b0..b879af8 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/RuoYiAccountApplication.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/RuoYiAccountApplication.java
@@ -7,6 +7,7 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
* 账户模块
@@ -18,6 +19,7 @@
@EnableRyFeignClients
@SpringBootApplication
@EnableScheduling//开启定时任务
+@EnableTransactionManagement//开启事务
public class RuoYiAccountApplication {
public static void main(String[] args) {
SpringApplication.run(RuoYiAccountApplication.class, args);
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java
index 1990b61..f1bb29d 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java
@@ -69,7 +69,7 @@
*/
@ApiOperation(tags = {"小程序-用户地址"},value = "删除用户地址")
@DeleteMapping(value = "/deleteById")
- public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
+ public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
return AjaxResult.ok(appUserAddressService.removeById(id));
}
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-account/src/main/resources/bootstrap.yml
index 7ca4a3c..f550578 100644
--- a/ruoyi-service/ruoyi-account/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-account/src/main/resources/bootstrap.yml
@@ -38,6 +38,50 @@
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
---
+
+seata:
+ enabled: true
+ application-id: ${spring.application.name}
+ tx-service-group: seata_tx_group #此处配置自定义的seata事务分组名称
+ enable-auto-data-source-proxy: true #开启数据库代理
+ service:
+ vgroup-mapping:
+ seata_tx_group: default
+ data-source-proxy-mode: AT
+ config:
+ type: nacos
+ nacos:
+ server-addr: 192.168.110.169:8848
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ group: DEFAULT_GROUP
+ data-id: seata-server.properties
+ username: nacos
+ password: nacos
+ registry:
+ type: nacos
+ nacos:
+ application: seata-server
+ server-addr: 192.168.110.169:8848
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ group: DEFAULT_GROUP
+ username: nacos
+ password: nacos
+ cloud:
+ nacos:
+ discovery:
+ server-addr: 192.168.110.169:8848 # nacos注册中心地址
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+ group: DEFAULT_GROUP
+ application: seata-server #Nacos 中 Seata 名称
+ username: nacos
+ password: nacos
+ sentinel:
+ transport:
+ dashboard: 127.0.0.1:8080 # Sentinel控制台地址
+ eager: true
+
+
+---
spring:
config:
activate:
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 d028f09..456c64f 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
@@ -66,7 +66,7 @@
*/
@ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理", "管理后台-充电桩信息"},value = "查询计费策略明细列表")
@GetMapping(value = "/queryAccountingStrategyDetailByStrategyId")
- public AjaxResult<List<TAccountingStrategyDetailVO>> queryAccountingStrategyDetailByStrategyId(@RequestParam Integer strategyId) {
+ public AjaxResult<List<TAccountingStrategyDetailVO>> queryAccountingStrategyDetailByStrategyId(@RequestParam("strategyId") Integer strategyId) {
List<TAccountingStrategyDetailVO> list = accountingStrategyDetailService.queryAccountingStrategyDetailByStrategyId(strategyId);
list.forEach(detail -> {
detail.setTotalPrice(detail.getElectrovalence().add(detail.getElectrovalence()));
@@ -111,7 +111,7 @@
*/
@ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "查看计费策略详情")
@GetMapping(value = "/getDetailById")
- public AjaxResult<TAccountingStrategy> getDetailById(@RequestParam Integer id) {
+ public AjaxResult<TAccountingStrategy> getDetailById(@RequestParam("id") Integer id) {
return AjaxResult.ok(accountingStrategyService.getById(id));
}
@@ -121,7 +121,7 @@
@Log(title = "删除计费策略", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略"},value = "删除计费策略")
@DeleteMapping(value = "/deleteById")
- public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
+ public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
// 刪除计费策略明细信息
accountingStrategyDetailService.remove(Wrappers.lambdaQuery(TAccountingStrategyDetail.class)
.eq(TAccountingStrategyDetail::getAccountingStrategyId, id));
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java
index b917562..e60d631 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java
@@ -49,7 +49,7 @@
*/
@ApiOperation(tags = {"小程序-站点管理-站点详情"},value = "通过站点id查询计费策略明细列表")
@GetMapping(value = "/queryAccountingStrategyDetailBySiteId")
- public AjaxResult<List<TAccountingStrategyDetailVO>> queryAccountingStrategyDetailBySiteId(@RequestParam Integer siteId) {
+ public AjaxResult<List<TAccountingStrategyDetailVO>> queryAccountingStrategyDetailBySiteId(@RequestParam("siteId") Integer siteId) {
TAccountingStrategy accountingStrategy = accountingStrategyService.getOne(Wrappers.lambdaQuery(TAccountingStrategy.class)
.eq(TAccountingStrategy::getSiteId, siteId)
.last("limit 1"));
@@ -64,7 +64,7 @@
*/
@ApiOperation(tags = {"小程序-站点管理-站点详情"},value = "通过站点id查询当前时间段计费策略展示")
@GetMapping(value = "/queryStrategyBySiteIdAndTime")
- public AjaxResult<List<TAccountingStrategyDetailVO>> queryStrategyBySiteIdAndTime(@RequestParam Integer siteId) {
+ public AjaxResult<List<TAccountingStrategyDetailVO>> queryStrategyBySiteIdAndTime(@RequestParam("siteId") Integer siteId) {
return AjaxResult.ok(accountingStrategyDetailService.queryStrategyBySiteIdAndTime(siteId));
}
@@ -73,7 +73,7 @@
*/
@ApiOperation(tags = {"小程序-站点管理-站点详情"},value = "价格说明金额返回,会员开通金额说明")
@GetMapping(value = "/queryPrice")
- public AjaxResult<StrategyPriceVO> queryPrice(@RequestParam Integer siteId) {
+ public AjaxResult<StrategyPriceVO> queryPrice(@RequestParam("siteId") Integer siteId) {
return AjaxResult.ok(accountingStrategyDetailService.queryPrice(siteId));
}
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 0149ad4..cca360e 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
@@ -75,7 +75,7 @@
*/
@ApiOperation(tags = {"后台-车库"},value = "查看车库详情")
@GetMapping(value = "/getDetailById")
- public AjaxResult<TCarport> getDetailById(@RequestParam Integer id) {
+ public AjaxResult<TCarport> getDetailById(@RequestParam("id") Integer id) {
return AjaxResult.ok(carportService.getById(id));
}
@@ -85,7 +85,7 @@
@Log(title = "删除车库", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-车库"},value = "删除车库")
@DeleteMapping(value = "/deleteById")
- public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
+ public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
// 刪除车道信息
vehicleRampService.remove(Wrappers.lambdaQuery(TVehicleRamp.class)
.eq(TVehicleRamp::getCarportId, id));
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 f65d459..6ef7c88 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
@@ -73,7 +73,7 @@
*/
@ApiOperation(tags = {"后台-充电枪", "管理后台-充电桩信息"},value = "查看充电枪详情")
@GetMapping(value = "/getDetailById")
- public AjaxResult<TChargingGun> getDetailById(@RequestParam Integer id) {
+ public AjaxResult<TChargingGun> getDetailById(@RequestParam("id") Integer id) {
return AjaxResult.ok(chargingGunService.getById(id));
}
@@ -83,7 +83,7 @@
@Log(title = "删除充电枪", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"管理后台-充电桩信息"},value = "删除充电枪")
@DeleteMapping(value = "/deleteById")
- public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
+ public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
TChargingGun chargingGun = chargingGunService.getById(id);
chargingGun.setDelFlag(true);
chargingGunService.updateById(chargingGun);
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 87a5bef..52653ec 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
@@ -72,7 +72,7 @@
*/
@ApiOperation(tags = {"后台-监控"},value = "查看监控详情")
@GetMapping(value = "/getDetailById")
- public AjaxResult<TMonitoringEquipment> getDetailById(@RequestParam Integer id) {
+ public AjaxResult<TMonitoringEquipment> getDetailById(@RequestParam("id") Integer id) {
return AjaxResult.ok(monitoringEquipmentService.getById(id));
}
@@ -82,7 +82,7 @@
@Log(title = "删除监控", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-监控"},value = "删除监控")
@DeleteMapping(value = "/deleteById")
- public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
+ public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
return AjaxResult.ok(monitoringEquipmentService.removeById(id));
}
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 be3a1ba..6f17648 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
@@ -92,7 +92,7 @@
*/
@ApiOperation(tags = {"后台-停车场"},value = "查看停车场详情")
@GetMapping(value = "/getDetailById")
- public AjaxResult<TParkingLot> getDetailById(@RequestParam Integer id) {
+ public AjaxResult<TParkingLot> getDetailById(@RequestParam("id") Integer id) {
return AjaxResult.ok(parkingLotService.getById(id));
}
@@ -102,7 +102,7 @@
@Log(title = "删除停车场", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "删除停车场")
@DeleteMapping(value = "/deleteById")
- public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
+ public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
// 刪除车道信息
vehicleRampService.remove(Wrappers.lambdaQuery(TVehicleRamp.class)
.eq(TVehicleRamp::getParkingLotId, id));
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 e02c00c..fdeaa28 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
@@ -59,7 +59,7 @@
*/
@ApiOperation(tags = {"后台-车道"},value = "查看车道详情")
@GetMapping(value = "/getDetailById")
- public AjaxResult<TVehicleRamp> getDetailById(@RequestParam Integer id) {
+ public AjaxResult<TVehicleRamp> getDetailById(@RequestParam("id") Integer id) {
return AjaxResult.ok(vehicleRampService.getById(id));
}
@@ -69,7 +69,7 @@
@Log(title = "删除车道", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-车道"},value = "删除车道")
@DeleteMapping(value = "/deleteById")
- public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
+ public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
return AjaxResult.ok(vehicleRampService.removeById(id));
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml
index 1dc2633..f462ae6 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml
@@ -39,22 +39,47 @@
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
---
+
seata:
- application-id: seata-chargingPile
- registry:
+ enabled: true
+ application-id: ${spring.application.name}
+ tx-service-group: seata_tx_group #此处配置自定义的seata事务分组名称
+ enable-auto-data-source-proxy: true #开启数据库代理
+ service:
+ vgroup-mapping:
+ seata_tx_group: default
+ data-source-proxy-mode: AT
+ config:
type: nacos
nacos:
server-addr: 192.168.110.169:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
- application: seata-server #Nacos 中 Seata 名称
+ data-id: seata-server.properties
username: nacos
password: nacos
- tx-service-group: seata_tx_group #事务组（被一个集群管理）
- service:
- vgroup-mapping:
- seata_tx_group: default
- data-source-proxy-mode: AT
+ registry:
+ type: nacos
+ nacos:
+ application: seata-server
+ server-addr: 192.168.110.169:8848
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ group: DEFAULT_GROUP
+ username: nacos
+ password: nacos
+ cloud:
+ nacos:
+ discovery:
+ server-addr: 192.168.110.169:8848 # nacos注册中心地址
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+ group: DEFAULT_GROUP
+ application: seata-server #Nacos 中 Seata 名称
+ username: nacos
+ password: nacos
+ sentinel:
+ transport:
+ dashboard: 127.0.0.1:8080 # Sentinel控制台地址
+ eager: true
---
spring:
config:
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/RuoYiIntegrationApplication.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/RuoYiIntegrationApplication.java
index ea77dbf..a05ffbf 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/RuoYiIntegrationApplication.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/RuoYiIntegrationApplication.java
@@ -7,6 +7,7 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
* 账户模块
@@ -18,6 +19,7 @@
@EnableRyFeignClients
@SpringBootApplication
@EnableScheduling//开启定时任务
+@EnableTransactionManagement//开启事务
public class RuoYiIntegrationApplication {
public static void main(String[] args) {
SpringApplication.run(RuoYiIntegrationApplication.class, args);
diff --git a/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml
index b0bc8fc..b35a43c 100644
--- a/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml
@@ -37,6 +37,51 @@
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+---
+
+seata:
+ enabled: true
+ application-id: ${spring.application.name}
+ tx-service-group: seata_tx_group #此处配置自定义的seata事务分组名称
+ enable-auto-data-source-proxy: true #开启数据库代理
+ service:
+ vgroup-mapping:
+ seata_tx_group: default
+ data-source-proxy-mode: AT
+ config:
+ type: nacos
+ nacos:
+ server-addr: 192.168.110.169:8848
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ group: DEFAULT_GROUP
+ data-id: seata-server.properties
+ username: nacos
+ password: nacos
+ registry:
+ type: nacos
+ nacos:
+ application: seata-server
+ server-addr: 192.168.110.169:8848
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ group: DEFAULT_GROUP
+ username: nacos
+ password: nacos
+ cloud:
+ nacos:
+ discovery:
+ server-addr: 192.168.110.169:8848 # nacos注册中心地址
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+ group: DEFAULT_GROUP
+ application: seata-server #Nacos 中 Seata 名称
+ username: nacos
+ password: nacos
+ sentinel:
+ transport:
+ dashboard: 127.0.0.1:8080 # Sentinel控制台地址
+ eager: true
+
+
---
spring:
config:
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/RuoYiOrderApplication.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/RuoYiOrderApplication.java
index abda5e2..5fe3649 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/RuoYiOrderApplication.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/RuoYiOrderApplication.java
@@ -7,6 +7,7 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
* 账户模块
@@ -18,6 +19,7 @@
@EnableRyFeignClients
@SpringBootApplication
@EnableScheduling//开启定时任务
+@EnableTransactionManagement//开启事务
public class RuoYiOrderApplication {
public static void main(String[] args) {
SpringApplication.run(RuoYiOrderApplication.class, args);
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 f93fba8..c5b3ae1 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
@@ -42,14 +42,14 @@
}
//用户订单数量
@PostMapping(value = "/useOrderCount")
- public R<Long> useOrderCount(@RequestParam Long userId) {
+ public R<Long> useOrderCount(@RequestParam("userId") 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) {
+ public R<TChargingOrder> detail(@RequestParam("orderId") 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 17afde1..0208eb3 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
@@ -75,7 +75,7 @@
//订单详情
@PostMapping(value = "/detail")
- public R<TExchangeOrder> detail(@RequestParam Long orderId) {
+ public R<TExchangeOrder> detail(@RequestParam("orderId") Long orderId) {
return R.ok(exchangeOrderService.getById(orderId));
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
index 677021d..d1615ae 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
@@ -50,7 +50,7 @@
*/
@ApiOperation(tags = {"小程序-订单申诉"},value = "查询订单申诉详情")
@GetMapping(value = "/getDetailById")
- public AjaxResult<TOrderAppealVO> getDetailById(@RequestParam Integer id) {
+ public AjaxResult<TOrderAppealVO> getDetailById(@RequestParam("id") Integer id) {
return AjaxResult.ok(orderAppealService.getDetailById(id));
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
index 44f75a0..6916f8a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
@@ -57,9 +57,9 @@
private TEvaluationTagClient evaluationTagClient;
@Resource
private AppUserClient appUserClient;
- @Autowired
+ @Resource
private AppUserCarClient appUserCarClient;
- @Autowired
+ @Resource
private TOrderEvaluateTagMapper orderEvaluateTagMapper;
@Resource
private TChargingOrderMapper chargingOrderMapper;
@@ -78,7 +78,7 @@
- @Autowired
+ @Resource
private TOrderEvaluateMapper orderEvaluateMapper;
@Override
public List<TEvaluationTagVO> getTagCount() {
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
index 7c243b4..25a9721 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
@@ -37,6 +37,51 @@
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+---
+
+seata:
+ enabled: true
+ application-id: ${spring.application.name}
+ tx-service-group: seata_tx_group #此处配置自定义的seata事务分组名称
+ enable-auto-data-source-proxy: true #开启数据库代理
+ service:
+ vgroup-mapping:
+ seata_tx_group: default
+ data-source-proxy-mode: AT
+ config:
+ type: nacos
+ nacos:
+ server-addr: 192.168.110.169:8848
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ group: DEFAULT_GROUP
+ data-id: seata-server.properties
+ username: nacos
+ password: nacos
+ registry:
+ type: nacos
+ nacos:
+ application: seata-server
+ server-addr: 192.168.110.169:8848
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ group: DEFAULT_GROUP
+ username: nacos
+ password: nacos
+ cloud:
+ nacos:
+ discovery:
+ server-addr: 192.168.110.169:8848 # nacos注册中心地址
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+ group: DEFAULT_GROUP
+ application: seata-server #Nacos 中 Seata 名称
+ username: nacos
+ password: nacos
+ sentinel:
+ transport:
+ dashboard: 127.0.0.1:8080 # Sentinel控制台地址
+ eager: true
+
+
---
spring:
config:
diff --git a/ruoyi-service/ruoyi-other/pom.xml b/ruoyi-service/ruoyi-other/pom.xml
index 9d8bc09..9ab8b38 100644
--- a/ruoyi-service/ruoyi-other/pom.xml
+++ b/ruoyi-service/ruoyi-other/pom.xml
@@ -118,13 +118,6 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-api-other</artifactId>
- <version>3.6.2</version>
- <scope>compile</scope>
- </dependency>
-
</dependencies>
<build>
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/RuoYiOtherApplication.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/RuoYiOtherApplication.java
index acc7ae3..e3090fc 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/RuoYiOtherApplication.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/RuoYiOtherApplication.java
@@ -7,6 +7,7 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
* 账户模块
@@ -18,6 +19,7 @@
@EnableRyFeignClients
@SpringBootApplication
@EnableScheduling//开启定时任务
+@EnableTransactionManagement//开启事务
public class RuoYiOtherApplication {
public static void main(String[] args) {
SpringApplication.run(RuoYiOtherApplication.class, args);
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityStatisticsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityStatisticsController.java
index ee8b0b7..43d551d 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityStatisticsController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityStatisticsController.java
@@ -28,7 +28,7 @@
* @since 2024-08-06
*/
@RestController
-@RequestMapping("/activity")
+@RequestMapping("/activityStatistics")
public class TActivityStatisticsController {
@Autowired
private OrderClient orderClient;
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
index 66c00cb..6635c05 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
@@ -14,7 +14,7 @@
/**
* <p>
- * 前端控制器
+ * 前端控制器
* </p>
*
* @author 无关风月
@@ -23,41 +23,33 @@
@RestController
@RequestMapping("/t-company")
public class TCompanyController {
- @Resource
- private TCompanyService companyService;
-
- //单位分页
- @PostMapping(value = "/unit/page")
- public R<Page<TCompany>> unitPage(@RequestBody UnitListQueryDto unitListQueryDto) {
- Page<TCompany> page = companyService.lambdaQuery()
- .orderByDesc(TCompany::getCreateTime)
- .like(unitListQueryDto.getCompanyName()!=null&& unitListQueryDto.getCompanyName().isEmpty(), TCompany::getName, unitListQueryDto.getCompanyName())
- .page(Page.of(unitListQueryDto.getPageCurr(), unitListQueryDto.getPageSize()));
- return R.ok(page);
-
- }
- //单位添加
- @PostMapping(value = "/unit/addOrUpdate")
- public R add(@RequestBody TCompany tCompany) {
- if (tCompany.getId()==null){
- tCompany.setCreateTime(LocalDateTime.now());
- }
- companyService.saveOrUpdate(tCompany);
- return R.ok();
- }
-
- @PostMapping(value = "/unit/delete")
- public R add(@RequestParam Integer id) {
- companyService.removeById(id);
-
- return R.ok();
- }
-
- @PostMapping(value = "/unit/delete")
- public R<TCompany> delete(@RequestParam Integer id) {
-
-
- return R.ok( companyService.getById(id));
- }
+ @Resource
+ private TCompanyService companyService;
+
+ //单位分页
+ @PostMapping(value = "/unit/page")
+ public R<Page<TCompany>> unitPage(@RequestBody UnitListQueryDto unitListQueryDto) {
+ Page<TCompany> page = companyService.lambdaQuery()
+ .orderByDesc(TCompany::getCreateTime)
+ .like(unitListQueryDto.getCompanyName() != null && unitListQueryDto.getCompanyName().isEmpty(), TCompany::getName, unitListQueryDto.getCompanyName())
+ .page(Page.of(unitListQueryDto.getPageCurr(), unitListQueryDto.getPageSize()));
+ return R.ok(page);
+
+ }
+
+ //单位添加
+ @PostMapping(value = "/unit/addOrUpdate")
+ public R add(@RequestBody TCompany tCompany) {
+ if (tCompany.getId() == null) {
+ tCompany.setCreateTime(LocalDateTime.now());
+ }
+ companyService.saveOrUpdate(tCompany);
+ return R.ok();
+ }
+
+ @PostMapping(value = "/unit/delete")
+ public R<TCompany> delete(@RequestParam("id") Integer id) {
+ return R.ok(companyService.getById(id));
+ }
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java
index a224192..2a669b4 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java
@@ -50,7 +50,7 @@
}
//标签删除
@PostMapping(value = "/delete")
- public R delete(@RequestParam Integer id) {
+ public R delete(@RequestParam("id") Integer id) {
tUserTagService.removeById(id);
return R.ok();
}
@@ -69,7 +69,7 @@
}
@PostMapping(value = "/getById")
- public R<TUserTag> getById(@RequestParam Integer id) {
+ public R<TUserTag> getById(@RequestParam("id") Integer id) {
return R.ok(tUserTagService.getById(id));
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
index 69430e4..f2509c6 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
@@ -95,7 +95,7 @@
* @return
*/
@PostMapping(value = "/getVipInfoByType")
- public R<TVip> getVipInfoByType(@RequestParam Integer type){
+ public R<TVip> getVipInfoByType(@RequestParam("type") Integer type){
switch (type){
case 1:
return R.ok(vipService.getOne(Wrappers.lambdaQuery(TVip.class)
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml
index e22d860..0bdf95b 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml
@@ -37,6 +37,51 @@
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+
+---
+seata:
+ enabled: true
+ application-id: ${spring.application.name}
+ tx-service-group: seata_tx_group #此处配置自定义的seata事务分组名称
+ enable-auto-data-source-proxy: true #开启数据库代理
+ service:
+ vgroup-mapping:
+ seata_tx_group: default
+ data-source-proxy-mode: AT
+ config:
+ type: nacos
+ nacos:
+ server-addr: 192.168.110.169:8848
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ group: DEFAULT_GROUP
+ data-id: seata-server.properties
+ username: nacos
+ password: nacos
+ registry:
+ type: nacos
+ nacos:
+ application: seata-server
+ server-addr: 192.168.110.169:8848
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ group: DEFAULT_GROUP
+ username: nacos
+ password: nacos
+ cloud:
+ nacos:
+ discovery:
+ server-addr: 192.168.110.169:8848 # nacos注册中心地址
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+ group: DEFAULT_GROUP
+ application: seata-server #Nacos 中 Seata 名称
+ username: nacos
+ password: nacos
+ sentinel:
+ transport:
+ dashboard: 127.0.0.1:8080 # Sentinel控制台地址
+ eager: true
+
+
---
spring:
config:
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/GenTableColumnMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/GenTableColumnMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/GenTableColumnMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/GenTableColumnMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/GenTableMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/GenTableMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/GenTableMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/GenTableMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/RegionMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/RegionMapper.xml
new file mode 100644
index 0000000..dbfa4b5
--- /dev/null
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/RegionMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.other.mapper.RegionMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.Region">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="code" property="code" />
+ <result column="citycode" property="citycode" />
+ <result column="parent_id" property="parentId" />
+ <result column="english" property="english" />
+ </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/SysDictDataMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SysDictDataMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/SysDictDataMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SysDictDataMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/SysDictTypeMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SysDictTypeMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/SysDictTypeMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SysDictTypeMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/SysNoticeMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SysNoticeMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/SysNoticeMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SysNoticeMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TActivityMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TActivityMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/TActivityMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TActivityMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TAdvertisingMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TAdvertisingMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/TAdvertisingMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TAdvertisingMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TCompanyMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TCompanyMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/TCompanyMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TCompanyMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TCouponMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TCouponMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/TCouponMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TCouponMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TEnterpriseUserApplicationMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TEnterpriseUserApplicationMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/TEnterpriseUserApplicationMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TEnterpriseUserApplicationMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TEvaluationTagMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TEvaluationTagMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/TEvaluationTagMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TEvaluationTagMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TGoodsMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TGoodsMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/TGoodsMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TGoodsMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/THtmlMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/THtmlMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/THtmlMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/THtmlMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TIntegralRuleMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TIntegralRuleMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/TIntegralRuleMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TIntegralRuleMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TInvoiceTypeMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TInvoiceTypeMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/TInvoiceTypeMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TInvoiceTypeMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TNoticeMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TNoticeMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/TNoticeMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TNoticeMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TRoleSiteMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TRoleSiteMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/TRoleSiteMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TRoleSiteMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TSystemConfigurationMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TSystemConfigurationMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/TSystemConfigurationMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TSystemConfigurationMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TUserSiteMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TUserSiteMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/TUserSiteMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TUserSiteMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TUserTagMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TUserTagMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/TUserTagMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TUserTagMapper.xml
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TVipMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TVipMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-other/src/main/resources/mapper/TVipMapper.xml
rename to ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TVipMapper.xml
diff --git a/ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml
index 71850da..b91155b 100644
--- a/ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml
@@ -37,6 +37,52 @@
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+
+---
+
+seata:
+ enabled: true
+ application-id: ${spring.application.name}
+ tx-service-group: seata_tx_group #此处配置自定义的seata事务分组名称
+ enable-auto-data-source-proxy: true #开启数据库代理
+ service:
+ vgroup-mapping:
+ seata_tx_group: default
+ data-source-proxy-mode: AT
+ config:
+ type: nacos
+ nacos:
+ server-addr: 192.168.110.169:8848
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ group: DEFAULT_GROUP
+ data-id: seata-server.properties
+ username: nacos
+ password: nacos
+ registry:
+ type: nacos
+ nacos:
+ application: seata-server
+ server-addr: 192.168.110.169:8848
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ group: DEFAULT_GROUP
+ username: nacos
+ password: nacos
+ cloud:
+ nacos:
+ discovery:
+ server-addr: 192.168.110.169:8848 # nacos注册中心地址
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+ group: DEFAULT_GROUP
+ application: seata-server #Nacos 中 Seata 名称
+ username: nacos
+ password: nacos
+ sentinel:
+ transport:
+ dashboard: 127.0.0.1:8080 # Sentinel控制台地址
+ eager: true
+
+
---
spring:
config:
--
Gitblit v1.7.1