diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java index a4d7696..fa8d626 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java @@ -45,6 +45,7 @@ import java.io.Serializable; import java.math.BigDecimal; import java.math.RoundingMode; +import java.text.DecimalFormat; import java.util.*; import java.util.stream.Collectors; @@ -171,7 +172,9 @@ dataDTO.setOnlineNum(0); } else { BigDecimal result = new BigDecimal(dataDTO.getOnlineNum()).divide(new BigDecimal(dataDTO.getDevTotal()), 2, RoundingMode.HALF_UP); - dataDTO.setOnlineRate(result.doubleValue() * 100); + DecimalFormat df = new DecimalFormat("#.00"); + + dataDTO.setOnlineRate( Convert.toDouble(df.format(result.doubleValue() * 100))); } }); return dataDTO; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java index a4d7696..fa8d626 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java @@ -45,6 +45,7 @@ import java.io.Serializable; import java.math.BigDecimal; import java.math.RoundingMode; +import java.text.DecimalFormat; import java.util.*; import java.util.stream.Collectors; @@ -171,7 +172,9 @@ dataDTO.setOnlineNum(0); } else { BigDecimal result = new BigDecimal(dataDTO.getOnlineNum()).divide(new BigDecimal(dataDTO.getDevTotal()), 2, RoundingMode.HALF_UP); - dataDTO.setOnlineRate(result.doubleValue() * 100); + DecimalFormat df = new DecimalFormat("#.00"); + + dataDTO.setOnlineRate( Convert.toDouble(df.format(result.doubleValue() * 100))); } }); return dataDTO; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java index 2fe9d67..4bfe5b4 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java @@ -196,7 +196,7 @@ List deviceFleets = BeanUtil.copyToList(dcFleetDTOS, DeviceFleet.class); deviceFleetService.saveOrUpdateBatch(deviceFleets); log.info("dc fleetDTOS:{}", dcFleetDTOS); - + log.info("dc token:",token); List dcDeviceDTOS = DcUtil.selectDevices(dcUrl, token); log.info("dc devices:{}", dcDeviceDTOS); //更新设备信息 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java index a4d7696..fa8d626 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java @@ -45,6 +45,7 @@ import java.io.Serializable; import java.math.BigDecimal; import java.math.RoundingMode; +import java.text.DecimalFormat; import java.util.*; import java.util.stream.Collectors; @@ -171,7 +172,9 @@ dataDTO.setOnlineNum(0); } else { BigDecimal result = new BigDecimal(dataDTO.getOnlineNum()).divide(new BigDecimal(dataDTO.getDevTotal()), 2, RoundingMode.HALF_UP); - dataDTO.setOnlineRate(result.doubleValue() * 100); + DecimalFormat df = new DecimalFormat("#.00"); + + dataDTO.setOnlineRate( Convert.toDouble(df.format(result.doubleValue() * 100))); } }); return dataDTO; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java index 2fe9d67..4bfe5b4 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java @@ -196,7 +196,7 @@ List deviceFleets = BeanUtil.copyToList(dcFleetDTOS, DeviceFleet.class); deviceFleetService.saveOrUpdateBatch(deviceFleets); log.info("dc fleetDTOS:{}", dcFleetDTOS); - + log.info("dc token:",token); List dcDeviceDTOS = DcUtil.selectDevices(dcUrl, token); log.info("dc devices:{}", dcDeviceDTOS); //更新设备信息 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java index e14f758..2b7d9c1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -41,7 +41,7 @@ String token = ""; if (tokenMap.containsKey(dcUser)) { log.info("dc user:{}",dcUser); - token = tokenMap.get(token); + token = tokenMap.get(dcUser); } else { token = DcUtil.loginDc(dcUrl, dcUser, dcPwd); if (StrUtil.isNotEmpty(token)) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java index a4d7696..fa8d626 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java @@ -45,6 +45,7 @@ import java.io.Serializable; import java.math.BigDecimal; import java.math.RoundingMode; +import java.text.DecimalFormat; import java.util.*; import java.util.stream.Collectors; @@ -171,7 +172,9 @@ dataDTO.setOnlineNum(0); } else { BigDecimal result = new BigDecimal(dataDTO.getOnlineNum()).divide(new BigDecimal(dataDTO.getDevTotal()), 2, RoundingMode.HALF_UP); - dataDTO.setOnlineRate(result.doubleValue() * 100); + DecimalFormat df = new DecimalFormat("#.00"); + + dataDTO.setOnlineRate( Convert.toDouble(df.format(result.doubleValue() * 100))); } }); return dataDTO; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java index 2fe9d67..4bfe5b4 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java @@ -196,7 +196,7 @@ List deviceFleets = BeanUtil.copyToList(dcFleetDTOS, DeviceFleet.class); deviceFleetService.saveOrUpdateBatch(deviceFleets); log.info("dc fleetDTOS:{}", dcFleetDTOS); - + log.info("dc token:",token); List dcDeviceDTOS = DcUtil.selectDevices(dcUrl, token); log.info("dc devices:{}", dcDeviceDTOS); //更新设备信息 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java index e14f758..2b7d9c1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -41,7 +41,7 @@ String token = ""; if (tokenMap.containsKey(dcUser)) { log.info("dc user:{}",dcUser); - token = tokenMap.get(token); + token = tokenMap.get(dcUser); } else { token = DcUtil.loginDc(dcUrl, dcUser, dcPwd); if (StrUtil.isNotEmpty(token)) { diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 496353e..dbf492a 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -136,11 +136,11 @@ - - com.casic - casic-video-sdk-hik - ${pro.version} - + + + + + net.java.dev.jna jna diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java index a4d7696..fa8d626 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java @@ -45,6 +45,7 @@ import java.io.Serializable; import java.math.BigDecimal; import java.math.RoundingMode; +import java.text.DecimalFormat; import java.util.*; import java.util.stream.Collectors; @@ -171,7 +172,9 @@ dataDTO.setOnlineNum(0); } else { BigDecimal result = new BigDecimal(dataDTO.getOnlineNum()).divide(new BigDecimal(dataDTO.getDevTotal()), 2, RoundingMode.HALF_UP); - dataDTO.setOnlineRate(result.doubleValue() * 100); + DecimalFormat df = new DecimalFormat("#.00"); + + dataDTO.setOnlineRate( Convert.toDouble(df.format(result.doubleValue() * 100))); } }); return dataDTO; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java index 2fe9d67..4bfe5b4 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java @@ -196,7 +196,7 @@ List deviceFleets = BeanUtil.copyToList(dcFleetDTOS, DeviceFleet.class); deviceFleetService.saveOrUpdateBatch(deviceFleets); log.info("dc fleetDTOS:{}", dcFleetDTOS); - + log.info("dc token:",token); List dcDeviceDTOS = DcUtil.selectDevices(dcUrl, token); log.info("dc devices:{}", dcDeviceDTOS); //更新设备信息 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java index e14f758..2b7d9c1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -41,7 +41,7 @@ String token = ""; if (tokenMap.containsKey(dcUser)) { log.info("dc user:{}",dcUser); - token = tokenMap.get(token); + token = tokenMap.get(dcUser); } else { token = DcUtil.loginDc(dcUrl, dcUser, dcPwd); if (StrUtil.isNotEmpty(token)) { diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 496353e..dbf492a 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -136,11 +136,11 @@ - - com.casic - casic-video-sdk-hik - ${pro.version} - + + + + + net.java.dev.jna jna diff --git a/casic-web/src/main/resources/config/application-shentong200.yml b/casic-web/src/main/resources/config/application-shentong200.yml index f9bdc85..53bf64f 100644 --- a/casic-web/src/main/resources/config/application-shentong200.yml +++ b/casic-web/src/main/resources/config/application-shentong200.yml @@ -45,7 +45,7 @@ device: 0 */20 * * * * open: true url: https://192.168.83.42:18080 - user: jtcsyh + user: ceshi pwd: logging: level.root: info