2021与蓝度共同重构项目,服务端
liuhaonan
2022-03-23 22ed17a5a141fdef23ce7438eb9c90d6604a89df
c3m预付款以及费率删除
已修改6个文件
25 ■■■■ 文件已修改
dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingChargeMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/param/IpVolumeMissionParam.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
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) {
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
@@ -76,4 +76,8 @@
}
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;
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);
    }
}
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 -> {