qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 联调

Browse Source
This commit is contained in:
邱贞招 2024-06-13 16:29:23 +08:00
parent 23f6007487
commit d31bfd5ebc
5 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsDeviceController.java
View File

@ -81,6 +81,9 @@ public class AsDeviceController extends BaseController
if(!asDeviceService.checkSNUnique(asDevice)){
return error("新增车辆'" + asDevice.getDeviceName() + "'失败，SN已存在");
}
if(!asDeviceService.checkMACUnique(asDevice)){
return error("新增车辆'" + asDevice.getDeviceName() + "'失败，MAC已存在");
}
return toAjax(asDeviceService.insertAsDevice(asDevice));
}
@ -95,6 +98,9 @@ public class AsDeviceController extends BaseController
if(!asDeviceService.checkSNUnique(asDevice)){
return error("修改车辆'" + asDevice.getDeviceName() + "'失败，SN已存在");
}
if(!asDeviceService.checkMACUnique(asDevice)){
return error("修改车辆'" + asDevice.getDeviceName() + "'失败，MAC已存在");
}
return toAjax(asDeviceService.updateAsDevice(asDevice));
}

2
electripper-system/src/main/java/com/ruoyi/system/mapper/AsDeviceMapper.java
View File

@ -109,4 +109,6 @@ public interface AsDeviceMapper extends BaseMapper<AsDevice>
AsDevice checkSNUnique(String sn);
AsDevice checkMACUnique(String mac);
}

5
electripper-system/src/main/java/com/ruoyi/system/service/IAsDeviceService.java
View File

@ -251,6 +251,11 @@ public interface IAsDeviceService extends IService<AsDevice>
*/
boolean checkSNUnique(AsDevice asDevice);
/**
* 判断是否重复
*/
boolean checkMACUnique(AsDevice asDevice);
// /**
// * 是否靠近运营区边界
// */

14
electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java
View File

@ -1412,6 +1412,20 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
return UserConstants.UNIQUE;
}
/**
* 检查SN是否唯一
*/
@Override
public boolean checkMACUnique(AsDevice asDevice) {
Long deviceId = StringUtils.isNull(asDevice.getDeviceId()) ? -1L : asDevice.getDeviceId();
AsDevice info = asDeviceMapper.checkMACUnique(asDevice.getMac());
if (StringUtils.isNotNull(info) && info.getDeviceId().longValue() != deviceId.longValue())
{
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
}
/**
* 判断是否靠近边界

4
electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml
View File

@ -131,6 +131,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select device_id, sn, device_name from et_device where sn = #{sn} limit 1
</select>
<select id="checkMACUnique" resultMap="AsDeviceResult">
select device_id, sn, device_name from et_device where mac = #{mac} limit 1
</select>
<insert id="insertAsDevice" parameterType="AsDevice" useGeneratedKeys="true" keyProperty="deviceId">
insert into et_device
<trim prefix="(" suffix=")" suffixOverrides=",">