diff --git a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java index 7457109..2c679d4 100644 --- a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java @@ -142,7 +142,7 @@ Thread.sleep(Integer.valueOf(map.get("time").toString()) * 1000); //重新关闭开关上电 DoorShortUtil.remoteControl(controllerIP, Long.valueOf(controllerSN), 2, 2); - Thread.sleep(2 * 60 * 1000); + Thread.sleep( 5* 1000); return true; } } catch (Exception e) { diff --git a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java index 7457109..2c679d4 100644 --- a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java @@ -142,7 +142,7 @@ Thread.sleep(Integer.valueOf(map.get("time").toString()) * 1000); //重新关闭开关上电 DoorShortUtil.remoteControl(controllerIP, Long.valueOf(controllerSN), 2, 2); - Thread.sleep(2 * 60 * 1000); + Thread.sleep( 5* 1000); return true; } } catch (Exception e) { diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java index cfb900f..2994cd5 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java @@ -188,6 +188,7 @@ this.alarmPitch = alarmPitch; this.alarmStatus = alarmStatus; this.lineNum = lineNum; + this.setAlarmTime(new Date()); } @Override diff --git a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java index 7457109..2c679d4 100644 --- a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java @@ -142,7 +142,7 @@ Thread.sleep(Integer.valueOf(map.get("time").toString()) * 1000); //重新关闭开关上电 DoorShortUtil.remoteControl(controllerIP, Long.valueOf(controllerSN), 2, 2); - Thread.sleep(2 * 60 * 1000); + Thread.sleep( 5* 1000); return true; } } catch (Exception e) { diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java index cfb900f..2994cd5 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java @@ -188,6 +188,7 @@ this.alarmPitch = alarmPitch; this.alarmStatus = alarmStatus; this.lineNum = lineNum; + this.setAlarmTime(new Date()); } @Override diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java index e8a5163..5790e88 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java @@ -401,13 +401,13 @@ //重新商店间隔2秒 Thread.sleep(2 * 1000); //重新关闭开关上电 - return DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2); + return ResponseData.success(DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2)); } } catch (InterruptedException e) { e.printStackTrace(); } - return false; + return ResponseData.error("控制失败，请检查网络配置"); } diff --git a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java index 7457109..2c679d4 100644 --- a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java @@ -142,7 +142,7 @@ Thread.sleep(Integer.valueOf(map.get("time").toString()) * 1000); //重新关闭开关上电 DoorShortUtil.remoteControl(controllerIP, Long.valueOf(controllerSN), 2, 2); - Thread.sleep(2 * 60 * 1000); + Thread.sleep( 5* 1000); return true; } } catch (Exception e) { diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java index cfb900f..2994cd5 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java @@ -188,6 +188,7 @@ this.alarmPitch = alarmPitch; this.alarmStatus = alarmStatus; this.lineNum = lineNum; + this.setAlarmTime(new Date()); } @Override diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java index e8a5163..5790e88 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java @@ -401,13 +401,13 @@ //重新商店间隔2秒 Thread.sleep(2 * 1000); //重新关闭开关上电 - return DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2); + return ResponseData.success(DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2)); } } catch (InterruptedException e) { e.printStackTrace(); } - return false; + return ResponseData.error("控制失败，请检查网络配置"); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java index 3a498e0..638095e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java @@ -44,11 +44,11 @@ public Executor taskExecutor() { ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); // 核心池大小 - taskExecutor.setCorePoolSize(5); + taskExecutor.setCorePoolSize(16); // 最大线程数 - taskExecutor.setMaxPoolSize(20); + taskExecutor.setMaxPoolSize(32); // 队列程度 - taskExecutor.setQueueCapacity(500); + taskExecutor.setQueueCapacity(800); // 线程空闲时间 taskExecutor.setKeepAliveSeconds(60); // 线程前缀名称 diff --git a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java index 7457109..2c679d4 100644 --- a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java @@ -142,7 +142,7 @@ Thread.sleep(Integer.valueOf(map.get("time").toString()) * 1000); //重新关闭开关上电 DoorShortUtil.remoteControl(controllerIP, Long.valueOf(controllerSN), 2, 2); - Thread.sleep(2 * 60 * 1000); + Thread.sleep( 5* 1000); return true; } } catch (Exception e) { diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java index cfb900f..2994cd5 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java @@ -188,6 +188,7 @@ this.alarmPitch = alarmPitch; this.alarmStatus = alarmStatus; this.lineNum = lineNum; + this.setAlarmTime(new Date()); } @Override diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java index e8a5163..5790e88 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java @@ -401,13 +401,13 @@ //重新商店间隔2秒 Thread.sleep(2 * 1000); //重新关闭开关上电 - return DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2); + return ResponseData.success(DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2)); } } catch (InterruptedException e) { e.printStackTrace(); } - return false; + return ResponseData.error("控制失败，请检查网络配置"); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java index 3a498e0..638095e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java @@ -44,11 +44,11 @@ public Executor taskExecutor() { ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); // 核心池大小 - taskExecutor.setCorePoolSize(5); + taskExecutor.setCorePoolSize(16); // 最大线程数 - taskExecutor.setMaxPoolSize(20); + taskExecutor.setMaxPoolSize(32); // 队列程度 - taskExecutor.setQueueCapacity(500); + taskExecutor.setQueueCapacity(800); // 线程空闲时间 taskExecutor.setKeepAliveSeconds(60); // 线程前缀名称 diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 5e4144b..97b1ecb 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -126,5 +126,4 @@ return ResponseData.success(busMonipoiInfoService.AIlistPage( monitorListDTO.getStationId(), monitorListDTO.getKeyword())); } - } diff --git a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java index 7457109..2c679d4 100644 --- a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java @@ -142,7 +142,7 @@ Thread.sleep(Integer.valueOf(map.get("time").toString()) * 1000); //重新关闭开关上电 DoorShortUtil.remoteControl(controllerIP, Long.valueOf(controllerSN), 2, 2); - Thread.sleep(2 * 60 * 1000); + Thread.sleep( 5* 1000); return true; } } catch (Exception e) { diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java index cfb900f..2994cd5 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java @@ -188,6 +188,7 @@ this.alarmPitch = alarmPitch; this.alarmStatus = alarmStatus; this.lineNum = lineNum; + this.setAlarmTime(new Date()); } @Override diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java index e8a5163..5790e88 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java @@ -401,13 +401,13 @@ //重新商店间隔2秒 Thread.sleep(2 * 1000); //重新关闭开关上电 - return DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2); + return ResponseData.success(DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2)); } } catch (InterruptedException e) { e.printStackTrace(); } - return false; + return ResponseData.error("控制失败，请检查网络配置"); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java index 3a498e0..638095e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java @@ -44,11 +44,11 @@ public Executor taskExecutor() { ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); // 核心池大小 - taskExecutor.setCorePoolSize(5); + taskExecutor.setCorePoolSize(16); // 最大线程数 - taskExecutor.setMaxPoolSize(20); + taskExecutor.setMaxPoolSize(32); // 队列程度 - taskExecutor.setQueueCapacity(500); + taskExecutor.setQueueCapacity(800); // 线程空闲时间 taskExecutor.setKeepAliveSeconds(60); // 线程前缀名称 diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 5e4144b..97b1ecb 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -126,5 +126,4 @@ return ResponseData.success(busMonipoiInfoService.AIlistPage( monitorListDTO.getStationId(), monitorListDTO.getKeyword())); } - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index d40c18a..ba3dc71 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -100,4 +100,12 @@ } + /** + * 设备列表（供大屏获取设备信息） + */ + @RequestMapping(value = "/listDp") + public Object listDp() { + return ResponseData.success(busStationInfoService.listDp()); + } + } diff --git a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java index 7457109..2c679d4 100644 --- a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java @@ -142,7 +142,7 @@ Thread.sleep(Integer.valueOf(map.get("time").toString()) * 1000); //重新关闭开关上电 DoorShortUtil.remoteControl(controllerIP, Long.valueOf(controllerSN), 2, 2); - Thread.sleep(2 * 60 * 1000); + Thread.sleep( 5* 1000); return true; } } catch (Exception e) { diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java index cfb900f..2994cd5 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java @@ -188,6 +188,7 @@ this.alarmPitch = alarmPitch; this.alarmStatus = alarmStatus; this.lineNum = lineNum; + this.setAlarmTime(new Date()); } @Override diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java index e8a5163..5790e88 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java @@ -401,13 +401,13 @@ //重新商店间隔2秒 Thread.sleep(2 * 1000); //重新关闭开关上电 - return DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2); + return ResponseData.success(DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2)); } } catch (InterruptedException e) { e.printStackTrace(); } - return false; + return ResponseData.error("控制失败，请检查网络配置"); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java index 3a498e0..638095e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java @@ -44,11 +44,11 @@ public Executor taskExecutor() { ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); // 核心池大小 - taskExecutor.setCorePoolSize(5); + taskExecutor.setCorePoolSize(16); // 最大线程数 - taskExecutor.setMaxPoolSize(20); + taskExecutor.setMaxPoolSize(32); // 队列程度 - taskExecutor.setQueueCapacity(500); + taskExecutor.setQueueCapacity(800); // 线程空闲时间 taskExecutor.setKeepAliveSeconds(60); // 线程前缀名称 diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 5e4144b..97b1ecb 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -126,5 +126,4 @@ return ResponseData.success(busMonipoiInfoService.AIlistPage( monitorListDTO.getStationId(), monitorListDTO.getKeyword())); } - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index d40c18a..ba3dc71 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -100,4 +100,12 @@ } + /** + * 设备列表（供大屏获取设备信息） + */ + @RequestMapping(value = "/listDp") + public Object listDp() { + return ResponseData.success(busStationInfoService.listDp()); + } + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 1409061..3505512 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -59,6 +59,10 @@ @TableField(exist = false) @ExcelProperty(value = "所在场站", order = 0) private String stationName; + + @TableField(exist = false) + @ExcelProperty(value = "所属单位", order = 0) + private String deptName; /** * 精确位置信息 */ diff --git a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java index 7457109..2c679d4 100644 --- a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java @@ -142,7 +142,7 @@ Thread.sleep(Integer.valueOf(map.get("time").toString()) * 1000); //重新关闭开关上电 DoorShortUtil.remoteControl(controllerIP, Long.valueOf(controllerSN), 2, 2); - Thread.sleep(2 * 60 * 1000); + Thread.sleep( 5* 1000); return true; } } catch (Exception e) { diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java index cfb900f..2994cd5 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java @@ -188,6 +188,7 @@ this.alarmPitch = alarmPitch; this.alarmStatus = alarmStatus; this.lineNum = lineNum; + this.setAlarmTime(new Date()); } @Override diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java index e8a5163..5790e88 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java @@ -401,13 +401,13 @@ //重新商店间隔2秒 Thread.sleep(2 * 1000); //重新关闭开关上电 - return DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2); + return ResponseData.success(DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2)); } } catch (InterruptedException e) { e.printStackTrace(); } - return false; + return ResponseData.error("控制失败，请检查网络配置"); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java index 3a498e0..638095e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java @@ -44,11 +44,11 @@ public Executor taskExecutor() { ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); // 核心池大小 - taskExecutor.setCorePoolSize(5); + taskExecutor.setCorePoolSize(16); // 最大线程数 - taskExecutor.setMaxPoolSize(20); + taskExecutor.setMaxPoolSize(32); // 队列程度 - taskExecutor.setQueueCapacity(500); + taskExecutor.setQueueCapacity(800); // 线程空闲时间 taskExecutor.setKeepAliveSeconds(60); // 线程前缀名称 diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 5e4144b..97b1ecb 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -126,5 +126,4 @@ return ResponseData.success(busMonipoiInfoService.AIlistPage( monitorListDTO.getStationId(), monitorListDTO.getKeyword())); } - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index d40c18a..ba3dc71 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -100,4 +100,12 @@ } + /** + * 设备列表（供大屏获取设备信息） + */ + @RequestMapping(value = "/listDp") + public Object listDp() { + return ResponseData.success(busStationInfoService.listDp()); + } + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 1409061..3505512 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -59,6 +59,10 @@ @TableField(exist = false) @ExcelProperty(value = "所在场站", order = 0) private String stationName; + + @TableField(exist = false) + @ExcelProperty(value = "所属单位", order = 0) + private String deptName; /** * 精确位置信息 */ diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java index 27fe879..2bf29c7 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java @@ -129,6 +129,7 @@ this.speed = speed; this.lineNum = lineNum; this.lineName = lineName; + this.updateTime= new Date(); this.ts = ts; } diff --git a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java index 7457109..2c679d4 100644 --- a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java @@ -142,7 +142,7 @@ Thread.sleep(Integer.valueOf(map.get("time").toString()) * 1000); //重新关闭开关上电 DoorShortUtil.remoteControl(controllerIP, Long.valueOf(controllerSN), 2, 2); - Thread.sleep(2 * 60 * 1000); + Thread.sleep( 5* 1000); return true; } } catch (Exception e) { diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java index cfb900f..2994cd5 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java @@ -188,6 +188,7 @@ this.alarmPitch = alarmPitch; this.alarmStatus = alarmStatus; this.lineNum = lineNum; + this.setAlarmTime(new Date()); } @Override diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java index e8a5163..5790e88 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java @@ -401,13 +401,13 @@ //重新商店间隔2秒 Thread.sleep(2 * 1000); //重新关闭开关上电 - return DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2); + return ResponseData.success(DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2)); } } catch (InterruptedException e) { e.printStackTrace(); } - return false; + return ResponseData.error("控制失败，请检查网络配置"); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java index 3a498e0..638095e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java @@ -44,11 +44,11 @@ public Executor taskExecutor() { ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); // 核心池大小 - taskExecutor.setCorePoolSize(5); + taskExecutor.setCorePoolSize(16); // 最大线程数 - taskExecutor.setMaxPoolSize(20); + taskExecutor.setMaxPoolSize(32); // 队列程度 - taskExecutor.setQueueCapacity(500); + taskExecutor.setQueueCapacity(800); // 线程空闲时间 taskExecutor.setKeepAliveSeconds(60); // 线程前缀名称 diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 5e4144b..97b1ecb 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -126,5 +126,4 @@ return ResponseData.success(busMonipoiInfoService.AIlistPage( monitorListDTO.getStationId(), monitorListDTO.getKeyword())); } - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index d40c18a..ba3dc71 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -100,4 +100,12 @@ } + /** + * 设备列表（供大屏获取设备信息） + */ + @RequestMapping(value = "/listDp") + public Object listDp() { + return ResponseData.success(busStationInfoService.listDp()); + } + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 1409061..3505512 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -59,6 +59,10 @@ @TableField(exist = false) @ExcelProperty(value = "所在场站", order = 0) private String stationName; + + @TableField(exist = false) + @ExcelProperty(value = "所属单位", order = 0) + private String deptName; /** * 精确位置信息 */ diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java index 27fe879..2bf29c7 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java @@ -129,6 +129,7 @@ this.speed = speed; this.lineNum = lineNum; this.lineName = lineName; + this.updateTime= new Date(); this.ts = ts; } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java index e435fcc..efd2e2b 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java @@ -1,13 +1,15 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.station.StationPointList; import com.casic.missiles.modular.system.dto.station.StationStateStatisticsVO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.casic.missiles.modular.system.model.BusStationInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; +import java.util.Map; /** *

