fix

zhanzhiqin

2022-05-10 11b3fe6c307790a35ce05810c6daaac78ad0b208

fix

 dao/src/main/java/com/sandu/ximon/dao/bo/BindCount.java

ÎļþÒÑɾ³ý

 dao/src/main/java/com/sandu/ximon/dao/bo/BindEquipments.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,102 @@
package com.sandu.ximon.dao.bo;

import com.sandu.ximon.dao.enums.PoleBindingEnums;
import lombok.Data;

/**
 * ç¯æ†è®¾å¤‡çš„绑定情况
 */
@Data
public class BindEquipments {
    /**
     * è·¯ç¯
     */
    private boolean light = false;
    /**
     * LED诺瓦
     */
    private boolean nova = false;
    /**
     * å……电桩
     */
    private boolean c3mCharging = false;
    /**
     * å¤§æ°”监测
     */
    private boolean airMonitoring = false;
    /**
     * æ°´è´¨ç›‘测
     */
    private boolean waterMonitoring = false;
    /**
     * ip音柱
     */
    private boolean ipVolume = false;
    /**
     * æ‘„像头
     */
    private boolean monitor = false;
    /**
     * æ†ä½“倾测
     */
    private boolean lightPoleHeeling = false;
    /**
     * ä¸€ä»¶æ±‚助
     */
    private boolean forHelp = false;
    /**
     * led熙讯
     */
    private boolean xiXun = false;
    /**
     * å†œè€•
     */
    private boolean airNongGeng = false;

    /**
     * è®¾å¤‡è®¾å¤‡æ˜¯å¦ç»‘定
     *
     * @param deviceType
     */
    public void setInfo(Integer deviceType) {
        switch (String.valueOf(deviceType)) {
            case PoleBindingEnums.LIGHT:
                this.light = true;
                break;
            case PoleBindingEnums.VONNOX:
                this.nova = true;
                break;
            case PoleBindingEnums.CHARGING_PILE:
                this.c3mCharging = true;
                break;
            case PoleBindingEnums.ATMOSPHERIC:
                this.airMonitoring = true;
                break;
            case PoleBindingEnums.WATER:
                this.waterMonitoring = true;
                break;
            case PoleBindingEnums.IPVOLUME:
                this.ipVolume = true;
                break;
            case PoleBindingEnums.LCD_ADVERTISING:
                //LCD功能未做
                break;
            case PoleBindingEnums.MONITOR:
                this.monitor = true;
                break;
            case PoleBindingEnums.LIGHTPOLEHEELING:
                this.lightPoleHeeling = true;
                break;
            case PoleBindingEnums.FOR_HELP:
                this.forHelp = true;
                break;
            case PoleBindingEnums.XIXUN:
                this.xiXun = true;
                break;
            case PoleBindingEnums.ATMOSPHERIC_NONG_GENG:
                this.airNongGeng = true;
                break;
            default:
        }
    }
}

 dao/src/main/java/com/sandu/ximon/dao/domain/Pole.java

@@ -4,20 +4,24 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;

import com.sandu.ximon.dao.bo.BindEquipments;
import lombok.Data;

/**
 * ç¯æ†è¡¨
 *
 * @TableName pole
 */
@TableName(value ="pole")
@TableName(value = "pole")
@Data
public class Pole implements Serializable {
    /**
     * 
     *
     */
    @TableId(type = IdType.AUTO)
    private Long id;
@@ -38,7 +42,7 @@
    private Integer deviceType;

    /**
     * 
     *
     */
    private Long userId;

@@ -98,10 +102,16 @@
    private LocalDateTime createTime;

    /**
     * 
     *
     */
    private LocalDateTime updateTime;

    /**
     * ç¯æ†è®¾å¤‡çš„绑定情况
     */
    @TableField(exist = false)
    private BindEquipments bindEquipments;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java

@@ -102,7 +102,6 @@
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<Pole> results = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), param);

        CommonPage commonPage = CommonPage.restPage(results);
        int size = results.size();
        commonPage.setTotal((long) size);

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java

@@ -317,16 +317,21 @@
    }

    /**
     * è®¾ç½®ç»‘定设备数量
     * èŽ·å–绑定设备详情
     *
     * @param list
     * @return
     */
    public List<Pole> setCount(List<Pole> list) {
        for (Pole post : list) {
            int size = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, post.getId())).size();
//                    System.out.println("size:----------------------"+size);
            post.setBindingCount(size);
        BindEquipments bindEquipments;
        for (Pole pole : list) {
            bindEquipments = new BindEquipments();
            List<PoleBinding> poleBindings = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, pole.getId()));
            pole.setBindingCount(poleBindings.size());
            for (PoleBinding poleBinding : poleBindings) {
                bindEquipments.setInfo(poleBinding.getDeviceType());
            }
            pole.setBindEquipments(bindEquipments);
        }
        return list;
    }