From 38a1f1c64ba2c88df06ff42c4b0303f499d9da52 Mon Sep 17 00:00:00 2001 From: weidong Date: Tue, 2 Jul 2024 20:12:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=B7=A5=E7=82=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/imdroid/beidou/controller/IndexController.java | 7 +++++-- sec-beidou/src/main/resources/application.properties | 6 +++--- .../resources/templates/page/table/gnss_status_list.html | 3 +-- 3 files changed, 9 insertions(+), 7 deletions(-) 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 70157db5..0d9e5ef2 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 @@ -112,9 +112,12 @@ 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") .leftJoin("gnssdevices d on t.deviceid = d.deviceid") .ne("d.tenantid",Tenant.SAAS_PROVIDER_ID) - .eq("opmode",GnssDevice.OP_MODE_USE); + .eq("opmode",GnssDevice.OP_MODE_USE) + .orderByDesc("updatetime"); + String query = (String) session.getAttribute("query"); if(query != null){ if(query.equals("offline")){ @@ -136,7 +139,7 @@ public class IndexController extends BasicController{ session.setAttribute("query",query); } - IPage cs = statusMapper.selectPage(pageable, queryWrapper); + IPage cs = statusMapper.selectJoinPage(pageable, GnssStatusJoin.class, queryWrapper); JSONObject jsonObject = new JSONObject(); jsonObject.put("code", 0); jsonObject.put("msg", ""); diff --git a/sec-beidou/src/main/resources/application.properties b/sec-beidou/src/main/resources/application.properties index 22c57f7c..1d107400 100644 --- a/sec-beidou/src/main/resources/application.properties +++ b/sec-beidou/src/main/resources/application.properties @@ -2,9 +2,9 @@ #spring.datasource.url=jdbc:mysql://192.168.101.54:3306/beidou?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true #spring.datasource.username=beidou #spring.datasource.password=Passw0rd#123! -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/beidou?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true -#spring.datasource.url=jdbc:mysql://139.9.51.237:3306/beidou?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true -spring.datasource.username=admin +#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/beidou?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true +spring.datasource.url=jdbc:mysql://139.9.51.237:3306/beidou?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true +spring.datasource.username=radmin spring.datasource.password=DBMgr_2022 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.jpa.properties.hibernate.hbm2ddl.auto=update 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 bb5a7f83..57f275e5 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,11 +39,10 @@ cols: [[ {field: 'deviceid', title: '设备号', sort: true}, {field: 'devicetype', title: '设备类型',templet: '#typeTrans'}, + {field: 'name', title: '工点'}, {field: 'updatetime', title: '更新时间', templet: "
{{layui.util.toDateString(d.updatetime, 'yyyy-MM-dd HH:mm:ss')}}
"}, {field: 'state', title: '状态',templet: '#stateTrans'}, {field: 'warning', title: '告警',templet: '#warningTrans'}, - {field: 'longitude', title: '经度'}, - {field: 'latitude', title: '维度'}, {field: 'voltage', title: '电压'}, {field: 'temperature', title: '温度'}, {field: 'humidity', title: '湿度'},