diff --git a/sec-api/src/main/java/com/imdroid/secapi/dto/GnssStatusJoin.java b/sec-api/src/main/java/com/imdroid/secapi/dto/GnssStatusJoin.java index abefd73a..35a70306 100644 --- a/sec-api/src/main/java/com/imdroid/secapi/dto/GnssStatusJoin.java +++ b/sec-api/src/main/java/com/imdroid/secapi/dto/GnssStatusJoin.java @@ -49,9 +49,6 @@ public class GnssStatusJoin { @ExcelProperty("湿度") Float humidity; - @ExcelProperty("可见卫星") - Integer satelliteinview; - @ExcelProperty("使用卫星") Integer satelliteinuse; // 这里的收发都是服务端统计的,终端收发详细统计在msg_trx表里 @@ -83,4 +80,6 @@ public class GnssStatusJoin { @ExcelIgnore Integer group_id; + @ExcelIgnore + String name;//设备名称 } diff --git a/sec-api/src/main/java/com/imdroid/secapi/dto/GnssStatusMapper.java b/sec-api/src/main/java/com/imdroid/secapi/dto/GnssStatusMapper.java index ebbc7edb..e2cd2b1f 100644 --- a/sec-api/src/main/java/com/imdroid/secapi/dto/GnssStatusMapper.java +++ b/sec-api/src/main/java/com/imdroid/secapi/dto/GnssStatusMapper.java @@ -18,7 +18,7 @@ public interface GnssStatusMapper extends MPJBaseMapper { @Update({"update gnssstatus set state=0,warning=#{warning},warningcode=#{warningcode} where deviceid=#{deviceid}"}) int setOfflineByDeviceId(GnssStatusJoin status); - @Select({"select s.*, d.devicetype, d.group_id from gnssstatus s ,gnssdevices d where s.deviceid=d.deviceid and s.state <> 0"}) + @Select({"select s.*, d.devicetype, d.group_id, d.name from gnssstatus s ,gnssdevices d where s.deviceid=d.deviceid and s.state <> 0"}) List queryOnline(); // 需要关联设备类型 diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/data/vo/device/DeviceStatusVO.java b/sec-beidou/src/main/java/com/imdroid/beidou/data/vo/device/DeviceStatusVO.java index 96744a35..4d2fdbec 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/data/vo/device/DeviceStatusVO.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/data/vo/device/DeviceStatusVO.java @@ -75,7 +75,6 @@ public class DeviceStatusVO { this.rxbytes = gnssStatus.getRxbytes(); this.d3xxbytes = gnssStatus.getD3xxbytes(); this.b562bytes = gnssStatus.getB562bytes(); - this.satelliteinview = gnssStatus.getSatelliteinview(); this.satelliteinuse = gnssStatus.getSatelliteinuse(); this.dtuState = gnssStatus.getState(); } diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/task/DeviceStatusChecker.java b/sec-beidou/src/main/java/com/imdroid/beidou/task/DeviceStatusChecker.java index e3e4997d..ba215da4 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/task/DeviceStatusChecker.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/task/DeviceStatusChecker.java @@ -46,7 +46,7 @@ public class DeviceStatusChecker { GnssDeviceMapper deviceMapper; static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - @Scheduled(cron = "0 18,48 * * * ?") // 每半时执行一次 + @Scheduled(cron = "0 18,59 * * * ?") // 每半时执行一次 public void checkDeviceState() throws ExecutionException, InterruptedException { List groupCfgs = groupMapper.selectList(null); HashMap group_cycle_map=new HashMap<>(); @@ -86,7 +86,7 @@ public class DeviceStatusChecker { warningMsg.setCode(WarningCfg.TYPE_DEVICE_OFF_LINE); warningMsgMapper.insert(warningMsg); //短信推送 - deviceIds.add(status.getDeviceid()); + deviceIds.add(status.getDeviceid()+"("+status.getName()+")"); } } if(deviceIds.size()>0){ @@ -132,7 +132,7 @@ public class DeviceStatusChecker { status.setWarningcode(status.getWarningcode() | WarningCfg.TYPE_BS_NO_RESULT); status.setWarning(WarningCfg.LEVEL_2); - deviceIds.add(bs.getDeviceid()); + deviceIds.add(bs.getDeviceid()+"("+bs.getName()+")"); } gnssStatusMapper.updateById(status); }