From 22ed17a5a141fdef23ce7438eb9c90d6604a89df Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 23 三月 2022 16:46:50 +0800
Subject: [PATCH] c3m预付款以及费率删除
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java | 6 ++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java | 5 +++++
dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingChargeMapper.java | 2 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java | 4 ++++
ximon-admin/src/main/java/com/sandu/ximon/admin/param/IpVolumeMissionParam.java | 2 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 6 ++----
6 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingChargeMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingChargeMapper.java
index 60f060a..7537f33 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingChargeMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingChargeMapper.java
@@ -13,7 +13,7 @@
public interface C3mChargingChargeMapper extends BaseMapper<C3mChargingCharge> {
@Delete("delete from c3_charging_charge where c3_id = #{id}")
- void deleteCharge(@Param("id") Integer c3Id);
+ boolean deleteCharge(@Param("id") Integer c3Id);
@Select("select * from c3_charging_charge where c3_id = #{c3Id} limit 5")
List<C3mChargingCharge> getChargeByC3Id(@Param("c3Id") Integer c3Id);
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java
index 4515574..662877b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java
@@ -26,6 +26,7 @@
/**
* 娣诲姞璐圭巼
+ *
* @param charge
* @return
*/
@@ -41,6 +42,11 @@
return ResponseUtil.success(chargeService.updateCharge(chargeEntities));
}
+ @PostMapping("/deleteC3mCharging")
+ public ResponseVO<Object> deleteC3mCharging(@PathVariable Integer c3mId) {
+ return ResponseUtil.success(chargeService.deleteC3mCharging(c3mId));
+ }
+
@GetMapping("/getChargeByC3Id/{c3mId}") //鏈悓姝ユ枃妗�
public ResponseVO<Object> getChargeByC3Id(@PathVariable Integer c3mId) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
index 783ded6..fab209f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
@@ -76,4 +76,8 @@
+
+
+
+
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/IpVolumeMissionParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/IpVolumeMissionParam.java
index 8f3f471..8cbeca1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/IpVolumeMissionParam.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/IpVolumeMissionParam.java
@@ -59,7 +59,7 @@
TaskRunTimeVO[] exec;
// 浠诲姟鎵ц瑙勫垯锛堟瘡澶╀负 0锛屾瘡鍛ㄤ负 1锛屾墜鍔ㄤ负 2)
- private Integer rule;
+ // private Integer rule;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java
index 229f7b3..d149397 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java
@@ -140,6 +140,7 @@
/**
* 鏍规嵁鐏潌id鏌ユ壘璐圭巼
+ *
* @param poleId
* @return
*/
@@ -151,4 +152,8 @@
Long c3Id = chargingMapper.getAllByC3Mac(one.getDeviceCode()).getC3Id();
return getChargeByC3Id(c3Id.intValue());
}
+
+ public boolean deleteC3mCharging(Integer c3mId) {
+ return c3mChargingChargeMapper.deleteCharge(c3mId);
+ }
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
index b98e853..5bf9528 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
@@ -381,16 +381,14 @@
}
task.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
// byId.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
+ task.setBdate(byId.getOnDate());
+ task.setEdate(byId.getOffDate());
-// IpVolumeMissionBo bo = new IpVolumeMissionBo();
List<BroadcastV2TaskFile> taskFiles = broadcastV2TaskFileService.list(Wrappers.lambdaQuery(BroadcastV2TaskFile.class)
.eq(BroadcastV2TaskFile::getTaskId, taskId));
List<BroadcastV2TaskTerminal> taskTerminals = broadcastV2TaskTerminalService.list(Wrappers.lambdaQuery(BroadcastV2TaskTerminal.class)
.eq(BroadcastV2TaskTerminal::getTaskId, taskId));
-// if(taskFiles.isEmpty()||taskTerminals.isEmpty()){
-// throw new BusinessException("");
-// }
if (!taskFiles.isEmpty()) {
taskFiles.forEach(
fileId -> {
--
Gitblit v1.9.3