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 2025-01-17 14:59:49 +08:00
parent 3a29e6118a
commit 0bf150765f
7 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sec-api/src/main/java/com/imdroid/secapi/dto/GnssDevice.java
View File

@ -65,5 +65,5 @@ public class GnssDevice {
// 日志记录控制
private Short loggingmode;
private String remark;
}

2
sec-api/src/main/java/com/imdroid/secapi/dto/GnssStatusJoin.java
View File

@ -92,4 +92,6 @@ public class GnssStatusJoin {
Double longitude;
@ExcelProperty("海拔")
Double altitude;
@ExcelProperty("备注")
String remark;
}

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

@ -135,6 +135,11 @@ public class GnssDeviceController extends BasicController{
if (StringUtils.hasText(appver)) {
queryWrapper.like("appver", appver);
}
//备注
String remark = search.getString("remark");
if (StringUtils.hasText(remark)) {
queryWrapper.like("remark", remark);
}
//使用状态
Integer opmode = search.getInteger("opmode");
if (opmode != null && opmode != QUERY_ALL) {

2
sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java
View File

@ -99,7 +99,7 @@ public class GnssStatusController extends BasicController implements CommonExcel
public MPJQueryWrapper<GnssStatus> prepareQueryWrapper() {
return new MPJQueryWrapper<GnssStatus>()
.selectAll(GnssStatus.class)
.select("d.devicetype as devicetype")
.select("d.devicetype as devicetype,d.remark as remark")
.leftJoin("gnssdevices d on t.deviceid = d.deviceid")
.orderByDesc("t.updatetime");
}

14
sec-beidou/src/main/resources/templates/page/gnss_dev_cfg.html
View File

@ -82,6 +82,12 @@
</select>
</div>
</div>
<div class="layui-inline" th:if="${role=='SUPER_ADMIN'}">
<label class="layui-form-label">备注</label>
<div class="layui-input-inline">
<input type="text" name="remark" id="remark" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
<button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索</button>
</div>
@ -113,6 +119,7 @@
table = layui.table;
var cfg_cols = [
{field: 'deviceid', title: '设备号', width: 100, sort: true},
{field: 'remark', title: '备注', width: 100},
{field: 'project_id', title: '项目号', width: 120, sort: true},
{field: 'sector', title: '桩号', width: 120, sort: true},
{field: 'name', title: '监测点号', width: 80},
@ -131,10 +138,13 @@
{title: '操作', toolbar: '#currentTableBar', fixed: "right", width: 120}
];
if([[${role}]] == "USER") {
cfg_cols[15].hide = true;
cfg_cols[17].hide = true;
}
else if([[${role}]] != "SUPER_ADMIN") {
cfg_cols[1].hide = true;
}
if([[${tenant_id}]] != 0) {
cfg_cols[10].hide = true;
cfg_cols[11].hide = true;
}
/**
* 初始化表单，要加上，不然刷新部分组件可能会不加载

10
sec-beidou/src/main/resources/templates/page/gnss_status.html
View File

@ -61,6 +61,12 @@
</select>
</div>
</div>
<div class="layui-inline" th:if="${role=='SUPER_ADMIN'}">
<label class="layui-form-label">备注</label>
<div class="layui-input-inline">
<input type="text" name="sl_d.remark" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
<button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索</button>
<button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-export-btn"><i class="layui-icon">&#xe67d;</i>导出</button>
@ -92,6 +98,7 @@
table = layui.table;
var cfg_cols = [
{field: 'deviceid', title: '设备号', sort: true},
{field: 'remark', title: '备注', width: 100},
{field: 'devicetype', title: '设备类型',templet: '#typeTrans'},
{field: 'updatetime', title: '更新时间', templet: "<div>{{layui.util.toDateString(d.updatetime, 'yyyy-MM-dd HH:mm:ss')}}</div>"},
{field: 'state', title: '状态',templet: '#stateTrans'},
@ -107,6 +114,9 @@
{field: 'latitude', title: '纬度'},
{title: '操作', toolbar: '#currentTableBar', fixed: "right", width: 80}
];
if([[${role}]] != "SUPER_ADMIN") {
cfg_cols[1].hide = true;
}
/**
* 初始化表单，要加上，不然刷新部分组件可能会不加载
*/

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

@ -207,6 +207,13 @@
</div>
</div>
<hr>
<div class="layui-form-item" th:if="${role=='SUPER_ADMIN'}">
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
<input type="text" name="remark" id="remark" class="layui-input">
</div>
</div>
<hr th:if="${role=='SUPER_ADMIN'}">
<div class="layui-form-item">
<div class="layui-input-block" style="float:right" >
<button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认保存</button>
@ -312,6 +319,7 @@
$('#ecefz').val(data.ecefz);
$('#model').val(data.model);
$('#sector').val(data.sector);
$('#remark').val(data.remark);
setEcefEditor();
form.render();
}