2021与蓝度共同重构项目,服务端
liuhaonan
2022-04-13 7b8d89b03cbf3b8cc98419462c2e616dcb70a5fe
设备汇总
已修改5个文件
35 ■■■■ 文件已修改
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MenuController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/vo/PoleBindVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TaskVO.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
@@ -28,6 +28,11 @@
        return ResponseUtil.successPage(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
    }
    @PostMapping("/getByC3Mac/{c3Mac}")
    public ResponseVO<Object> getByC3Mac(String c3Mac) {
        return ResponseUtil.success(c3ChargingService.getByC3Mac(c3Mac));
    }
    /**
     * 充电开启
     */
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MenuController.java
@@ -36,9 +36,9 @@
    @GetMapping("/treeList")
    public ResponseVO<Object> treeList() {
//        if(!permissionConfig.check("菜单列表")){
//            return ResponseUtil.fail("缺少对应用户权限");
//        }
        if(!permissionConfig.check("菜单列表")){
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<MenuNode> menuTrees = menuService.treeList();
        return ResponseUtil.success(menuTrees);
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -183,6 +183,22 @@
    }
    /**
     * 查询充电桩
     * @return
     */
    public C3mCharging getByC3Mac(String c3Mac){
        C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
        String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
        if(s != null){
            one.setStatusBit(1);
        }else{
            one.setStatusBit(0);
        }
        return one;
    }
    /**
     * 开始充电
     *
     * @param c3Mac
ximon-admin/src/main/java/com/sandu/ximon/admin/vo/PoleBindVO.java
@@ -28,7 +28,7 @@
    /**
     * 充电桩
     */
    private C3mCharging c3mCharging;
    private C3mCharging c3mCharging; //
    /**
ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TaskVO.java
@@ -32,7 +32,11 @@
        taskVO.setPn(9999);   //  指定播放次数(默认为 1 次)
        taskVO.setLv(10);   //  任务优先级别(11-100),数值越小,优先级别 越 大。
        taskVO.setBtime(systemReservation); //  系统保留
        taskVO.setRule(param.getRule());  //  任务执行规则(每天为 0,每周为 1,手动为 2)
        if (param.getRule() == null) {
            taskVO.setRule(1);
        } else {
            taskVO.setRule(param.getRule());  //  任务执行规则(每天为 0,每周为 1,手动为 2)
        }
        taskVO.setBdate(param.getOnDate()); //  任务开始日期,一般为任务创建日期
        taskVO.setEdate(param.getOffDate()); //  任务结束日期,一直有效为-1
        taskVO.setWeek(Integer.parseInt(param.getWeek(), 2));  //  每周执行规则,rule 为 1 时,有效