ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
@@ -2,7 +2,6 @@ import com.sandu.common.domain.ResponseVO; import com.sandu.common.object.BaseConditionVO; import com.sandu.common.security.annotation.AnonymousAccess; import com.sandu.common.util.ResponseUtil; import com.sandu.ximon.admin.manager.iot.amqp.processor.AirDataProcessor; import com.sandu.ximon.admin.manager.iot.frame.A5Frame; @@ -12,6 +11,7 @@ import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService; import com.sandu.ximon.admin.security.PermissionConfig; import com.sandu.ximon.admin.service.AirDataService; import com.sandu.ximon.admin.utils.RedisUtils; import com.sandu.ximon.dao.bo.AirDataBo; import com.sandu.ximon.dao.enums.MenuEnum; import lombok.AllArgsConstructor; @@ -31,6 +31,7 @@ public class AirDataController { private final AirDataService airDataService; private PermissionConfig permissionConfig; private RedisUtils redisUtils; /** * 查询大气数据模糊查询 @@ -65,6 +66,7 @@ System.out.println(commonFrame + " -----------commonFrame"); AirDataProcessor.getInstance().process("a1JsfPG4iKW", macStr, commonFrame); if (commonFrame != null) { success.add(macStr); } else { failed.add(macStr); ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
@@ -9,13 +9,10 @@ import com.sandu.ximon.admin.param.MonitorParam; import com.sandu.ximon.admin.security.PermissionConfig; import com.sandu.ximon.admin.service.MonitorService; import com.sandu.ximon.dao.bo.MonitorBo; import com.sandu.ximon.dao.domain.Monitor; import com.sandu.ximon.dao.enums.MenuEnum; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; /** * 摄像头 ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.sandu.common.execption.BusinessException; import com.sandu.common.object.BaseConditionVO; import com.sandu.common.service.impl.BaseServiceImpl; import com.sandu.common.util.SpringContextHolder; @@ -47,7 +48,7 @@ boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(byId.getHostMac(), PoleBindingEnums.FOR_HELP); if (!belong) { throw new RuntimeException("该设备不属于您,不能修改设备信息"); throw new BusinessException("该设备不属于您,不能修改设备信息"); } InterphoneHost interphoneHost = new InterphoneHost(); interphoneHost.setHostId(id); @@ -66,7 +67,7 @@ InterphoneHostSubPole one = interphoneHostSubService.getOne(Wrappers.lambdaQuery(InterphoneHostSubPole.class).eq(InterphoneHostSubPole::getHostId, id)); if (one != null) { throw new RuntimeException("该主机存在绑定关系，不能删除"); throw new BusinessException("该主机存在绑定关系，不能删除"); } if (byId == null) { return false; ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneSubService.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.sandu.common.execption.BusinessException; import com.sandu.common.object.BaseConditionVO; import com.sandu.common.service.impl.BaseServiceImpl; import com.sandu.common.util.SpringContextHolder; @@ -44,7 +45,7 @@ } boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(byId.getSubMac(), PoleBindingEnums.FOR_HELP); if (!belong) { throw new RuntimeException("该设备不属于您,不能修改设备信息"); throw new BusinessException("该设备不属于您,不能修改设备信息"); } InterphoneSub interphoneSub = new InterphoneSub(); BeanUtils.copyProperties(interphoneSubParam, interphoneSub); @@ -59,7 +60,7 @@ InterphoneSub byId = getById(id); InterphoneHostSubPole one = interphoneHostSubService.getOne(Wrappers.lambdaQuery(InterphoneHostSubPole.class).eq(InterphoneHostSubPole::getSubId, id)); if (one != null) { throw new RuntimeException("该子设备存在绑定关系，不能删除"); throw new BusinessException("该子设备存在绑定关系，不能删除"); } if (byId == null) { return false; ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
@@ -247,7 +247,7 @@ } boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(String.valueOf(byId.getId()), PoleBindingEnums.IPVOLUME); if (!belong) { throw new RuntimeException("该设备不属于您,不能修改设备信息"); throw new BusinessException("该设备不属于您,不能修改设备信息"); } byId.setTerminalName(name); return updateById(byId); ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.sandu.common.execption.BusinessException; import com.sandu.common.object.BaseConditionVO; import com.sandu.common.service.impl.BaseServiceImpl; import com.sandu.common.util.SpringContextHolder; @@ -9,12 +10,10 @@ import com.sandu.ximon.admin.utils.VnnoxAPIUtil; import com.sandu.ximon.admin.vo.EquipmentInfomation; import com.sandu.ximon.dao.domain.LedPlayerEntity; import com.sandu.ximon.dao.domain.PoleBinding; import com.sandu.ximon.dao.mapper.LedPlayerEntityMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -50,7 +49,7 @@ public LedPlayerEntity getBySnAndPlayerSn(String sn) { LedPlayerEntity one = getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn)); if (one == null) { throw new RuntimeException("诺瓦设备不存在"); throw new BusinessException("诺瓦设备不存在"); } List list = new ArrayList(); list.add(one); @@ -76,9 +75,18 @@ } LedPlayerEntity one = getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn)); List<LedPlayerEntity> list = new ArrayList<>(); list.add(one); List<LedPlayerEntity> ledPlayerEntities = vnnoxAPIUtil.syncCurrentInfo(list); Integer onlineStatus = ledPlayerEntities.get(0).getOnlineStatus(); if (one != null) { equipmentInfo.setEquipmentMac(one.getSn()); equipmentInfo.setEquipmentName(one.getName()); if (onlineStatus == 0) { equipmentInfo.setEquipmentState("在线"); }else { equipmentInfo.setEquipmentName("离线"); } } return equipmentInfo; ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -402,7 +402,7 @@ boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(one.getDeviceSerial(), PoleBindingEnums.MONITOR); if (!belong) { throw new RuntimeException("该设备不属于您,不能修改设备信息"); throw new BusinessException("该设备不属于您,不能修改设备信息"); } if (one != null) { one.setNote(notes); ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java
@@ -1,6 +1,5 @@ package com.sandu.ximon.admin.service; 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; @@ -53,6 +52,10 @@ if (poleGroup == null) { throw new BusinessException("未找到该分组"); } /** * 刪除 */ poleGroupRelationService.remove(Wrappers.lambdaQuery(PoleGroupRelation.class).eq(PoleGroupRelation::getPoleGroupId, groupId)); return removeById(groupId); }
@@ -189,7 +189,7 @@ boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(byId.getLightemitControlCode(), PoleBindingEnums.XIXUN); if (!belong) { throw new RuntimeException("该设备不属于您,不能修改设备信息"); throw new BusinessException("该设备不属于您,不能修改设备信息"); } poleLightemit.setLightemitId(ledId); boolean b = this.updateById(poleLightemit); ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
@@ -233,7 +233,7 @@ } boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(byId.getSn(), PoleBindingEnums.VONNOX); if (!belong) { throw new RuntimeException("该设备不属于您,不能修改设备信息"); throw new BusinessException("该设备不属于您,不能修改设备信息"); } LedPlayerEntity led = new LedPlayerEntity(); led.setId(id);
