设备汇总

liuhaonan

2022-04-13 4167b21d9f2ad8774c248ef160910bea5311c002

设备汇总

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

@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;

import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;

/**
@@ -51,6 +53,12 @@
     */
    private LocalDateTime updateTime;

    /**
     * 在线状态 0：离线 1：在线
     */
    @TableField(exist = false)
    private Integer onlineStatus;

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

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

@@ -59,11 +59,13 @@
    /**
     * 灯杆编号
     */
    @TableField(exist = false)
    private Long poleCode;

    /**
     * 灯杆名称
     */
    @TableField(exist = false)
    private String poleName;

    @TableField(exist = false)

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

@@ -37,7 +37,7 @@
    private String deviceCode;

    /**
     * 设备类型，0路灯，1led屏幕，2充电桩，3大气监测，4水质监测，5ip音柱，6lcd广告机，7摄像头，8杆体倾测，9一键救助
     * 设备类型，0路灯，1诺瓦，2充电桩，3大气监测，4水质监测，5ip音柱，6lcd广告机，7摄像头，8杆体倾测，9一键救助 ,10 熙讯
     */
    private Integer deviceType;


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

@@ -5,7 +5,6 @@
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.service.AirEquipmentService;
import com.sandu.ximon.dao.bo.AirEquipmentBo;
import com.sandu.ximon.dao.domain.AirEquipment;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -40,4 +39,9 @@
            return ResponseUtil.fail("操作失败");
        }
    }

    @GetMapping("/getAirEquipment/{mac}")
    public ResponseVO<Object> getAirEquipment(@PathVariable String mac) {
        return ResponseUtil.success(airEquipmentService.getAirEquipment(mac));
    }
}

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

@@ -90,6 +90,17 @@
    }

    /**
     * 获取萤石云摄像头信息
     *
     * @param
     * @return
     */
    @GetMapping("/getYSYInfo/{deviceSerial}")
    public ResponseVO<Object> getMonitorInfo(@PathVariable String deviceSerial) {
        return ResponseUtil.success(monitorService.getMonitorInfo(deviceSerial));
    }

    /**
     * 添加萤石云摄像头
     *
     * @param monitorParam 添加摄像头结果

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

@@ -223,5 +223,13 @@
        return ResponseUtil.success(results);
    }

    /**
     * 查看灯杆绑定的设备
     */
    @PostMapping("/getPoleBindDevice/{poleId}")
    public ResponseVO<Object> getPoleBindDevice(@PathVariable Long poleId) {
        return ResponseUtil.success(poleService.getBindByPoleId(poleId));
    }


}

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

@@ -187,6 +187,6 @@

    @GetMapping("/getVnnoxInfo/{sn}")
    public ResponseVO<Object> getBySnAndPlayerId(@PathVariable String sn) {
        return ResponseUtil.success(ledPlayerEntityService.getBySnAndPlayerId(sn));
        return ResponseUtil.success(ledPlayerEntityService.getBySnAndPlayerSn(sn));
    }
}

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

@@ -63,4 +63,11 @@
        }
        return removeById(Id);
    }

    /**
     * 根据Mac大气设备数据详情
     */
    public AirEquipment getAirEquipment(String mac) {
        return getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, mac));
    }
}

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

