2021与蓝度共同重构项目,服务端
liuhaonan
2022-08-18 652667cdf201526e76b812696273010960cfab38
changes
已修改4个文件
53 ■■■■ 文件已修改
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -104,7 +104,7 @@
        System.out.println("同步时间戳结束");
        //设置费率
        System.out.println("设置费率开始");  // todo 充电桩设备设置费率
        System.out.println("设置费率开始");
        C3mCharging c3mCharging1 = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid));
        List<C3mChargingCharge> list = c3mChargingChargeService.list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3mCharging1.getC3Id()));
        if (list.size() == 0) {//费率表中没有此充电桩数据时  添加默认费率
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java
@@ -44,7 +44,7 @@
     * @param
     * @return
     */
    public boolean updateCharge(List<C3mChargingCharge> chargeEntities) {  //TODO
    public boolean updateCharge(List<C3mChargingCharge> chargeEntities) {
        //  删除原本存在的费率
        Integer c3Id = chargeEntities.get(0).getC3Id();
@@ -223,8 +223,8 @@
            //获取当前时间
//            LocalTime localTime = LocalTime.now();
            LocalTime localTime = LocalTime.of(0, 0);
            System.out.println(localTime);
            LocalTime localTime = LocalTime.of(18, 00);
            System.out.println("time"+localTime);
            C3mChargingCharge temp1 = collect.get(collect.size() - 1);
            if (localTime.isAfter(LocalTime.of(temp1.getHour(), temp1.getMin()))) {
@@ -258,45 +258,6 @@
            }
        }
//
//        //获取当前时间
//        LocalTime localTime = LocalTime.now();
//        //遍历费率集合  判断当前时间是否在费率时间段内
//        LocalTime startTime;
//        LocalTime endTime;
//        //默认费率
//        Double charge = 8.8;
//        if (list.size() > 1) {
//            //费率条数大于1时,遍历费率集合  获取当前时间段的费率
//            for (int i = 0; i < list.size(); i++) {
//                //获取费率时间段  转化为LocalTime
//                startTime = LocalTime.of(list.get(i).getHour(), list.get(i).getMin());
//                endTime = LocalTime.of(list.get(i + 1).getHour(), list.get(i + 1).getMin());
//                if (i == list.size()) {
//                    startTime = LocalTime.of(list.get(i).getHour(), list.get(i).getMin());
//                    endTime = LocalTime.of(list.get(0).getHour(), list.get(0).getMin());
//                }
//                //判断当前时间是否在费率时间段内
//                if (localTime.isAfter(startTime) && localTime.isBefore(endTime)) {
//                    //获取费率
//                    charge = list.get(i).getCharge();
//                }
//
//            }
//        } else if (list.size() == 1) {
//            //只有一条费率时,直接获取费率
//            charge = list.get(0).getCharge();
//        } else {
//            //其他费率时,获取默认费率
//            charge = 8.8;
//        }
//
//        //charge转化为BigDecimal
//        //double直接使用 new BigDecimal()时会出现精度问题,所以需要使用BigDecimal.valueOf()方法  并设置精度为2位小数
//        BigDecimal chargeDecimal = BigDecimal.valueOf(charge).setScale(2, BigDecimal.ROUND_HALF_UP);
//
//        return chargeDecimal;
        return BigDecimal.valueOf(99);
        return BigDecimal.valueOf(8.8);
    }
}
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
@@ -236,7 +236,7 @@
        //取出覆盖操作的关系信息
        //记录这些灯杆原先的任务
        List<LightTaskPoleRelation> oldRelation = new ArrayList<>();
        if ("FFFF".equals(param.getLightAddress())) {  //todo
        if ("FFFF".equals(param.getLightAddress())) {
            // 灯杆中存在其他任务的灯头
            if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
                oldRelation = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldPoleIdList)
ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
@@ -560,7 +560,7 @@
    private List<PlayerWidget> generateWaterAndSensorWidget(A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage poleSensorEntity) {
        //TODO
        List widgetList = new ArrayList<>();
        List<String> list = new ArrayList<>();
        if (Objects.nonNull(poleSensorEntity)) {