venue/smart_venue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api-设备唯一Id 修改为 设备号 + 场馆号 + 进场OR出场

Browse Source
This commit is contained in:
limqhz
2020-07-23 16:39:58 +08:00
parent ade7baaa6b
commit 16e2f04c38
17 changed files with 125 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
service/src/main/java/com/sv/mapper/DeviceMapper.java
View File

@@ -67,15 +67,15 @@ public interface DeviceMapper {
/**
* 更新设备状态为 0 - 未连接
*/
void offline(@Param("venueId") Integer venueId,@Param("deviceName") String deviceName);
void offline(@Param("venueId") Integer venueId,@Param("deviceName") String deviceName,@Param("deviceType")DeviceType deviceType);
/**
* 更新设备状态为 2 - 连接成功
*/
void online(@Param("venueId") Integer venueId,@Param("deviceName") String deviceName);
void online(@Param("venueId") Integer venueId, @Param("deviceName") String deviceName, @Param("deviceType")DeviceType deviceType);
Integer checkDevice(@Param("deviceName") String deviceName,@Param("venueId") Integer venueId);
Integer checkDevice(@Param("deviceName") String deviceName,@Param("venueId") Integer venueId, @Param("deviceType") DeviceType deviceType);
/**
* 根据记录找设备
@@ -84,5 +84,5 @@ public interface DeviceMapper {
* @param deviceType
* @return
*/
Device findByDevice(String deviceName, Integer venueId, DeviceType deviceType);
Device findByDevice(@Param("deviceName") String deviceName,@Param("venueId") Integer venueId,@Param("deviceType") DeviceType deviceType);
}

4
service/src/main/java/com/sv/service/api/QRCodeService.java
View File

@@ -26,8 +26,8 @@ public class QRCodeService {
@Resource
private DeviceMapper deviceMapper;
public Venue initEnter(Integer venueId,String deviceName) {
Integer integer = deviceMapper.checkDevice(deviceName, venueId);
public Venue initEnter(Integer venueId,String deviceName,DeviceType deviceType) {
Integer integer = deviceMapper.checkDevice(deviceName, venueId,deviceType);
if (integer != 1){
throw new ServiceException(com.sv.exception.api.ExceptionCodeTemplate.DEVICE_ERROR);
}

11
service/src/main/java/com/sv/service/oms/DeviceService.java
View File

@@ -135,24 +135,25 @@ public class DeviceService extends BaseServiceImpl {
* 设备连接断开
*/
@Transactional
public void offline(String deviceName, Integer venueId){
deviceMapper.offline(venueId,deviceName);
public void offline(String deviceName, Integer venueId,DeviceType deviceType){
deviceMapper.offline(venueId,deviceName,deviceType);
}
/**
* 新的设备注册的逻辑
*/
@Transactional
public void online(String deviceName,Integer venueId,Integer venueType,String deviceIp){
public void online(String deviceName,Integer venueId,DeviceType deviceType,Integer venueType,String deviceIp){
Device device = new Device();
device.setVenueId(venueId);
device.setVenueType(venueType);
device.setName(deviceName);
device.setStatus(DeviceStatusEnum.ONLINE.value);
device.setStream(deviceIp);
if(deviceMapper.checkDevice(deviceName,venueId) > 0){
device.setDeviceType(deviceType);
if(deviceMapper.checkDevice(deviceName,venueId,deviceType) > 0){
logger.info(deviceName + venueId + "设备已存在");
deviceMapper.online(venueId, deviceName);
deviceMapper.online(venueId, deviceName,deviceType);
}else {
logger.info("落地客户端信息clientId = " + deviceIp + "&deviceName = " + deviceName + "&venueId = " + venueId);
deviceMapper.insert(device);