diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BaseData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BaseData.java index fc3eecec..6c676ba3 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BaseData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BaseData.java @@ -1,19 +1,13 @@ package com.xhpc.common.data.up; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - import java.io.Serializable; -import java.util.Date; -@JsonIgnoreProperties public class BaseData implements Serializable { private static final long serialVersionUID = 1L; private String createBy; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; + private String createTime; private String hex; private int seq; @@ -37,12 +31,12 @@ public class BaseData implements Serializable { this.createBy = createBy; } - public Date getCreateTime() { + public String getCreateTime() { return createTime; } - public void setCreateTime(Date createTime) { + public void setCreateTime(String createTime) { this.createTime = createTime; } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java index 14456a27..1bd799d4 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java @@ -1,5 +1,6 @@ package com.xhpc.pp.logic; +import cn.hutool.core.date.DateUtil; import com.fasterxml.jackson.databind.ObjectMapper; import com.xhpc.common.api.PileOrderService; import com.xhpc.common.data.redis.CacheOrderData; @@ -44,6 +45,7 @@ public class OrderDataLogic implements ServiceLogic { cacheOrderData.setStartSoc((Integer) cacheOrder.get("startSoc")); cacheOrderData.setEndSoc((Integer) cacheOrder.get("endSoc")); cacheOrderData.setStatus(1); + cacheOrderData.setCreateTime(DateUtil.now()); cacheOrder.put("orderData", cacheOrderData); REDIS.setCacheMap(orderkey, cacheOrder); String gunkey = "gun:".concat(orderData.getPileNo()).concat(orderData.getGunId()); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java index cd441435..cd1c93f2 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java @@ -1,5 +1,6 @@ package com.xhpc.pp.logic; +import cn.hutool.core.date.DateUtil; import com.fasterxml.jackson.databind.ObjectMapper; import com.xhpc.common.api.PileOrderService; import com.xhpc.common.api.SmsService; @@ -19,7 +20,6 @@ import org.springframework.stereotype.Component; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; -import java.util.Calendar; import java.util.List; import java.util.Map; @@ -58,8 +58,6 @@ public class RealtimeDataLogic implements ServiceLogic { String gunId = realtimeData.getGunId(); String terminalId = pileNo.concat(gunId); String gunkey = "gun:".concat(terminalId); - realtimeData.setCreateBy("SYSTEM"); - realtimeData.setCreateTime(Calendar.getInstance().getTime()); Map cacheGun = REDIS.getCacheMap(gunkey); String statusplain = stable[Integer.parseInt(realtimeData.getStatus())]; cacheGun.put("pileGunStatus", pvgstable[Integer.parseInt(realtimeData.getPileGunStatus())]); @@ -104,6 +102,7 @@ public class RealtimeDataLogic implements ServiceLogic { CacheRealtimeData cacheRealtimeData = translate(realtimeData); realtimeDataList.add(cacheRealtimeData); String lord = orderkey.concat(".lord"); + cacheRealtimeData.setCreateTime(DateUtil.now()); REDIS.setCacheObject(lord, cacheRealtimeData); Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc"); if (cacheStartSoc == 0 && socInt != 0) cacheOrder.put("startSoc", socInt);