diff --git a/src/main/java/com/zhgd/xmgl/task/GantryCraneTask.java b/src/main/java/com/zhgd/xmgl/task/GantryCraneTask.java index 7bd93293b..1abb4a337 100644 --- a/src/main/java/com/zhgd/xmgl/task/GantryCraneTask.java +++ b/src/main/java/com/zhgd/xmgl/task/GantryCraneTask.java @@ -100,7 +100,7 @@ public class GantryCraneTask { String devSn = gantryCrane.getDevSn(); data.setDevSn(devSn); data.setProjectSn(gantryCrane.getProjectSn()); - data.setReciveTime(now); + data.setReciveTime(DateUtil.parse(dto.getCtime())); data.setRunTime(null); data.setWindSpeed(Convert.toStr(dto.getWind1())); data.setWindSpeedState(getWindSpeedState(dto.getAL1bit5())); @@ -171,7 +171,7 @@ public class GantryCraneTask { cycle.setStartTime(DateUtil.formatDateTime(lastNewData.getReciveTime())); cycle.setEndTime(DateUtil.formatDateTime(now)); cycle.setWorkTime(Convert.toStr(DateUtil.between(lastNewData.getReciveTime(), now, DateUnit.SECOND))); - cycle.setAddTime(now); + cycle.setAddTime(data.getReciveTime()); //cycle.setDriverName(); //cycle.setDriverIdCard(); cycle.setMasterHookWorkStartHeight(Convert.toStr(lastNewData.getSmallCraneMainHookHeight())); diff --git a/src/main/java/com/zhgd/xmgl/task/dto/GantryCraneCurrentDataDto.java b/src/main/java/com/zhgd/xmgl/task/dto/GantryCraneCurrentDataDto.java index ef444ee8c..058d3e79a 100644 --- a/src/main/java/com/zhgd/xmgl/task/dto/GantryCraneCurrentDataDto.java +++ b/src/main/java/com/zhgd/xmgl/task/dto/GantryCraneCurrentDataDto.java @@ -5,6 +5,8 @@ import lombok.Data; @Data public class GantryCraneCurrentDataDto { + @JsonProperty("ctime") + private String ctime; @JsonProperty("DevID") private String devID; @JsonProperty("DevType") diff --git a/src/main/java/com/zhgd/xmgl/util/DateUtils.java b/src/main/java/com/zhgd/xmgl/util/DateUtils.java index ce9b2ee2a..0882d7fb5 100644 --- a/src/main/java/com/zhgd/xmgl/util/DateUtils.java +++ b/src/main/java/com/zhgd/xmgl/util/DateUtils.java @@ -466,7 +466,7 @@ public class DateUtils { DateTime beginDate = DateUtil.lastWeek(); DateTime endDate = DateTime.now(); long offset = DateUtil.betweenDay(beginDate, endDate, true); - for (int i = 0; i < offset + 1; i++) { + for (int i = 1; i < offset + 1; i++) { rtList.add(DateUtil.format(DateUtil.offsetDay(beginDate, i), pattern)); } return rtList; diff --git a/src/main/java/com/zhgd/xmgl/util/NumberUtils.java b/src/main/java/com/zhgd/xmgl/util/NumberUtils.java index b34e12be9..c88989408 100644 --- a/src/main/java/com/zhgd/xmgl/util/NumberUtils.java +++ b/src/main/java/com/zhgd/xmgl/util/NumberUtils.java @@ -54,7 +54,7 @@ public class NumberUtils { if (!NumberUtil.isNumber(s1) || !NumberUtil.isNumber(s2)) { return false; } - return Convert.toDouble(s1) >= Convert.toDouble(s2); + return Convert.toDouble(s1) > Convert.toDouble(s2); } catch (Exception e) { e.printStackTrace(); }