@@ -31,4 +33,6 @@ List statisticsStatus(); + List> listDp(); + } diff --git a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java index 7457109..2c679d4 100644 --- a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java @@ -142,7 +142,7 @@ Thread.sleep(Integer.valueOf(map.get("time").toString()) * 1000); //重新关闭开关上电 DoorShortUtil.remoteControl(controllerIP, Long.valueOf(controllerSN), 2, 2); - Thread.sleep(2 * 60 * 1000); + Thread.sleep( 5* 1000); return true; } } catch (Exception e) { diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java index cfb900f..2994cd5 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java @@ -188,6 +188,7 @@ this.alarmPitch = alarmPitch; this.alarmStatus = alarmStatus; this.lineNum = lineNum; + this.setAlarmTime(new Date()); } @Override diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java index e8a5163..5790e88 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java @@ -401,13 +401,13 @@ //重新商店间隔2秒 Thread.sleep(2 * 1000); //重新关闭开关上电 - return DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2); + return ResponseData.success(DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2)); } } catch (InterruptedException e) { e.printStackTrace(); } - return false; + return ResponseData.error("控制失败，请检查网络配置"); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java index 3a498e0..638095e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java @@ -44,11 +44,11 @@ public Executor taskExecutor() { ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); // 核心池大小 - taskExecutor.setCorePoolSize(5); + taskExecutor.setCorePoolSize(16); // 最大线程数 - taskExecutor.setMaxPoolSize(20); + taskExecutor.setMaxPoolSize(32); // 队列程度 - taskExecutor.setQueueCapacity(500); + taskExecutor.setQueueCapacity(800); // 线程空闲时间 taskExecutor.setKeepAliveSeconds(60); // 线程前缀名称 diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 5e4144b..97b1ecb 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -126,5 +126,4 @@ return ResponseData.success(busMonipoiInfoService.AIlistPage( monitorListDTO.getStationId(), monitorListDTO.getKeyword())); } - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index d40c18a..ba3dc71 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -100,4 +100,12 @@ } + /** + * 设备列表（供大屏获取设备信息） + */ + @RequestMapping(value = "/listDp") + public Object listDp() { + return ResponseData.success(busStationInfoService.listDp()); + } + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 1409061..3505512 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -59,6 +59,10 @@ @TableField(exist = false) @ExcelProperty(value = "所在场站", order = 0) private String stationName; + + @TableField(exist = false) + @ExcelProperty(value = "所属单位", order = 0) + private String deptName; /** * 精确位置信息 */ diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java index 27fe879..2bf29c7 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java @@ -129,6 +129,7 @@ this.speed = speed; this.lineNum = lineNum; this.lineName = lineName; + this.updateTime= new Date(); this.ts = ts; } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java index e435fcc..efd2e2b 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java @@ -1,13 +1,15 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.station.StationPointList; import com.casic.missiles.modular.system.dto.station.StationStateStatisticsVO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.casic.missiles.modular.system.model.BusStationInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; +import java.util.Map; /** *

