diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/auth/WebMvcConfig.java b/sec-beidou/src/main/java/com/imdroid/beidou/auth/WebMvcConfig.java index 875dfccd..08957b65 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/auth/WebMvcConfig.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/auth/WebMvcConfig.java @@ -21,7 +21,8 @@ public class WebMvcConfig implements WebMvcConfigurer { public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(authInterceptor) .addPathPatterns("/**") - .excludePathPatterns("/**/*.js","/**/*.css","/**/*.jpg","/**/*.png", "/do_login", "/mini-register", "/login", "/test/**", "/api/**", - "/file/upload"); + .excludePathPatterns("/**/*.js","/**/*.css","/**/*.jpg","/**/*.png", + "/do_login", "/mini-register", "/login", "/test/**", "/api/**", + "/file/upload","/device_summary/**"); } } diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/DeviceSummaryController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/DeviceSummaryController.java new file mode 100644 index 00000000..081b79e7 --- /dev/null +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/DeviceSummaryController.java @@ -0,0 +1,50 @@ +package com.imdroid.beidou.controller; + +import com.alibaba.fastjson.JSONObject; +import com.imdroid.common.util.NumberUtils; +import com.imdroid.secapi.dto.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.time.format.DateTimeFormatter; + +@Controller +public class DeviceSummaryController extends BasicController{ + + @Autowired + private GnssStatusMapper gnssStatusMapper; + + final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + + /**** 推送页面 *****/ + @RequestMapping("/device_summary") + public String gnssDevSummary() { + return "/page/gnss_dev_summary"; + } + + + /**** 推送数据 *****/ + @RequestMapping("/device_summary/query") + @ResponseBody + public JSONObject query(@RequestParam String deviceId) { + JSONObject jsonObject = new JSONObject(); + GnssStatusJoin gnssStatus = gnssStatusMapper.queryByDeviceId(deviceId); + if(gnssStatus==null){ + jsonObject.put("code",0); + jsonObject.put("msg","无此设备"); + } + else{ + jsonObject.put("code",1); + jsonObject.put("deviceState",gnssStatus.getState()==GnssStatus.STATE_OFFLINE?"0":"1"); + jsonObject.put("deviceType",gnssStatus.getDevicetype()==GnssDevice.TYPE_ROVER?"监测站":"基准站"); + jsonObject.put("onlineTime",gnssStatus.getUpdatetime().format(dateFormatter)); + jsonObject.put("voltage",NumberUtils.scaleTwo((double)gnssStatus.getVoltage()/1000)); + jsonObject.put("satNum",gnssStatus.getSatelliteinuse()>=12?"多于12":gnssStatus.getSatelliteinuse()); + jsonObject.put("rxBytes",gnssStatus.getB562bytes()+gnssStatus.getD3xxbytes()); + jsonObject.put("rssi",gnssStatus.getRssi()); + } + return jsonObject; + } + +} diff --git a/sec-beidou/src/main/resources/templates/page/gnss_dev_summary.html b/sec-beidou/src/main/resources/templates/page/gnss_dev_summary.html new file mode 100644 index 00000000..13b66598 --- /dev/null +++ b/sec-beidou/src/main/resources/templates/page/gnss_dev_summary.html @@ -0,0 +1,138 @@ + + + + + 设备信息 + + + + + + + +
+
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+
+
+
+
+ +
+
基本信息
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+ + + + + \ No newline at end of file