diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java index f5a25c74..8b646bd4 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java @@ -58,8 +58,12 @@ public class IndexController extends BasicController{ Iterator iterator = deviceList.iterator(); while(iterator.hasNext()){ GnssStatusJoin status=iterator.next(); - if(status.getState() == GnssStatus.STATE_OFFLINE) deviceOfflineNum++; - if((status.getWarningcode()&WarningCfg.TYPE_NO_FIXED_RESULT) != 0) noFix++; + if(status.getState() == GnssStatus.STATE_OFFLINE) { + deviceOfflineNum++; + } + else if((status.getWarningcode()&WarningCfg.TYPE_NO_FIXED_RESULT) != 0) { + noFix++; + } if(status.getWarning() == WarningCfg.LEVEL_1) warning1Num++; else if(status.getWarning() == WarningCfg.LEVEL_2) warning2Num++; @@ -111,7 +115,7 @@ public class IndexController extends BasicController{ Page pageable = new Page<>(page == null ? 1 : page, limit == null ? 10 : limit); MPJQueryWrapper queryWrapper = new MPJQueryWrapper<>(); queryWrapper.selectAll(GnssStatus.class) - .select("d.name as name","d.devicetype as devicetype") + .select("d.name as name","d.devicetype as devicetype","d.project_id as project_id") .leftJoin("gnssdevices d on t.deviceid = d.deviceid") .ne("d.tenantid",Tenant.SAAS_PROVIDER_ID) .eq("opmode",GnssDevice.OP_MODE_USE) diff --git a/sec-beidou/src/main/resources/templates/page/table/gnss_status_list.html b/sec-beidou/src/main/resources/templates/page/table/gnss_status_list.html index 57f275e5..81ea3658 100644 --- a/sec-beidou/src/main/resources/templates/page/table/gnss_status_list.html +++ b/sec-beidou/src/main/resources/templates/page/table/gnss_status_list.html @@ -39,6 +39,7 @@ cols: [[ {field: 'deviceid', title: '设备号', sort: true}, {field: 'devicetype', title: '设备类型',templet: '#typeTrans'}, + {field: 'project_id', title: '项目号'}, {field: 'name', title: '工点'}, {field: 'updatetime', title: '更新时间', templet: "
{{layui.util.toDateString(d.updatetime, 'yyyy-MM-dd HH:mm:ss')}}
"}, {field: 'state', title: '状态',templet: '#stateTrans'}, @@ -47,6 +48,8 @@ {field: 'temperature', title: '温度'}, {field: 'humidity', title: '湿度'}, {field: 'rssi', title: '信号'}, + {field: 'pitch', title: 'x倾角'}, + {field: 'roll', title: 'y倾角'}, {field: 'satelliteinuse', title: '使用卫星数'} ]], limits: [10, 15, 20, 25, 50, 100],