From 3805534a85a9f9389dce859818b75b0f1059ee44 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 15 八月 2024 20:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/pom.xml | 6
ruoyi-service/ruoyi-chargingPile/pom.xml | 6
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ChargeMonitoring.java | 39 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderAccountingStrategyService.java | 21
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLoginLogMapper.java | 3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java | 217 +++---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderAccountingStrategyFallbackFactory.java | 42 +
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml | 28
ruoyi-api/ruoyi-api-order/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 3
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml | 1
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ChargingGunMonitoring.java | 38 +
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java | 10
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java | 2
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 8
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 2
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 13
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderAccountingStrategyController.java | 38 +
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileMapper.java | 13
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingGun.java | 4
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/GetChargingGunMonitoring.java | 28
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLoginLogMapper.xml | 2
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ChargingGunCountMonitoring.java | 25
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java | 133 ++--
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java | 208 ++++++
/dev/null | 91 ---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLoginLogService.java | 3
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderAccountingStrategyServiceImpl.java | 104 +++
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java | 6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginLogController.java | 6
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TChargingPileService.java | 29
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderAccountingStrategyClient.java | 39 +
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 26
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java | 192 +++---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java | 3
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml | 12
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLoginLogServiceImpl.java | 3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 358 +++++------
37 files changed, 1,178 insertions(+), 584 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingGun.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingGun.java
index d5d50a2..2bef523 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingGun.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingGun.java
@@ -86,6 +86,10 @@
@ApiModelProperty(value = "额定功率", required = true)
@TableField("rated_power")
private BigDecimal ratedPower;
+
+ @ApiModelProperty(value = "实时充电功率", required = true)
+ @TableField("charging_power")
+ private BigDecimal chargingPower;
@ApiModelProperty(value = "车位号")
@TableField("parking_number")
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java
index 2a393d9..289f788 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java
@@ -96,6 +96,4 @@
@ApiModelProperty(value = "设备状态（1=工作中，2=离线，3=故障）")
@TableField("status")
private Integer status;
-
-
}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderAccountingStrategyFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderAccountingStrategyFallbackFactory.java
new file mode 100644
index 0000000..4abfb5e
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderAccountingStrategyFallbackFactory.java
@@ -0,0 +1,42 @@
+package com.ruoyi.order.api.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.order.api.feignClient.ChargingOrderAccountingStrategyClient;
+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;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 充电订单服务降级处理
+ *
+ * @author ruoyi
+ */
+@Component
+public class ChargingOrderAccountingStrategyFallbackFactory implements FallbackFactory<ChargingOrderAccountingStrategyClient>
+{
+ private static final Logger log = LoggerFactory.getLogger(ChargingOrderAccountingStrategyFallbackFactory.class);
+
+ @Override
+ public ChargingOrderAccountingStrategyClient create(Throwable throwable) {
+ log.error("充电订单调用失败:{}", throwable.getMessage());
+ return new ChargingOrderAccountingStrategyClient() {
+
+
+ @Override
+ public R<List<List<Map<String, Object>>>> getTotalElectricQuantity(Integer days) {
+ return R.fail("获取给定天数每天的充电量统计数据失败：" + throwable.getMessage());
+ }
+
+ @Override
+ public R<List<Double>> getDailyChargingDegree(Integer days) {
+ return R.fail("获取给定天数每天的充电度数失败：" + throwable.getMessage());
+ }
+ };
+ }
+}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderAccountingStrategyClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderAccountingStrategyClient.java
new file mode 100644
index 0000000..c09794d
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderAccountingStrategyClient.java
@@ -0,0 +1,39 @@
+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.ChargingOrderAccountingStrategyFallbackFactory;
+import com.ruoyi.order.api.factory.ChargingOrderFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/8/14 19:09
+ */
+@FeignClient(contextId = "ChargingOrderAccountingStrategyClient", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = ChargingOrderAccountingStrategyFallbackFactory.class)
+public interface ChargingOrderAccountingStrategyClient {
+
+
+ /**
+ * 获取给定天数每天的充电量统计数据
+ * @param days 天数
+ * @return
+ */
+ @GetMapping("/t-charging-order-accounting-strategy/getTotalElectricQuantity")
+ R<List<List<Map<String, Object>>>> getTotalElectricQuantity(Integer days, @RequestParam("siteIds") Set<Integer> siteIds);
+
+
+ /**
+ * 获取给定天数每天的充电度数
+ * @param days
+ * @return
+ */
+ @GetMapping("/t-charging-order-getDailyChargingDegree-strategy/getUtilizationTrend")
+ R<List<Double>> getDailyChargingDegree(Integer days, @RequestParam("siteIds") Set<Integer> siteIds);
+}
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 b6fa52e..2ac0181 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
@@ -6,6 +6,7 @@
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.query.TChargingCountQuery;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
@@ -29,4 +30,13 @@
*/
@PostMapping(value = "/t-charging-order/getChargingCount")
public R<Integer> getChargingCount(@RequestBody TChargingCountQuery req);
+
+
+ /**
+ * 根据充电枪获取正在充电的订单
+ * @param chargingGunId 充电枪id
+ * @return
+ */
+ @GetMapping(value = "/t-charging-order/getOrderDetailByGunId")
+ R<TChargingOrder> getOrderDetailByGunId(@RequestParam("chargingGunId") Integer chargingGunId);
}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index 3f36bcb..7cfd713 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -67,6 +67,14 @@
@ApiModelProperty(value = "充电枪id")
@TableField("charging_gun_id")
private Integer chargingGunId;
+
+ @ApiModelProperty(value = "充电总度数")
+ @TableField("charging_capacity")
+ private BigDecimal chargingCapacity;
+
+ @ApiModelProperty(value = "充电功率")
+ @TableField("charging_power")
+ private BigDecimal chargingPower;
@ApiModelProperty(value = "充电开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
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 41989f2..1a46e82 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,3 +1,4 @@
com.ruoyi.order.api.factory.ChargingOrderFallbackFactory
com.ruoyi.order.api.factory.OrderFallbackFactory
-com.ruoyi.order.api.factory.ExchangeOrderFallbackFactory
\ No newline at end of file
+com.ruoyi.order.api.factory.ExchangeOrderFallbackFactory
+com.ruoyi.order.api.factory.ChargingOrderAccountingStrategyFallbackFactory
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java
index bad9133..a7a6a22 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java
@@ -134,6 +134,12 @@
@ApiModelProperty(value = "商城专享价开关（0=否，1=是）")
@TableField("mall_exclusive_price")
private Integer mallExclusivePrice;
+ @ApiModelProperty(value = "内部会员折扣")
+ @TableField("discount")
+ private BigDecimal discount;
+ @ApiModelProperty(value = "会员类型 1常规 2内部")
+ @TableField("type")
+ private Integer type;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java
index 2408762..b1e307c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.controller;
import java.util.List;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.system.domain.SysConfig;
@@ -26,109 +27,98 @@
/**
* 参数配置 信息操作处理
- *
+ *
* @author ruoyi
*/
@RestController
@RequestMapping("/config")
-public class SysConfigController extends BaseController
-{
- @Autowired
- private ISysConfigService configService;
-
- /**
- * 获取参数配置列表
- */
- @RequiresPermissions("system:config:list")
- @GetMapping("/list")
- public TableDataInfo list(SysConfig config)
- {
- startPage();
- List<SysConfig> list = configService.selectConfigList(config);
- return getDataTable(list);
- }
-
- @Log(title = "参数管理", businessType = BusinessType.EXPORT)
- @RequiresPermissions("system:config:export")
- @PostMapping("/export")
- public void export(HttpServletResponse response, SysConfig config)
- {
- List<SysConfig> list = configService.selectConfigList(config);
- ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
- util.exportExcel(response, list, "参数数据");
- }
-
- /**
- * 根据参数编号获取详细信息
- */
- @GetMapping(value = "/{configId}")
- public AjaxResult getInfo(@PathVariable Long configId)
- {
- return success(configService.selectConfigById(configId));
- }
-
- /**
- * 根据参数键名查询参数值
- */
- @GetMapping(value = "/configKey/{configKey}")
- public AjaxResult getConfigKey(@PathVariable String configKey)
- {
- return success(configService.selectConfigByKey(configKey));
- }
-
- /**
- * 新增参数配置
- */
- @RequiresPermissions("system:config:add")
- @Log(title = "参数管理", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysConfig config)
- {
- if (!configService.checkConfigKeyUnique(config))
- {
- return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
- }
- config.setCreateBy(SecurityUtils.getUsername());
- return toAjax(configService.insertConfig(config));
- }
-
- /**
- * 修改参数配置
- */
- @RequiresPermissions("system:config:edit")
- @Log(title = "参数管理", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysConfig config)
- {
- if (!configService.checkConfigKeyUnique(config))
- {
- return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
- }
- config.setUpdateBy(SecurityUtils.getUsername());
- return toAjax(configService.updateConfig(config));
- }
-
- /**
- * 删除参数配置
- */
- @RequiresPermissions("system:config:remove")
- @Log(title = "参数管理", businessType = BusinessType.DELETE)
- @DeleteMapping("/{configIds}")
- public AjaxResult remove(@PathVariable Long[] configIds)
- {
- configService.deleteConfigByIds(configIds);
- return success();
- }
-
- /**
- * 刷新参数缓存
- */
- @RequiresPermissions("system:config:remove")
- @Log(title = "参数管理", businessType = BusinessType.CLEAN)
- @DeleteMapping("/refreshCache")
- public AjaxResult refreshCache()
- {
- configService.resetConfigCache();
- return success();
- }
+public class SysConfigController extends BaseController {
+ @Resource
+ private ISysConfigService configService;
+
+ /**
+ * 获取参数配置列表
+ */
+ @RequiresPermissions("system:config:list")
+ @GetMapping("/list")
+ public TableDataInfo list(SysConfig config) {
+ startPage();
+ List<SysConfig> list = configService.selectConfigList(config);
+ return getDataTable(list);
+ }
+
+ @Log(title = "参数管理", businessType = BusinessType.EXPORT)
+ @RequiresPermissions("system:config:export")
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, SysConfig config) {
+ List<SysConfig> list = configService.selectConfigList(config);
+ ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
+ util.exportExcel(response, list, "参数数据");
+ }
+
+ /**
+ * 根据参数编号获取详细信息
+ */
+ @GetMapping(value = "/{configId}")
+ public AjaxResult getInfo(@PathVariable Long configId) {
+ return success(configService.selectConfigById(configId));
+ }
+
+ /**
+ * 根据参数键名查询参数值
+ */
+ @GetMapping(value = "/configKey/{configKey}")
+ public AjaxResult getConfigKey(@PathVariable String configKey) {
+ return success(configService.selectConfigByKey(configKey));
+ }
+
+ /**
+ * 新增参数配置
+ */
+ @RequiresPermissions("system:config:add")
+ @Log(title = "参数管理", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@Validated @RequestBody SysConfig config) {
+ if (!configService.checkConfigKeyUnique(config)) {
+ return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
+ }
+ config.setCreateBy(SecurityUtils.getUsername());
+ return toAjax(configService.insertConfig(config));
+ }
+
+ /**
+ * 修改参数配置
+ */
+ @RequiresPermissions("system:config:edit")
+ @Log(title = "参数管理", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@Validated @RequestBody SysConfig config) {
+ if (!configService.checkConfigKeyUnique(config)) {
+ return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
+ }
+ config.setUpdateBy(SecurityUtils.getUsername());
+ return toAjax(configService.updateConfig(config));
+ }
+
+ /**
+ * 删除参数配置
+ */
+ @RequiresPermissions("system:config:remove")
+ @Log(title = "参数管理", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{configIds}")
+ public AjaxResult remove(@PathVariable Long[] configIds) {
+ configService.deleteConfigByIds(configIds);
+ return success();
+ }
+
+ /**
+ * 刷新参数缓存
+ */
+ @RequiresPermissions("system:config:remove")
+ @Log(title = "参数管理", businessType = BusinessType.CLEAN)
+ @DeleteMapping("/refreshCache")
+ public AjaxResult refreshCache() {
+ configService.resetConfigCache();
+ return success();
+ }
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginLogController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginLogController.java
index 208c975..7982c50 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginLogController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginLogController.java
@@ -1,12 +1,10 @@
package com.ruoyi.system.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.domain.SysLoginLog;
+import com.ruoyi.system.api.domain.SysLoginLog;
import com.ruoyi.system.service.ISysLoginLogService;
import com.ruoyi.system.service.ISysUserService;
import io.swagger.annotations.ApiOperation;
@@ -27,8 +25,6 @@
@Resource
private ISysLoginLogService sysLoginLogService;
- @Resource
- private ISysUserService sysUserService;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
index 81d8f1a..76d6f28 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
@@ -13,115 +13,114 @@
/**
* 参数配置表 sys_config
- *
+ *
* @author ruoyi
*/
-public class SysConfig extends BaseModel
-{
- private static final long serialVersionUID = 1L;
-
- /** 参数主键 */
- @Excel(name = "参数主键", cellType = ColumnType.NUMERIC)
- private Long configId;
-
- /** 参数名称 */
- @Excel(name = "参数名称")
- private String configName;
-
- /** 参数键名 */
- @Excel(name = "参数键名")
- private String configKey;
-
- /** 参数键值 */
- @Excel(name = "参数键值")
- private String configValue;
-
- /** 系统内置（Y是 N否） */
- @Excel(name = "系统内置", readConverterExp = "Y=是,N=否")
- private String configType;
-
- public Long getConfigId()
- {
- return configId;
- }
-
- public void setConfigId(Long configId)
- {
- this.configId = configId;
- }
-
- @NotBlank(message = "参数名称不能为空")
- @Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
- public String getConfigName()
- {
- return configName;
- }
-
- public void setConfigName(String configName)
- {
- this.configName = configName;
- }
-
- @NotBlank(message = "参数键名长度不能为空")
- @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符")
- public String getConfigKey()
- {
- return configKey;
- }
-
- public void setConfigKey(String configKey)
- {
- this.configKey = configKey;
- }
-
- @NotBlank(message = "参数键值不能为空")
- @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
- public String getConfigValue()
- {
- return configValue;
- }
-
- public void setConfigValue(String configValue)
- {
- this.configValue = configValue;
- }
-
- public String getConfigType()
- {
- return configType;
- }
-
- public void setConfigType(String configType)
- {
- this.configType = configType;
- }
-
-
- @ApiModelProperty(value = "备注说明")
- @Excel(name = "备注说明")
- private String remark;
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("configId", getConfigId())
- .append("configName", getConfigName())
- .append("configKey", getConfigKey())
- .append("configValue", getConfigValue())
- .append("configType", getConfigType())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
- }
+public class SysConfig extends BaseModel {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 参数主键
+ */
+ @Excel(name = "参数主键", cellType = ColumnType.NUMERIC)
+ private Long configId;
+
+ /**
+ * 参数名称
+ */
+ @Excel(name = "参数名称")
+ private String configName;
+
+ /**
+ * 参数键名
+ */
+ @Excel(name = "参数键名")
+ private String configKey;
+
+ /**
+ * 参数键值
+ */
+ @Excel(name = "参数键值")
+ private String configValue;
+
+ /**
+ * 系统内置（Y是 N否）
+ */
+ @Excel(name = "系统内置", readConverterExp = "Y=是,N=否")
+ private String configType;
+
+ public Long getConfigId() {
+ return configId;
+ }
+
+ public void setConfigId(Long configId) {
+ this.configId = configId;
+ }
+
+ @NotBlank(message = "参数名称不能为空")
+ @Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
+ public String getConfigName() {
+ return configName;
+ }
+
+ public void setConfigName(String configName) {
+ this.configName = configName;
+ }
+
+ @NotBlank(message = "参数键名长度不能为空")
+ @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符")
+ public String getConfigKey() {
+ return configKey;
+ }
+
+ public void setConfigKey(String configKey) {
+ this.configKey = configKey;
+ }
+
+ @NotBlank(message = "参数键值不能为空")
+ @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
+ public String getConfigValue() {
+ return configValue;
+ }
+
+ public void setConfigValue(String configValue) {
+ this.configValue = configValue;
+ }
+
+ public String getConfigType() {
+ return configType;
+ }
+
+ public void setConfigType(String configType) {
+ this.configType = configType;
+ }
+
+
+ @ApiModelProperty(value = "备注说明")
+ @Excel(name = "备注说明")
+ private String remark;
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("configId", getConfigId())
+ .append("configName", getConfigName())
+ .append("configKey", getConfigKey())
+ .append("configValue", getConfigValue())
+ .append("configType", getConfigType())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
+ }
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLoginLog.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLoginLog.java
deleted file mode 100644
index df7119c..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLoginLog.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.ruoyi.system.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.LocalDate;
-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-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
index 39ea778..463fd8c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
@@ -1,78 +1,79 @@
package com.ruoyi.system.mapper;
import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.SysConfig;
import org.apache.ibatis.annotations.Mapper;
/**
* 参数配置 数据层
- *
+ *
* @author ruoyi
*/
@Mapper
-public interface SysConfigMapper
-{
- /**
- * 查询参数配置信息
- *
- * @param config 参数配置信息
- * @return 参数配置信息
- */
- public SysConfig selectConfig(SysConfig config);
-
- /**
- * 通过ID查询配置
- *
- * @param configId 参数ID
- * @return 参数配置信息
- */
- public SysConfig selectConfigById(Long configId);
-
- /**
- * 查询参数配置列表
- *
- * @param config 参数配置信息
- * @return 参数配置集合
- */
- public List<SysConfig> selectConfigList(SysConfig config);
-
- /**
- * 根据键名查询参数配置信息
- *
- * @param configKey 参数键名
- * @return 参数配置信息
- */
- public SysConfig checkConfigKeyUnique(String configKey);
-
- /**
- * 新增参数配置
- *
- * @param config 参数配置信息
- * @return 结果
- */
- public int insertConfig(SysConfig config);
-
- /**
- * 修改参数配置
- *
- * @param config 参数配置信息
- * @return 结果
- */
- public int updateConfig(SysConfig config);
-
- /**
- * 删除参数配置
- *
- * @param configId 参数ID
- * @return 结果
- */
- public int deleteConfigById(Long configId);
-
- /**
- * 批量删除参数信息
- *
- * @param configIds 需要删除的参数ID
- * @return 结果
- */
- public int deleteConfigByIds(Long[] configIds);
+public interface SysConfigMapper extends BaseMapper<SysConfig> {
+ /**
+ * 查询参数配置信息
+ *
+ * @param config 参数配置信息
+ * @return 参数配置信息
+ */
+ public SysConfig selectConfig(SysConfig config);
+
+ /**
+ * 通过ID查询配置
+ *
+ * @param configId 参数ID
+ * @return 参数配置信息
+ */
+ public SysConfig selectConfigById(Long configId);
+
+ /**
+ * 查询参数配置列表
+ *
+ * @param config 参数配置信息
+ * @return 参数配置集合
+ */
+ public List<SysConfig> selectConfigList(SysConfig config);
+
+ /**
+ * 根据键名查询参数配置信息
+ *
+ * @param configKey 参数键名
+ * @return 参数配置信息
+ */
+ public SysConfig checkConfigKeyUnique(String configKey);
+
+ /**
+ * 新增参数配置
+ *
+ * @param config 参数配置信息
+ * @return 结果
+ */
+ public int insertConfig(SysConfig config);
+
+ /**
+ * 修改参数配置
+ *
+ * @param config 参数配置信息
+ * @return 结果
+ */
+ public int updateConfig(SysConfig config);
+
+ /**
+ * 删除参数配置
+ *
+ * @param configId 参数ID
+ * @return 结果
+ */
+ public int deleteConfigById(Long configId);
+
+ /**
+ * 批量删除参数信息
+ *
+ * @param configIds 需要删除的参数ID
+ * @return 结果
+ */
+ public int deleteConfigByIds(Long[] configIds);
}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLoginLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLoginLogMapper.java
index e3be84b..0d194b8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLoginLogMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLoginLogMapper.java
@@ -1,9 +1,8 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.system.domain.SysLoginLog;
+import com.ruoyi.system.api.domain.SysLoginLog;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLoginLogService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLoginLogService.java
index e99400e..3afe7c2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLoginLogService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLoginLogService.java
@@ -4,8 +4,7 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.system.domain.SysLoginLog;
-import org.springframework.web.bind.annotation.RequestBody;
+import com.ruoyi.system.api.domain.SysLoginLog;
/**
* @author zhibing.pu
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
index d48cbfe..626ae5c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -3,6 +3,7 @@
import java.util.Collection;
import java.util.List;
import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
@@ -18,197 +19,176 @@
/**
* 参数配置 服务层实现
- *
+ *
* @author ruoyi
*/
@Service
-public class SysConfigServiceImpl implements ISysConfigService
-{
- @Autowired
- private SysConfigMapper configMapper;
-
- @Autowired
- private RedisService redisService;
-
- /**
- * 项目启动时，初始化参数到缓存
- */
- @PostConstruct
- public void init()
- {
- // TODO
+public class SysConfigServiceImpl implements ISysConfigService {
+ @Resource
+ private SysConfigMapper configMapper;
+
+ @Resource
+ private RedisService redisService;
+
+ /**
+ * 项目启动时，初始化参数到缓存
+ */
+ @PostConstruct
+ public void init() {
+ // TODO
// loadingConfigCache();
- }
-
- /**
- * 查询参数配置信息
- *
- * @param configId 参数配置ID
- * @return 参数配置信息
- */
- @Override
- public SysConfig selectConfigById(Long configId)
- {
- SysConfig config = new SysConfig();
- config.setConfigId(configId);
- return configMapper.selectConfig(config);
- }
-
- /**
- * 根据键名查询参数配置信息
- *
- * @param configKey 参数key
- * @return 参数键值
- */
- @Override
- public String selectConfigByKey(String configKey)
- {
- String configValue = Convert.toStr(redisService.getCacheObject(getCacheKey(configKey)));
- if (StringUtils.isNotEmpty(configValue))
- {
- return configValue;
- }
- SysConfig config = new SysConfig();
- config.setConfigKey(configKey);
- SysConfig retConfig = configMapper.selectConfig(config);
- if (StringUtils.isNotNull(retConfig))
- {
- redisService.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
- return retConfig.getConfigValue();
- }
- return StringUtils.EMPTY;
- }
-
- /**
- * 查询参数配置列表
- *
- * @param config 参数配置信息
- * @return 参数配置集合
- */
- @Override
- public List<SysConfig> selectConfigList(SysConfig config)
- {
- return configMapper.selectConfigList(config);
- }
-
- /**
- * 新增参数配置
- *
- * @param config 参数配置信息
- * @return 结果
- */
- @Override
- public int insertConfig(SysConfig config)
- {
- int row = configMapper.insertConfig(config);
- if (row > 0)
- {
- redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
- }
- return row;
- }
-
- /**
- * 修改参数配置
- *
- * @param config 参数配置信息
- * @return 结果
- */
- @Override
- public int updateConfig(SysConfig config)
- {
- SysConfig temp = configMapper.selectConfigById(config.getConfigId());
- if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey()))
- {
- redisService.deleteObject(getCacheKey(temp.getConfigKey()));
- }
-
- int row = configMapper.updateConfig(config);
- if (row > 0)
- {
- redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
- }
- return row;
- }
-
- /**
- * 批量删除参数信息
- *
- * @param configIds 需要删除的参数ID
- */
- @Override
- public void deleteConfigByIds(Long[] configIds)
- {
- for (Long configId : configIds)
- {
- SysConfig config = selectConfigById(configId);
- if (StringUtils.equals(UserConstants.YES, config.getConfigType()))
- {
- throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
- }
- configMapper.deleteConfigById(configId);
- redisService.deleteObject(getCacheKey(config.getConfigKey()));
- }
- }
-
- /**
- * 加载参数缓存数据
- */
- @Override
- public void loadingConfigCache(){
- List<SysConfig> configsList = configMapper.selectConfigList(new SysConfig());
- for (SysConfig config : configsList)
- {
- redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
- }
- }
-
- /**
- * 清空参数缓存数据
- */
- @Override
- public void clearConfigCache()
- {
- Collection<String> keys = redisService.keys(CacheConstants.SYS_CONFIG_KEY + "*");
- redisService.deleteObject(keys);
- }
-
- /**
- * 重置参数缓存数据
- */
- @Override
- public void resetConfigCache()
- {
- clearConfigCache();
- loadingConfigCache();
- }
-
- /**
- * 校验参数键名是否唯一
- *
- * @param config 参数配置信息
- * @return 结果
- */
- @Override
- public boolean checkConfigKeyUnique(SysConfig config)
- {
- Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId();
- SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey());
- if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue())
- {
- return UserConstants.NOT_UNIQUE;
- }
- return UserConstants.UNIQUE;
- }
-
- /**
- * 设置cache key
- *
- * @param configKey 参数键
- * @return 缓存键key
- */
- private String getCacheKey(String configKey)
- {
- return CacheConstants.SYS_CONFIG_KEY + configKey;
- }
+ }
+
+ /**
+ * 查询参数配置信息
+ *
+ * @param configId 参数配置ID
+ * @return 参数配置信息
+ */
+ @Override
+ public SysConfig selectConfigById(Long configId) {
+ SysConfig config = new SysConfig();
+ config.setConfigId(configId);
+ return configMapper.selectConfig(config);
+ }
+
+ /**
+ * 根据键名查询参数配置信息
+ *
+ * @param configKey 参数key
+ * @return 参数键值
+ */
+ @Override
+ public String selectConfigByKey(String configKey) {
+ String configValue = Convert.toStr(redisService.getCacheObject(getCacheKey(configKey)));
+ if (StringUtils.isNotEmpty(configValue)) {
+ return configValue;
+ }
+ SysConfig config = new SysConfig();
+ config.setConfigKey(configKey);
+ SysConfig retConfig = configMapper.selectConfig(config);
+ if (StringUtils.isNotNull(retConfig)) {
+ redisService.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
+ return retConfig.getConfigValue();
+ }
+ return StringUtils.EMPTY;
+ }
+
+ /**
+ * 查询参数配置列表
+ *
+ * @param config 参数配置信息
+ * @return 参数配置集合
+ */
+ @Override
+ public List<SysConfig> selectConfigList(SysConfig config) {
+ return configMapper.selectConfigList(config);
+ }
+
+ /**
+ * 新增参数配置
+ *
+ * @param config 参数配置信息
+ * @return 结果
+ */
+ @Override
+ public int insertConfig(SysConfig config) {
+ int row = configMapper.insertConfig(config);
+ if (row > 0) {
+ redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
+ }
+ return row;
+ }
+
+ /**
+ * 修改参数配置
+ *
+ * @param config 参数配置信息
+ * @return 结果
+ */
+ @Override
+ public int updateConfig(SysConfig config) {
+ SysConfig temp = configMapper.selectConfigById(config.getConfigId());
+ if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey())) {
+ redisService.deleteObject(getCacheKey(temp.getConfigKey()));
+ }
+
+ int row = configMapper.updateConfig(config);
+ if (row > 0) {
+ redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
+ }
+ return row;
+ }
+
+ /**
+ * 批量删除参数信息
+ *
+ * @param configIds 需要删除的参数ID
+ */
+ @Override
+ public void deleteConfigByIds(Long[] configIds) {
+ for (Long configId : configIds) {
+ SysConfig config = selectConfigById(configId);
+ if (StringUtils.equals(UserConstants.YES, config.getConfigType())) {
+ throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
+ }
+ configMapper.deleteConfigById(configId);
+ redisService.deleteObject(getCacheKey(config.getConfigKey()));
+ }
+ }
+
+ /**
+ * 加载参数缓存数据
+ */
+ @Override
+ public void loadingConfigCache() {
+ List<SysConfig> configsList = configMapper.selectConfigList(new SysConfig());
+ for (SysConfig config : configsList) {
+ redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
+ }
+ }
+
+ /**
+ * 清空参数缓存数据
+ */
+ @Override
+ public void clearConfigCache() {
+ Collection<String> keys = redisService.keys(CacheConstants.SYS_CONFIG_KEY + "*");
+ redisService.deleteObject(keys);
+ }
+
+ /**
+ * 重置参数缓存数据
+ */
+ @Override
+ public void resetConfigCache() {
+ clearConfigCache();
+ loadingConfigCache();
+ }
+
+ /**
+ * 校验参数键名是否唯一
+ *
+ * @param config 参数配置信息
+ * @return 结果
+ */
+ @Override
+ public boolean checkConfigKeyUnique(SysConfig config) {
+ Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId();
+ SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey());
+ if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) {
+ return UserConstants.NOT_UNIQUE;
+ }
+ return UserConstants.UNIQUE;
+ }
+
+ /**
+ * 设置cache key
+ *
+ * @param configKey 参数键
+ * @return 缓存键key
+ */
+ private String getCacheKey(String configKey) {
+ return CacheConstants.SYS_CONFIG_KEY + configKey;
+ }
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLoginLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLoginLogServiceImpl.java
index 69d7b95..afe491d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLoginLogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLoginLogServiceImpl.java
@@ -5,8 +5,8 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.system.api.domain.SysLoginLog;
import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.domain.SysLoginLog;
import com.ruoyi.system.mapper.SysLoginLogMapper;
import com.ruoyi.system.service.ISysLoginLogService;
import com.ruoyi.system.service.ISysUserService;
@@ -14,7 +14,6 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
-import java.util.Date;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index f2ea622..644448f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -17,15 +17,19 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.110.169:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: 87dfc9b5-3336-4273-906c-a31cc3925c47
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ username: nacos
+ password: nacos
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
- namespace: 87dfc9b5-3336-4273-906c-a31cc3925c47
+ server-addr: 192.168.110.169:8848
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
+ username: nacos
+ password: nacos
name: ${spring.application.name}
# 配置文件格式
file-extension: yml
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLoginLogMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLoginLogMapper.xml
index 87f8136..3ea257b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLoginLogMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLoginLogMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.system.mapper.SysLoginLogMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.system.domain.SysLoginLog">
+ <resultMap id="BaseResultMap" type="com.ruoyi.system.api.domain.SysLoginLog">
<id column="id" property="id" />
<result column="user_id" property="userId" />
<result column="user_name" property="username" />
diff --git a/ruoyi-service/ruoyi-account/pom.xml b/ruoyi-service/ruoyi-account/pom.xml
index a247e97..435d4bc 100644
--- a/ruoyi-service/ruoyi-account/pom.xml
+++ b/ruoyi-service/ruoyi-account/pom.xml
@@ -21,6 +21,12 @@
<version>3.6.2</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-api-chargingPile</artifactId>
+ <version>3.6.2</version>
+ <scope>compile</scope>
+ </dependency>
<!-- SpringCloud Alibaba Nacos -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
diff --git a/ruoyi-service/ruoyi-chargingPile/pom.xml b/ruoyi-service/ruoyi-chargingPile/pom.xml
index cfa425f..87b9b86 100644
--- a/ruoyi-service/ruoyi-chargingPile/pom.xml
+++ b/ruoyi-service/ruoyi-chargingPile/pom.xml
@@ -120,6 +120,12 @@
<version>3.6.2</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-api-order</artifactId>
+ <version>3.6.2</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
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 8fe2dbc..86aa7ab 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
@@ -7,6 +7,7 @@
import com.ruoyi.chargingPile.api.model.TApplyChargingPile;
import com.ruoyi.chargingPile.api.model.TCarport;
import com.ruoyi.chargingPile.api.vo.TCarportVO;
+import com.ruoyi.chargingPile.dto.ChargeMonitoring;
import com.ruoyi.chargingPile.service.TApplyChargingPileService;
import com.ruoyi.chargingPile.service.TCarportService;
import com.ruoyi.chargingPile.service.TVehicleRampService;
@@ -81,5 +82,7 @@
+
+
}
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 0b68161..8be1229 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
@@ -5,6 +5,10 @@
import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.chargingPile.api.query.TChargingGunQuery;
import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
+import com.ruoyi.chargingPile.dto.ChargeMonitoring;
+import com.ruoyi.chargingPile.dto.ChargingGunCountMonitoring;
+import com.ruoyi.chargingPile.dto.ChargingGunMonitoring;
+import com.ruoyi.chargingPile.dto.GetChargingGunMonitoring;
import com.ruoyi.chargingPile.service.TChargingGunService;
import com.ruoyi.chargingPile.service.TChargingPileService;
import com.ruoyi.common.core.domain.R;
@@ -135,7 +139,29 @@
}
+ @ResponseBody
+ @GetMapping("/chargeMonitoring/{siteId}")
+ @ApiOperation(value = "获取充电设施监控数据", tags = {"管理后台-充电设备监控"})
+ public AjaxResult<ChargeMonitoring> chargeMonitoring(@PathVariable Integer siteId){
+ ChargeMonitoring chargeMonitoring = chargingPileService.chargeMonitoring(siteId);
+ return AjaxResult.success(chargeMonitoring);
+ }
+
+ @ResponseBody
+ @GetMapping("/getChargingGunCountMonitoring/{siteId}")
+ @ApiOperation(value = "获取充电枪各种状态汇总监控数据", tags = {"管理后台-充电设备监控"})
+ public AjaxResult<ChargingGunCountMonitoring> getChargingGunCountMonitoring(@PathVariable Integer siteId){
+ ChargingGunCountMonitoring chargingGunCountMonitoring = chargingPileService.getChargingGunCountMonitoring(siteId);
+ return AjaxResult.success(chargingGunCountMonitoring);
+ }
+ @ResponseBody
+ @GetMapping("/getChargingGunMonitoring")
+ @ApiOperation(value = "获取充电枪监控数据", tags = {"管理后台-充电设备监控"})
+ public AjaxResult<PageInfo<ChargingGunMonitoring>> getChargingGunMonitoring(GetChargingGunMonitoring query){
+ PageInfo<ChargingGunMonitoring> chargingGunMonitoring = chargingPileService.getChargingGunMonitoring(query);
+ return AjaxResult.success(chargingGunMonitoring);
+ }
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ChargeMonitoring.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ChargeMonitoring.java
new file mode 100644
index 0000000..6431cad
--- /dev/null
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ChargeMonitoring.java
@@ -0,0 +1,39 @@
+package com.ruoyi.chargingPile.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/8/14 15:54
+ */
+@ApiModel
+@Data
+public class ChargeMonitoring {
+ @ApiModelProperty("电站电话")
+ private String phone;
+ @ApiModelProperty("详细地址")
+ private String address;
+ @ApiModelProperty("终点总数")
+ private Integer terminalTotal;
+ @ApiModelProperty("充电中")
+ private Integer charging;
+ @ApiModelProperty("未充电")
+ private Integer notCharged;
+ @ApiModelProperty("额定功率")
+ private BigDecimal ratedPower;
+ @ApiModelProperty("实时功率")
+ private BigDecimal realTimePower;
+ @ApiModelProperty("需求功率满足率")
+ private BigDecimal demandPowerSatisfactionRate;
+ @ApiModelProperty("充电量趋势")
+ private Map<String, Object> chargeTrend;
+ @ApiModelProperty("利用率趋势")
+ private Map<String, Object> utilizationTrend;
+
+}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ChargingGunCountMonitoring.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ChargingGunCountMonitoring.java
new file mode 100644
index 0000000..7847497
--- /dev/null
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ChargingGunCountMonitoring.java
@@ -0,0 +1,25 @@
+package com.ruoyi.chargingPile.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/8/15 16:36
+ */
+@Data
+@ApiModel
+public class ChargingGunCountMonitoring {
+ @ApiModelProperty("空闲中")
+ private Long leisure;
+ @ApiModelProperty("已插枪")
+ private Long loaded;
+ @ApiModelProperty("充电中")
+ private Long charging;
+ @ApiModelProperty("离网")
+ private Long offline;
+ @ApiModelProperty("故障")
+ private Long breakdown;
+
+}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ChargingGunMonitoring.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ChargingGunMonitoring.java
new file mode 100644
index 0000000..07f6b75
--- /dev/null
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ChargingGunMonitoring.java
@@ -0,0 +1,38 @@
+package com.ruoyi.chargingPile.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/8/15 13:58
+ */
+@Data
+@ApiModel
+public class ChargingGunMonitoring {
+ @ApiModelProperty("充电枪id")
+ private Integer id;
+ @ApiModelProperty("充电枪状态（1=离线，2=空闲，3=已插枪，4=占用（充电中），7=故障）")
+ private Integer status;
+ @ApiModelProperty("名称")
+ private String name;
+ @ApiModelProperty("充电比率")
+ private BigDecimal chargingRatio;
+ @ApiModelProperty("车位")
+ private String parkingNumber;
+ @ApiModelProperty("车牌号")
+ private String licensePlate;
+ @ApiModelProperty("电量")
+ private String electricQuantity;
+ @ApiModelProperty("当前SOC值")
+ private String soc;
+ @ApiModelProperty("实时A相电流")
+ private String electricCurrent;
+ @ApiModelProperty("实时A相电压")
+ private String voltage;
+ @ApiModelProperty("故障原因")
+ private String faultCause;
+}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/GetChargingGunMonitoring.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/GetChargingGunMonitoring.java
new file mode 100644
index 0000000..356797f
--- /dev/null
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/GetChargingGunMonitoring.java
@@ -0,0 +1,28 @@
+package com.ruoyi.chargingPile.dto;
+
+import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/8/15 13:48
+ */
+@Data
+@ApiModel
+public class GetChargingGunMonitoring extends BasePage {
+ @ApiModelProperty("站带你id")
+ private Integer siteId;
+ @ApiModelProperty("充电枪状态（1=离线，2=空闲，3=已插枪，4=占用（充电中），7=故障）")
+ private List<Integer> status;
+ @ApiModelProperty("soc开始值")
+ private Double socStart;
+ @ApiModelProperty("soc结束值")
+ private Double socEnd;
+ @ApiModelProperty("终端名称")
+ private String name;
+
+}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileMapper.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileMapper.java
index ca0be89..9cf2e89 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileMapper.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileMapper.java
@@ -5,6 +5,8 @@
import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.chargingPile.api.query.PageChargingPileList;
import com.ruoyi.chargingPile.api.vo.TChargingPileVO;
+import com.ruoyi.chargingPile.dto.ChargingGunMonitoring;
+import com.ruoyi.chargingPile.dto.GetChargingGunMonitoring;
import com.ruoyi.common.core.web.page.PageInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -45,4 +47,15 @@
* @return
*/
List<TChargingPileVO> getChargingGunList(@Param("siteId")Integer siteId);
+
+
+ /**
+ * 获取充电枪监控数据
+ * @param pageInfo
+ * @param siteIds
+ * @param query
+ * @return
+ */
+ List<ChargingGunMonitoring> getChargingGunMonitoring(PageInfo<ChargingGunMonitoring> pageInfo, @Param("siteIds") Set<Integer> siteIds,
+ @Param("query") GetChargingGunMonitoring query);
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TChargingPileService.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TChargingPileService.java
index beb89c2..0246a3e 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TChargingPileService.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TChargingPileService.java
@@ -6,6 +6,10 @@
import com.ruoyi.chargingPile.api.query.BatchSetAccountingStrategy;
import com.ruoyi.chargingPile.api.query.PageChargingPileList;
import com.ruoyi.chargingPile.api.vo.TChargingPileVO;
+import com.ruoyi.chargingPile.dto.ChargeMonitoring;
+import com.ruoyi.chargingPile.dto.ChargingGunCountMonitoring;
+import com.ruoyi.chargingPile.dto.ChargingGunMonitoring;
+import com.ruoyi.chargingPile.dto.GetChargingGunMonitoring;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import org.springframework.web.bind.annotation.PathVariable;
@@ -77,5 +81,30 @@
* @return
*/
List<TChargingPileVO> getChargingGunList(Integer siteId,Integer type);
+
+
+ /**
+ * 获取充电设备监控数据
+ * @param siteId
+ * @return
+ */
+ ChargeMonitoring chargeMonitoring(Integer siteId);
+
+
+ /**
+ * 获取充电枪各种状态汇总
+ * @param siteId 站点id
+ * @return
+ */
+ ChargingGunCountMonitoring getChargingGunCountMonitoring(Integer siteId);
+
+
+
+ /**
+ * 获取充电枪监控数据
+ * @param query
+ * @return
+ */
+ PageInfo<ChargingGunMonitoring> getChargingGunMonitoring(GetChargingGunMonitoring query);
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
index 6d771f5..212b792 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
@@ -3,7 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.feignClient.AppUserCarClient;
+import com.ruoyi.account.api.model.TAppUserCar;
import com.ruoyi.chargingPile.api.dto.PageChargingPileListDTO;
+import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.chargingPile.api.query.BatchSetAccountingStrategy;
@@ -11,14 +14,22 @@
import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
import com.ruoyi.chargingPile.api.vo.TChargingPileVO;
import com.ruoyi.chargingPile.domain.SiteMenu;
+import com.ruoyi.chargingPile.dto.ChargeMonitoring;
+import com.ruoyi.chargingPile.dto.ChargingGunCountMonitoring;
+import com.ruoyi.chargingPile.dto.ChargingGunMonitoring;
+import com.ruoyi.chargingPile.dto.GetChargingGunMonitoring;
import com.ruoyi.chargingPile.mapper.TChargingPileMapper;
import com.ruoyi.chargingPile.service.IPartnerService;
+import com.ruoyi.chargingPile.service.ISiteService;
import com.ruoyi.chargingPile.service.TChargingGunService;
import com.ruoyi.chargingPile.service.TChargingPileService;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.order.api.feignClient.ChargingOrderAccountingStrategyClient;
+import com.ruoyi.order.api.feignClient.ChargingOrderClient;
+import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.other.api.feignClient.RoleSiteClient;
import com.ruoyi.other.api.feignClient.UserSiteClient;
import com.ruoyi.system.api.domain.SysUser;
@@ -26,11 +37,12 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
+import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* <p>
@@ -57,6 +69,19 @@
@Resource
private RoleSiteClient roleSiteClient;
+
+ @Resource
+ private ISiteService siteService;
+
+ @Resource
+ private ChargingOrderAccountingStrategyClient chargingOrderAccountingStrategyClient;
+
+ @Resource
+ private ChargingOrderClient chargingOrderClient;
+
+ @Resource
+ private AppUserCarClient appUserCarClient;
+
@@ -229,4 +254,179 @@
});
return chargingPileVOS;
}
+
+
+ /**
+ * 获取监控设备监控数据
+ * @param siteId
+ * @return
+ */
+ @Override
+ public ChargeMonitoring chargeMonitoring(Integer siteId) {
+ //获取当前登录账户的站点权限数据
+ Set<Integer> siteIds = new HashSet<>();
+ if(null == siteId){
+ SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ Integer roleType = sysUser.getRoleType();
+ Integer objectId = sysUser.getObjectId();
+ if(2 == roleType){
+ siteIds = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
+ }else{
+ //非管理员需要根据角色和用户配置查询允许的站点数据
+ if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
+ List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).getData();
+ data.addAll(data1);
+ siteIds = new HashSet<>(data);
+ }
+ }
+ }else{
+ siteIds.add(siteId);
+ }
+ List<Site> sites = siteService.listByIds(siteIds);
+ List<TChargingGun> total = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getSiteId, siteIds).eq(TChargingGun::getDelFlag, 0));
+ List<TChargingGun> charging = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getSiteId, siteIds).eq(TChargingGun::getStatus, 4).eq(TChargingGun::getDelFlag, 0));
+ BigDecimal ratedPower = total.stream().map(TChargingGun::getRatedPower).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal realTimePower = charging.stream().map(TChargingGun::getChargingPower).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ ChargeMonitoring chargeMonitoring = new ChargeMonitoring();
+ chargeMonitoring.setPhone(sites.size() == 1 ? sites.get(0).getPhone() : "");
+ chargeMonitoring.setAddress(sites.size() == 1 ? sites.get(0).getAddress() : "");
+ chargeMonitoring.setTerminalTotal(total.size());
+ chargeMonitoring.setCharging(charging.size());
+ chargeMonitoring.setNotCharged(total.size() - charging.size());
+ chargeMonitoring.setRatedPower(ratedPower.setScale(4, RoundingMode.HALF_EVEN));
+ chargeMonitoring.setRealTimePower(realTimePower.setScale(4, RoundingMode.HALF_EVEN));
+ chargeMonitoring.setDemandPowerSatisfactionRate(realTimePower.divide(ratedPower).multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN));
+
+ List<String> dates = new ArrayList<>();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MMM-dd");
+ Calendar calendar = Calendar.getInstance();
+ for (int i = 6; i >= 0; i--) {
+ calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - i);
+ dates.add(sdf.format(calendar.getTime()));
+ }
+ List<List<Map<String, Object>>> value1 = chargingOrderAccountingStrategyClient.getTotalElectricQuantity(6, siteIds).getData();
+ Map<String, Object> chargeTrend = new HashMap<>();
+ chargeTrend.put("date", dates);
+ chargeTrend.put("value", value1);
+ chargeMonitoring.setChargeTrend(chargeTrend);
+
+ //每日利用率=当日充电度数/（总桩数量*桩总功率*24小时）
+ List<TChargingPile> list = this.list(new LambdaQueryWrapper<TChargingPile>().in(TChargingPile::getSiteId, siteIds).eq(TChargingPile::getDelFlag, 0));
+ BigDecimal v = list.stream().map(TChargingPile::getRatedPower).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(4, RoundingMode.HALF_EVEN);
+ List<Double> data = chargingOrderAccountingStrategyClient.getDailyChargingDegree(6, siteIds).getData();
+ List<Double> value2 = new ArrayList<>();
+ for (Double datum : data) {
+ Double datum1 = new BigDecimal(datum).divide(new BigDecimal(list.size()).multiply(v).multiply(new BigDecimal(24))).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ value2.add(datum1);
+ }
+ Map<String, Object> utilizationTrend = new HashMap<>();
+ utilizationTrend.put("date", dates);
+ utilizationTrend.put("value", value2);
+ chargeMonitoring.setUtilizationTrend(utilizationTrend);
+ return chargeMonitoring;
+ }
+
+ /**
+ * 获取充电枪各种状态汇总
+ * @param siteId 站点id
+ * @return
+ */
+ @Override
+ public ChargingGunCountMonitoring getChargingGunCountMonitoring(Integer siteId) {
+ //获取当前登录账户的站点权限数据
+ Set<Integer> siteIds = new HashSet<>();
+ if(null == siteId){
+ SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ Integer roleType = sysUser.getRoleType();
+ Integer objectId = sysUser.getObjectId();
+ if(2 == roleType){
+ siteIds = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
+ }else{
+ //非管理员需要根据角色和用户配置查询允许的站点数据
+ if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
+ List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).getData();
+ data.addAll(data1);
+ siteIds = new HashSet<>(data);
+ }
+ }
+ }else{
+ siteIds.add(siteId);
+ }
+ List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getSiteId, siteIds).eq(TChargingGun::getDelFlag, 0));
+ //空闲
+ long leisure = list.stream().filter(s -> s.getStatus().equals(2)).count();
+ //已插枪
+ long loaded = list.stream().filter(s -> Arrays.asList(3, 5, 6).contains(s.getStatus())).count();
+ //充电中
+ long charging = list.stream().filter(s -> s.getStatus().equals(4)).count();
+ //离网
+ long offline = list.stream().filter(s -> s.getStatus().equals(0)).count();
+ //故障
+ long breakdown = list.stream().filter(s -> s.getStatus().equals(7)).count();
+ ChargingGunCountMonitoring chargingGunCountMonitoring = new ChargingGunCountMonitoring();
+ chargingGunCountMonitoring.setLeisure(leisure);
+ chargingGunCountMonitoring.setLoaded(loaded);
+ chargingGunCountMonitoring.setCharging(charging);
+ chargingGunCountMonitoring.setOffline(offline);
+ chargingGunCountMonitoring.setBreakdown(breakdown);
+ return chargingGunCountMonitoring;
+ }
+
+ /**
+ * 获取充电枪监控数据
+ * @param query
+ * @return
+ */
+ @Override
+ public PageInfo<ChargingGunMonitoring> getChargingGunMonitoring(GetChargingGunMonitoring query) {
+ //获取当前登录账户的站点权限数据
+ Set<Integer> siteIds = new HashSet<>();
+ if(null == query.getSiteId()){
+ SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ Integer roleType = sysUser.getRoleType();
+ Integer objectId = sysUser.getObjectId();
+ if(2 == roleType){
+ siteIds = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
+ }else{
+ //非管理员需要根据角色和用户配置查询允许的站点数据
+ if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
+ List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).getData();
+ data.addAll(data1);
+ siteIds = new HashSet<>(data);
+ }
+ }
+ }else{
+ siteIds.add(query.getSiteId());
+ }
+ // todo 待完善
+ if(null != query.getStatus() && 0 < query.getStatus().size()){
+ if(query.getStatus().contains(3)){
+ query.getStatus().add(6);
+ query.getStatus().add(7);
+ }
+ }
+ PageInfo<ChargingGunMonitoring> pageInfo = new PageInfo<>(query.getPageCurr(), query.getPageSize());
+ List<ChargingGunMonitoring> chargingGunMonitoring = this.baseMapper.getChargingGunMonitoring(pageInfo, siteIds, query);
+ for (ChargingGunMonitoring gunMonitoring : chargingGunMonitoring) {
+ Integer status = gunMonitoring.getStatus();
+ if(status == 5 || status == 6){
+ gunMonitoring.setStatus(3);
+ }
+ if(status == 4){
+ Integer id = gunMonitoring.getId();
+ //根据订单数据查询车牌号
+ TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(id).getData();
+ Integer appUserCarId = chargingOrder.getAppUserCarId();
+ if(null != appUserCarId){
+ TAppUserCar tAppUserCar = appUserCarClient.getCarByIds(Arrays.asList(appUserCarId)).getData().get(0);
+ gunMonitoring.setLicensePlate(tAppUserCar.getLicensePlate());
+ }
+ }
+ }
+ return pageInfo.setRecords(chargingGunMonitoring);
+ }
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml
index f7c9430..dcf4843 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml
@@ -18,6 +18,7 @@
<result column="lower_limit_of_rated_voltage" property="lowerLimitOfRatedVoltage" />
<result column="rated_current" property="ratedCurrent" />
<result column="rated_power" property="ratedPower" />
+ <result column="charging_power" property="chargingPower" />
<result column="parking_number" property="parkingNumber" />
<result column="parking_status" property="parkingStatus" />
<result column="parking_lock_state" property="parkingLockState" />
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml
index 0029319..bcfe11d 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml
@@ -79,4 +79,32 @@
select id,code, `name`, `number` from t_charging_pile
where del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()} and site_id = #{siteId}
</select>
+
+
+
+ <select id="getChargingGunMonitoring" resultType="com.ruoyi.chargingPile.dto.ChargingGunMonitoring">
+ select
+ a.id,
+ a.status,
+ CONCAT(b.number, a.name) as name,
+ a.parking_number as parkingNumber
+ from t_charging_gun a
+ left join t_charging_pile b on (a.charging_pile_id = b.id)
+ where a.del_flag = 0
+ <if test="null != siteIds and siteIds.size() > 0">
+ and a.site_id in
+ <foreach collection="siteIds" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="null != query.status and query.status.size() > 0">
+ and a.status in
+ <foreach collection="query.status" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="null != query.name and '' != query.name">
+ and a.name like CONCAT('%', #{query.name}, '%')
+ </if>
+ </select>
</mapper>
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderAccountingStrategyController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderAccountingStrategyController.java
index a9a0543..eb4fe5b 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderAccountingStrategyController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderAccountingStrategyController.java
@@ -1,9 +1,15 @@
package com.ruoyi.order.controller;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.order.service.TChargingOrderAccountingStrategyService;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* <p>
@@ -18,5 +24,33 @@
@RequestMapping("/t-charging-order-accounting-strategy")
public class TChargingOrderAccountingStrategyController {
+ @Resource
+ private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService;
+
+
+ /**
+ * 获取给定天数每天的充电量统计数据
+ * @param days 天数
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/getTotalElectricQuantity/{days}")
+ public R<List<List<Map<String, Object>>>> getTotalElectricQuantity(@PathVariable Integer days, @RequestParam("siteIds") Set<Integer> siteIds){
+ List<List<Map<String, Object>>> list = chargingOrderAccountingStrategyService.getTotalElectricQuantity(days, siteIds);
+ return R.ok(list);
+ }
+
+
+ /**
+ * 获取给定天数每天的充电度数
+ * @param days 天数
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/getDailyChargingDegree/{days}")
+ public R<List<Double>> getDailyChargingDegree(@PathVariable Integer days, @RequestParam("siteIds") Set<Integer> siteIds){
+ List<Double> list = chargingOrderAccountingStrategyService.getDailyChargingDegree(days, siteIds);
+ return R.ok(list);
+ }
}
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 c5b3ae1..d05882b 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
@@ -52,6 +52,17 @@
public R<TChargingOrder> detail(@RequestParam("orderId") Long orderId) {
return R.ok(chargingOrderService.getById(orderId));
}
-
+
+ /**
+ * 根据充电枪id获取正在进行中的订单
+ * @param chargingGunId 充电枪id
+ * @return
+ */
+ @GetMapping(value = "/getOrderDetailByGunId")
+ public R<TChargingOrder> getOrderDetailByGunId(@RequestParam("chargingGunId") Integer chargingGunId){
+ TChargingOrder one = chargingOrderService.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getChargingGunId, chargingGunId)
+ .eq(TChargingOrder::getDelFlag, 0).eq(TChargingOrder::getStatus, 3));
+ return R.ok(one);
+ }
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderAccountingStrategyService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderAccountingStrategyService.java
index 815962b..576ce36 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderAccountingStrategyService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderAccountingStrategyService.java
@@ -2,6 +2,11 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* <p>
@@ -12,5 +17,19 @@
* @since 2024-08-07
*/
public interface TChargingOrderAccountingStrategyService extends IService<TChargingOrderAccountingStrategy> {
-
+
+ /**
+ * 获取给定天数范围内的充电量统计
+ * @param days 天数
+ * @return
+ */
+ List<List<Map<String, Object>>> getTotalElectricQuantity(Integer days, Set<Integer> siteIds);
+
+
+ /**
+ * 获取给定天数每天的充电度数
+ * @param days 天数
+ * @return
+ */
+ List<Double> getDailyChargingDegree(Integer days, Set<Integer> siteIds);
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderAccountingStrategyServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderAccountingStrategyServiceImpl.java
index 6c41242..413fa9b 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderAccountingStrategyServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderAccountingStrategyServiceImpl.java
@@ -1,10 +1,23 @@
package com.ruoyi.order.service.impl;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
import com.ruoyi.order.mapper.TChargingOrderAccountingStrategyMapper;
import com.ruoyi.order.service.TChargingOrderAccountingStrategyService;
+import com.ruoyi.order.service.TChargingOrderService;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
+import java.time.Duration;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
/**
* <p>
@@ -16,5 +29,94 @@
*/
@Service
public class TChargingOrderAccountingStrategyServiceImpl extends ServiceImpl<TChargingOrderAccountingStrategyMapper, TChargingOrderAccountingStrategy> implements TChargingOrderAccountingStrategyService {
-
+
+ @Resource
+ private TChargingOrderService chargingOrderService;
+
+
+
+ /**
+ * 获取给定天数范围内的充电量统计
+ * @param days 天数
+ * @return
+ */
+ @Override
+ public List<List<Map<String, Object>>> getTotalElectricQuantity(Integer days, Set<Integer> siteIds) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - days);
+ String startTime = sdf.format(calendar.getTime()) + " 00:00:00";
+ List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>().in(TChargingOrder::getSiteId, siteIds).eq(TChargingOrder::getStatus, 5)
+ .eq(TChargingOrder::getDelFlag, 0).last(" and end_time between '" + startTime + "' and DATE_FORMAT('%Y-%m-%d %H:%i:%s', now())"));
+ List<Long> orderId = list.stream().map(TChargingOrder::getId).collect(Collectors.toList());
+ List<TChargingOrderAccountingStrategy> list1 = this.list(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().in(TChargingOrderAccountingStrategy::getChargingOrderId, orderId));
+
+ List<List<Map<String, Object>>> list2 = new ArrayList<>();
+ Calendar nowDateTime = Calendar.getInstance();
+ for (int i = days; i >= 0; i--) {
+ nowDateTime.set(Calendar.DAY_OF_YEAR, nowDateTime.get(Calendar.DAY_OF_YEAR) - i);
+ List<TChargingOrder> collect = list.stream().filter(s -> sdf.format(s.getEndTime()).equals(sdf.format(nowDateTime.getTime()))).collect(Collectors.toList());
+ List<Long> orderIds = collect.stream().map(TChargingOrder::getId).collect(Collectors.toList());
+
+
+ List<Map<String, Object>> datas = new ArrayList<>();
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("name", "尖");
+ BigDecimal value1 = list1.stream().filter(s -> orderIds.contains(s.getChargingOrderId()) && s.getType() == 1)
+ .map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
+ map1.put("value", value1.setScale(2, RoundingMode.HALF_EVEN));
+ datas.add(map1);
+
+ Map<String, Object> map2 = new HashMap<>();
+ map2.put("name", "峰");
+ BigDecimal value2 = list1.stream().filter(s -> orderIds.contains(s.getChargingOrderId()) && s.getType() == 2)
+ .map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
+ map1.put("value", value2.setScale(2, RoundingMode.HALF_EVEN));
+ datas.add(map2);
+
+ Map<String, Object> map3 = new HashMap<>();
+ map3.put("name", "平");
+ BigDecimal value3 = list1.stream().filter(s -> orderIds.contains(s.getChargingOrderId()) && s.getType() == 3)
+ .map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
+ map1.put("value", value3.setScale(2, RoundingMode.HALF_EVEN));
+ datas.add(map3);
+
+ Map<String, Object> map4 = new HashMap<>();
+ map4.put("name", "谷");
+ BigDecimal value4 = list1.stream().filter(s -> orderIds.contains(s.getChargingOrderId()) && s.getType() == 4)
+ .map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
+ map1.put("value", value4.setScale(2, RoundingMode.HALF_EVEN));
+ datas.add(map4);
+ list2.add(datas);
+ }
+ return list2;
+ }
+
+
+ /**
+ * 获取给定天数每天的充电度数
+ * @param days 天数
+ * @return
+ */
+ @Override
+ public List<Double> getDailyChargingDegree(Integer days, Set<Integer> siteIds) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - days);
+ String startTime = sdf.format(calendar.getTime()) + " 00:00:00";
+ List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>().in(TChargingOrder::getSiteId, siteIds).eq(TChargingOrder::getStatus, 5)
+ .eq(TChargingOrder::getDelFlag, 0).last(" and end_time between '" + startTime + "' and DATE_FORMAT('%Y-%m-%d %H:%i:%s', now())"));
+
+ List<Double> list2 = new ArrayList<>();
+ Calendar nowDateTime = Calendar.getInstance();
+ //遍历获取每天的数值
+ for (int i = days; i >= 0; i--) {
+ nowDateTime.set(Calendar.DAY_OF_YEAR, nowDateTime.get(Calendar.DAY_OF_YEAR) - i);
+ //充电量
+ BigDecimal reduce = list.stream().filter(s -> sdf.format(s.getEndTime()).equals(sdf.format(nowDateTime.getTime())))
+ .map(TChargingOrder::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
+ list2.add(reduce.doubleValue());
+ }
+ return list2;
+ }
}
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
index 210207a..f41d4d6 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -14,6 +14,8 @@
<result column="parking_lot_id" property="parkingLotId" />
<result column="charging_pile_id" property="chargingPileId" />
<result column="charging_gun_id" property="chargingGunId" />
+ <result column="charging_capacity" property="chargingCapacity"/>
+ <result column="charging_power" property="chargingPower"/>
<result column="start_time" property="startTime" />
<result column="end_time" property="endTime" />
<result column="status" property="status" />
--
Gitblit v1.7.1