@@ -31,4 +33,6 @@ List statisticsStatus(); + List> listDp(); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java index 569e612..248853b 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java @@ -20,9 +20,7 @@ import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; import com.casic.missiles.util.DictCodeUtils; -import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -244,5 +242,4 @@ } } - } diff --git a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java index 7457109..2c679d4 100644 --- a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java @@ -142,7 +142,7 @@ Thread.sleep(Integer.valueOf(map.get("time").toString()) * 1000); //重新关闭开关上电 DoorShortUtil.remoteControl(controllerIP, Long.valueOf(controllerSN), 2, 2); - Thread.sleep(2 * 60 * 1000); + Thread.sleep( 5* 1000); return true; } } catch (Exception e) { diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java index cfb900f..2994cd5 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java @@ -188,6 +188,7 @@ this.alarmPitch = alarmPitch; this.alarmStatus = alarmStatus; this.lineNum = lineNum; + this.setAlarmTime(new Date()); } @Override diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java index e8a5163..5790e88 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java @@ -401,13 +401,13 @@ //重新商店间隔2秒 Thread.sleep(2 * 1000); //重新关闭开关上电 - return DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2); + return ResponseData.success(DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2)); } } catch (InterruptedException e) { e.printStackTrace(); } - return false; + return ResponseData.error("控制失败，请检查网络配置"); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java index 3a498e0..638095e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java @@ -44,11 +44,11 @@ public Executor taskExecutor() { ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); // 核心池大小 - taskExecutor.setCorePoolSize(5); + taskExecutor.setCorePoolSize(16); // 最大线程数 - taskExecutor.setMaxPoolSize(20); + taskExecutor.setMaxPoolSize(32); // 队列程度 - taskExecutor.setQueueCapacity(500); + taskExecutor.setQueueCapacity(800); // 线程空闲时间 taskExecutor.setKeepAliveSeconds(60); // 线程前缀名称 diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 5e4144b..97b1ecb 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -126,5 +126,4 @@ return ResponseData.success(busMonipoiInfoService.AIlistPage( monitorListDTO.getStationId(), monitorListDTO.getKeyword())); } - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index d40c18a..ba3dc71 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -100,4 +100,12 @@ } + /** + * 设备列表（供大屏获取设备信息） + */ + @RequestMapping(value = "/listDp") + public Object listDp() { + return ResponseData.success(busStationInfoService.listDp()); + } + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 1409061..3505512 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -59,6 +59,10 @@ @TableField(exist = false) @ExcelProperty(value = "所在场站", order = 0) private String stationName; + + @TableField(exist = false) + @ExcelProperty(value = "所属单位", order = 0) + private String deptName; /** * 精确位置信息 */ diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java index 27fe879..2bf29c7 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java @@ -129,6 +129,7 @@ this.speed = speed; this.lineNum = lineNum; this.lineName = lineName; + this.updateTime= new Date(); this.ts = ts; } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java index e435fcc..efd2e2b 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java @@ -1,13 +1,15 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.station.StationPointList; import com.casic.missiles.modular.system.dto.station.StationStateStatisticsVO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.casic.missiles.modular.system.model.BusStationInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; +import java.util.Map; /** *

