Skip to content

B
basic-api-boot
提交 f1af7360 作者: 方治民
操作

Merge branch 'dev_tml' of https://gitlab.yiring.com/chemical-kesai/kshg-api into dev_fzm 

 Conflicts:
	app/src/main/java/com/yiring/app/domain/location/LocationTag.java
上级 1e28aae6 e54fde30
正在显示 包含 2152 行增加 和 537 行删除
app/src/main/java/com/yiring/app/design/check/rule/AllowEntranceStrategy.java deleted 100644 → 0
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.check.rule;
import com.yiring.app.constant.alarm.RelevanceParamEnum;
import com.yiring.app.design.check.IParamInitStrategy;
import com.yiring.app.param.location.rule.LocationFenceRuleAddParam;
import com.yiring.app.param.location.rule.RuleParam;
import com.yiring.app.param.location.rule.TimeAndUserParam;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import java.util.ArrayList;
import java.util.List;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
/**
* @author tml
* @version 1.0
* @date 2022/4/29 9:32
*/
@Component
public class AllowEntranceStrategy implements IParamInitStrategy<LocationFenceRuleAddParam> {
public AllowEntranceStrategy() {
Integer relevanceParam = RelevanceParamEnum.ALLOW_ENTRANCE.getCode();
LocationFenceRuleContext.register(relevanceParam, this);
}
@Override
public Result<String> paramInit(LocationFenceRuleAddParam param) {
RuleParam ruleParam = param.getRuleParam();
List<TimeAndUserParam> timeAndUser = ruleParam.getTimeAndUser();
if (CollectionUtils.isEmpty(timeAndUser)) {
return Result.no(Status.EXPECTATION_FAILED, "请至少配置一条允许进入人员的规则");
}
for (TimeAndUserParam item : timeAndUser) {
if (CollectionUtils.isEmpty(item.getUser())) {
return Result.no(Status.EXPECTATION_FAILED, "请至少配置一个允许进入的人员");
}
}
ruleParam.setDuration(-1);
ruleParam.setDistance(-1);
ruleParam.setTimeAndNumber(new ArrayList<>());
return Result.ok();
}
}
app/src/main/java/com/yiring/app/design/check/rule/MaxPeopleNumberStrategy.java deleted 100644 → 0
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.check.rule;
import com.yiring.app.constant.alarm.RelevanceParamEnum;
import com.yiring.app.design.check.IParamInitStrategy;
import com.yiring.app.param.location.rule.*;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import java.util.ArrayList;
import java.util.List;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
/**
* 最多人数校验
* @author tml
* @version 1.0
* @date 2022/4/29 9:28
*/
@Component
public class MaxPeopleNumberStrategy implements IParamInitStrategy<LocationFenceRuleAddParam> {
public MaxPeopleNumberStrategy() {
Integer relevanceParam = RelevanceParamEnum.MAX_PEOPLE_NUMBER.getCode();
LocationFenceRuleContext.register(relevanceParam, this);
}
@Override
public Result<String> paramInit(LocationFenceRuleAddParam param) {
RuleParam ruleParam = param.getRuleParam();
List<TimeAndNumberParam> timeAndNumber = ruleParam.getTimeAndNumber();
if (CollectionUtils.isEmpty(timeAndNumber)) {
return Result.no(Status.EXPECTATION_FAILED, "请至少配置一条最多人数的规则");
}
for (TimeAndNumberParam item : timeAndNumber) {
if (item.getNumber() == null || item.getNumber() < 0) {
item.setNumber(0);
}
if (item.getBeginTime() == null || item.getEndTime() == null) {
item.setBeginTime(null);
item.setEndTime(null);
}
}
//将时间和距离都设为-1
ruleParam.setDuration(-1);
ruleParam.setDistance(-1);
ArrayList<TimeAndUserParam> list = new ArrayList<>();
ruleParam.setTimeAndUser(list);
return Result.ok();
}
}
app/src/main/java/com/yiring/app/design/check/rule/NotAllowLeaveStrategy.java deleted 100644 → 0
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.check.rule;
import com.yiring.app.constant.alarm.RelevanceParamEnum;
import com.yiring.app.design.check.IParamInitStrategy;
import com.yiring.app.param.location.rule.LocationFenceRuleAddParam;
import com.yiring.app.param.location.rule.RuleParam;
import com.yiring.app.param.location.rule.TimeAndUserParam;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import java.util.ArrayList;
import java.util.List;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
/**
* @author tml
* @version 1.0
* @date 2022/4/29 9:32
*/
@Component
public class NotAllowLeaveStrategy implements IParamInitStrategy<LocationFenceRuleAddParam> {
public NotAllowLeaveStrategy() {
Integer relevanceParam = RelevanceParamEnum.NOT_ALLOW_LEAVE.getCode();
LocationFenceRuleContext.register(relevanceParam, this);
}
@Override
public Result<String> paramInit(LocationFenceRuleAddParam param) {
RuleParam ruleParam = param.getRuleParam();
List<TimeAndUserParam> timeAndUser = ruleParam.getTimeAndUser();
if (CollectionUtils.isEmpty(timeAndUser)) {
return Result.no(Status.EXPECTATION_FAILED, "请至少配置一条不允许离开人员的规则");
}
for (TimeAndUserParam item : timeAndUser) {
if (CollectionUtils.isEmpty(item.getUser())) {
return Result.no(Status.EXPECTATION_FAILED, "请至少配置一个不允许离开的人员");
}
}
ruleParam.setDuration(-1);
ruleParam.setDistance(-1);
ruleParam.setTimeAndNumber(new ArrayList<>());
return Result.ok();
}
}
app/src/main/java/com/yiring/app/design/check/rule/RetentionDurationStrategy.java deleted 100644 → 0
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.check.rule;
import com.yiring.app.constant.alarm.RelevanceParamEnum;
import com.yiring.app.design.check.IParamInitStrategy;
import com.yiring.app.param.location.rule.LocationFenceRuleAddParam;
import com.yiring.app.param.location.rule.RuleParam;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import java.util.ArrayList;
import org.springframework.stereotype.Component;
/**
* @author tml
* @version 1.0
* @date 2022/4/29 9:33
*/
@Component
public class RetentionDurationStrategy implements IParamInitStrategy<LocationFenceRuleAddParam> {
public RetentionDurationStrategy() {
Integer relevanceParam = RelevanceParamEnum.RETENTION_DURATION.getCode();
LocationFenceRuleContext.register(relevanceParam, this);
}
@Override
public Result<String> paramInit(LocationFenceRuleAddParam param) {
RuleParam ruleParam = param.getRuleParam();
if (ruleParam.getDuration() == null || ruleParam.getDuration() < 0) {
return Result.no(Status.EXPECTATION_FAILED, "滞留时长异常");
}
ruleParam.setDistance(-1);
ruleParam.setTimeAndUser(new ArrayList<>());
ruleParam.setTimeAndNumber(new ArrayList<>());
return Result.ok();
}
}
app/src/main/java/com/yiring/app/design/check/rule/StaticDurationStrategy.java deleted 100644 → 0
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.check.rule;
import com.yiring.app.constant.alarm.RelevanceParamEnum;
import com.yiring.app.design.check.IParamInitStrategy;
import com.yiring.app.param.location.rule.LocationFenceRuleAddParam;
import com.yiring.app.param.location.rule.RuleParam;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import java.util.ArrayList;
import org.springframework.stereotype.Component;
/**
* @author tml
* @version 1.0
* @date 2022/4/29 9:32
*/
@Component
public class StaticDurationStrategy implements IParamInitStrategy<LocationFenceRuleAddParam> {
public StaticDurationStrategy() {
Integer relevanceParam = RelevanceParamEnum.STATIC_DURATION.getCode();
LocationFenceRuleContext.register(relevanceParam, this);
}
@Override
public Result<String> paramInit(LocationFenceRuleAddParam param) {
RuleParam ruleParam = param.getRuleParam();
if (ruleParam.getDuration() == null || ruleParam.getDuration() < 0) {
return Result.no(Status.EXPECTATION_FAILED, "静止时长异常");
}
ruleParam.setDistance(-1);
ruleParam.setTimeAndUser(new ArrayList<>());
ruleParam.setTimeAndNumber(new ArrayList<>());
return Result.ok();
}
}
app/src/main/java/com/yiring/app/design/check/rule/TriggerAlarmDistanceStrategy.java deleted 100644 → 0
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.check.rule;
import com.yiring.app.constant.alarm.RelevanceParamEnum;
import com.yiring.app.design.check.IParamInitStrategy;
import com.yiring.app.param.location.rule.LocationFenceRuleAddParam;
import com.yiring.app.param.location.rule.RuleParam;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import java.util.ArrayList;
import org.springframework.stereotype.Component;
/**
* @author tml
* @version 1.0
* @date 2022/4/29 9:33
*/
@Component
public class TriggerAlarmDistanceStrategy implements IParamInitStrategy<LocationFenceRuleAddParam> {
public TriggerAlarmDistanceStrategy() {
Integer relevanceParam = RelevanceParamEnum.TRIGGER_ALARM_DISTANCE.getCode();
LocationFenceRuleContext.register(relevanceParam, this);
}
@Override
public Result<String> paramInit(LocationFenceRuleAddParam param) {
RuleParam ruleParam = param.getRuleParam();
if (ruleParam.getDistance() == null || ruleParam.getDistance() < 0) {
return Result.no(Status.EXPECTATION_FAILED, "触发报警距离异常");
}
ruleParam.setDuration(-1);
ruleParam.setTimeAndUser(new ArrayList<>());
ruleParam.setTimeAndNumber(new ArrayList<>());
return Result.ok();
}
}
app/src/main/java/com/yiring/app/design/check/IParamInitStrategy.java → app/src/main/java/com/yiring/app/design/strategy/IParamInitStrategy.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.check;
package com.yiring.app.design.strategy;
import com.yiring.common.core.Result;
......@@ -8,6 +8,7 @@ import com.yiring.common.core.Result;
* @version 1.0
* @date 2022/4/29 9:21
*/
@FunctionalInterface
public interface IParamInitStrategy<T> {
/**
* 校验参数
......
app/src/main/java/com/yiring/app/design/strategy/IScanAlarmStrategy.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.strategy;
import com.yiring.app.param.location.fence.LocationFenceJobParam;
import com.yiring.app.vo.location.fence.LocationFenceJobVo;
/**
* 扫描是否满足报警策略
* @author tml
* @version 1.0
* @date 2022/5/14 11:05
*/
@FunctionalInterface
public interface IScanAlarmStrategy {
/**
* 判断是否触发报警
* @param param 参数
* @return 需要报警的报警信息
*/
LocationFenceJobVo scanAlarm(LocationFenceJobParam param);
}
app/src/main/java/com/yiring/app/design/check/fence/DangerousStrategy.java → app/src/main/java/com/yiring/app/design/strategy/fence/DangerousStrategy.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.check.fence;
package com.yiring.app.design.strategy.fence;
import com.yiring.app.constant.alarm.RelevanceParamEnum;
import com.yiring.app.design.check.IParamInitStrategy;
import com.yiring.app.design.strategy.IParamInitStrategy;
import com.yiring.app.param.location.rule.LocationFenceRuleAddParam;
import com.yiring.common.core.Result;
import org.springframework.stereotype.Component;
......
app/src/main/java/com/yiring/app/design/check/fence/DefaultStrategy.java → app/src/main/java/com/yiring/app/design/strategy/fence/DefaultStrategy.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.check.fence;
package com.yiring.app.design.strategy.fence;
import com.yiring.app.design.check.IParamInitStrategy;
import com.yiring.app.design.strategy.IParamInitStrategy;
import com.yiring.app.param.location.rule.LocationFenceRuleAddParam;
import com.yiring.app.param.location.rule.RuleParam;
import com.yiring.common.core.Result;
......
app/src/main/java/com/yiring/app/design/check/fence/LocationFenceTypeContext.java → app/src/main/java/com/yiring/app/design/strategy/fence/LocationFenceTypeContext.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.check.fence;
package com.yiring.app.design.strategy.fence;
import com.yiring.app.constant.alarm.FenceTypeEnum;
import com.yiring.app.design.check.IParamInitStrategy;
import com.yiring.app.design.strategy.IParamInitStrategy;
import com.yiring.app.param.location.rule.LocationFenceRuleAddParam;
import com.yiring.common.core.Result;
import java.util.concurrent.ConcurrentHashMap;
......
app/src/main/java/com/yiring/app/design/strategy/rule/AllowEntranceStrategy.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.strategy.rule;
import com.yiring.app.constant.alarm.RelevanceParamEnum;
import com.yiring.app.design.strategy.IParamInitStrategy;
import com.yiring.app.design.strategy.IScanAlarmStrategy;
import com.yiring.app.domain.alarm.AlarmType;
import com.yiring.app.domain.location.LocationFence;
import com.yiring.app.domain.location.LocationFenceAlarm;
import com.yiring.app.domain.location.LocationTag;
import com.yiring.app.param.location.fence.LocationFenceJobParam;
import com.yiring.app.param.location.rule.LocationFenceRuleAddParam;
import com.yiring.app.param.location.rule.RelevanceUserParam;
import com.yiring.app.param.location.rule.RuleParam;
import com.yiring.app.param.location.rule.TimeAndUserParam;
import com.yiring.app.util.TimeUtil;
import com.yiring.app.vo.location.fence.LocationFenceJobVo;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
/**
* 允许进入人员相关策略
* @author tml
* @version 1.0
* @date 2022/4/29 9:32
*/
@Component
public class AllowEntranceStrategy implements IParamInitStrategy<LocationFenceRuleAddParam>, IScanAlarmStrategy {
public AllowEntranceStrategy() {
Integer relevanceParam = RelevanceParamEnum.ALLOW_ENTRANCE.getCode();
LocationFenceRuleContext.register(relevanceParam, this);
}
@Override
public Result<String> paramInit(LocationFenceRuleAddParam param) {
RuleParam ruleParam = param.getRuleParam();
List<TimeAndUserParam> timeAndUser = ruleParam.getTimeAndUser();
if (CollectionUtils.isEmpty(timeAndUser)) {
return Result.no(Status.EXPECTATION_FAILED, "请至少配置一条允许进入人员的规则");
}
for (TimeAndUserParam item : timeAndUser) {
if (CollectionUtils.isEmpty(item.getUser())) {
return Result.no(Status.EXPECTATION_FAILED, "请至少配置一个允许进入的人员");
}
}
ruleParam.setDuration(-1);
ruleParam.setDistance(-1);
ruleParam.setTimeAndNumber(new ArrayList<>());
return Result.ok();
}
@Override
public LocationFenceJobVo scanAlarm(LocationFenceJobParam param) {
RuleParam rule = param.getRule();
Set<LocationTag> tagSet = param.getTagSet();
Long mapId = param.getMapId();
List<LocationFenceAlarm> oldAlarms = param.getOldAlarms();
Long fenceId = param.getFenceId();
Long alarmTypeId = param.getAlarmTypeId();
LocationFenceJobVo jobVo = new LocationFenceJobVo();
List<TimeAndUserParam> timeAndUserParamList = rule.getTimeAndUser();
TimeAndUserParam timeAndUserParam = null;
//筛选在当前时间生效的配置
for (TimeAndUserParam item : timeAndUserParamList) {
if (TimeUtil.judgeTime(LocalDateTime.now(), item.getBeginTime(), item.getEndTime())) {
timeAndUserParam = item;
break;
}
}
//如果不在配置的时间内，则将报警记录中的状态刷新为结束，并且需要添加的报警为空
if (timeAndUserParam == null) {
jobVo.setModifyAlarm(oldAlarms);
return jobVo;
}
//筛选出围栏内允许进入人员之外的人
Set<String> uuids = timeAndUserParam
.getUser()
.stream()
.map(RelevanceUserParam::getUuid)
.collect(Collectors.toSet());
List<LocationFenceAlarm> newAlarms = tagSet
.stream()
.filter(e -> !uuids.contains(e.getUser().getUuid()))
.map(e -> {
LocationFence fence = LocationFence.builder().id(fenceId).build();
AlarmType alarmType = AlarmType.builder().id(alarmTypeId).build();
return LocationFenceAlarm
.builder()
.fence(fence)
.point(e.getPoint())
.areaId(mapId)
.user(e.getUser())
.tag(e)
.startTime(LocalDateTime.now())
.type(alarmType)
.status(LocationFenceAlarm.Status.ING)
.build();
})
.collect(Collectors.toList());
//取两个集合没有相交的部分，newAlarms不重合的部分代表需要添加的报警，oldAlarms不重合的部分代表需要结束的报警
if (!CollectionUtils.isEmpty(oldAlarms)) {
Set<Long> newSet = newAlarms.stream().map(e -> e.getTag().getId()).collect(Collectors.toSet());
Set<Long> oldSet = oldAlarms.stream().map(e -> e.getTag().getId()).collect(Collectors.toSet());
newAlarms =
newAlarms.stream().filter(e -> !oldSet.contains(e.getTag().getId())).collect(Collectors.toList());
oldAlarms =
oldAlarms.stream().filter(e -> !newSet.contains(e.getTag().getId())).collect(Collectors.toList());
}
jobVo.setAddAlarm(newAlarms);
jobVo.setModifyAlarm(oldAlarms);
return jobVo;
}
}
app/src/main/java/com/yiring/app/design/check/rule/LocationFenceRuleContext.java → app/src/main/java/com/yiring/app/design/strategy/rule/LocationFenceRuleContext.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.check.rule;
package com.yiring.app.design.strategy.rule;
import com.yiring.app.constant.alarm.RelevanceParamEnum;
import com.yiring.app.design.check.IParamInitStrategy;
import com.yiring.app.design.check.fence.LocationFenceTypeContext;
import com.yiring.app.design.strategy.IParamInitStrategy;
import com.yiring.app.design.strategy.fence.LocationFenceTypeContext;
import com.yiring.app.param.location.rule.LocationFenceRuleAddParam;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
......
app/src/main/java/com/yiring/app/design/strategy/rule/MaxPeopleNumberStrategy.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.strategy.rule;
import com.yiring.app.constant.alarm.RelevanceParamEnum;
import com.yiring.app.design.strategy.IParamInitStrategy;
import com.yiring.app.design.strategy.IScanAlarmStrategy;
import com.yiring.app.domain.alarm.AlarmType;
import com.yiring.app.domain.location.*;
import com.yiring.app.param.location.fence.LocationFenceJobParam;
import com.yiring.app.param.location.rule.LocationFenceRuleAddParam;
import com.yiring.app.param.location.rule.RuleParam;
import com.yiring.app.param.location.rule.TimeAndNumberParam;
import com.yiring.app.param.location.rule.TimeAndUserParam;
import com.yiring.app.util.TimeUtil;
import com.yiring.app.vo.location.fence.LocationFenceJobVo;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
/**
* 最多人数相关策略
* @author tml
* @version 1.0
* @date 2022/4/29 9:28
*/
@Component
public class MaxPeopleNumberStrategy implements IParamInitStrategy<LocationFenceRuleAddParam>, IScanAlarmStrategy {
@Resource
private LocationTurnoverRepository locationTurnoverRepository;
public MaxPeopleNumberStrategy() {
Integer relevanceParam = RelevanceParamEnum.MAX_PEOPLE_NUMBER.getCode();
LocationFenceRuleContext.register(relevanceParam, this);
ScanAlarmContext.register(relevanceParam, this);
}
@Override
public Result<String> paramInit(LocationFenceRuleAddParam param) {
RuleParam ruleParam = param.getRuleParam();
List<TimeAndNumberParam> timeAndNumber = ruleParam.getTimeAndNumber();
if (CollectionUtils.isEmpty(timeAndNumber)) {
return Result.no(Status.EXPECTATION_FAILED, "请至少配置一条最多人数的规则");
}
for (TimeAndNumberParam item : timeAndNumber) {
if (item.getNumber() == null || item.getNumber() < 0) {
item.setNumber(0);
}
if (item.getBeginTime() == null || item.getEndTime() == null) {
item.setBeginTime(null);
item.setEndTime(null);
}
}
//将时间和距离都设为-1
ruleParam.setDuration(-1);
ruleParam.setDistance(-1);
ArrayList<TimeAndUserParam> list = new ArrayList<>();
ruleParam.setTimeAndUser(list);
return Result.ok();
}
@Override
public LocationFenceJobVo scanAlarm(LocationFenceJobParam param) {
RuleParam rule = param.getRule();
Set<LocationTag> tagSet = param.getTagSet();
Long mapId = param.getMapId();
List<LocationFenceAlarm> oldAlarms = param.getOldAlarms();
Long fenceId = param.getFenceId();
Long alarmTypeId = param.getAlarmTypeId();
LocationFenceJobVo jobVo = new LocationFenceJobVo();
List<TimeAndNumberParam> timeAndNumberParamList = rule.getTimeAndNumber();
TimeAndNumberParam timeAndNumberParam = null;
//筛选在当前时间生效的配置
for (TimeAndNumberParam item : timeAndNumberParamList) {
if (TimeUtil.judgeTime(LocalDateTime.now(), item.getBeginTime(), item.getEndTime())) {
timeAndNumberParam = item;
break;
}
}
//如果现在不在配置的时间内，或围栏中的人少于配置的最大人数，则将报警记录中的状态刷新为结束，并且需要添加的报警为空
if (timeAndNumberParam == null || tagSet.size() <= timeAndNumberParam.getNumber()) {
jobVo.setModifyAlarm(oldAlarms);
return jobVo;
}
//多出的人数
int exceed = tagSet.size() - timeAndNumberParam.getNumber();
List<LocationFenceAlarm> newAlarms = new ArrayList<>();
//查询围栏内人员进入时的信息
String beginTime = timeAndNumberParam.getBeginTime();
String endTime = timeAndNumberParam.getEndTime();
List<LocationTurnover> turnoverList = locationTurnoverRepository.withinFence(fenceId, true);
//筛选出在配置时间段内进入的进出信息
turnoverList =
turnoverList
.stream()
.filter(e -> TimeUtil.judgeTime(e.getTime(), beginTime, endTime))
.sorted(Comparator.comparing(LocationTurnover::getTime).reversed())
.collect(Collectors.toList());
//记录触发报警的信息(例如最大人数是3，那么前三个员工进入的不会记录)
for (int i = 0; i < exceed; i++) {
LocationTurnover turnover = turnoverList.get(i);
LocationFence fence = LocationFence.builder().id(fenceId).build();
AlarmType alarmType = AlarmType.builder().id(alarmTypeId).build();
LocationFenceAlarm locationFenceAlarm = LocationFenceAlarm
.builder()
.fence(fence)
.point(turnover.getTag().getPoint())
.areaId(mapId)
.user(turnover.getTag().getUser())
.tag(turnover.getTag())
.startTime(LocalDateTime.now())
.type(alarmType)
.status(LocationFenceAlarm.Status.ING)
.build();
newAlarms.add(locationFenceAlarm);
}
//取两个集合没有相交的部分，newAlarms不重合的部分代表需要添加的报警，oldAlarms不重合的部分代表需要结束的报警
if (!CollectionUtils.isEmpty(oldAlarms)) {
Set<Long> newSet = newAlarms.stream().map(e -> e.getTag().getId()).collect(Collectors.toSet());
Set<Long> oldSet = oldAlarms.stream().map(e -> e.getTag().getId()).collect(Collectors.toSet());
newAlarms =
newAlarms.stream().filter(e -> !oldSet.contains(e.getTag().getId())).collect(Collectors.toList());
oldAlarms =
oldAlarms.stream().filter(e -> !newSet.contains(e.getTag().getId())).collect(Collectors.toList());
}
jobVo.setAddAlarm(newAlarms);
jobVo.setModifyAlarm(oldAlarms);
return jobVo;
}
}
app/src/main/java/com/yiring/app/design/check/rule/MinPeopleNumberStrategy.java → app/src/main/java/com/yiring/app/design/strategy/rule/MinPeopleNumberStrategy.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.check.rule;
package com.yiring.app.design.strategy.rule;
import com.yiring.app.constant.alarm.RelevanceParamEnum;
import com.yiring.app.design.check.IParamInitStrategy;
import com.yiring.app.design.strategy.IParamInitStrategy;
import com.yiring.app.design.strategy.IScanAlarmStrategy;
import com.yiring.app.domain.alarm.AlarmType;
import com.yiring.app.domain.location.*;
import com.yiring.app.param.location.fence.LocationFenceJobParam;
import com.yiring.app.param.location.rule.LocationFenceRuleAddParam;
import com.yiring.app.param.location.rule.RuleParam;
import com.yiring.app.param.location.rule.TimeAndNumberParam;
import com.yiring.app.param.location.rule.TimeAndUserParam;
import com.yiring.app.util.TimeUtil;
import com.yiring.app.vo.location.fence.LocationFenceJobVo;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
/**
* 最少人数相关策略
* @author tml
* @version 1.0
* @date 2022/4/29 9:31
*/
@Component
public class MinPeopleNumberStrategy implements IParamInitStrategy<LocationFenceRuleAddParam> {
public class MinPeopleNumberStrategy implements IParamInitStrategy<LocationFenceRuleAddParam>, IScanAlarmStrategy {
@Resource
private LocationTurnoverRepository locationTurnoverRepository;
public MinPeopleNumberStrategy() {
Integer relevanceParam = RelevanceParamEnum.MIN_PEOPLE_NUMBER.getCode();
......@@ -50,4 +65,73 @@ public class MinPeopleNumberStrategy implements IParamInitStrategy<LocationFence
ruleParam.setTimeAndUser(list);
return Result.ok();
}
@Override
public LocationFenceJobVo scanAlarm(LocationFenceJobParam param) {
RuleParam rule = param.getRule();
Set<LocationTag> tagSet = param.getTagSet();
Long mapId = param.getMapId();
List<LocationFenceAlarm> oldAlarms = param.getOldAlarms();
Long fenceId = param.getFenceId();
Long alarmTypeId = param.getAlarmTypeId();
LocationFenceJobVo jobVo = new LocationFenceJobVo();
List<TimeAndNumberParam> timeAndNumberParamList = rule.getTimeAndNumber();
TimeAndNumberParam timeAndNumberParam = null;
//筛选在当前时间生效的配置
for (TimeAndNumberParam item : timeAndNumberParamList) {
if (TimeUtil.judgeTime(LocalDateTime.now(), item.getBeginTime(), item.getEndTime())) {
timeAndNumberParam = item;
break;
}
}
//如果现在不在配置的时间内，或围栏中的人大于配置的最小人数，则将报警记录中的状态刷新为结束，并且需要添加的报警为空
if (timeAndNumberParam == null || param.getTagSet().size() >= timeAndNumberParam.getNumber()) {
jobVo.setModifyAlarm(oldAlarms);
return jobVo;
}
//少的人数
int missing = timeAndNumberParam.getNumber() - tagSet.size();
List<LocationFenceAlarm> newAlarms = new ArrayList<>();
//查询出这个围栏的信息
String beginTime = timeAndNumberParam.getBeginTime();
String endTime = timeAndNumberParam.getEndTime();
List<LocationTurnover> turnoverList = locationTurnoverRepository.withinFence(fenceId, false);
//筛选出在配置时间段内出这个围栏的进出信息
turnoverList =
turnoverList
.stream()
.filter(e -> TimeUtil.judgeTime(e.getTime(), beginTime, endTime))
.sorted(Comparator.comparing(LocationTurnover::getTime).reversed())
.collect(Collectors.toList());
//记录触发报警的信息(例如最小人数是3，这段时间一开始有6个人在围栏，然后出去的4个，那么只有第四个人出去才会记录)
for (int i = 0; i < missing; i++) {
LocationTurnover turnover = turnoverList.get(i);
LocationFence fence = LocationFence.builder().id(fenceId).build();
AlarmType alarmType = AlarmType.builder().id(alarmTypeId).build();
LocationFenceAlarm locationFenceAlarm = LocationFenceAlarm
.builder()
.fence(fence)
.point(turnover.getTag().getPoint())
.areaId(mapId)
.user(turnover.getTag().getUser())
.tag(turnover.getTag())
.startTime(LocalDateTime.now())
.type(alarmType)
.status(LocationFenceAlarm.Status.ING)
.build();
newAlarms.add(locationFenceAlarm);
}
//取两个集合没有相交的部分，newAlarms不重合的部分代表需要添加的报警，oldAlarms不重合的部分代表需要结束的报警
if (!CollectionUtils.isEmpty(oldAlarms)) {
Set<Long> newSet = newAlarms.stream().map(e -> e.getTag().getId()).collect(Collectors.toSet());
Set<Long> oldSet = oldAlarms.stream().map(e -> e.getTag().getId()).collect(Collectors.toSet());
newAlarms =
newAlarms.stream().filter(e -> !oldSet.contains(e.getTag().getId())).collect(Collectors.toList());
oldAlarms =
oldAlarms.stream().filter(e -> !newSet.contains(e.getTag().getId())).collect(Collectors.toList());
}
jobVo.setAddAlarm(newAlarms);
jobVo.setModifyAlarm(oldAlarms);
return jobVo;
}
}
app/src/main/java/com/yiring/app/design/strategy/rule/NotAllowLeaveStrategy.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.strategy.rule;
import com.yiring.app.constant.alarm.RelevanceParamEnum;
import com.yiring.app.design.strategy.IParamInitStrategy;
import com.yiring.app.design.strategy.IScanAlarmStrategy;
import com.yiring.app.domain.alarm.AlarmType;
import com.yiring.app.domain.location.*;
import com.yiring.app.param.location.fence.LocationFenceJobParam;
import com.yiring.app.param.location.rule.LocationFenceRuleAddParam;
import com.yiring.app.param.location.rule.RelevanceUserParam;
import com.yiring.app.param.location.rule.RuleParam;
import com.yiring.app.param.location.rule.TimeAndUserParam;
import com.yiring.app.util.TimeUtil;
import com.yiring.app.vo.location.fence.LocationFenceJobVo;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
/**
* 不允许离开人员相关策略
* @author tml
* @version 1.0
* @date 2022/4/29 9:32
*/
@Component
public class NotAllowLeaveStrategy implements IParamInitStrategy<LocationFenceRuleAddParam>, IScanAlarmStrategy {
@Resource
private LocationTurnoverRepository locationTurnoverRepository;
public NotAllowLeaveStrategy() {
Integer relevanceParam = RelevanceParamEnum.NOT_ALLOW_LEAVE.getCode();
LocationFenceRuleContext.register(relevanceParam, this);
}
@Override
public Result<String> paramInit(LocationFenceRuleAddParam param) {
RuleParam ruleParam = param.getRuleParam();
List<TimeAndUserParam> timeAndUser = ruleParam.getTimeAndUser();
if (CollectionUtils.isEmpty(timeAndUser)) {
return Result.no(Status.EXPECTATION_FAILED, "请至少配置一条不允许离开人员的规则");
}
for (TimeAndUserParam item : timeAndUser) {
if (CollectionUtils.isEmpty(item.getUser())) {
return Result.no(Status.EXPECTATION_FAILED, "请至少配置一个不允许离开的人员");
}
}
ruleParam.setDuration(-1);
ruleParam.setDistance(-1);
ruleParam.setTimeAndNumber(new ArrayList<>());
return Result.ok();
}
@Override
public LocationFenceJobVo scanAlarm(LocationFenceJobParam param) {
RuleParam rule = param.getRule();
Set<LocationTag> tagSet = param.getTagSet();
Long mapId = param.getMapId();
List<LocationFenceAlarm> oldAlarms = param.getOldAlarms();
Long fenceId = param.getFenceId();
Long alarmTypeId = param.getAlarmTypeId();
LocationFenceJobVo jobVo = new LocationFenceJobVo();
List<TimeAndUserParam> timeAndUserParamList = rule.getTimeAndUser();
TimeAndUserParam timeAndUserParam = null;
//筛选在当前时间生效的配置
for (TimeAndUserParam item : timeAndUserParamList) {
if (TimeUtil.judgeTime(LocalDateTime.now(), item.getBeginTime(), item.getEndTime())) {
timeAndUserParam = item;
break;
}
}
//如果不在配置的时间内，则将报警记录中的状态刷新为结束，并且需要添加的报警为空
if (timeAndUserParam == null) {
jobVo.setModifyAlarm(oldAlarms);
return jobVo;
}
String beginTime = timeAndUserParam.getBeginTime();
String endTime = timeAndUserParam.getEndTime();
//筛选出在配置时间段内出这个围栏的进出信息
List<LocationTurnover> turnoverList = locationTurnoverRepository.withinFence(fenceId, false);
//筛选出在配置时间段内出这个围栏的进出信息
turnoverList =
turnoverList
.stream()
.filter(e -> TimeUtil.judgeTime(e.getTime(), beginTime, endTime))
.sorted(Comparator.comparing(LocationTurnover::getTime).reversed())
.collect(Collectors.toList());
//筛选出离开围栏的人员是不允许离开的人员
Set<String> uuids = timeAndUserParam
.getUser()
.stream()
.map(RelevanceUserParam::getUuid)
.collect(Collectors.toSet());
List<LocationFenceAlarm> newAlarms = turnoverList
.stream()
.filter(e -> uuids.contains(e.getTag().getUser().getUuid()))
.map(e -> {
LocationFence fence = LocationFence.builder().id(fenceId).build();
AlarmType alarmType = AlarmType.builder().id(alarmTypeId).build();
return LocationFenceAlarm
.builder()
.fence(fence)
.point(e.getTag().getPoint())
.areaId(mapId)
.user(e.getTag().getUser())
.tag(e.getTag())
.startTime(LocalDateTime.now())
.type(alarmType)
.status(LocationFenceAlarm.Status.ING)
.build();
})
.collect(Collectors.toList());
//取两个集合没有相交的部分，newAlarms不重合的部分代表需要添加的报警，oldAlarms不重合的部分代表需要结束的报警
if (!CollectionUtils.isEmpty(oldAlarms)) {
Set<Long> newSet = newAlarms.stream().map(e -> e.getTag().getId()).collect(Collectors.toSet());
Set<Long> oldSet = oldAlarms.stream().map(e -> e.getTag().getId()).collect(Collectors.toSet());
newAlarms =
newAlarms.stream().filter(e -> !oldSet.contains(e.getTag().getId())).collect(Collectors.toList());
oldAlarms =
oldAlarms.stream().filter(e -> !newSet.contains(e.getTag().getId())).collect(Collectors.toList());
}
jobVo.setAddAlarm(newAlarms);
jobVo.setModifyAlarm(oldAlarms);
return jobVo;
}
}
app/src/main/java/com/yiring/app/design/strategy/rule/RetentionDurationStrategy.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.strategy.rule;
import com.yiring.app.constant.alarm.RelevanceParamEnum;
import com.yiring.app.design.strategy.IParamInitStrategy;
import com.yiring.app.design.strategy.IScanAlarmStrategy;
import com.yiring.app.domain.alarm.AlarmType;
import com.yiring.app.domain.location.*;
import com.yiring.app.param.location.fence.LocationFenceJobParam;
import com.yiring.app.param.location.rule.LocationFenceRuleAddParam;
import com.yiring.app.param.location.rule.RuleParam;
import com.yiring.app.vo.location.fence.LocationFenceJobVo;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
/**
* 滞留时长相关策略
* @author tml
* @version 1.0
* @date 2022/4/29 9:33
*/
@Component
public class RetentionDurationStrategy implements IParamInitStrategy<LocationFenceRuleAddParam>, IScanAlarmStrategy {
@Resource
private LocationTurnoverRepository locationTurnoverRepository;
public RetentionDurationStrategy() {
Integer relevanceParam = RelevanceParamEnum.RETENTION_DURATION.getCode();
LocationFenceRuleContext.register(relevanceParam, this);
}
@Override
public Result<String> paramInit(LocationFenceRuleAddParam param) {
RuleParam ruleParam = param.getRuleParam();
if (ruleParam.getDuration() == null || ruleParam.getDuration() < 0) {
return Result.no(Status.EXPECTATION_FAILED, "滞留时长异常");
}
ruleParam.setDistance(-1);
ruleParam.setTimeAndUser(new ArrayList<>());
ruleParam.setTimeAndNumber(new ArrayList<>());
return Result.ok();
}
@Override
public LocationFenceJobVo scanAlarm(LocationFenceJobParam param) {
RuleParam rule = param.getRule();
Set<LocationTag> tagSet = param.getTagSet();
Long mapId = param.getMapId();
List<LocationFenceAlarm> oldAlarms = param.getOldAlarms();
Long fenceId = param.getFenceId();
Long alarmTypeId = param.getAlarmTypeId();
LocationFenceJobVo jobVo = new LocationFenceJobVo();
//查询出最新进入该围栏的标签，计算从进入到现在滞留了多长时间，筛选出超过配置的滞留时长的人员
List<LocationTurnover> turnoverList = locationTurnoverRepository.withinFence(fenceId, true);
LocalDateTime time = LocalDateTime.now().minusMinutes(rule.getDuration());
List<LocationFenceAlarm> newAlarms = turnoverList
.stream()
.filter(e -> e.getTime().isBefore(time))
.map(e -> {
LocationFence fence = LocationFence.builder().id(fenceId).build();
AlarmType alarmType = AlarmType.builder().id(alarmTypeId).build();
return LocationFenceAlarm
.builder()
.fence(fence)
.point(e.getTag().getPoint())
.areaId(mapId)
.user(e.getTag().getUser())
.tag(e.getTag())
.startTime(LocalDateTime.now())
.type(alarmType)
.status(LocationFenceAlarm.Status.ING)
.build();
})
.collect(Collectors.toList());
//取两个集合没有相交的部分，newAlarms不重合的部分代表需要添加的报警，oldAlarms不重合的部分代表需要结束的报警
if (!CollectionUtils.isEmpty(oldAlarms)) {
Set<Long> newSet = newAlarms.stream().map(e -> e.getTag().getId()).collect(Collectors.toSet());
Set<Long> oldSet = oldAlarms.stream().map(e -> e.getTag().getId()).collect(Collectors.toSet());
newAlarms =
newAlarms.stream().filter(e -> !oldSet.contains(e.getTag().getId())).collect(Collectors.toList());
oldAlarms =
oldAlarms.stream().filter(e -> !newSet.contains(e.getTag().getId())).collect(Collectors.toList());
}
jobVo.setAddAlarm(newAlarms);
jobVo.setModifyAlarm(oldAlarms);
return jobVo;
}
}
app/src/main/java/com/yiring/app/design/strategy/rule/ScanAlarmContext.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.strategy.rule;
import com.yiring.app.constant.alarm.RelevanceParamEnum;
import com.yiring.app.design.strategy.IScanAlarmStrategy;
import com.yiring.app.param.location.fence.LocationFenceJobParam;
import com.yiring.app.vo.location.fence.LocationFenceJobVo;
import java.util.concurrent.ConcurrentHashMap;
import lombok.extern.slf4j.Slf4j;
/**
* @author tml
* @version 1.0
* @date 2022/5/14 17:51
*/
@Slf4j
public class ScanAlarmContext {
private static final ConcurrentHashMap<Integer, IScanAlarmStrategy> MAP = new ConcurrentHashMap<>(10);
public static void register(Integer relevanceParam, IScanAlarmStrategy strategy) {
MAP.put(relevanceParam, strategy);
}
public static LocationFenceJobVo scanAlarm(Integer relevanceParam, LocationFenceJobParam param) {
if (
relevanceParam == null || relevanceParam > RelevanceParamEnum.MAX || relevanceParam < RelevanceParamEnum.MIN
) {
log.warn("ScanAlarmContext.scanAlarm报警类型的关联参数异常, relevanceParam:[{}]", relevanceParam);
throw new RuntimeException("报警类型的关联参数异常");
}
IScanAlarmStrategy strategy = MAP.get(relevanceParam);
return strategy.scanAlarm(param);
}
}
app/src/main/java/com/yiring/app/design/strategy/rule/StaticDurationStrategy.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.strategy.rule;
import com.yiring.app.constant.alarm.RelevanceParamEnum;
import com.yiring.app.design.strategy.IParamInitStrategy;
import com.yiring.app.design.strategy.IScanAlarmStrategy;
import com.yiring.app.domain.alarm.AlarmType;
import com.yiring.app.domain.location.LocationFence;
import com.yiring.app.domain.location.LocationFenceAlarm;
import com.yiring.app.domain.location.LocationTag;
import com.yiring.app.param.location.fence.LocationFenceJobParam;
import com.yiring.app.param.location.rule.LocationFenceRuleAddParam;
import com.yiring.app.param.location.rule.RuleParam;
import com.yiring.app.vo.location.fence.LocationFenceJobVo;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
/**
* 静止时长相关策略
* @author tml
* @version 1.0
* @date 2022/4/29 9:32
*/
@Component
public class StaticDurationStrategy implements IParamInitStrategy<LocationFenceRuleAddParam>, IScanAlarmStrategy {
public StaticDurationStrategy() {
Integer relevanceParam = RelevanceParamEnum.STATIC_DURATION.getCode();
LocationFenceRuleContext.register(relevanceParam, this);
}
@Override
public Result<String> paramInit(LocationFenceRuleAddParam param) {
RuleParam ruleParam = param.getRuleParam();
if (ruleParam.getDuration() == null || ruleParam.getDuration() < 0) {
return Result.no(Status.EXPECTATION_FAILED, "静止时长异常");
}
ruleParam.setDistance(-1);
ruleParam.setTimeAndUser(new ArrayList<>());
ruleParam.setTimeAndNumber(new ArrayList<>());
return Result.ok();
}
@Override
public LocationFenceJobVo scanAlarm(LocationFenceJobParam param) {
RuleParam rule = param.getRule();
Set<LocationTag> tagSet = param.getTagSet();
Long mapId = param.getMapId();
List<LocationFenceAlarm> oldAlarms = param.getOldAlarms();
Long fenceId = param.getFenceId();
Long alarmTypeId = param.getAlarmTypeId();
LocationFenceJobVo jobVo = new LocationFenceJobVo();
//筛选出围栏中静止的，并且静止时长超过配置规则时长的标签
LocalDateTime time = LocalDateTime.now().minusMinutes(rule.getDuration());
List<LocationFenceAlarm> newAlarms = tagSet
.stream()
.filter(LocationTag::getSilent)
.filter(e -> e.getTime().isBefore(time))
.map(e -> {
LocationFence fence = LocationFence.builder().id(fenceId).build();
AlarmType alarmType = AlarmType.builder().id(alarmTypeId).build();
return LocationFenceAlarm
.builder()
.fence(fence)
.point(e.getPoint())
.areaId(mapId)
.user(e.getUser())
.tag(e)
.startTime(LocalDateTime.now())
.type(alarmType)
.status(LocationFenceAlarm.Status.ING)
.build();
})
.collect(Collectors.toList());
//取两个集合没有相交的部分，newAlarms不重合的部分代表需要添加的报警，oldAlarms不重合的部分代表需要结束的报警
if (!CollectionUtils.isEmpty(oldAlarms)) {
Set<Long> newSet = newAlarms.stream().map(e -> e.getTag().getId()).collect(Collectors.toSet());
Set<Long> oldSet = oldAlarms.stream().map(e -> e.getTag().getId()).collect(Collectors.toSet());
newAlarms =
newAlarms.stream().filter(e -> !oldSet.contains(e.getTag().getId())).collect(Collectors.toList());
oldAlarms =
oldAlarms.stream().filter(e -> !newSet.contains(e.getTag().getId())).collect(Collectors.toList());
}
jobVo.setAddAlarm(newAlarms);
jobVo.setModifyAlarm(oldAlarms);
return jobVo;
}
}
app/src/main/java/com/yiring/app/design/strategy/rule/TriggerAlarmDistanceStrategy.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.design.strategy.rule;
import com.yiring.app.constant.alarm.RelevanceParamEnum;
import com.yiring.app.design.strategy.IParamInitStrategy;
import com.yiring.app.design.strategy.IScanAlarmStrategy;
import com.yiring.app.domain.alarm.AlarmType;
import com.yiring.app.domain.location.LocationFence;
import com.yiring.app.domain.location.LocationFenceAlarm;
import com.yiring.app.domain.location.LocationTag;
import com.yiring.app.domain.location.LocationTagRepository;
import com.yiring.app.param.location.fence.LocationFenceJobParam;
import com.yiring.app.param.location.rule.LocationFenceRuleAddParam;
import com.yiring.app.param.location.rule.RuleParam;
import com.yiring.app.vo.location.fence.LocationFenceJobVo;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.locationtech.jts.geom.Geometry;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
/**
* 触发报警距离相关策略
* @author tml
* @version 1.0
* @date 2022/4/29 9:33
*/
@Component
public class TriggerAlarmDistanceStrategy implements IParamInitStrategy<LocationFenceRuleAddParam>, IScanAlarmStrategy {
@Resource
private LocationTagRepository locationTagRepository;
public TriggerAlarmDistanceStrategy() {
Integer relevanceParam = RelevanceParamEnum.TRIGGER_ALARM_DISTANCE.getCode();
LocationFenceRuleContext.register(relevanceParam, this);
}
@Override
public Result<String> paramInit(LocationFenceRuleAddParam param) {
RuleParam ruleParam = param.getRuleParam();
if (ruleParam.getDistance() == null || ruleParam.getDistance() < 0) {
return Result.no(Status.EXPECTATION_FAILED, "触发报警距离异常");
}
ruleParam.setDuration(-1);
ruleParam.setTimeAndUser(new ArrayList<>());
ruleParam.setTimeAndNumber(new ArrayList<>());
return Result.ok();
}
@Override
public LocationFenceJobVo scanAlarm(LocationFenceJobParam param) {
RuleParam rule = param.getRule();
Set<LocationTag> tagSet = param.getTagSet();
Long mapId = param.getMapId();
List<LocationFenceAlarm> oldAlarms = param.getOldAlarms();
Long fenceId = param.getFenceId();
Long alarmTypeId = param.getAlarmTypeId();
Geometry geometry = param.getGeometry();
LocationFenceJobVo jobVo = new LocationFenceJobVo();
//查询出距离围栏规则之类距离的所有标签，封装成报警信息
List<LocationTag> locationTags = locationTagRepository.findByDistance(geometry, rule.getDistance());
List<LocationFenceAlarm> newAlarms = locationTags
.stream()
.map(e -> {
LocationFence fence = LocationFence.builder().id(fenceId).build();
AlarmType alarmType = AlarmType.builder().id(alarmTypeId).build();
return LocationFenceAlarm
.builder()
.fence(fence)
.point(e.getPoint())
.areaId(mapId)
.user(e.getUser())
.tag(e)
.startTime(LocalDateTime.now())
.type(alarmType)
.status(LocationFenceAlarm.Status.ING)
.build();
})
.collect(Collectors.toList());
//取两个集合没有相交的部分，newAlarms不重合的部分代表需要添加的报警，oldAlarms不重合的部分代表需要结束的报警
if (!CollectionUtils.isEmpty(oldAlarms)) {
Set<Long> newSet = newAlarms.stream().map(e -> e.getTag().getId()).collect(Collectors.toSet());
Set<Long> oldSet = oldAlarms.stream().map(e -> e.getTag().getId()).collect(Collectors.toSet());
newAlarms =
newAlarms.stream().filter(e -> !oldSet.contains(e.getTag().getId())).collect(Collectors.toList());
oldAlarms =
oldAlarms.stream().filter(e -> !newSet.contains(e.getTag().getId())).collect(Collectors.toList());
}
jobVo.setAddAlarm(newAlarms);
jobVo.setModifyAlarm(oldAlarms);
return jobVo;
}
}
app/src/main/java/com/yiring/app/domain/location/LocationFenceAlarm.java
......@@ -88,5 +88,9 @@ public class LocationFenceAlarm extends BasicEntity implements Serializable {
public String text() {
return this.text;
}
public static Status get(boolean flag) {
return flag ? ING : OVER;
}
}
}
app/src/main/java/com/yiring/app/domain/location/LocationFenceAlarmRepository.java
......@@ -2,8 +2,13 @@
package com.yiring.app.domain.location;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
/**
......@@ -14,4 +19,22 @@ import org.springframework.stereotype.Repository;
@Repository
public interface LocationFenceAlarmRepository
extends JpaRepository<LocationFenceAlarm, Serializable>, JpaSpecificationExecutor<LocationFenceAlarm> {}
extends JpaRepository<LocationFenceAlarm, Serializable>, JpaSpecificationExecutor<LocationFenceAlarm> {
/**
* 批量关闭报警状态
* @param ids id集
* @param now 当前时间
* @return 修改量
*/
@Query("UPDATE LocationFenceAlarm SET status = 'OVER', updateTime = :now, endTime = :now WHERE id IN(:ids)")
@Modifying
int batchOver(@Param("ids") List<Long> ids, @Param("now") LocalDateTime now);
/**
* 根据状态查询
* @param status 状态
* @return 报警信息
*/
@Query("SELECT l FROM LocationFenceAlarm l WHERE l.status = ?1")
List<LocationFenceAlarm> findAllByStatus(LocationFenceAlarm.Status status);
}
app/src/main/java/com/yiring/app/domain/location/LocationFenceRepository.java
......@@ -40,6 +40,14 @@ public interface LocationFenceRepository
List<LocationFence> findLikeName(String name);
/**
* 根据启用条件查询电子围栏
* @param enable 是否启用
* @return 单子围栏信息
*/
@Query("SELECT f FROM LocationFence f WHERE f.enable = ?1 AND deleted = false")
List<LocationFence> findAllByEnable(boolean enable);
/**
* 查询空间信息在围栏内的围栏信息
* @param areaId 地图区域 id
* @param geometry 空间信息
......
app/src/main/java/com/yiring/app/domain/location/LocationTag.java
......@@ -8,6 +8,7 @@ import com.yiring.common.domain.BasicEntity;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Objects;
import javax.persistence.*;
import lombok.*;
import lombok.experimental.FieldDefaults;
......@@ -113,8 +114,8 @@ public class LocationTag extends BasicEntity implements Serializable {
@Comment("是否在厂外")
Boolean out;
@Comment("运动状态变更时间")
LocalDateTime silentStatusUpdateTime;
@Comment("静止/运动变更时间")
LocalDateTime time;
@SuppressWarnings({ "unused" })
public enum Type {
......@@ -131,4 +132,31 @@ public class LocationTag extends BasicEntity implements Serializable {
return this.text;
}
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
LocationTag that = (LocationTag) o;
return (
Objects.equals(linkId, that.linkId) &&
Objects.equals(imei, that.imei) &&
Objects.equals(code, that.code) &&
type == that.type &&
Objects.equals(silent, that.silent) &&
Objects.equals(user, that.user) &&
Objects.equals(used, that.used) &&
Objects.equals(volt, that.volt) &&
Objects.equals(voltUnit, that.voltUnit) &&
Objects.equals(category, that.category) &&
Objects.equals(point, that.point) &&
Objects.equals(out, that.out) &&
Objects.equals(time, that.time)
);
}
@Override
public int hashCode() {
return Objects.hash(linkId, imei, code, type, silent, user, used, volt, voltUnit, category, point, out, time);
}
}
app/src/main/java/com/yiring/app/domain/location/LocationTagRepository.java
......@@ -7,6 +7,7 @@ import org.locationtech.jts.geom.Geometry;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
/**
......@@ -43,4 +44,13 @@ public interface LocationTagRepository
*/
@Query(value = "SELECT * FROM BS_LOCATION_TAG WHERE user_id IN (?1)", nativeQuery = true)
List<LocationTag> findByUserIds(List<Long> userIds);
/**
* 查询距离指定区域多少米的标签
* @param geometry 指定区域
* @param distance 距离(米)
* @return 定位标签
*/
@Query(value = "SELECT * FROM BS_LOCATION_TAG WHERE st_distance(point, :geometry) < :distance", nativeQuery = true)
List<LocationTag> findByDistance(@Param("geometry") Geometry geometry, @Param("distance") Integer distance);
}
app/src/main/java/com/yiring/app/domain/location/LocationTurnoverRepository.java
......@@ -2,8 +2,10 @@
package com.yiring.app.domain.location;
import java.io.Serializable;
import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
/**
......@@ -14,4 +16,15 @@ import org.springframework.stereotype.Repository;
@Repository
public interface LocationTurnoverRepository
extends JpaRepository<LocationTurnover, Serializable>, JpaSpecificationExecutor<LocationTurnover> {}
extends JpaRepository<LocationTurnover, Serializable>, JpaSpecificationExecutor<LocationTurnover> {
/**
* 查询进入围栏状态为最新的所有
* @param fenceId 围栏id
* @param enter 是否是进入
* @return 所有信息
*/
@Query(
"SELECT l FROM LocationTurnover l WHERE l.sourceId = ?1 AND l.type = 'FENCE' AND l.enter = ?2 AND l.isLatest = true"
)
List<LocationTurnover> withinFence(Long fenceId, Boolean enter);
}
app/src/main/java/com/yiring/app/domain/rehearsal/EvacuationZoneRepository.java
......@@ -49,7 +49,7 @@ public interface EvacuationZoneRepository
* @param name 名称
* @return 撤离区列表
*/
@Query("SELECT e FROM EvacuationZone e WHERE e.deleted = false AND e.name like %?1%")
@Query("SELECT e FROM EvacuationZone e WHERE e.deleted = false AND e.enable = true AND e.name like %?1%")
List<EvacuationZone> findLikeName(String name);
/**
......
app/src/main/java/com/yiring/app/domain/rehearsal/RehearsalPlan.java
......@@ -63,9 +63,6 @@ public class RehearsalPlan extends BasicEntity implements Serializable {
@Comment("演练时间")
private LocalDateTime rehearsalTime;
@Comment("推送信息")
private String pushMsg;
@Comment("演练计划的状态(1:未启动, 2:进行中, 3:已结束)")
private Integer status;
......
app/src/main/java/com/yiring/app/domain/video/VideoRepository.java
......@@ -2,6 +2,7 @@
package com.yiring.app.domain.video;
import java.io.Serializable;
import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Repository;
......@@ -18,8 +19,8 @@ public interface VideoRepository extends JpaRepository<Video, Serializable>, Jpa
* 根据监控点位名称模糊查询
* @author tzl
* @date 2022/4/27 13:39
* @param VideoName 监控点位名称
* @param str 监控点位名称
* @return com.yiring.app.domain.video.Video
*/
Video findByVideoNameLike(String VideoName);
List<Video> findByVideoNameLike(String str);
}
app/src/main/java/com/yiring/app/excel/location/fence/FenceAlarmExcel.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.excel.location.fence;
import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
import com.github.liaochong.myexcel.core.annotation.ExcelModel;
import com.yiring.app.constant.alarm.FenceTypeEnum;
import com.yiring.app.domain.location.LocationFenceAlarm;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author tml
* @version 1.0
* @date 2022/5/17 17:23
*/
@ExcelModel
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class FenceAlarmExcel implements Serializable {
@Serial
private static final long serialVersionUID = 4526095986813965381L;
@ExcelColumn(title = "地图名称")
private String mapName;
@ExcelColumn(title = "围栏名称")
private String fenceName;
@ExcelColumn(title = "围栏类别")
private String fenceTypeName;
@ExcelColumn(title = "报警人员")
private String realName;
@ExcelColumn(title = "标签号")
private String tagId;
@ExcelColumn(title = "报警开始时间")
private LocalDateTime startTime;
@ExcelColumn(title = "报警结束时间")
private LocalDateTime endTime;
@ExcelColumn(title = "报警类型")
private String alarmTypeName;
@ExcelColumn(title = "接收人")
private String recipient;
@ExcelColumn(title = "报警状态")
private String statusName;
public static FenceAlarmExcel transform(LocationFenceAlarm fenceAlarm) {
return FenceAlarmExcel
.builder()
.fenceName(fenceAlarm.getFence().getName())
.fenceTypeName(FenceTypeEnum.getByCode(fenceAlarm.getFence().getFenceType()))
.realName(fenceAlarm.getUser().getRealName())
.tagId(fenceAlarm.getTag().getCode())
.startTime(fenceAlarm.getStartTime())
.endTime(fenceAlarm.getEndTime())
.alarmTypeName(fenceAlarm.getType().getName())
//todo
//.recipient()
.statusName(fenceAlarm.getStatus().text())
.build();
}
}
app/src/main/java/com/yiring/app/excel/perstatistics/PersonnelStatisticsExportExcel.java
......@@ -27,8 +27,8 @@ public class PersonnelStatisticsExportExcel implements Serializable {
String region;
@ExcelColumn(title = "入场人数", width = 5)
String admissionNumber;
Long admissionNumber;
@ExcelColumn(title = "出场人数", width = 5)
String attendance;
Long attendance;
}
app/src/main/java/com/yiring/app/excel/rehearsal/RehearsalPlanExcel.java
......@@ -29,31 +29,28 @@ public class RehearsalPlanExcel implements Serializable {
@Serial
private static final long serialVersionUID = -2976618459214077036L;
@ExcelColumn(title = "演练主题")
@ExcelColumn(title = "演练主题", width = 10)
private String topical;
@ExcelColumn(title = "事故点")
@ExcelColumn(title = "事故点", width = 10)
private String accidentSpotName;
@ExcelColumn(title = "周边范围(m)")
@ExcelColumn(title = "周边范围(m)", width = 10)
private Integer scope;
@ExcelColumn(title = "撤离点")
@ExcelColumn(title = "撤离点", width = 10)
private String evacuationZoneName;
@ExcelColumn(title = "风险程度")
@ExcelColumn(title = "风险程度", width = 10)
private String riskLevelName;
@ExcelColumn(title = "事故信息")
@ExcelColumn(title = "事故信息", width = 10)
private String accidentMsg;
@ExcelColumn(title = "演练时间")
@ExcelColumn(title = "演练时间", width = 20)
private LocalDateTime rehearsalTime;
@ExcelColumn(title = "推送信息")
private String pushMsg;
@ExcelColumn(title = "状态")
@ExcelColumn(title = "状态", width = 10)
private String statusName;
public static RehearsalPlanExcel transform(RehearsalPlan rehearsalPlan) {
......@@ -66,7 +63,6 @@ public class RehearsalPlanExcel implements Serializable {
.riskLevelName(RiskLevelEnum.getByCode(rehearsalPlan.getRiskLevel()))
.accidentMsg(rehearsalPlan.getAccidentMsg())
.rehearsalTime(rehearsalPlan.getRehearsalTime())
.pushMsg(rehearsalPlan.getPushMsg())
.statusName(RehearsalPlanStatusEnum.getByCode(rehearsalPlan.getStatus()))
.build();
}
......
app/src/main/java/com/yiring/app/job/FenceAlarmJob.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.job;
import com.alibaba.fastjson.JSON;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.yiring.app.design.strategy.rule.ScanAlarmContext;
import com.yiring.app.domain.location.*;
import com.yiring.app.param.location.fence.LocationFenceJobParam;
import com.yiring.app.param.location.rule.RuleParam;
import com.yiring.app.vo.location.fence.LocationFenceJobVo;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
/**
* @author tml
* @version 1.0
* @date 2022/5/14 10:10
*/
@Slf4j
@Component
public class FenceAlarmJob {
@Resource
private LocationFenceRepository locationFenceRepository;
@Resource
private LocationFenceAlarmRepository locationFenceAlarmRepository;
@XxlJob("ScanAlarmHandler")
@Transactional(rollbackFor = Exception.class)
public void scanAlarmHandler() {
//查询出所有已启用的电子围栏信息和正在报警的报警信息
List<LocationFence> fenceList = locationFenceRepository.findAllByEnable(true);
List<LocationFenceAlarm> alarmList = locationFenceAlarmRepository.findAllByStatus(
LocationFenceAlarm.Status.ING
);
Map<Long, List<LocationFenceAlarm>> alarmMap = alarmList
.stream()
.collect(Collectors.groupingBy(e -> e.getFence().getId()));
LocationFenceJobVo jobVo = LocationFenceJobVo
.builder()
.addAlarm(new ArrayList<>())
.modifyAlarm(new ArrayList<>())
.build();
for (LocationFence fence : fenceList) {
//获取该围栏下的所有报警规则
Set<LocationFenceRule> fenceRuleSet = fence.getRules();
for (LocationFenceRule fenceRule : fenceRuleSet) {
RuleParam ruleParam = JSON.parseObject(fenceRule.getRule(), RuleParam.class);
List<LocationFenceAlarm> oldAlarms = alarmMap.get(fence.getId());
LocationFenceJobParam fenceJobParam = LocationFenceJobParam
.builder()
.rule(ruleParam)
.fenceId(fence.getId())
.alarmTypeId(fenceRule.getAlarmType().getId())
.tagSet(fence.getTags())
.mapId(fence.getMapId())
.geometry(fence.getGeometry())
.oldAlarms(oldAlarms)
.build();
LocationFenceJobVo locationFenceJobVo = ScanAlarmContext.scanAlarm(
fenceRule.getRelevanceParamType(),
fenceJobParam
);
jobVo.merge(locationFenceJobVo);
}
}
//添加报警和关闭报警
locationFenceAlarmRepository.saveAllAndFlush(jobVo.getAddAlarm());
List<Long> ids = jobVo.getModifyAlarm().stream().map(LocationFenceAlarm::getId).collect(Collectors.toList());
locationFenceAlarmRepository.batchOver(ids, LocalDateTime.now());
log.info(
"FenceAlarmJob.scanAlarmHandler: 添加的报警:[{}], 关闭的报警:[{}]",
JSON.toJSONString(jobVo.getAddAlarm()),
JSON.toJSONString(jobVo.getModifyAlarm())
);
}
}
app/src/main/java/com/yiring/app/param/location/fence/FenceAlarmConditionParam.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.param.location.fence;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author tml
* @version 1.0
* @date 2022/5/17 14:49
*/
@ApiModel("围栏报警数据管理查询")
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class FenceAlarmConditionParam implements Serializable {
@Serial
private static final long serialVersionUID = -2397459299914947087L;
@ApiModelProperty(value = "地图id", example = "1")
private Long mapId;
@ApiModelProperty(value = "围栏id", example = "1")
private Long fenceId;
@ApiModelProperty(value = "报警人员真名", example = "张三")
private String realName;
@ApiModelProperty(value = "报警状态", example = "true|false")
private Boolean status;
@ApiModelProperty(value = "报警开始时间", example = "2022-05-06 14:00:00")
private LocalDateTime beginTime;
@ApiModelProperty(value = "报警结束时间", example = "2022-05-7 14:00:00")
private LocalDateTime endTime;
}
app/src/main/java/com/yiring/app/param/location/fence/LocationFenceJobParam.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.param.location.fence;
import com.yiring.app.domain.location.LocationFenceAlarm;
import com.yiring.app.domain.location.LocationTag;
import com.yiring.app.param.location.rule.RuleParam;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
import java.util.Set;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.locationtech.jts.geom.Geometry;
/**
* 扫描围栏报警的param
* @author tml
* @version 1.0
* @date 2022/5/16 9:23
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class LocationFenceJobParam implements Serializable {
@Serial
private static final long serialVersionUID = -1078898654919721759L;
/**
* 围栏的报警规则
*/
private RuleParam rule;
/**
* 围栏id
*/
private Long fenceId;
/**
* 报警类别id
*/
private Long alarmTypeId;
/**
* 围栏中的定位标签
*/
private Set<LocationTag> tagSet;
/**
* 围栏所属的地图id
*/
private Long mapId;
/**
* 围栏的空间信息
*/
private Geometry geometry;
/**
* 属于该围栏当前正在报警的信息
*/
private List<LocationFenceAlarm> oldAlarms;
}
app/src/main/java/com/yiring/app/param/perstatistics/PersonnelStatisticsQueryParam.java
......@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.*;
import lombok.experimental.FieldDefaults;
......@@ -25,6 +26,15 @@ public class PersonnelStatisticsQueryParam implements Serializable {
@Serial
private static final long serialVersionUID = -638192778218413746L;
@ApiModelProperty(value = "区域", example = "化工区")
String region;
@ApiModelProperty(value = "区域", example = "11")
Long sourceId;
@ApiModelProperty(value = "部门名称", example = "11")
Long departmentId;
@ApiModelProperty(value = "开始时间")
LocalDateTime startTime;
@ApiModelProperty(value = "结束时间")
LocalDateTime endTime;
}
app/src/main/java/com/yiring/app/param/rehearsal/RehearsalPlanAddParam.java
......@@ -55,10 +55,6 @@ public class RehearsalPlanAddParam implements Serializable {
@NotEmpty(message = "事故信息不能为空")
private String accidentMsg;
@ApiModelProperty(value = "推送信息", example = "气体泄露，请尽快逃离", required = true)
@NotEmpty(message = "推送信息不能为空")
private String pushMsg;
public RehearsalPlan transform() {
AccidentSpot accidentSpot = AccidentSpot.builder().id(accidentSpotId).build();
EvacuationZone evacuationZone = EvacuationZone.builder().id(evacuationZoneId).build();
......@@ -70,7 +66,6 @@ public class RehearsalPlanAddParam implements Serializable {
.evacuationZone(evacuationZone)
.riskLevel(riskLevel)
.accidentMsg(accidentMsg)
.pushMsg(pushMsg)
.status(RehearsalPlanStatusEnum.UN_START.getCode())
.deleted(false)
.build();
......
app/src/main/java/com/yiring/app/param/rehearsal/RehearsalPlanModifyParam.java
......@@ -51,9 +51,6 @@ public class RehearsalPlanModifyParam implements Serializable {
@ApiModelProperty(value = "事故信息", example = "气体泄露")
private String accidentMsg;
@ApiModelProperty(value = "推送信息", example = "气体泄露，请尽快逃离")
private String pushMsg;
public RehearsalPlan transform() {
AccidentSpot accidentSpot = AccidentSpot.builder().id(accidentSpotId).build();
EvacuationZone evacuationZone = EvacuationZone.builder().id(evacuationZoneId).build();
......@@ -66,7 +63,6 @@ public class RehearsalPlanModifyParam implements Serializable {
.evacuationZone(evacuationZone)
.riskLevel(riskLevel)
.accidentMsg(accidentMsg)
.pushMsg(pushMsg)
.build();
}
}
app/src/main/java/com/yiring/app/param/rehearsal/RehearsalPlanPlaybackParam.java
......@@ -13,6 +13,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author tml
* @version 1.0
* @date 2022/5/12 11:56
......@@ -21,7 +22,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@NoArgsConstructor
@Builder
@ApiModel("演练计划查看回放param")
@ApiModel("RehearsalPlanPlaybackParam")
public class RehearsalPlanPlaybackParam implements Serializable {
@Serial
......@@ -31,6 +32,6 @@ public class RehearsalPlanPlaybackParam implements Serializable {
@NotNull(message = "演练计划id不能为空")
private Long id;
@ApiModelProperty(value = "看回放的开始时间(不传则默认演练开始的时间)")
@ApiModelProperty(value = "看回放的开始时间")
private LocalDateTime beginTime;
}
app/src/main/java/com/yiring/app/service/analysis/history/impl/HistoryRouteServiceImpl.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.service.analysis.history.impl;
import com.alibaba.fastjson.JSONArray;
import com.github.liaochong.myexcel.core.DefaultStreamExcelBuilder;
import com.yiring.app.constant.RedisKey;
import com.yiring.app.domain.location.LocationLog;
import com.yiring.app.domain.location.LocationLogRepository;
import com.yiring.app.excel.analysis.history.HistoryRouteExcel;
import com.yiring.app.param.analysis.history.HistoryRouteConditionParam;
import com.yiring.app.service.analysis.history.HistoryRouteService;
import com.yiring.app.util.MapUtil;
import com.yiring.app.vo.analysis.history.HistoryRouteVo;
import com.yiring.app.vo.map.MapVo;
import com.yiring.common.core.Redis;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import com.yiring.common.vo.PageVo;
......@@ -45,26 +43,18 @@ public class HistoryRouteServiceImpl implements HistoryRouteService {
private LocationLogRepository locationLogRepository;
@Resource
private Redis redis;
private MapUtil mapUtil;
@Override
public Result<PageVo<HistoryRouteVo>> findByCondition(HistoryRouteConditionParam param) {
Specification<LocationLog> specification = getSpecification(param);
ArrayList<MapVo.MapVoReuslt> list1 = new ArrayList<>();
Object map = redis.get(RedisKey.ZY_MAP_AREAS);
String mapString = JSONArray.toJSONString(map);
List<MapVo.MapVoReuslt> mapVo = JSONArray.parseArray(mapString, MapVo.MapVoReuslt.class);
List<LocationLog> list = locationLogRepository.findAll(specification);
List<HistoryRouteVo> voList = list
.stream()
.map(e -> {
HistoryRouteVo routeVo = HistoryRouteVo.transform(e);
for (MapVo.MapVoReuslt item : mapVo) {
if (item.getId().equals(e.getAreaId().intValue())) {
routeVo.setMapName(item.getName());
break;
}
}
routeVo.setMapName(mapUtil.getMapName(e.getAreaId().intValue()));
return routeVo;
})
.collect(Collectors.toList());
......
app/src/main/java/com/yiring/app/service/location/fence/FenceAlarmService.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.service.location.fence;
import com.yiring.app.param.location.fence.FenceAlarmConditionParam;
import com.yiring.app.vo.IdNameVo;
import com.yiring.app.vo.location.fence.FenceAlarmVo;
import com.yiring.common.core.Result;
import com.yiring.common.param.PageParam;
import com.yiring.common.vo.PageVo;
import javax.servlet.http.HttpServletResponse;
/**
* @author tml
* @version 1.0
* @date 2022/5/17 16:24
*/
public interface FenceAlarmService {
/**
* 查询围栏报警数据列表
* @param param 查询条件
* @param pageParam 分页参数
* @return 报警数据
*/
Result<PageVo<FenceAlarmVo>> findList(FenceAlarmConditionParam param, PageParam pageParam);
/**
* 查询围栏下拉框
* @return 围栏id和名称
*/
Result<PageVo<IdNameVo>> findFenceList();
/**
* 导出围栏报警数据
* @param param 查询条件
*/
void export(FenceAlarmConditionParam param, HttpServletResponse response);
}
app/src/main/java/com/yiring/app/service/location/fence/impl/FenceAlarmServiceImpl.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.service.location.fence.impl;
import com.github.liaochong.myexcel.core.DefaultStreamExcelBuilder;
import com.yiring.app.domain.location.LocationFence;
import com.yiring.app.domain.location.LocationFenceAlarm;
import com.yiring.app.domain.location.LocationFenceAlarmRepository;
import com.yiring.app.domain.location.LocationFenceRepository;
import com.yiring.app.excel.location.fence.FenceAlarmExcel;
import com.yiring.app.param.location.fence.FenceAlarmConditionParam;
import com.yiring.app.service.location.fence.FenceAlarmService;
import com.yiring.app.util.MapUtil;
import com.yiring.app.vo.IdNameVo;
import com.yiring.app.vo.location.fence.FenceAlarmVo;
import com.yiring.auth.domain.user.User;
import com.yiring.common.core.Result;
import com.yiring.common.param.PageParam;
import com.yiring.common.vo.PageVo;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
import javax.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* @author tml
* @version 1.0
* @date 2022/5/17 16:27
*/
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
public class FenceAlarmServiceImpl implements FenceAlarmService {
@Resource
private LocationFenceAlarmRepository locationFenceAlarmRepository;
@Resource
private LocationFenceRepository locationFenceRepository;
@Resource
private MapUtil mapUtil;
@Override
public Result<PageVo<FenceAlarmVo>> findList(FenceAlarmConditionParam param, PageParam pageParam) {
Pageable pageable = PageParam.toPageable(pageParam);
Specification<LocationFenceAlarm> specification = getSpecification(param);
Page<LocationFenceAlarm> page = locationFenceAlarmRepository.findAll(specification, pageable);
List<FenceAlarmVo> voList = page
.get()
.map(e -> {
FenceAlarmVo vo = FenceAlarmVo.transform(e);
vo.setMapName(mapUtil.getMapName(e.getAreaId().intValue()));
return vo;
})
.collect(Collectors.toList());
PageVo<FenceAlarmVo> pageVo = PageVo.build(voList, voList.size());
return Result.ok(pageVo);
}
@Override
public Result<PageVo<IdNameVo>> findFenceList() {
List<LocationFence> list = locationFenceRepository.findAll();
List<IdNameVo> voList = list
.stream()
.map(e -> new IdNameVo(e.getId(), e.getName()))
.collect(Collectors.toList());
PageVo<IdNameVo> pageVo = PageVo.build(voList, voList.size());
return Result.ok(pageVo);
}
@Override
public void export(FenceAlarmConditionParam param, HttpServletResponse response) {
Specification<LocationFenceAlarm> specification = getSpecification(param);
List<LocationFenceAlarm> list = locationFenceAlarmRepository.findAll(specification);
List<FenceAlarmExcel> excelList = list
.stream()
.map(e -> {
FenceAlarmExcel excel = FenceAlarmExcel.transform(e);
excel.setMapName(mapUtil.getMapName(e.getAreaId().intValue()));
return excel;
})
.collect(Collectors.toList());
try (
DefaultStreamExcelBuilder<FenceAlarmExcel> streamExcelBuilder = DefaultStreamExcelBuilder
.of(FenceAlarmExcel.class)
.threadPool(Executors.newFixedThreadPool(2))
.rowHeight(14)
.titleRowHeight(14)
.style(
"cell->vertical-align:center;text-align:center",
"title->vertical-align:center;text-align:center;font-weight:bold;font-family:等线"
)
.start()
) {
streamExcelBuilder.append(excelList);
String fileName = URLEncoder.encode("围栏报警数据列表.xlsx", StandardCharsets.UTF_8);
response.setContentType("application/octet-stream");
response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
OutputStream out = response.getOutputStream();
Workbook workbook = streamExcelBuilder.fixedTitles().build();
workbook.write(out);
workbook.close();
out.flush();
out.close();
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new RuntimeException("报警类型列表导出失败: " + e.getMessage());
}
}
private Specification<LocationFenceAlarm> getSpecification(FenceAlarmConditionParam param) {
return (root, query, criteriaBuilder) -> {
ArrayList<Predicate> list = new ArrayList<>();
if (param.getMapId() != null) {
list.add(criteriaBuilder.equal(root.get(LocationFenceAlarm.Fields.areaId), param.getMapId()));
}
if (param.getFenceId() != null) {
LocationFence fence = LocationFence.builder().id(param.getFenceId()).build();
list.add(criteriaBuilder.equal(root.get(LocationFenceAlarm.Fields.fence), fence));
}
if (param.getRealName() != null) {
Join<Object, Object> join = root.join(LocationFenceAlarm.Fields.user, JoinType.LEFT);
list.add(criteriaBuilder.equal(join.get(User.Fields.realName), param.getRealName()));
}
if (param.getStatus() != null) {
list.add(
criteriaBuilder.equal(
root.get(LocationFenceAlarm.Fields.status),
LocationFenceAlarm.Status.get(param.getStatus())
)
);
}
if (param.getBeginTime() != null) {
list.add(
criteriaBuilder.greaterThanOrEqualTo(
root.get(LocationFenceAlarm.Fields.startTime),
param.getBeginTime()
)
);
}
if (param.getEndTime() != null) {
list.add(
criteriaBuilder.lessThanOrEqualTo(root.get(LocationFenceAlarm.Fields.endTime), param.getEndTime())
);
}
Predicate[] array = list.toArray(new Predicate[0]);
return criteriaBuilder.and(array);
};
}
}
app/src/main/java/com/yiring/app/service/perstatistics/PersonnelStatisticsService.java → app/src/main/java/com/yiring/app/service/location/turnover/LocationTurnoverService.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.service.perstatistics;
package com.yiring.app.service.location.turnover;
import com.yiring.app.param.perstatistics.PersonnelStatisticsQueryParam;
import com.yiring.app.vo.perstatistics.PersonnelStatisticsDetailVo;
import com.yiring.app.vo.perstatistics.PersonnelStatisticsVo;
import com.yiring.common.core.Result;
import com.yiring.common.param.PageParam;
......@@ -10,30 +11,48 @@ import javax.servlet.http.HttpServletResponse;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/15 9:27
* 2022/5/15 11:41
*/
public interface PersonnelStatisticsService {
public interface LocationTurnoverService {
/**
* 分页查询
* 分页区域人员统计信息
* @author tzl
* @date 2022/5/15 9:41
* @date 2022/5/15 11:44
* @param personnelStatisticsQueryParam PersonnelStatisticsQueryParam
* @param pageParam PageParam
* @return com.yiring.common.core.Result<com.yiring.common.vo.PageVo<com.yiring.app.vo.perstatistics.PersonnelStatisticsVo>>
* @return com.yiring.common.core.Result<com.yiring.common.vo.PageVo<com.yiring.app.domain.location.LocationTurnover>>
*/
Result<PageVo<PersonnelStatisticsVo>> pagePerSta(
Result<PageVo<PersonnelStatisticsVo>> pageInfo(
PersonnelStatisticsQueryParam personnelStatisticsQueryParam,
PageParam pageParam
);
/**
* 下拉框
* @author tzl
* @date 2022/5/16 13:59
* @param personnelStatisticsQueryParam PersonnelStatisticsQueryParam
* @return com.yiring.common.core.Result<com.yiring.common.vo.PageVo<com.yiring.app.vo.perstatistics.PersonnelStatisticsVo>>
*/
Result<PageVo<PersonnelStatisticsVo>> indexInfo(PersonnelStatisticsQueryParam personnelStatisticsQueryParam);
/**
* 导出人员统计
*
* @author tzl
* @date 2022/5/15 9:56
* @date 2022/5/16 11:57
* @param personnelStatisticsQueryParam PersonnelStatisticsQueryParam
* @param response HttpServletResponse
* @param httpServletResponse HttpServletResponse
*/
void export(PersonnelStatisticsQueryParam personnelStatisticsQueryParam, HttpServletResponse response);
void export(PersonnelStatisticsQueryParam personnelStatisticsQueryParam, HttpServletResponse httpServletResponse);
/**
*
* @author tzl
* @date 2022/5/15 17:42
* @param personnelStatisticsQueryParam PersonnelStatisticsQueryParam
* @param pageParam PageParam
* @return com.yiring.common.core.Result<com.yiring.common.vo.PageVo<com.yiring.app.vo.perstatistics.PersonnelStatisticsVo>>
*/
Result<PageVo<PersonnelStatisticsDetailVo>> selectInfo(
PersonnelStatisticsQueryParam personnelStatisticsQueryParam,
PageParam pageParam
);
}
app/src/main/java/com/yiring/app/service/message/impl/PositionMessageServiceImpl.java
......@@ -14,6 +14,7 @@ import com.yiring.app.param.key.KeyAlarmAddParam;
import com.yiring.app.service.message.PositionMessageService;
import com.yiring.app.stomp.message.PositionMessage;
import com.yiring.app.util.GeoUtils;
import com.yiring.app.vo.equipment.EquipmentVo;
import com.yiring.auth.domain.dept.Department;
import com.yiring.auth.domain.user.User;
import com.yiring.auth.domain.user.UserRepository;
......@@ -28,6 +29,7 @@ import javax.persistence.criteria.Expression;
import javax.persistence.criteria.Predicate;
import lombok.extern.slf4j.Slf4j;
import org.locationtech.jts.geom.Point;
import org.springframework.beans.BeanUtils;
import org.springframework.data.domain.*;
import org.springframework.messaging.simp.SimpMessagingTemplate;
import org.springframework.stereotype.Service;
......@@ -468,6 +470,25 @@ public class PositionMessageServiceImpl implements PositionMessageService {
public void processDeviceStatusMessage(JSONObject data) {
// TODO
log.info("DeviceStatus Message: {}", data);
EquipmentVo equipmentVo = data.toJavaObject(EquipmentVo.class);
if (equipmentVo.getDeviceType().equals("BTI")) {
Optional<LocationTag> one = locationTagRepository.findOne(
Example.of(LocationTag.builder().code(equipmentVo.getDeviceId()).build())
);
if (one.isEmpty()) {
log.error("没找到该标签");
return;
}
//修改标签电量
LocationTag locationTag = LocationTag
.builder()
.code(equipmentVo.getDeviceId())
.volt(equipmentVo.getVolt())
.voltUnit(equipmentVo.getField_21())
.build();
BeanUtils.copyProperties(one.get(), locationTag);
locationTagRepository.saveAndFlush(locationTag);
}
}
/**
......
app/src/main/java/com/yiring/app/service/perstatistics/impl/PersonnelStatisticsServiceImpl.java deleted 100644 → 0
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.service.perstatistics.impl;
import cn.hutool.core.util.StrUtil;
import com.github.liaochong.myexcel.core.DefaultStreamExcelBuilder;
import com.yiring.app.domain.perstatistics.PersonnelStatistics;
import com.yiring.app.domain.perstatistics.PersonnelStatisticsRepository;
import com.yiring.app.excel.perstatistics.PersonnelStatisticsExportExcel;
import com.yiring.app.param.perstatistics.PersonnelStatisticsQueryParam;
import com.yiring.app.service.perstatistics.PersonnelStatisticsService;
import com.yiring.app.vo.perstatistics.PersonnelStatisticsVo;
import com.yiring.common.core.Result;
import com.yiring.common.param.PageParam;
import com.yiring.common.vo.PageVo;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.persistence.criteria.Order;
import javax.persistence.criteria.Predicate;
import javax.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/15 9:28
*/
@Slf4j
@Transactional(rollbackFor = RuntimeException.class)
@Service
public class PersonnelStatisticsServiceImpl implements PersonnelStatisticsService {
@Resource
PersonnelStatisticsRepository personnelStatisticsRepository;
@Override
public Result<PageVo<PersonnelStatisticsVo>> pagePerSta(
PersonnelStatisticsQueryParam personnelStatisticsQueryParam,
PageParam pageParam
) {
//分页
Pageable pageable = PageRequest.of(pageParam.getPageNo() - 1, pageParam.getPageSize());
Page<PersonnelStatistics> all = personnelStatisticsRepository.findAll(
condition(personnelStatisticsQueryParam),
pageable
);
List<PersonnelStatisticsVo> data = all
.get()
.map(personnelStatistics -> {
PersonnelStatisticsVo vo = new PersonnelStatisticsVo();
BeanUtils.copyProperties(personnelStatistics, vo);
return vo;
})
.collect(Collectors.toList());
PageVo<PersonnelStatisticsVo> resultVo = PageVo.build(data, all.getTotalElements());
return Result.ok(resultVo);
}
@Override
public void export(PersonnelStatisticsQueryParam personnelStatisticsQueryParam, HttpServletResponse response) {
List<PersonnelStatistics> all = personnelStatisticsRepository.findAll(condition(personnelStatisticsQueryParam));
List<PersonnelStatisticsExportExcel> visitorExportExcels = all
.stream()
.map(personnelStatistics -> {
PersonnelStatisticsExportExcel personnelStatisticsExportExcel = new PersonnelStatisticsExportExcel();
BeanUtils.copyProperties(personnelStatistics, personnelStatisticsExportExcel);
return personnelStatisticsExportExcel;
})
.toList();
try (
DefaultStreamExcelBuilder<PersonnelStatisticsExportExcel> defaultStreamExcelBuilder = DefaultStreamExcelBuilder
.of(PersonnelStatisticsExportExcel.class)
.threadPool(Executors.newFixedThreadPool(2))
.rowHeight(14)
.titleRowHeight(14)
.widths(8)
.style(
"cell->vertical-align:center;text-align:center",
"title->vertical-align:center;text-align:center;font-weight:bold;font-family:等线"
)
.start()
) {
defaultStreamExcelBuilder.append(visitorExportExcels);
String fileName = URLEncoder.encode("人员统计.xlsx", StandardCharsets.UTF_8);
response.setContentType("application/octet-stream");
response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
OutputStream out = response.getOutputStream();
Workbook workbook = defaultStreamExcelBuilder.fixedTitles().build();
workbook.write(out);
workbook.close();
out.flush();
out.close();
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new RuntimeException("导出访客信息失败: " + e.getMessage());
}
}
public Specification<PersonnelStatistics> condition(PersonnelStatisticsQueryParam personnelStatisticsQueryParam) {
return (root, query, criteriaBuilder) -> {
List<Predicate> list = new ArrayList<>();
//查询条件
if (StrUtil.isNotBlank(personnelStatisticsQueryParam.getRegion())) {
//区域查询
list.add(
criteriaBuilder.like(
root.get(PersonnelStatistics.Fields.region),
"%" + personnelStatisticsQueryParam.getRegion() + "%"
)
);
}
Order order = criteriaBuilder.desc(root.get(PersonnelStatistics.Fields.updateTime));
Predicate[] predicates = new Predicate[list.size()];
query.orderBy(order);
query.where(list.toArray(predicates));
return criteriaBuilder.and(list.toArray(predicates));
};
}
}
app/src/main/java/com/yiring/app/service/rehearsal/impl/RehearsalPlanServiceImpl.java
......@@ -237,6 +237,7 @@ public class RehearsalPlanServiceImpl implements RehearsalPlanService {
return Result.no(Status.EXPECTATION_FAILED, "演练计划已经启动过了");
}
rehearsalPlan.setStatus(RehearsalPlanStatusEnum.RUNNING.getCode());
rehearsalPlan.setRehearsalTime(LocalDateTime.now());
//事故点信息
AccidentSpot accidentSpot = rehearsalPlan.getAccidentSpot();
Integer scope = rehearsalPlan.getScope();
......
app/src/main/java/com/yiring/app/service/video/VideoService.java
......@@ -98,5 +98,5 @@ public interface VideoService {
* @param indexParam 入参
* @return com.yiring.common.core.Result<com.yiring.app.vo.video.VideoNameVo>
*/
Result<VideoNameVo> findByVideoNameLike(IndexParam indexParam);
Result<PageVo<VideoNameVo>> findByVideoNameLike(IndexParam indexParam);
}
app/src/main/java/com/yiring/app/service/video/impl/VideoServiceImpl.java
......@@ -95,8 +95,8 @@ public class VideoServiceImpl implements VideoService {
.mediaServerId("ZbnQN5csqxrPix7a")
.enable(true)
.enable_hls(true)
.type(video.getM3u8().contains("sss") ? "ffmpeg" : "default")
.timeout_ms(video.getM3u8().contains("sss") ? 60 : null)
.type(video.getM3u8().contains("/h265") ? "ffmpeg" : "default")
.timeout_ms(video.getM3u8().contains("/h265") ? 60 : null)
.build();
JSONObject jsonObject = gbClient.proxySave(streamProxyItem, gbCookie());
if (!jsonObject.get("code").equals(0)) {
......@@ -158,8 +158,8 @@ public class VideoServiceImpl implements VideoService {
.mediaServerId("ZbnQN5csqxrPix7a")
.enable(true)
.enable_hls(true)
.type(video.getM3u8().contains("sss") ? "ffmpeg" : "default")
.timeout_ms(video.getM3u8().contains("sss") ? 60 : null)
.type(video.getM3u8().contains("/h265") ? "ffmpeg" : "default")
.timeout_ms(video.getM3u8().contains("/h265") ? 60 : null)
.build();
JSONObject jsonObject = gbClient.proxySave(streamProxyItem, gbCookie());
if (!jsonObject.get("code").equals(0)) {
......@@ -363,11 +363,20 @@ public class VideoServiceImpl implements VideoService {
}
@Override
public Result<VideoNameVo> findByVideoNameLike(IndexParam indexParam) {
VideoNameVo videoNameVo = new VideoNameVo();
Video byVideoNameLike = videoRepository.findByVideoNameLike(indexParam.getStr());
BeanUtils.copyProperties(byVideoNameLike, videoNameVo);
return Result.ok(videoNameVo);
public Result<PageVo<VideoNameVo>> findByVideoNameLike(IndexParam indexParam) {
List<Video> byVideoNameLike = videoRepository.findAll(
condition(VideoQueryParam.builder().videoName(indexParam.getStr()).build())
);
List<VideoNameVo> data = byVideoNameLike
.stream()
.map(video -> {
VideoNameVo vo = new VideoNameVo();
BeanUtils.copyProperties(video, vo);
return vo;
})
.collect(Collectors.toList());
PageVo<VideoNameVo> pageVo = PageVo.build(data, data.size());
return Result.ok(pageVo);
}
boolean has(String uuid) {
......
app/src/main/java/com/yiring/app/util/MapUtil.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.util;
import com.alibaba.fastjson.JSONArray;
import com.yiring.app.constant.RedisKey;
import com.yiring.app.vo.map.MapVo;
import com.yiring.common.core.Redis;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.stereotype.Component;
/**
* @author tml
* @version 1.0
* @date 2022/5/17 16:58
*/
@Component
public class MapUtil {
@Resource
private Redis redis;
public String getMapName(Integer mapId) {
Object map = redis.get(RedisKey.ZY_MAP_AREAS);
String mapString = JSONArray.toJSONString(map);
List<MapVo.MapVoReuslt> mapVo = JSONArray.parseArray(mapString, MapVo.MapVoReuslt.class);
for (MapVo.MapVoReuslt item : mapVo) {
if (item.getId().equals(mapId)) {
return item.getName();
}
}
return "未知地图";
}
}
app/src/main/java/com/yiring/app/util/TimeUtil.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.util;
import com.yiring.common.constant.RegEx;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
/**
* @author tml
* @version 1.0
* @date 2022/5/14 14:06
*/
public class TimeUtil {
/**
* 判断一个时间是否在配置的时间内
* @param time 判断的时间
* @param beginTime 配置的开始时间
* @param endTime 配置的结束时间
* @return true:在 false:不在
*/
public static boolean judgeTime(LocalDateTime time, String beginTime, String endTime) {
if (!beginTime.matches(RegEx.TIME_RULE) || !endTime.matches(RegEx.TIME_RULE)) {
throw new IllegalArgumentException("时间格式不正确");
}
DateTimeFormatter pattern = DateTimeFormatter.ofPattern("E HH:mm:ss");
String source = time.format(pattern);
int beginWeek = transform(beginTime.charAt(2));
int endWeek = transform(endTime.charAt(2));
int nowWeek = transform(source.charAt(1));
if (nowWeek < beginWeek || nowWeek > endWeek) {
return false;
}
int beginHour = Integer.parseInt(beginTime.substring(4, 6));
int endHour = Integer.parseInt(endTime.substring(4, 6));
int nowHour = Integer.parseInt(beginTime.substring(3, 5));
if (nowHour < beginHour || nowHour > endHour) {
return false;
}
int beginMinute = Integer.parseInt(beginTime.substring(7, 9));
int endMinute = Integer.parseInt(endTime.substring(7, 9));
int nowMinute = Integer.parseInt(beginTime.substring(6, 8));
if (nowMinute < beginMinute || nowHour > endMinute) {
return false;
}
int beginSecond = Integer.parseInt(beginTime.substring(10));
int endSecond = Integer.parseInt(endTime.substring(10));
int nowSecond = Integer.parseInt(beginTime.substring(9));
if (nowSecond < beginSecond || nowSecond > endSecond) {
return false;
}
return true;
}
private static int transform(char source) {
return switch (source) {
case '一' -> 1;
case '二' -> 2;
case '三' -> 3;
case '四' -> 4;
case '五' -> 5;
case '六' -> 6;
case '日' -> 7;
default -> 1;
};
}
}
app/src/main/java/com/yiring/app/vo/analysis/history/HistoryRouteVo.java
......@@ -35,7 +35,7 @@ public class HistoryRouteVo implements Serializable {
@ApiModelProperty(value = "工号", example = "ks2022")
private String uuid;
@ApiModelProperty(value = "经纬度")
@ApiModelProperty(value = "经纬度", dataType = "java.lang.String")
private Point point;
@ApiModelProperty(value = "地图名称", example = "总图")
......
app/src/main/java/com/yiring/app/vo/equipment/EquipmentVo.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.vo.equipment;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/16 9:56
*/
@ApiModel("EquipmentVo")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class EquipmentVo implements Serializable {
@Serial
private static final long serialVersionUID = -3268799901290404934L;
@ApiModelProperty(value = "设备编号", example = "1518841086628335616")
String deviceId;
@ApiModelProperty(value = "地图编号", example = "1518841086628335616")
String areaId;
@ApiModelProperty(value = "设备类型", example = "BTI:定位器 SXT:监控摄像头 GAT:闸机 LAB:指示牌 BTR:定位基站")
String deviceType;
@ApiModelProperty(value = "电量", example = "1")
Integer volt;
@ApiModelProperty(value = "电量单位(默认mV)", example = "mV")
String field_21;
@ApiModelProperty(value = "修改时间", example = "2022")
LocalDateTime updateTime;
}
app/src/main/java/com/yiring/app/vo/location/fence/FenceAlarmVo.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.vo.location.fence;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.yiring.app.constant.alarm.FenceTypeEnum;
import com.yiring.app.domain.location.LocationFenceAlarm;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author tml
* @version 1.0
* @date 2022/5/17 15:15
*/
@ApiModel("围栏报警数据管理")
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class FenceAlarmVo implements Serializable {
@Serial
private static final long serialVersionUID = 8259241388552022873L;
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "id", example = "1")
private Long id;
@ApiModelProperty(value = "地图id", example = "1")
private Long mapId;
@ApiModelProperty(value = "地图名称", example = "总图")
private String mapName;
@ApiModelProperty(value = "围栏名称", example = "一号围栏")
private String fenceName;
@ApiModelProperty(value = "围栏类别code", example = "1")
private Integer fenceType;
@ApiModelProperty(value = "围栏类别名称", example = "普通围栏")
private String fenceTypeName;
@ApiModelProperty(value = "报警人员名称", example = "张三")
private String realName;
@ApiModelProperty(value = "标签号", example = "BTT1")
private String tagId;
@ApiModelProperty(value = "报警开始时间", example = "2022-05-04 13:00:00")
private LocalDateTime startTime;
@ApiModelProperty(value = "报警结束时间", example = "2022-05-04 13:00:00")
private LocalDateTime endTime;
@ApiModelProperty(value = "报警类型", example = "超员报警")
private String alarmTypeName;
@ApiModelProperty(value = "接收人", example = "李四")
private String recipient;
@ApiModelProperty(value = "报警状态", example = "报警中")
private String statusName;
public static FenceAlarmVo transform(LocationFenceAlarm fenceAlarm) {
return FenceAlarmVo
.builder()
.id(fenceAlarm.getId())
.mapId(fenceAlarm.getAreaId())
.fenceName(fenceAlarm.getFence().getName())
.fenceType(fenceAlarm.getFence().getFenceType())
.fenceTypeName(FenceTypeEnum.getByCode(fenceAlarm.getFence().getFenceType()))
.realName(fenceAlarm.getUser().getRealName())
.tagId(fenceAlarm.getTag().getCode())
.startTime(fenceAlarm.getStartTime())
.endTime(fenceAlarm.getEndTime())
.alarmTypeName(fenceAlarm.getType().getName())
//todo
//.recipient()
.statusName(fenceAlarm.getStatus().text())
.build();
}
}
app/src/main/java/com/yiring/app/vo/location/fence/LocationFenceJobVo.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.vo.location.fence;
import com.yiring.app.domain.location.LocationFenceAlarm;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 扫描围栏报警的vo
* @author tml
* @version 1.0
* @date 2022/5/16 9:17
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class LocationFenceJobVo implements Serializable {
@Serial
private static final long serialVersionUID = -594643836931827494L;
/**
* 需要添加的报警信息集合
*/
private List<LocationFenceAlarm> addAlarm;
/**
* 需要修改成取消报警的报警信息集合
*/
private List<LocationFenceAlarm> modifyAlarm;
/**
* 合并一个LocationFenceJobVo
* @param vo 目标LocationFenceJobVo
*/
public void merge(LocationFenceJobVo vo) {
addAlarm.addAll(vo.getAddAlarm());
modifyAlarm.addAll(vo.getModifyAlarm());
}
}
app/src/main/java/com/yiring/app/vo/location/station/LocationBaseStationVo.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.vo.location.station;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.yiring.app.util.GeoUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.*;
import lombok.experimental.FieldDefaults;
import org.locationtech.jts.geom.Point;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/17 10:41
*/
@ApiModel("LocationBaseStationVo")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class LocationBaseStationVo implements Serializable {
@Serial
private static final long serialVersionUID = 2580621691725484516L;
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键", example = "188354391834")
Long id;
@ApiModelProperty(value = "编号", example = "BTI88888888")
String deviceId;
@ApiModelProperty(value = "类型", example = "BTI88888888")
String deviceType;
@ApiModelProperty(value = "最后一次在线时间", example = "BTI88888888")
LocalDateTime time;
@ApiModelProperty(value = "坐标", example = "01010000805C8FC2F528D4734033333333335B7D400000000000000000")
Point point;
public Point getPoint() {
if (x != null && y != null && z != null) {
return GeoUtils.xyzToPoint(x, y, z);
}
return null;
}
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "所属地图id", example = "1:总图2:一层3:二层")
Long areaId;
@ApiModelProperty(value = "所属地图", example = "1:总图2:一层3:二层")
String areaName;
@ApiModelProperty(value = "电量单位", example = "")
String voltUnit;
Double x;
Double y;
Double z;
}
app/src/main/java/com/yiring/app/vo/perstatistics/PersonnelStatisticsDetailVo.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.vo.perstatistics;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.*;
import lombok.experimental.FieldDefaults;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/15 9:15
*/
@ApiModel("PersonnelStatisticsDetailVo")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class PersonnelStatisticsDetailVo implements Serializable {
@Serial
private static final long serialVersionUID = -1591876062645939080L;
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "区域id", example = "1")
Long sourceId;
@ApiModelProperty(value = "区域", example = "化工区")
String region;
@ApiModelProperty(value = "时间", example = "")
LocalDateTime time;
@ApiModelProperty(value = "是否入场")
Boolean enter;
@ApiModelProperty(value = "用户")
UserVo userVo;
@ApiModel("UserVo")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public static class UserVo implements Serializable {
@Serial
private static final long serialVersionUID = 4115779013003587949L;
@ApiModelProperty(value = "被访人姓名", example = "张三")
String realName;
String uuid;
String deptName;
}
}
app/src/main/java/com/yiring/app/vo/perstatistics/PersonnelStatisticsVo.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.vo.perstatistics;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.*;
import lombok.experimental.FieldDefaults;
......@@ -25,15 +28,22 @@ public class PersonnelStatisticsVo implements Serializable {
@Serial
private static final long serialVersionUID = -5973651085056867803L;
@ApiModelProperty(value = "主键id", example = "1")
Long id;
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "区域id", example = "1")
Long sourceId;
@ApiModelProperty(value = "区域", example = "化工区")
String region;
@ApiModelProperty(value = "入场人数", example = "10")
String admissionNumber;
Long admissionNumber;
@ApiModelProperty(value = "出场人数", example = "5")
String attendance;
Long attendance;
@ApiModelProperty(value = "开始时间")
LocalDateTime startTime;
@ApiModelProperty(value = "结束时间")
LocalDateTime endTime;
}
app/src/main/java/com/yiring/app/vo/perstatistics/TurnoverResultVo.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.vo.perstatistics;
import io.swagger.annotations.ApiModel;
import java.io.Serial;
import java.io.Serializable;
import lombok.*;
import lombok.experimental.FieldDefaults;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/15 14:07
*/
@ApiModel("TurnoverResultVo")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class TurnoverResultVo implements Serializable {
@Serial
private static final long serialVersionUID = 4478127252599634203L;
Long num;
Long sourceId;
Boolean enter;
}
app/src/main/java/com/yiring/app/vo/rehearsal/AccidentSpotVo.java
......@@ -43,7 +43,7 @@ public class AccidentSpotVo implements Serializable {
@ApiModelProperty(value = "地图名称", example = "总图")
private String mapName;
@ApiModelProperty(value = "空间信息")
@ApiModelProperty(value = "空间信息", dataType = "java.lang.String")
private Geometry geometry;
@ApiModelProperty(value = "摄像头id", example = "1")
......
app/src/main/java/com/yiring/app/vo/rehearsal/EvacuationZoneVo.java
......@@ -42,7 +42,7 @@ public class EvacuationZoneVo implements Serializable {
@ApiModelProperty(value = "地图名称", example = "总图")
private String mapName;
@ApiModelProperty(value = "空间信息")
@ApiModelProperty(value = "空间信息", dataType = "java.lang.String")
private Geometry geometry;
@ApiModelProperty(value = "摄像头id", example = "1")
......
app/src/main/java/com/yiring/app/vo/rehearsal/RehearsalPlanRealTimeVo.java
......@@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
* @version 1.0
* @date 2022/5/12 11:40
*/
@ApiModel("演练计划实时数据VO")
@ApiModel("RehearsalPlanRealTimeVo")
@Data
@AllArgsConstructor
@NoArgsConstructor
......
app/src/main/java/com/yiring/app/vo/rehearsal/RehearsalPlanVo.java
......@@ -38,6 +38,7 @@ public class RehearsalPlanVo implements Serializable {
@ApiModelProperty(value = "演练主题", example = "红色演练")
private String topical;
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "事故点id", example = "1522844636060585984")
private Long accidentSpotId;
......@@ -47,6 +48,7 @@ public class RehearsalPlanVo implements Serializable {
@ApiModelProperty(value = "周边范围(事故点周围多少米)", example = "50")
private Integer scope;
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "撤离区id", example = "1523562795864428544")
private Long evacuationZoneId;
......@@ -65,9 +67,6 @@ public class RehearsalPlanVo implements Serializable {
@ApiModelProperty(value = "演练时间", example = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime rehearsalTime;
@ApiModelProperty(value = "推送信息", example = "气体泄露，请尽快逃离")
private String pushMsg;
@ApiModelProperty(value = "演练计划的状态code", example = "1")
private Integer status;
......@@ -88,7 +87,6 @@ public class RehearsalPlanVo implements Serializable {
.riskLevelName(RiskLevelEnum.getByCode(rehearsalPlan.getRiskLevel()))
.accidentMsg(rehearsalPlan.getAccidentMsg())
.rehearsalTime(rehearsalPlan.getRehearsalTime())
.pushMsg(rehearsalPlan.getPushMsg())
.status(rehearsalPlan.getStatus())
.statusName(RehearsalPlanStatusEnum.getByCode(rehearsalPlan.getStatus()))
.build();
......
app/src/main/java/com/yiring/app/vo/rehearsal/UserLocationVo.java
......@@ -18,7 +18,7 @@ import org.locationtech.jts.geom.Point;
* @version 1.0
* @date 2022/5/12 11:48
*/
@ApiModel("员工位置信息VO")
@ApiModel("员工位置信息")
@Data
@AllArgsConstructor
@NoArgsConstructor
......@@ -35,6 +35,6 @@ public class UserLocationVo implements Serializable {
@ApiModelProperty(value = "员工姓名", example = "1")
private String realmName;
@ApiModelProperty(value = "员工坐标")
@ApiModelProperty(value = "员工坐标", dataType = "java.lang.String")
private Point point;
}
app/src/main/java/com/yiring/app/web/location/fence/FenceAlarmController.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.web.location.fence;
import com.yiring.app.param.location.fence.FenceAlarmConditionParam;
import com.yiring.app.service.location.fence.FenceAlarmService;
import com.yiring.app.vo.IdNameVo;
import com.yiring.app.vo.location.fence.FenceAlarmVo;
import com.yiring.common.core.Result;
import com.yiring.common.domain.BasicEntity;
import com.yiring.common.param.PageParam;
import com.yiring.common.vo.PageVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.Objects;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import org.springframework.data.domain.Sort;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author tml
* @version 1.0
* @date 2022/5/17 14:41
*/
@Api(tags = "围栏报警数据管理")
@Validated
@RestController
@RequestMapping("/fence/alarm")
public class FenceAlarmController {
@Resource
private FenceAlarmService fenceAlarmService;
@ApiOperation("查询围栏报警数据列表")
@GetMapping("/findList")
public Result<PageVo<FenceAlarmVo>> findList(@Valid FenceAlarmConditionParam param, @Valid PageParam pageParam) {
if (Objects.isNull(pageParam.getSortField())) {
pageParam.setSortField(BasicEntity.Fields.createTime);
pageParam.setSortOrder(Sort.Direction.DESC);
}
return fenceAlarmService.findList(param, pageParam);
}
@ApiOperation("查询围栏下拉框")
@GetMapping("/findFenceList")
public Result<PageVo<IdNameVo>> findFenceList() {
return fenceAlarmService.findFenceList();
}
@ApiOperation(value = "导出围栏报警数据", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
@GetMapping("/export")
public void export(@Valid FenceAlarmConditionParam param, HttpServletResponse response) {
fenceAlarmService.export(param, response);
}
}
app/src/main/java/com/yiring/app/web/location/rule/LocationAlarmRuleController.java
......@@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.*;
@Validated
@SuppressWarnings({ "deprecation" })
@Api(tags = "电子围栏报警规则,配置报警给谁", description = "AlarmRule")
@Api(tags = "报警规则", description = "AlarmRule")
@RestController
@RequestMapping("/alarm/rule")
public class LocationAlarmRuleController {
......
app/src/main/java/com/yiring/app/web/location/rule/LocationFenceRuleController.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.web.location.rule;
import com.yiring.app.design.check.rule.LocationFenceRuleContext;
import com.yiring.app.design.strategy.rule.LocationFenceRuleContext;
import com.yiring.app.param.location.rule.LocationFenceRuleAddParam;
import com.yiring.app.param.location.rule.LocationFenceRuleModifyParam;
import com.yiring.app.service.location.rule.impl.LocationFenceRuleServiceImpl;
......@@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
@Validated
@SuppressWarnings({ "deprecation" })
@Api(tags = "电子围栏报警规则,什么情况下会报警", description = "FenceRule")
@Api(tags = "电子围栏报警规则", description = "FenceRule")
@RestController
@RequestMapping("/location/rule")
public class LocationFenceRuleController {
......
app/src/main/java/com/yiring/app/web/location/station/LocationBaseStationController.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.web.location.station;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.yiring.app.feign.zy.location.beacon.LocationBeaconClient;
import com.yiring.app.util.zy.ZyUtil;
import com.yiring.app.vo.location.station.LocationBaseStationVo;
import com.yiring.common.core.Result;
import com.yiring.common.vo.PageVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.HashMap;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/17 10:36
*/
@Validated
@SuppressWarnings({ "deprecation" })
@Api(tags = "基站", description = "")
@RestController
@RequestMapping("/station/")
public class LocationBaseStationController {
@Resource
LocationBeaconClient locationBeaconClient;
@ApiOperation(value = "查询基站信息")
@PostMapping("/page")
public Result<PageVo<LocationBaseStationVo>> page() {
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("deviceType", "BTR");
hashMap.put("pageSize", 1000);
hashMap.put("pageNum", 1);
hashMap.put("orgId", 100);
hashMap.put("deviceId", "");
JSONObject page = locationBeaconClient.page(JSONUtil.toJsonStr(hashMap), ZyUtil.manageLogin());
JSONObject data = JSONUtil.parseObj(page.get("data"));
JSONArray records = JSONUtil.parseArray(data.get("records"));
List<LocationBaseStationVo> locationBaseStationVos = JSONUtil.toList(
JSONUtil.toJsonStr(records),
LocationBaseStationVo.class
);
return Result.ok(PageVo.build(locationBaseStationVos, locationBaseStationVos.size()));
}
}
app/src/main/java/com/yiring/app/web/perstatistics/PersonnelStatisticsController.java → app/src/main/java/com/yiring/app/web/location/turnover/LocationTurnoverController.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.web.perstatistics;
package com.yiring.app.web.location.turnover;
import com.yiring.app.param.perstatistics.PersonnelStatisticsQueryParam;
import com.yiring.app.service.perstatistics.PersonnelStatisticsService;
import com.yiring.app.service.location.turnover.LocationTurnoverService;
import com.yiring.app.vo.perstatistics.PersonnelStatisticsDetailVo;
import com.yiring.app.vo.perstatistics.PersonnelStatisticsVo;
import com.yiring.common.core.Result;
import com.yiring.common.param.PageParam;
......@@ -29,21 +30,29 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j
@Validated
@SuppressWarnings({ "deprecation" })
@Api(tags = "人员统计", description = "PersonnelStatistics")
@Api(tags = "人员统计", description = "LocationTurnover")
@RestController
@RequestMapping("/personnelStatistics/")
public class PersonnelStatisticsController {
@RequestMapping("/locationTurnover/")
public class LocationTurnoverController {
@Resource
PersonnelStatisticsService personnelStatisticsService;
LocationTurnoverService locationTurnoverService;
@ApiOperation(value = "分页查询人员统计")
@GetMapping("pagePerSta")
public Result<PageVo<PersonnelStatisticsVo>> pagePerSta(
@GetMapping("pageInfo")
public Result<PageVo<PersonnelStatisticsVo>> pageInfo(
@Valid PersonnelStatisticsQueryParam personnelStatisticsQueryParam,
@Valid PageParam pageParam
) {
return personnelStatisticsService.pagePerSta(personnelStatisticsQueryParam, pageParam);
return locationTurnoverService.pageInfo(personnelStatisticsQueryParam, pageParam);
}
@ApiOperation(value = "下拉框")
@GetMapping("indexInfo")
public Result<PageVo<PersonnelStatisticsVo>> indexInfo(
@Valid PersonnelStatisticsQueryParam personnelStatisticsQueryParam
) {
return locationTurnoverService.indexInfo(personnelStatisticsQueryParam);
}
@ApiOperation(value = "导出", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
......@@ -52,6 +61,15 @@ public class PersonnelStatisticsController {
HttpServletResponse response,
@Valid PersonnelStatisticsQueryParam personnelStatisticsQueryParam
) {
personnelStatisticsService.export(personnelStatisticsQueryParam, response);
locationTurnoverService.export(personnelStatisticsQueryParam, response);
}
@ApiOperation(value = "查询人员统计详情")
@GetMapping("selectInfo")
public Result<PageVo<PersonnelStatisticsDetailVo>> selectInfo(
@Valid PersonnelStatisticsQueryParam personnelStatisticsQueryParam,
@Valid PageParam pageParam
) {
return locationTurnoverService.selectInfo(personnelStatisticsQueryParam, pageParam);
}
}
app/src/main/java/com/yiring/app/web/rehearsal/AccidentSpotController.java
......@@ -84,7 +84,7 @@ public class AccidentSpotController {
}
@ApiOperation("事故点名下拉框")
@ApiImplicitParam(value = "事故点名(全模糊)", name = "name", example = "事故", required = true)
@ApiImplicitParam(value = "事故点名(全模糊)", name = "name", example = "事故")
@GetMapping("/findAccidentList")
public Result<PageVo<IdNameVo>> findAccidentList(String name) {
if (name == null) {
......
app/src/main/java/com/yiring/app/web/rehearsal/RehearsalPlanController.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.web.rehearsal;
import com.yiring.app.constant.rehearsal.RiskLevelEnum;
import com.yiring.app.domain.alarm.AlarmType;
import com.yiring.app.domain.location.LocationTag;
import com.yiring.app.domain.location.LocationTagRepository;
import com.yiring.app.domain.rehearsal.AccidentSpot;
import com.yiring.app.domain.rehearsal.AccidentSpotRepository;
import com.yiring.app.param.rehearsal.RehearsalPlanAddParam;
import com.yiring.app.param.rehearsal.RehearsalPlanConditionParam;
import com.yiring.app.param.rehearsal.RehearsalPlanModifyParam;
import com.yiring.app.param.rehearsal.RehearsalPlanPlaybackParam;
import com.yiring.app.service.rehearsal.RehearsalPlanService;
import com.yiring.app.vo.CodeNameVo;
import com.yiring.app.vo.rehearsal.RehearsalPlanRealTimeVo;
import com.yiring.app.vo.rehearsal.RehearsalPlanVo;
import com.yiring.common.core.Result;
......@@ -19,14 +17,11 @@ import com.yiring.common.param.PageParam;
import com.yiring.common.vo.PageVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import org.locationtech.jts.geom.Geometry;
import org.springframework.data.domain.Sort;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
......@@ -47,12 +42,6 @@ public class RehearsalPlanController {
@Resource
private RehearsalPlanService rehearsalPlanService;
@Resource
LocationTagRepository locationTagRepository;
@Resource
AccidentSpotRepository accidentSpotRepository;
@ApiOperation("添加一条演练计划")
@PostMapping("/addOne")
public Result<String> addOne(@Valid RehearsalPlanAddParam param) {
......@@ -90,6 +79,14 @@ public class RehearsalPlanController {
return rehearsalPlanService.findList(conditionParam, pageParam);
}
@ApiOperation(value = "查询风险等级")
@GetMapping("/findRiskLevel")
public Result<PageVo<CodeNameVo>> findRiskLevel() {
List<CodeNameVo> list = RiskLevelEnum.getAll();
PageVo<CodeNameVo> pageVo = PageVo.build(list, list.size());
return Result.ok(pageVo);
}
@ApiOperation(value = "导出演练计划", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
@GetMapping("/export")
public void export(@Valid RehearsalPlanConditionParam conditionParam, HttpServletResponse response) {
......@@ -108,30 +105,15 @@ public class RehearsalPlanController {
return rehearsalPlanService.stop(idParam);
}
@ApiOperation("查看演练(实时)")
@ApiOperation("实时查看演练")
@GetMapping("/findRealTime")
public Result<RehearsalPlanRealTimeVo> findRealTime(@Valid IdParam idParam) {
return rehearsalPlanService.findRealTime(idParam);
}
@ApiOperation("查看回放(每次查询一分钟的回放信息)")
@ApiOperation("查看回放")
@GetMapping("/findPlayback")
public Result<PageVo<RehearsalPlanRealTimeVo>> findPlayback(@Valid RehearsalPlanPlaybackParam param) {
return rehearsalPlanService.findPlayback(param);
}
@PostMapping("/test")
public Geometry test(@RequestBody Geometry geometry) {
double degree = 100 / (2 * Math.PI * 6371004) * 360;
return geometry.buffer(degree);
}
@GetMapping("/get")
public Result<ArrayList<LocationTag>> get() {
Optional<AccidentSpot> optional = accidentSpotRepository.findById(1524292027951353856L);
Geometry geometry = optional.get().getGeometry();
List<LocationTag> inArea = locationTagRepository.findInArea(geometry);
System.out.println(inArea);
return Result.ok(new ArrayList<>(inArea));
}
}
app/src/main/java/com/yiring/app/web/video/VideoController.java
......@@ -89,7 +89,7 @@ public class VideoController {
@ApiOperation(value = "根据监控点位名称模糊查询")
@GetMapping("findByVideoNameLike")
public Result<VideoNameVo> findByVideoNameLike(@Valid IndexParam indexParam) {
public Result<PageVo<VideoNameVo>> findByVideoNameLike(@Valid IndexParam indexParam) {
return videoService.findByVideoNameLike(indexParam);
}
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论