yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

加入创建时间

Browse Source
This commit is contained in:
ZZ 2021-09-01 12:10:02 +08:00
parent f453d8afbd
commit 9b9326883b
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BaseData.java
View File

@ -1,19 +1,13 @@
package com.xhpc.common.data.up; package com.xhpc.common.data.up;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
@JsonIgnoreProperties
public class BaseData implements Serializable { public class BaseData implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String createBy; private String createBy;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String createTime;
private Date createTime;
private String hex; private String hex;
private int seq; private int seq;
@ -37,12 +31,12 @@ public class BaseData implements Serializable {
this.createBy = createBy; this.createBy = createBy;
} }
public Date getCreateTime() { public String getCreateTime() {
return createTime; return createTime;
} }
public void setCreateTime(Date createTime) { public void setCreateTime(String createTime) {
this.createTime = createTime; this.createTime = createTime;
} }

2
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java
View File

@ -1,5 +1,6 @@
package com.xhpc.pp.logic; package com.xhpc.pp.logic;
import cn.hutool.core.date.DateUtil;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.xhpc.common.api.PileOrderService; import com.xhpc.common.api.PileOrderService;
import com.xhpc.common.data.redis.CacheOrderData; import com.xhpc.common.data.redis.CacheOrderData;
@ -44,6 +45,7 @@ public class OrderDataLogic implements ServiceLogic {
cacheOrderData.setStartSoc((Integer) cacheOrder.get("startSoc")); cacheOrderData.setStartSoc((Integer) cacheOrder.get("startSoc"));
cacheOrderData.setEndSoc((Integer) cacheOrder.get("endSoc")); cacheOrderData.setEndSoc((Integer) cacheOrder.get("endSoc"));
cacheOrderData.setStatus(1); cacheOrderData.setStatus(1);
cacheOrderData.setCreateTime(DateUtil.now());
cacheOrder.put("orderData", cacheOrderData); cacheOrder.put("orderData", cacheOrderData);
REDIS.setCacheMap(orderkey, cacheOrder); REDIS.setCacheMap(orderkey, cacheOrder);
String gunkey = "gun:".concat(orderData.getPileNo()).concat(orderData.getGunId()); String gunkey = "gun:".concat(orderData.getPileNo()).concat(orderData.getGunId());

5
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java
View File

@ -1,5 +1,6 @@
package com.xhpc.pp.logic; package com.xhpc.pp.logic;
import cn.hutool.core.date.DateUtil;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.xhpc.common.api.PileOrderService; import com.xhpc.common.api.PileOrderService;
import com.xhpc.common.api.SmsService; import com.xhpc.common.api.SmsService;
@ -19,7 +20,6 @@ import org.springframework.stereotype.Component;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -58,8 +58,6 @@ public class RealtimeDataLogic implements ServiceLogic {
String gunId = realtimeData.getGunId(); String gunId = realtimeData.getGunId();
String terminalId = pileNo.concat(gunId); String terminalId = pileNo.concat(gunId);
String gunkey = "gun:".concat(terminalId); String gunkey = "gun:".concat(terminalId);
realtimeData.setCreateBy("SYSTEM");
realtimeData.setCreateTime(Calendar.getInstance().getTime());
Map<String, Object> cacheGun = REDIS.getCacheMap(gunkey); Map<String, Object> cacheGun = REDIS.getCacheMap(gunkey);
String statusplain = stable[Integer.parseInt(realtimeData.getStatus())]; String statusplain = stable[Integer.parseInt(realtimeData.getStatus())];
cacheGun.put("pileGunStatus", pvgstable[Integer.parseInt(realtimeData.getPileGunStatus())]); cacheGun.put("pileGunStatus", pvgstable[Integer.parseInt(realtimeData.getPileGunStatus())]);
@ -104,6 +102,7 @@ public class RealtimeDataLogic implements ServiceLogic {
CacheRealtimeData cacheRealtimeData = translate(realtimeData); CacheRealtimeData cacheRealtimeData = translate(realtimeData);
realtimeDataList.add(cacheRealtimeData); realtimeDataList.add(cacheRealtimeData);
String lord = orderkey.concat(".lord"); String lord = orderkey.concat(".lord");
cacheRealtimeData.setCreateTime(DateUtil.now());
REDIS.setCacheObject(lord, cacheRealtimeData); REDIS.setCacheObject(lord, cacheRealtimeData);
Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc"); Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc");
if (cacheStartSoc == 0 && socInt != 0) cacheOrder.put("startSoc", socInt); if (cacheStartSoc == 0 && socInt != 0) cacheOrder.put("startSoc", socInt);