@@ -31,4 +33,6 @@ List statisticsStatus(); + List> listDp(); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java index 569e612..248853b 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java @@ -20,9 +20,7 @@ import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; import com.casic.missiles.util.DictCodeUtils; -import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -244,5 +242,4 @@ } } - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java index 4b1c511..8d2c747 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -11,6 +14,7 @@ import com.casic.missiles.modular.system.dto.monitor.MonitorPointList; import com.casic.missiles.modular.system.dto.station.StationPointList; import com.casic.missiles.modular.system.dto.station.StationStateStatisticsVO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.casic.missiles.modular.system.model.BusStationInfo; import com.casic.missiles.modular.system.dao.BusStationInfoMapper; import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; @@ -19,7 +23,10 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -35,6 +42,7 @@ private final AbstractPermissionContext permissionContext; private final IBusMonipoiInfoService busMonipoiInfoService; + private final AbstractDeptService deptService; @Override @@ -74,7 +82,7 @@ @Override public ResponseData deleteStation(Long busStationInfoId) { - List monitorPointLists=busMonipoiInfoService.monitorList(busStationInfoId); + List monitorPointLists=busMonipoiInfoService.monitorList(busStationInfoId); if(CollectionUtils.isNotEmpty(monitorPointLists)){ throw new BusinessException(BusinessExceptionEnum.DEVICE_BOUND_FAILED); } @@ -93,4 +101,35 @@ return stateStatisticsVOS; } + + @Override + public List> listDp() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("VALID", "0"); + List monitorPointLists = busMonipoiInfoService.list(queryWrapper); + List> resultMap = new ArrayList<>(); + try { + for (BusMonipoiInfo busMonipoiInfo : monitorPointLists) { + Map map = new HashMap<>(); + map.put("名称",busMonipoiInfo.getMonitorName()); + map.put("位置",busMonipoiInfo.getLocation()); + map.put("在线状态","0".equals(busMonipoiInfo.getDeviceStatus())?"离线":( + "1".equals(busMonipoiInfo.getDeviceStatus())?"在线":"报警")); + if(ObjectUtil.isNotEmpty(busMonipoiInfo.getStationId())){ + BusStationInfo busStationInfo = this.getById(busMonipoiInfo.getStationId()); + if(null!=busStationInfo){ + busMonipoiInfo.setStationName(busStationInfo.getStationName()); + if(ObjectUtil.isNotEmpty(busStationInfo.getDeptId())){ + map.put("所属公司",deptService.getDeptName(busStationInfo.getDeptId())); + + } + } + } + resultMap.add(map); + } + } catch (Exception e) { + e.printStackTrace(); + } + return resultMap; + } } diff --git a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java index 7457109..2c679d4 100644 --- a/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java @@ -142,7 +142,7 @@ Thread.sleep(Integer.valueOf(map.get("time").toString()) * 1000); //重新关闭开关上电 DoorShortUtil.remoteControl(controllerIP, Long.valueOf(controllerSN), 2, 2); - Thread.sleep(2 * 60 * 1000); + Thread.sleep( 5* 1000); return true; } } catch (Exception e) { diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java index cfb900f..2994cd5 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java @@ -188,6 +188,7 @@ this.alarmPitch = alarmPitch; this.alarmStatus = alarmStatus; this.lineNum = lineNum; + this.setAlarmTime(new Date()); } @Override diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java index e8a5163..5790e88 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java @@ -401,13 +401,13 @@ //重新商店间隔2秒 Thread.sleep(2 * 1000); //重新关闭开关上电 - return DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2); + return ResponseData.success(DoorShortUtil.remoteControl(doorIp, Long.valueOf(sn), 2, 2)); } } catch (InterruptedException e) { e.printStackTrace(); } - return false; + return ResponseData.error("控制失败，请检查网络配置"); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java index 3a498e0..638095e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java @@ -44,11 +44,11 @@ public Executor taskExecutor() { ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); // 核心池大小 - taskExecutor.setCorePoolSize(5); + taskExecutor.setCorePoolSize(16); // 最大线程数 - taskExecutor.setMaxPoolSize(20); + taskExecutor.setMaxPoolSize(32); // 队列程度 - taskExecutor.setQueueCapacity(500); + taskExecutor.setQueueCapacity(800); // 线程空闲时间 taskExecutor.setKeepAliveSeconds(60); // 线程前缀名称 diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 5e4144b..97b1ecb 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -126,5 +126,4 @@ return ResponseData.success(busMonipoiInfoService.AIlistPage( monitorListDTO.getStationId(), monitorListDTO.getKeyword())); } - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index d40c18a..ba3dc71 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -100,4 +100,12 @@ } + /** + * 设备列表（供大屏获取设备信息） + */ + @RequestMapping(value = "/listDp") + public Object listDp() { + return ResponseData.success(busStationInfoService.listDp()); + } + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 1409061..3505512 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -59,6 +59,10 @@ @TableField(exist = false) @ExcelProperty(value = "所在场站", order = 0) private String stationName; + + @TableField(exist = false) + @ExcelProperty(value = "所属单位", order = 0) + private String deptName; /** * 精确位置信息 */ diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java index 27fe879..2bf29c7 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java @@ -129,6 +129,7 @@ this.speed = speed; this.lineNum = lineNum; this.lineName = lineName; + this.updateTime= new Date(); this.ts = ts; } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java index e435fcc..efd2e2b 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java @@ -1,13 +1,15 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.station.StationPointList; import com.casic.missiles.modular.system.dto.station.StationStateStatisticsVO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.casic.missiles.modular.system.model.BusStationInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; +import java.util.Map; /** *