@@ -38,7 +38,7 @@
    /**
     * 诺瓦硬件设备
     */
    public LedPlayerEntity getBySnAndPlayerId(String sn){
    public LedPlayerEntity getBySnAndPlayerSn(String sn){
        LedPlayerEntity one = getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn));
        if(one==null){
            throw new RuntimeException("诺瓦设备不存在");

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

@@ -48,6 +48,13 @@
    }

    /**
     * 根据Mac获取最新数据
     */
    public LightPoleHeeling getLightPoleHeelingByMac(String mac) {
        return getOne(Wrappers.lambdaQuery(LightPoleHeeling.class).eq(LightPoleHeeling::getMac, mac));
    }

    /**
     * 灯杆倾斜心跳包
     *
     * @param deviceName

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

@@ -121,6 +121,22 @@
        return listLight;
    }

    /**
     * 获取单个路灯信息
     * @param deviceCode 设备码
     * @return
     */
    public Light getLight(String deviceCode) {
        Light one = getOne(Wrappers.<Light>lambdaQuery().eq(Light::getDeviceCode, deviceCode));
        Object o = redisService.get(LightKey.REPORT_MAC.key(deviceCode));
        if (o != null) {
            one.setOnlineStatus(1);
        }else {
            one.setOnlineStatus(0);
        }
        return one;
    }

    public boolean addRemark(LightRemarkParam param) {
        Light light = getById(param.getLightId());
        if (light == null) {

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

@@ -1,10 +1,8 @@
package com.sandu.ximon.admin.service;


import cn.hutool.core.collection.CollUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
@@ -12,7 +10,6 @@
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.MonitorParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.bo.AirEquipmentBo;
import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.admin.dto.YSY_AccessTokenDto;
@@ -102,6 +99,21 @@
        return accessTokenDto.getData().getAccessToken();
    }


    /**
     * 获取萤石云摄像头信息  无需验证accessToken
     * @return
     */
    public YSY_MonitorDto.MonitorDto getMonitorInfo(String deviceSerial) {
        String token = getAccessToken();
        Map<String, Object> paramMap = new HashMap<>();
        paramMap.put("accessToken", token);
        paramMap.put("deviceSerial", deviceSerial);
        String s = HttpUtil.post(YSY_URL + GET_DEVICE_URL, paramMap);
        YSY_MonitorDto monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);
        return monitorDto.getData();
    }

    /**
     * 添加萤石云摄像头
     *

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

@@ -206,6 +206,11 @@
    }


    /**
     * 查询单个LED
     * @param lightControlCode
     * @return
     */
    public PoleLightemitEntity getLedByLightControlCode(String lightControlCode) {
        PoleLightemitEntity xiXun = getOne(Wrappers.lambdaQuery(PoleLightemitEntity.class).eq(PoleLightemitEntity::getLightemitControlCode, lightControlCode));
        if(xiXun==null){

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

@@ -11,6 +11,7 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.redis.RedisService;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.dto.DeviceStatus;
import com.sandu.ximon.admin.manager.iot.frame.A1Frame;
import com.sandu.ximon.admin.manager.iot.frame.FrameBuilder;
@@ -32,6 +33,7 @@
import com.sandu.ximon.admin.param.PoleStatesParam;
import com.sandu.ximon.admin.redis.LightKey;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.vo.PoleBindVO;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.domain.PoleGroupRelation;
@@ -148,18 +150,18 @@
                if (param.getOnLineStates() != 2) {//绑定的真实灯杆是否在线
                    list = isOnLine(list, param);
                }
            }else {//全部灯杆  实体/虚拟
            } else {//全部灯杆  实体/虚拟
                if (param.getOnLineStates() != 2) {  //查询全部灯杆是否在线
                    list = isOnLine(list, param);
                }
            }
        }else {//全部 绑定/未绑定
        } else {//全部 绑定/未绑定
            if (param.getIsTrue() != 2) {// 判断灯杆类型
                list = isTrue(list, param);// 实体/虚拟
                if (param.getOnLineStates() != 2) {// 灯杆的在线判断
                    list = isOnLine(list, param);//在线/离线
                }
            }else {//全类型灯杆
            } else {//全类型灯杆
                if (param.getOnLineStates() != 2) {//判断在线状态
                    list = isOnLine(list, param);//在线/离线
                }
@@ -502,23 +504,22 @@
        String Code = uniqueMac.substring(0, uniqueMac.length() - 2);*/
        pole.setDeviceCode(uniqueMac);
        pole.setPoleName(uniqueMac);
      /*  int i = Integer.parseInt(strm);*/
        if("00".equals(a1DeviceMacRespInnerFrame.getType())){
        /*  int i = Integer.parseInt(strm);*/
        if ("00".equals(a1DeviceMacRespInnerFrame.getType())) {
            pole.setDeviceType(0);
        }else if("01".equals(a1DeviceMacRespInnerFrame.getType())){
        } else if ("01".equals(a1DeviceMacRespInnerFrame.getType())) {
            pole.setDeviceType(1);
        }

        pole.setPoleCode(generatePoleCode());
        Pole one = getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, uniqueMac));
//        setMac = save(pole);
        if(one==null){
        if (one == null) {
            return save(pole);
        }else {
        } else {
            pole.setId(one.getId());
            return updateById(pole);
        }



    }
@@ -571,7 +572,7 @@
                throw new BusinessException("灯杆不存在");
            }
            pole.setUserId(clientId);
            if(!clientService.findClientId(clientId)){
            if (!clientService.findClientId(clientId)) {
                pole.setClientId(clientService.getClientId(clientId));
            }
            r = updateById(pole);
@@ -585,40 +586,40 @@
    }


    public List<Pole> getOwnerPole(BaseConditionVO baseConditionVO, String keyword,Long cilentId) {
    public List<Pole> getOwnerPole(BaseConditionVO baseConditionVO, String keyword, Long cilentId) {
        LambdaQueryWrapper<Pole> eq;
//        if(SecurityUtils.getClientId()!=null){
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        if (clientService.findClientId(cilentId)) {
            eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getUserId, cilentId);
        } else {
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
            if(clientService.findClientId(cilentId)){
                eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getUserId, cilentId);
            }else{
                PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
                eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, cilentId)
                        .or(
                                pole->{
                                    pole.eq(Pole::getUserId, cilentId);
                                }
                        );
            }
            eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, cilentId)
                    .or(
                            pole -> {
                                pole.eq(Pole::getUserId, cilentId);
                            }
                    );
        }

