diff --git a/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java b/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java index a9c4a8f..2ea3aaa 100644 --- a/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java +++ b/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java @@ -214,10 +214,13 @@ if (ToolUtil.isNotEmpty(backpackPosition)) { // TODO: 2022/8/16 判定在线时间 String offlineThreshold = offlineTime; - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date date = new Date(); - date.setTime(Long.parseLong(backpackPosition.getUpTime())); - Date latestTime = DateUtil.parseTime(dateFormat.format(date)); + if (!StringUtils.isEmpty(backpackPosition.getUpTime()) && !backpackPosition.getUpTime().contains("-")) { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = new Date(); + date.setTime(Long.parseLong(backpackPosition.getUpTime())); + backpackPosition.setUpTime(dateFormat.format(date)); + } + Date latestTime = DateUtil.parseTime(backpackPosition.getUpTime()); Long offlineMinutes = ((System.currentTimeMillis() - latestTime.getTime()) / 1000) / 60; // TODO: 2022/8/18 报警信息来自? //这里复用车辆的报警表bus_alarm_record diff --git a/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java b/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java index a9c4a8f..2ea3aaa 100644 --- a/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java +++ b/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java @@ -214,10 +214,13 @@ if (ToolUtil.isNotEmpty(backpackPosition)) { // TODO: 2022/8/16 判定在线时间 String offlineThreshold = offlineTime; - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date date = new Date(); - date.setTime(Long.parseLong(backpackPosition.getUpTime())); - Date latestTime = DateUtil.parseTime(dateFormat.format(date)); + if (!StringUtils.isEmpty(backpackPosition.getUpTime()) && !backpackPosition.getUpTime().contains("-")) { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = new Date(); + date.setTime(Long.parseLong(backpackPosition.getUpTime())); + backpackPosition.setUpTime(dateFormat.format(date)); + } + Date latestTime = DateUtil.parseTime(backpackPosition.getUpTime()); Long offlineMinutes = ((System.currentTimeMillis() - latestTime.getTime()) / 1000) / 60; // TODO: 2022/8/18 报警信息来自? //这里复用车辆的报警表bus_alarm_record diff --git a/casic-web/pom.xml b/casic-web/pom.xml index c86ae73..0317b45 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -257,7 +257,7 @@ 2.6 - ${resource.delimiter} + @ true diff --git a/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java b/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java index a9c4a8f..2ea3aaa 100644 --- a/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java +++ b/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java @@ -214,10 +214,13 @@ if (ToolUtil.isNotEmpty(backpackPosition)) { // TODO: 2022/8/16 判定在线时间 String offlineThreshold = offlineTime; - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date date = new Date(); - date.setTime(Long.parseLong(backpackPosition.getUpTime())); - Date latestTime = DateUtil.parseTime(dateFormat.format(date)); + if (!StringUtils.isEmpty(backpackPosition.getUpTime()) && !backpackPosition.getUpTime().contains("-")) { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = new Date(); + date.setTime(Long.parseLong(backpackPosition.getUpTime())); + backpackPosition.setUpTime(dateFormat.format(date)); + } + Date latestTime = DateUtil.parseTime(backpackPosition.getUpTime()); Long offlineMinutes = ((System.currentTimeMillis() - latestTime.getTime()) / 1000) / 60; // TODO: 2022/8/18 报警信息来自? //这里复用车辆的报警表bus_alarm_record diff --git a/casic-web/pom.xml b/casic-web/pom.xml index c86ae73..0317b45 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -257,7 +257,7 @@ 2.6 - ${resource.delimiter} + @ true diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index f2dbe75..12dac20 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -32,9 +32,9 @@ #flowable数据源和多数据源配置 casic: - kaptcha-open: true #是否开启登录时验证码 (true/false) + kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha/base64,/config/baseConfig,/route/mockToken,/job/updateSinkJob,/route/sync,/websocket/* + nologin-urls: /user/register,/user/sms/**,/user/login,/user/appLogin,/kaptcha/base64,/config/baseConfig,/route/mockToken,/job/updateSinkJob,/route/sync,/websocket/* file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload diff --git a/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java b/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java index a9c4a8f..2ea3aaa 100644 --- a/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java +++ b/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java @@ -214,10 +214,13 @@ if (ToolUtil.isNotEmpty(backpackPosition)) { // TODO: 2022/8/16 判定在线时间 String offlineThreshold = offlineTime; - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date date = new Date(); - date.setTime(Long.parseLong(backpackPosition.getUpTime())); - Date latestTime = DateUtil.parseTime(dateFormat.format(date)); + if (!StringUtils.isEmpty(backpackPosition.getUpTime()) && !backpackPosition.getUpTime().contains("-")) { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = new Date(); + date.setTime(Long.parseLong(backpackPosition.getUpTime())); + backpackPosition.setUpTime(dateFormat.format(date)); + } + Date latestTime = DateUtil.parseTime(backpackPosition.getUpTime()); Long offlineMinutes = ((System.currentTimeMillis() - latestTime.getTime()) / 1000) / 60; // TODO: 2022/8/18 报警信息来自? //这里复用车辆的报警表bus_alarm_record diff --git a/casic-web/pom.xml b/casic-web/pom.xml index c86ae73..0317b45 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -257,7 +257,7 @@ 2.6 - ${resource.delimiter} + @ true diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index f2dbe75..12dac20 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -32,9 +32,9 @@ #flowable数据源和多数据源配置 casic: - kaptcha-open: true #是否开启登录时验证码 (true/false) + kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha/base64,/config/baseConfig,/route/mockToken,/job/updateSinkJob,/route/sync,/websocket/* + nologin-urls: /user/register,/user/sms/**,/user/login,/user/appLogin,/kaptcha/base64,/config/baseConfig,/route/mockToken,/job/updateSinkJob,/route/sync,/websocket/* file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload diff --git a/casic-web/src/main/resources/config/application-test.yml b/casic-web/src/main/resources/config/application-test.yml index 02ce3c8..f90cf9a 100644 --- a/casic-web/src/main/resources/config/application-test.yml +++ b/casic-web/src/main/resources/config/application-test.yml @@ -22,7 +22,7 @@ #flowable数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken + nologin-urls: /user/register,/user/sms/**,/user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload smartcity: config: diff --git a/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java b/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java index a9c4a8f..2ea3aaa 100644 --- a/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java +++ b/casic-car-support/src/main/java/com/casic/missiles/modular/position/service/impl/BackpackPositionServiceImpl.java @@ -214,10 +214,13 @@ if (ToolUtil.isNotEmpty(backpackPosition)) { // TODO: 2022/8/16 判定在线时间 String offlineThreshold = offlineTime; - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date date = new Date(); - date.setTime(Long.parseLong(backpackPosition.getUpTime())); - Date latestTime = DateUtil.parseTime(dateFormat.format(date)); + if (!StringUtils.isEmpty(backpackPosition.getUpTime()) && !backpackPosition.getUpTime().contains("-")) { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = new Date(); + date.setTime(Long.parseLong(backpackPosition.getUpTime())); + backpackPosition.setUpTime(dateFormat.format(date)); + } + Date latestTime = DateUtil.parseTime(backpackPosition.getUpTime()); Long offlineMinutes = ((System.currentTimeMillis() - latestTime.getTime()) / 1000) / 60; // TODO: 2022/8/18 报警信息来自? //这里复用车辆的报警表bus_alarm_record diff --git a/casic-web/pom.xml b/casic-web/pom.xml index c86ae73..0317b45 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -257,7 +257,7 @@ 2.6 - ${resource.delimiter} + @ true diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index f2dbe75..12dac20 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -32,9 +32,9 @@ #flowable数据源和多数据源配置 casic: - kaptcha-open: true #是否开启登录时验证码 (true/false) + kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha/base64,/config/baseConfig,/route/mockToken,/job/updateSinkJob,/route/sync,/websocket/* + nologin-urls: /user/register,/user/sms/**,/user/login,/user/appLogin,/kaptcha/base64,/config/baseConfig,/route/mockToken,/job/updateSinkJob,/route/sync,/websocket/* file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload diff --git a/casic-web/src/main/resources/config/application-test.yml b/casic-web/src/main/resources/config/application-test.yml index 02ce3c8..f90cf9a 100644 --- a/casic-web/src/main/resources/config/application-test.yml +++ b/casic-web/src/main/resources/config/application-test.yml @@ -22,7 +22,7 @@ #flowable数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken + nologin-urls: /user/register,/user/sms/**,/user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload smartcity: config: diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index f94fdc2..a7ac9e8 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -36,7 +36,7 @@ ################### guns配置 ################### casic: swagger-open: false #是否开启swagger (true/false) - kaptcha-open: true #是否开启登录时验证码 (true/false) + kaptcha-open: false #是否开启登录时验证码 (true/false) file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录) muti-datasource-open: false #是否开启多数据源(true/false) spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)