@@ -31,4 +33,6 @@ List statisticsStatus(); + List> listDp(); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java index 569e612..248853b 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java @@ -20,9 +20,7 @@ import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; import com.casic.missiles.util.DictCodeUtils; -import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -244,5 +242,4 @@ } } - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java index 4b1c511..8d2c747 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -11,6 +14,7 @@ import com.casic.missiles.modular.system.dto.monitor.MonitorPointList; import com.casic.missiles.modular.system.dto.station.StationPointList; import com.casic.missiles.modular.system.dto.station.StationStateStatisticsVO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.casic.missiles.modular.system.model.BusStationInfo; import com.casic.missiles.modular.system.dao.BusStationInfoMapper; import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; @@ -19,7 +23,10 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -35,6 +42,7 @@ private final AbstractPermissionContext permissionContext; private final IBusMonipoiInfoService busMonipoiInfoService; + private final AbstractDeptService deptService; @Override @@ -74,7 +82,7 @@ @Override public ResponseData deleteStation(Long busStationInfoId) { - List monitorPointLists=busMonipoiInfoService.monitorList(busStationInfoId); + List monitorPointLists=busMonipoiInfoService.monitorList(busStationInfoId); if(CollectionUtils.isNotEmpty(monitorPointLists)){ throw new BusinessException(BusinessExceptionEnum.DEVICE_BOUND_FAILED); } @@ -93,4 +101,35 @@ return stateStatisticsVOS; } + + @Override + public List> listDp() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("VALID", "0"); + List monitorPointLists = busMonipoiInfoService.list(queryWrapper); + List> resultMap = new ArrayList<>(); + try { + for (BusMonipoiInfo busMonipoiInfo : monitorPointLists) { + Map map = new HashMap<>(); + map.put("名称",busMonipoiInfo.getMonitorName()); + map.put("位置",busMonipoiInfo.getLocation()); + map.put("在线状态","0".equals(busMonipoiInfo.getDeviceStatus())?"离线":( + "1".equals(busMonipoiInfo.getDeviceStatus())?"在线":"报警")); + if(ObjectUtil.isNotEmpty(busMonipoiInfo.getStationId())){ + BusStationInfo busStationInfo = this.getById(busMonipoiInfo.getStationId()); + if(null!=busStationInfo){ + busMonipoiInfo.setStationName(busStationInfo.getStationName()); + if(ObjectUtil.isNotEmpty(busStationInfo.getDeptId())){ + map.put("所属公司",deptService.getDeptName(busStationInfo.getDeptId())); + + } + } + } + resultMap.add(map); + } + } catch (Exception e) { + e.printStackTrace(); + } + return resultMap; + } } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index f17630c..1805400 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -21,7 +21,7 @@ # redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer casic: #kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/alarm/getAIRecords,/monitor/AIlistPage,/websocket/*,/HCNet/reStart + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/alarm/getAIRecords,/monitor/AIlistPage,/websocket/*,/HCNet/reStart,/station/listDp file: uploadPath: C:\casic\tmp\ downloadPath: D:\tmp\