//        }else {
//            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
//            eq = Wrappers.lambdaQuery(Pole.class);
//        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        if (!keyword.isEmpty()){
            eq.like(Pole::getPoleName,keyword).or(
                    code->{
                        code.like(Pole::getPoleCode,keyword);
        if (!keyword.isEmpty()) {
            eq.like(Pole::getPoleName, keyword).or(
                    code -> {
                        code.like(Pole::getPoleCode, keyword);
                    }
            ).or(
                    deviceCode->{
                        deviceCode.like(Pole::getDeviceCode,keyword);
                    deviceCode -> {
                        deviceCode.like(Pole::getDeviceCode, keyword);
                    }
            );
        }
        List<Pole> list ;
        list =list(eq);
        List<Pole> list;
        list = list(eq);
        setCount(list);
        setOnline(list);
        return list;
@@ -627,12 +628,61 @@

    /**
     * 根据灯杆id查询灯杆绑定设备
     *
     * @return
     */
    public List<Pole> getBindByPoleId(Long poleId){
    public PoleBindVO getBindByPoleId(Long poleId) {
        List<PoleBinding> bind = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId));

        return list(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId,poleId));
        PoleBindVO bindVO = new PoleBindVO();
        bindVO.setPole(getPoleByMac(poleId));
        bind.forEach(poleBinding -> {
            if (poleBinding.getDeviceType() == 0) {//单灯
                bindVO.setLight(SpringContextHolder.getBean(LightService.class).getLight(poleBinding.getDeviceCode()));
            } else if (poleBinding.getDeviceType() == 1) {//诺瓦
                bindVO.setNova(SpringContextHolder.getBean(LedPlayerEntityService.class).getBySnAndPlayerSn(poleBinding.getDeviceCode()));
            } else if (poleBinding.getDeviceType() == 2) {//充电桩
                bindVO.setC3mCharging(SpringContextHolder.getBean(C3ChargingService.class).getByC3Mac(poleBinding.getDeviceCode()));
            } else if (poleBinding.getDeviceType() == 3) {//大气
                bindVO.setAirMonitoring(SpringContextHolder.getBean(AirEquipmentService.class).getAirEquipment(poleBinding.getDeviceCode()));
            } else if (poleBinding.getDeviceType() == 4) {//水质
                 bindVO.setWaterMonitoring(SpringContextHolder.getBean(WaterQualityDataService.class).getWaterQualityDataInfo(poleBinding.getDeviceCode()));
            } else if (poleBinding.getDeviceType() == 5) {//音柱
                bindVO.setIpVolume(SpringContextHolder.getBean(IpVolumeService.class).getIpTerminalDetail(Integer.valueOf(poleBinding.getDeviceCode())));
            } else if (poleBinding.getDeviceType() == 6) {//LCD
                //lcd暂无
            } else if (poleBinding.getDeviceType() == 7) {//摄像头
                bindVO.setMonitor(SpringContextHolder.getBean(MonitorService.class).getMonitorInfo(poleBinding.getDeviceCode()));
            } else if (poleBinding.getDeviceType() == 8) {//杆体倾测
                bindVO.setLightPoleHeeling(SpringContextHolder.getBean(LightPoleHeelingService.class).getLightPoleHeelingByMac(poleBinding.getDeviceCode()));
            } else if (poleBinding.getDeviceType() == 9) {//一键求助
                //一键求助暂无
            } else if (poleBinding.getDeviceType() == 10) {//熙讯
                bindVO.setXiXun(SpringContextHolder.getBean(PoleLightemitService.class).getLedByLightControlCode(poleBinding.getDeviceCode()));
            } else {
                throw new BusinessException("未知设备类型");
            }
        });
        return bindVO;
    }


}
    public Pole getPoleByMac(Long poleId) {
        Pole one = getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, poleId));
        ArrayList<String> macs = new ArrayList<>();
        macs.add(one.getDeviceCode());
        List<DeviceStatus> deviceStatuses = listStatusByDeviceCode(macs);
        if (deviceStatuses.get(0).getStatus() == 0) {
            one.setOnLineState("离线");
        } else if (deviceStatuses.get(0).getStatus() == 1) {
            one.setOnLineState("在线");
        } else if (deviceStatuses.get(0).getStatus() == 2) {
            one.setOnLineState("未激活");
        } else if (deviceStatuses.get(0).getStatus() == 3) {
            one.setOnLineState("不可用");
        } else {
            one.setOnLineState("未知");
        }
        return one;
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/vo/PoleBindVO.java

@@ -1,5 +1,7 @@
package com.sandu.ximon.admin.vo;

import com.sandu.ximon.admin.dto.WaterQualityDataDto;
import com.sandu.ximon.admin.dto.YSY_MonitorDto;
import com.sandu.ximon.dao.domain.*;
import lombok.Data;

@@ -12,13 +14,13 @@
public class PoleBindVO {


    private Pole pole;
    private Pole pole; //


    /**
     * 大气监测
     */
    private AirMonitoring airMonitoring;
    private AirEquipment airMonitoring; //

    /**
     * ip音柱
@@ -34,17 +36,17 @@
    /**
     * 路灯
     */
    private Light light;
    private Light light; //

    /**
     * 杆体倾测
     */
    private LightPoleHeeling lightPoleHeeling;
    private LightPoleHeeling lightPoleHeeling; //

    /**
     * 摄像头
     */
    private Monitor monitor;
    private YSY_MonitorDto.MonitorDto monitor; //

    /**
     * LED诺瓦
@@ -59,5 +61,5 @@
    /**
     * 水质监测
     */
    private WaterMonitoring waterMonitoring;
    private WaterQualityDataDto waterMonitoring;
}