diff --git a/src/main/java/com/genersoft/iot/vmp/conf/security/JwtAuthenticationFilter.java b/src/main/java/com/genersoft/iot/vmp/conf/security/JwtAuthenticationFilter.java index 4ed301954..c7a459044 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/security/JwtAuthenticationFilter.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/security/JwtAuthenticationFilter.java @@ -152,7 +152,6 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter { } Map parameterMap = request.getParameterMap(); - parameterMap.remove("sign"); // 参数排序 Set paramKeys = new TreeSet<>(parameterMap.keySet()); @@ -160,6 +159,9 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter { // 参数拼接 StringBuilder beforeSign = new StringBuilder(); for (String paramKey : paramKeys) { + if (paramKey.equals("sign")) { + continue; + } beforeSign.append(paramKey).append(parameterMap.get(paramKey)[0]); } // 如果是post请求的json消息,拼接body字符串 @@ -182,15 +184,15 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter { return false; } // 验证请求时间戳 - Long timestamp = Long.getLong(timestampStr); + long timestamp = Long.parseLong(timestampStr); Instant timeInstant = Instant.ofEpochMilli(timestamp + SyTokenManager.INSTANCE.expires * 60 * 1000); - if (timeInstant.isAfter(Instant.now())) { + if (timeInstant.isBefore(Instant.now())) { log.info("[SY-接口验签] 时间戳已经过期"); return false; } // accessToken校验 if (accessToken.equals(SyTokenManager.INSTANCE.adminToken)) { - log.info("[SY-接口验签] 时间戳已经过期"); + log.info("[SY-接口验签] adminToken已经默认放行"); return true; }else { // 对token进行解密 diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbSipDate.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbSipDate.java index 0631c5d06..e02954f37 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbSipDate.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbSipDate.java @@ -3,6 +3,7 @@ package com.genersoft.iot.vmp.gb28181.bean; import gov.nist.core.InternalErrorHandler; import gov.nist.javax.sip.header.SIPDate; +import java.io.Serial; import java.util.*; /** @@ -10,11 +11,9 @@ import java.util.*; */ public class GbSipDate extends SIPDate { - /** - * - */ + @Serial private static final long serialVersionUID = 1L; - + private Calendar javaCal; public GbSipDate(long timeMillis) { diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEvent.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEvent.java index 9f91bed92..11ed3a595 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEvent.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEvent.java @@ -3,6 +3,8 @@ package com.genersoft.iot.vmp.gb28181.event.alarm; import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm; import org.springframework.context.ApplicationEvent; +import java.io.Serial; + /** * @description: 报警事件 * @author: lawrencehj @@ -10,9 +12,8 @@ import org.springframework.context.ApplicationEvent; */ public class AlarmEvent extends ApplicationEvent { - /** - * - */ + + @Serial private static final long serialVersionUID = 1L; public AlarmEvent(Object source) { @@ -24,7 +25,7 @@ public class AlarmEvent extends ApplicationEvent { public DeviceAlarm getAlarmInfo() { return deviceAlarm; } - + public void setAlarmInfo(DeviceAlarm deviceAlarm) { this.deviceAlarm = deviceAlarm; } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordInfoEndEvent.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordInfoEndEvent.java index 4788eb622..ef2283fa0 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordInfoEndEvent.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordInfoEndEvent.java @@ -5,6 +5,8 @@ import lombok.Getter; import lombok.Setter; import org.springframework.context.ApplicationEvent; +import java.io.Serial; + /** * @description: 录像查询结束时间 * @author: pan @@ -13,9 +15,8 @@ import org.springframework.context.ApplicationEvent; @Setter @Getter public class RecordInfoEndEvent extends ApplicationEvent { - /** - * - */ + + @Serial private static final long serialVersionUID = 1L; public RecordInfoEndEvent(Object source) { diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordInfoEvent.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordInfoEvent.java index d78a22b28..e6a9da9ff 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordInfoEvent.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordInfoEvent.java @@ -5,6 +5,8 @@ import lombok.Getter; import lombok.Setter; import org.springframework.context.ApplicationEvent; +import java.io.Serial; + /** * @description: 录像查询结束时间 * @author: pan @@ -14,9 +16,8 @@ import org.springframework.context.ApplicationEvent; @Setter @Getter public class RecordInfoEvent extends ApplicationEvent { - /** - * - */ + + @Serial private static final long serialVersionUID = 1L; public RecordInfoEvent(Object source) { diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java index 8435350eb..e6696bc19 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java @@ -67,7 +67,10 @@ public class GbChannelServiceImpl implements IGbChannelService { } commonGBChannel.setCreateTime(DateUtil.getNow()); commonGBChannel.setUpdateTime(DateUtil.getNow()); - return commonGBChannelMapper.insert(commonGBChannel); + int result = commonGBChannelMapper.insert(commonGBChannel); + // 发送通道新增通知 + + return result; } @Override diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/event/ConnectChangeEvent.java b/src/main/java/com/genersoft/iot/vmp/jt1078/event/ConnectChangeEvent.java index cb7ffaa63..c298c2c1c 100755 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/event/ConnectChangeEvent.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/event/ConnectChangeEvent.java @@ -5,6 +5,7 @@ import lombok.Getter; import lombok.Setter; import org.springframework.context.ApplicationEvent; +import java.io.Serial; import java.time.Clock; /** @@ -15,6 +16,7 @@ import java.time.Clock; @Getter public class ConnectChangeEvent extends ApplicationEvent { + @Serial private static final long serialVersionUID = 1L; public ConnectChangeEvent(Object source) { diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/event/DeviceUpdateEvent.java b/src/main/java/com/genersoft/iot/vmp/jt1078/event/DeviceUpdateEvent.java index 76bedfc30..552236f13 100755 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/event/DeviceUpdateEvent.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/event/DeviceUpdateEvent.java @@ -5,11 +5,14 @@ import lombok.Getter; import lombok.Setter; import org.springframework.context.ApplicationEvent; +import java.io.Serial; + /** * 设备更新事件 */ public class DeviceUpdateEvent extends ApplicationEvent { + @Serial private static final long serialVersionUID = 1L; public DeviceUpdateEvent(Object source) { diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/event/JTPositionEvent.java b/src/main/java/com/genersoft/iot/vmp/jt1078/event/JTPositionEvent.java index 5e30975aa..4155ba9ab 100755 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/event/JTPositionEvent.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/event/JTPositionEvent.java @@ -6,11 +6,14 @@ import lombok.Getter; import lombok.Setter; import org.springframework.context.ApplicationEvent; +import java.io.Serial; + /** * 设备更新事件 */ public class JTPositionEvent extends ApplicationEvent { + @Serial private static final long serialVersionUID = 1L; public JTPositionEvent(Object source) { diff --git a/src/main/java/com/genersoft/iot/vmp/media/event/mediaServer/MediaServerEventAbstract.java b/src/main/java/com/genersoft/iot/vmp/media/event/mediaServer/MediaServerEventAbstract.java index 8fa9953d3..8f80345e1 100755 --- a/src/main/java/com/genersoft/iot/vmp/media/event/mediaServer/MediaServerEventAbstract.java +++ b/src/main/java/com/genersoft/iot/vmp/media/event/mediaServer/MediaServerEventAbstract.java @@ -5,10 +5,12 @@ import lombok.Getter; import lombok.Setter; import org.springframework.context.ApplicationEvent; +import java.io.Serial; + public abstract class MediaServerEventAbstract extends ApplicationEvent { - + @Serial private static final long serialVersionUID = 1L; @Getter diff --git a/web/src/views/map/index.vue b/web/src/views/map/index.vue index 9397d9d7b..bdcf0cf13 100755 --- a/web/src/views/map/index.vue +++ b/web/src/views/map/index.vue @@ -264,6 +264,7 @@ export default { this.closeInfoBox() this.$store.dispatch('commonChanel/getAllForMap', {}).then(data => { cameraListForSource = data + console.log(data.length) let minLng = data[0].gbLongitude let maxLng = data[0].gbLongitude let minLat = data[0].gbLatitude @@ -294,7 +295,7 @@ export default { } } cameraList.push(cameraData) - if (item.mapLevel) { + if (item.mapLevel) { if (cameraListForLevelMap.has(item.mapLevel)) { let list = cameraListForLevelMap.get(item.mapLevel) list.push(cameraData) @@ -350,6 +351,7 @@ export default { if (this.channelLayer) { this.channelLayer = this.$refs.mapComponent.updatePointLayer(this.channelLayer, cameraList, true) }else { + console.log(cameraList.length) this.channelLayer = this.$refs.mapComponent.addPointLayer(cameraList, clientEvent, null) } break