diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java index b8c16a3..239560b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java @@ -65,7 +65,6 @@ public Object add(@RequestBody @Valid BusPlan busPlan) { return busPlanService.saveOrUpdateBusPlan(busPlan) ? ResponseData.success() : ResponseData.error(BusinessExceptionEnum.ADD_FAILED.DEVICE_REGISTER_FAILED.getMessage()); - } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java index b8c16a3..239560b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java @@ -65,7 +65,6 @@ public Object add(@RequestBody @Valid BusPlan busPlan) { return busPlanService.saveOrUpdateBusPlan(busPlan) ? ResponseData.success() : ResponseData.error(BusinessExceptionEnum.ADD_FAILED.DEVICE_REGISTER_FAILED.getMessage()); - } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java index 82ea79a..6e9e43e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java @@ -1325,9 +1325,12 @@ } } }); - } + + //缓存自研设备报警阈值,若改变阈值需重启程序 +// public static volatile Map deviceRuleMap = new HashMap<>(); + public DataGasEs processHidden(MonitorBaseInfo monitorBaseInfo, double direction, double pitch, Double strength) { DataGasEs dataGasEs = new DataGasEs(); dataGasEs.setDevcode(monitorBaseInfo.getDevcode()); @@ -1343,7 +1346,7 @@ * 甲烷数据保存es */ public void insertDataGasEs(MonitorBaseInfo monitorBaseInfo, Double concentration, double direction, - double pitch, Double threshold) { + double pitch, Double threshold) { try { DataGasEs dataGasEs = EsDataFactory.getDataGasEs(); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java index b8c16a3..239560b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java @@ -65,7 +65,6 @@ public Object add(@RequestBody @Valid BusPlan busPlan) { return busPlanService.saveOrUpdateBusPlan(busPlan) ? ResponseData.success() : ResponseData.error(BusinessExceptionEnum.ADD_FAILED.DEVICE_REGISTER_FAILED.getMessage()); - } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java index 82ea79a..6e9e43e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java @@ -1325,9 +1325,12 @@ } } }); - } + + //缓存自研设备报警阈值,若改变阈值需重启程序 +// public static volatile Map deviceRuleMap = new HashMap<>(); + public DataGasEs processHidden(MonitorBaseInfo monitorBaseInfo, double direction, double pitch, Double strength) { DataGasEs dataGasEs = new DataGasEs(); dataGasEs.setDevcode(monitorBaseInfo.getDevcode()); @@ -1343,7 +1346,7 @@ * 甲烷数据保存es */ public void insertDataGasEs(MonitorBaseInfo monitorBaseInfo, Double concentration, double direction, - double pitch, Double threshold) { + double pitch, Double threshold) { try { DataGasEs dataGasEs = EsDataFactory.getDataGasEs(); diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 959f5b6..ee1e0b7 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -12,6 +12,11 @@ url: jdbc:mysql://111.198.10.15:11336/casic_PTZ?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=GMT%2B8 username: root password: Casic203 + druid: + max-active: 50 + min-idle: 20 + + jms: pub-sub-domain: true # session: