Imdroid/security-monitor
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

1、支持批量增加设备

Browse Source
This commit is contained in:
weidong 2024-12-15 15:26:18 +08:00
parent 95d24e4619
commit 5fce40b221
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sec-beidou/src/main/java/com/imdroid/beidou/common/HttpResult.java
View File

@ -32,6 +32,9 @@ public class HttpResult implements Serializable {
public static String failed() {
return result(HTTP_RSP_FAILED, "failed");
}
public static String failed(String msg) {
return result(HTTP_RSP_FAILED, msg);
}
public static HttpResult success(Object data) {
return new HttpResult(HTTP_RSP_OK, "ok", data);

35
sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java
View File

@ -161,10 +161,16 @@ public class GnssDeviceController extends BasicController{
tenantQueryWrapper.eq("name", device.getTenantname());
Tenant tenant = tenantMapper.selectOne(tenantQueryWrapper);
if(tenant==null) return HttpResult.result(2, "invalid tenant");
device.setTenantid(tenant.getId());
device.setUpdatetime(LocalDateTime.now());
device.setUpdateuser((String) session.getAttribute("login_user"));
if(device.getDeviceid().contains("-")){
//批量增加
return addBatch(session, device);
}
// 检测该对象是否已存在
QueryWrapper<GnssDevice> wrapper = new QueryWrapper<>();
wrapper.eq("deviceid",device.getDeviceid());
@ -211,6 +217,35 @@ public class GnssDeviceController extends BasicController{
}
}
String addBatch(HttpSession session, GnssDevice devices){
String ids = devices.getDeviceid();
int pos = ids.indexOf("-");
if(pos == -1){
return HttpResult.failed("批量增加错误：设备编号格式错误");
}
try {
int beginId = Integer.parseInt(ids.substring(0, pos));
int endId = Integer.parseInt(ids.substring(pos + 1));
devices.setCreatetime(LocalDateTime.now());
devices.setCreateuser((String) session.getAttribute("login_user"));
devices.setSyn(false);
for(int id=beginId; id<=endId; id++){
QueryWrapper<GnssDevice> wrapper = new QueryWrapper<>();
wrapper.eq("deviceid",id);
GnssDevice old_device = gnssDeviceMapper.selectOne(wrapper);
if(old_device != null) continue;
devices.setId(null);
devices.setDeviceid(String.valueOf(id));
gnssDeviceMapper.insert(devices);
}
}
catch (Exception e){
return HttpResult.failed("批量增加错误："+e.getMessage());
}
updateBasicGroupAssociatedNum(devices,null);
return HttpResult.ok();
}
@PostMapping("/gnss/device/init_loc")
@ResponseBody
public JSONObject initLoc(@RequestParam String deviceid){

2
sec-beidou/src/main/resources/templates/page/table/gnss_add_dev.html
View File

@ -21,7 +21,7 @@
<div class="layui-inline">
<label class="layui-form-label required">设备编号</label>
<div class="layui-input-block">
<input type="number" name="deviceid" id="deviceid" lay-verify="required" lay-reqtext="不能为空" placeholder="请输入设备编号" value="" class="layui-input">
<input type="text" name="deviceid" id="deviceid" lay-verify="required" lay-reqtext="不能为空" placeholder="请输入设备编号" value="" class="layui-input">
</div>
</div>
<div class="layui-inline">