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

hb offline not so eager

Browse Source
This commit is contained in:
ZZ 2022-03-28 15:21:23 +08:00
parent c33f2b8f0c
commit c185b895a6
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/Calc.java
View File

@ -36,10 +36,15 @@ public class Calc {
expression = parser.parseExpression(ruleExpression); expression = parser.parseExpression(ruleExpression);
rs = expression.getValue(stdContext, String.class); rs = expression.getValue(stdContext, String.class);
System.out.println(rs); System.out.println(rs);
ruleExpression = "#totalPower * 0.03"; ruleExpression = "#totalPower - (0.03% * 2%)";
expression = parser.parseExpression(ruleExpression); // expression = parser.parseExpression(ruleExpression);
rs = expression.getValue(stdContext, String.class); // rs = expression.getValue(stdContext, String.class);
System.out.println(rs); // System.out.println(rs);
String[] split = ruleExpression.split("[()*/\\-+?]");
for (String splitValue : split) {
System.out.println(splitValue);
}
} }
private static void test(String s, double x) { private static void test(String s, double x) {
@ -254,7 +259,7 @@ class Parser extends Object {
*/ */
enum Symbol { enum Symbol {
PLUS('+'), MINUS('-'), STAR('*'), SLASH('/'), PLUS('+'), MINUS('-'), STAR('*'), SLASH('/'),
OPEN('('), CLOSE(')'), COMMA(','), OPEN('('), CLOSE(')'), COMMA(','), PERCENT('%'),
END(StreamTokenizer.TT_EOF), END(StreamTokenizer.TT_EOF),
WORD(StreamTokenizer.TT_WORD), WORD(StreamTokenizer.TT_WORD),
NUMBER(StreamTokenizer.TT_NUMBER); NUMBER(StreamTokenizer.TT_NUMBER);

22
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java
View File

@ -34,18 +34,20 @@ public class HBCheckTask {
Long hbtime = (Long) cacheGun.get("hbtime"); Long hbtime = (Long) cacheGun.get("hbtime");
hbtime = hbtime == null ? 0 : hbtime; hbtime = hbtime == null ? 0 : hbtime;
if ((now - hbtime) > 75000) { if ((now - hbtime) > 75000) {
cacheGun.put("statusInt", OFF_LINE); if (!DISCONNECTED.equals(cacheGun.get("status"))) {
cacheGun.put("status", DISCONNECTED); cacheGun.put("statusInt", OFF_LINE);
REDIS.setCacheMap(gunkey, cacheGun); cacheGun.put("status", DISCONNECTED);
REDIS.setCacheMap(gunkey, cacheGun);
XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();
deviceMessage.setType(StationDeviceEnum.PILE.getCode()); deviceMessage.setType(StationDeviceEnum.PILE.getCode());
String pileId= StrUtil.sub(gunkey.substring(gunkey.lastIndexOf(":") + 1), 0, -2); String pileId = StrUtil.sub(gunkey.substring(gunkey.lastIndexOf(":") + 1), 0, -2);
deviceMessage.setSerialNumber(pileId); deviceMessage.setSerialNumber(pileId);
deviceMessage.setStatus(0); deviceMessage.setStatus(0);
deviceMessage.setRemark("充电桩心跳掉线"); deviceMessage.setRemark("充电桩心跳掉线");
deviceMessageMapper.insertByDomain(deviceMessage); deviceMessageMapper.insertByDomain(deviceMessage);
}
} }
} }
} }