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

hutool UTC_SIMPLE_MS_PATTERN

Browse Source
This commit is contained in:
ZZ 2021-08-17 18:13:30 +08:00
parent 609d0c3bf3
commit db5af94803
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java
View File

@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
import java.util.Map;
import static cn.hutool.core.date.DatePattern.UTC_PATTERN;
import static cn.hutool.core.date.DatePattern.UTC_SIMPLE_PATTERN;
import static com.xhpc.pp.server.ChargingPileServer.REDIS;
import static com.xhpc.pp.utils.security.CP56Time2a.cp56toDate;
@ -31,7 +31,7 @@ public class PileTimeConfigReplyDataLogic implements ServiceLogic {
PileTimeConfigReplyData pileTimeConfigReplyData = objectMapper.convertValue(req, PileTimeConfigReplyData.class);
String pileNo = (String) req.get("pileNo");
String pk = "pile:".concat(pileNo);
String configTime = DateUtil.format(cp56toDate(pileTimeConfigReplyData.getSetTime()), UTC_PATTERN);
String configTime = DateUtil.format(cp56toDate(pileTimeConfigReplyData.getSetTime()), UTC_SIMPLE_PATTERN);
Map<String, Object> cachePile = REDIS.getCacheMap(pk);
cachePile.put("configTime", configTime);
REDIS.setCacheMap(pk, cachePile);

4
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java
View File

@ -21,7 +21,7 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.*;
import static cn.hutool.core.date.DatePattern.UTC_PATTERN;
import static cn.hutool.core.date.DatePattern.UTC_SIMPLE_PATTERN;
import static com.xhpc.common.data.redis.SeqUtil.seqHex;
import static com.xhpc.pp.server.ChargingPileServer.REDIS;
import static com.xhpc.pp.tx.ServiceResult.OK;
@ -106,7 +106,7 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler {
Date date = Calendar.getInstance().getTime();
String timebin = getTimeBin(seqHex(pilekey.concat("seqhex")), pileNo, date);
Map<String, Object> cachePile = REDIS.getCacheMap(pilekey);
cachePile.put("configTime", DateUtil.format(date, UTC_PATTERN));
cachePile.put("configTime", DateUtil.format(date, UTC_SIMPLE_PATTERN));
REDIS.setCacheMap(pilekey, cachePile);
log.info("server send time config msg >>>> ({}) |{}|", pileNo, timebin);
handler.sendClientBinary(HexUtils.toBytes(timebin));

8
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CP56Time2a.java
View File

@ -2,10 +2,14 @@ package com.xhpc.pp.utils.security;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import java.util.Calendar;
import java.util.Date;
import static cn.hutool.core.date.DatePattern.UTC_SIMPLE_MS_PATTERN;
import static cn.hutool.core.date.DatePattern.UTC_SIMPLE_PATTERN;
public class CP56Time2a {
public static Date cp56toDate(String hex) {
@ -89,7 +93,9 @@ public class CP56Time2a {
System.out.println(String.format("--未编码--: %s", time));
String hex = toCp56Hex(time);
System.out.println("--编码1--:" + hex);
System.out.println("--解码1--:" + cp56toDate(hex));
System.out.println("--解码1--:" + DateUtil.format(cp56toDate(hex), UTC_SIMPLE_PATTERN));
System.out.println("--D0073211110815--:" + DateUtil.format(cp56toDate("D0073211110815"), UTC_SIMPLE_MS_PATTERN));
System.out.println("--A85B3411110815--:" + DateUtil.format(cp56toDate("A85B3411110815"), UTC_SIMPLE_MS_PATTERN));
// String encode = encode(time);
// System.out.println(String.format("--编码2--:%s", encode));
// System.out.println("--解码2--:" + decode(HexUtils.toBytes(encode)));

4
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CacheDataUtils.java
View File

@ -5,7 +5,7 @@ import cn.hutool.core.date.DateUtil;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import static cn.hutool.core.date.DatePattern.UTC_FORMAT;
import static cn.hutool.core.date.DatePattern.UTC_SIMPLE_PATTERN;
import static com.xhpc.common.core.utils.StringUtils.capitalize;
import static com.xhpc.pp.utils.security.CP56Time2a.cp56toDate;
@ -21,7 +21,7 @@ public class CacheDataUtils {
if (tarfield.getType().getSimpleName().equals("Integer")) {
tarval = HexUtils.reverseHexInt(srcval);
} else if (tarFieldName.contains("ime")) {
tarval = DateUtil.format(cp56toDate(srcval), UTC_FORMAT);
tarval = DateUtil.format(cp56toDate(srcval), UTC_SIMPLE_PATTERN);
} else {
tarval = srcval;
}