From fa1f416fc8189227124dfb00463360705d8bcb66 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 31 十月 2024 16:35:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileNotificationMapper.java | 12 ++++++
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java | 12 +++---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 13 ++++--
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml | 18 ++++++++-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 14 ++++--
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileNotificationServiceImpl.java | 17 --------
6 files changed, 53 insertions(+), 33 deletions(-)
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 0c6cab6..15341dd 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
@@ -363,11 +363,16 @@
TAccountingStrategy one = accountingStrategyService.lambdaQuery().eq(TAccountingStrategy::getId, byId.getParentId()).one();
byId.setSiteId(one.getSiteId());
//将site表对应的模板id修改为新的这个
- Site byId1 = siteService.getById(one.getSiteId());
- if (byId1!=null) {
- byId1.setAccountingStrategyId(byId.getId());
- siteService.updateById(byId1);
+ List<Site> list = siteService.lambdaQuery().eq(Site::getAccountingStrategyId, one.getId()).list();
+ for (Site site : list) {
+ site.setAccountingStrategyId(byId.getId());
}
+ siteService.updateBatchById(list);
+ //
+
+
+
+ //
accountingStrategyService.removeById(one.getId());
}
//硬件
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileNotificationMapper.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileNotificationMapper.java
index d093e4c..abc3c3d 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileNotificationMapper.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileNotificationMapper.java
@@ -27,4 +27,16 @@
*/
List<TChargingPileNotification> chargingPileNotificationPageList(PageInfo<TChargingPileNotification> pageInfo, @Param("siteIds") Set<Integer> siteIds);
+ /**
+ * 保存通知数据
+ * @param siteId
+ * @param chargingPileId
+ * @param phone
+ * @param content
+ */
+ void saveData(@Param("siteId") Integer siteId,
+ @Param("chargingPileId")Integer chargingPileId,
+ @Param("phone")String phone,
+ @Param("content")String content);
+
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileNotificationServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileNotificationServiceImpl.java
index 9bead20..008af82 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileNotificationServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileNotificationServiceImpl.java
@@ -94,22 +94,7 @@
@Override
public void saveData(Integer type,Integer siteId,Integer chargingPileId, String phone, String data) {
- TChargingPileNotification notification = new TChargingPileNotification();
- switch (type){
- case 1:
- // 验证码
- notification.setPhone(phone);
- notification.setContent(data);
- break;
- default:
- // 停车占位
- notification.setSiteId(siteId);
- notification.setChargingPileId(chargingPileId);
- notification.setPhone(phone);
- notification.setContent(data);
- break;
- }
- this.save(notification);
+ this.baseMapper.saveData(siteId,chargingPileId,phone,data);
}
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml
index e35a362..2901664 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml
@@ -17,9 +17,23 @@
<sql id="Base_Column_List">
id, site_id, charging_pile_id, content, create_time, del_flag
</sql>
+ <insert id="saveData">
+ insert into t_charging_pile_notification(
+ <if test="siteId != null and siteId != 0">site_id,</if>
+ <if test="chargingPileId != null and chargingPileId != 0">charging_pile_id,</if>
+ <if test="phone != null and phone != ''">phone,</if>
+ <if test="content != null and content != ''">content,</if>
+ create_time
+ )values(
+ <if test="siteId != null and siteId != 0">#{siteId},</if>
+ <if test="chargingPileId != null and chargingPileId != 0">#{chargingPileId},</if>
+ <if test="phone != null and phone != ''">#{phone},</if>
+ <if test="content != null and content != ''">#{content},</if>
+ sysdate()
+ )
+ </insert>
-
-
+
<select id="chargingPileNotificationPageList" resultType="com.ruoyi.chargingPile.api.model.TChargingPileNotification">
select
a.id,
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java
index 529427e..6d56cff 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java
@@ -88,21 +88,21 @@
query.addCriteria(Criteria.where("status").is(mongoChargingOrderQuery.getStatus()));
}
- if (mongoChargingOrderQuery.getStartTime() != null) {
- String[] split = mongoChargingOrderQuery.getStartTime().split(" - ");
+ if (mongoChargingOrderQuery.getCreateTime() != null) {
+ String[] split = mongoChargingOrderQuery.getCreateTime().split(" - ");
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date start = dateFormat.parse(split[0]);
Date end = dateFormat.parse(split[1]);
- query.addCriteria(Criteria.where("startTime").gte(start).lt(end));
+ query.addCriteria(Criteria.where("create_time").gte(start).lt(end));
}
- if (mongoChargingOrderQuery.getEndTime() != null && mongoChargingOrderQuery.getEndTime() != null) {
- String[] split = mongoChargingOrderQuery.getEndTime().split(" - ");
+ if (mongoChargingOrderQuery.getLastTime() != null && mongoChargingOrderQuery.getLastTime() != null) {
+ String[] split = mongoChargingOrderQuery.getLastTime().split(" - ");
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date start = dateFormat.parse(split[0]);
Date end = dateFormat.parse(split[1]);
- query.addCriteria(Criteria.where("lastTime").gte(start).lt(end));
+ query.addCriteria(Criteria.where("last_time").gte(start).lt(end));
}
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 e3ab58d..efc6208 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
@@ -915,16 +915,13 @@
// 获取当前日期
LocalDate today = LocalDate.now();
start = statisticsQueryDto.getStartTime();
- end = statisticsQueryDto.getEndTime();
+ end = statisticsQueryDto.getEndTime().plusDays(1);
// 获取本月1号的日期
- YearMonth yearMonth = YearMonth.from(today);
// start = yearMonth.atDay(1);
//
// System.out.println("本月1号是: " + start);
}else if (statisticsQueryDto.getDayType()==4){
- LocalDate today = LocalDate.now();
- // 获取当前年份
- int currentYear = today.getYear();
+
// 获取今年1月1日的日期
start = statisticsQueryDto.getStartTime();
end = statisticsQueryDto.getEndTime();
@@ -933,7 +930,11 @@
// 获取今年1月1日的日期
start = statisticsQueryDto.getStartTime();
end = statisticsQueryDto.getEndTime();
+ if (start.equals(end)){
+ end = end.plusDays(1);
+ }
}
+
List<TChargingOrder> list = chargingOrderService.lambdaQuery().ge(TChargingOrder::getCreateTime, start).le(TChargingOrder::getCreateTime, end).in(TChargingOrder::getSiteId, siteIds).list();
List<Long> chargingOrderIds = list.stream().map(TChargingOrder::getId).collect(Collectors.toList());
chargingOrderIds.add(-1L);
@@ -1033,6 +1034,7 @@
LocalDate startDate = statisticsQueryDto.getStartTime();
LocalDate endDate = statisticsQueryDto.getEndTime();
+
List<Map<String, Object>> dateRangeStatistics = new ArrayList<>();
// 遍历日期范围
@@ -1063,6 +1065,8 @@
LocalDate startDate = statisticsQueryDto.getStartTime();
LocalDate endDate = statisticsQueryDto.getEndTime();
+
+
List<Map<String, Object>> dateRangeStatistics = new ArrayList<>();
// 遍历日期范围
--
Gitblit v1.7.1