diff --git a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ConnectorStatusInfo.java b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ConnectorStatusInfo.java
index bab733ae..0efb7b43 100644
--- a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ConnectorStatusInfo.java
+++ b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ConnectorStatusInfo.java
@@ -22,12 +22,12 @@ import java.util.Objects;
@Setter
public class ConnectorStatusInfo {
- final static int OFF_LINE = 0;//离网
- final static int FREE = 1;//空闲
- final static int CONNECTED = 2;//占用（未充电)
- final static int CHARGING = 3;//占用（充电中）
- final static int BOOKED = 4;//占用（预约锁定)
- final static int ERROR = 255;//故障
+ public final static int OFF_LINE = 0;//离网
+ public final static int FREE = 1;//空闲
+ public final static int CONNECTED = 2;//占用（未充电)
+ public final static int CHARGING = 3;//占用（充电中）
+ public final static int BOOKED = 4;//占用（预约锁定)
+ public final static int ERROR = 255;//故障
@Id
@JsonProperty("ConnectorID")
diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationStationStatusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationStationStatusTask.java
index 10bbc6d2..c97ede51 100644
--- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationStationStatusTask.java
+++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationStationStatusTask.java
@@ -17,7 +17,7 @@ import java.util.Map;
import java.util.Set;
import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
-import static com.xhpc.common.dto.ConnectorStatusInfo.*;
+import static com.xhpc.evcs.dto.ConnectorStatusInfo.*;
import static com.xhpc.evcs.domain.AuthSecretToken.SECRET_TOKEN_TYPE_OUT;
@Component
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysDictDataServiceImpl.java
index ae5fe736..8e1b189d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysDictDataServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysDictDataServiceImpl.java
@@ -8,6 +8,7 @@ import com.xhpc.system.service.ISysDictDataService;
import com.xhpc.system.utils.DictUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* 字典 业务层处理
@@ -100,6 +101,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService
* @return 结果
*/
@Override
+ @Transactional
public int updateDictData(SysDictData data)
{
int row = dictDataMapper.updateDictData(data);
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/dto/ConnectorStatusInfo.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/dto/ConnectorStatusInfo.java
deleted file mode 100644
index 155ed190..00000000
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/dto/ConnectorStatusInfo.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.xhpc.common.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class ConnectorStatusInfo {
-
- public final static int OFF_LINE = 0;//离网
- public final static int FREE = 1;//空闲
- public final static int CONNECTED = 2;//占用（未充电)
- public final static int CHARGING = 3;//占用（充电中）
- public final static int BOOKED = 4;//占用（预约锁定)
- public final static int ERROR = 255;//故障
-
- private String connectorID;
- private String operatorID;
- private Integer status;
-
-}
diff --git a/xhpc-modules/xhpc-power-pile/pom.xml b/xhpc-modules/xhpc-power-pile/pom.xml
index 1f236b43..265ad072 100644
--- a/xhpc-modules/xhpc-power-pile/pom.xml
+++ b/xhpc-modules/xhpc-power-pile/pom.xml
@@ -103,6 +103,12 @@
com.ruoyi
ruoyi-common-core
+
+ com.xhpc
+ evcs-common
+ 1.0
+ compile
+
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/TestController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/TestController.java
index c1793840..57aef7e4 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/TestController.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/TestController.java
@@ -1,6 +1,7 @@
package com.xhpc.pp.controller;
import com.alibaba.nacos.api.exception.NacosException;
+import com.xhpc.common.api.PileOrderService;
import com.xhpc.common.api.PowerPileService;
import com.xhpc.common.core.domain.R;
import com.xhpc.common.data.down.StartChargingData;
@@ -14,11 +15,13 @@ public class TestController {
@Autowired
private PowerPileService powerPileService;
+ @Autowired
+ private PileOrderService pileOrderService;
@GetMapping("test/{pno}/{ono}/{b}/{gid}")
public R test(@PathVariable String pno, @PathVariable String ono, @PathVariable int b, @PathVariable String gid) throws NacosException {
-// String serverIp = "127.0.0.1";
+// String serverIp = "172.31.183.135";
// int serverPort = 8848;
// String serverAddr = serverIp + ":" + serverPort;
// NamingService namingService = NacosFactory.createNamingService(serverAddr);
@@ -34,4 +37,14 @@ public class TestController {
return powerPileService.startCharging(d);
}
+ @GetMapping("rime/{orderNo}/{N}")
+ public R test(@PathVariable String orderNo, @PathVariable Integer N) {
+
+ for (int i = 0; i < N; i++) {
+
+ pileOrderService.pileRimeOrder(orderNo);
+ }
+
+ return R.ok();
+ }
}
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java
index 7cefce17..b170a620 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java
@@ -1,6 +1,6 @@
package com.xhpc.pp.logic;
-import com.xhpc.common.dto.ConnectorStatusInfo;
+import com.xhpc.evcs.dto.ConnectorStatusInfo;
import com.xhpc.pp.tx.ServiceParameter;
import com.xhpc.pp.tx.ServiceResult;
import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java
index db8353aa..b34e2b15 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java
@@ -8,7 +8,7 @@ import java.util.Map;
import java.util.Set;
import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
-import static com.xhpc.common.dto.ConnectorStatusInfo.OFF_LINE;
+import static com.xhpc.evcs.dto.ConnectorStatusInfo.OFF_LINE;
import static com.xhpc.pp.config.EarlierBeanConf.getLocalIPAndPort;
import static com.xhpc.pp.logic.RegisterLogic.DISCONNECTED;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CP56Time2a.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CP56Time2a.java
index 069a5c3c..ecf42383 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CP56Time2a.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CP56Time2a.java
@@ -88,13 +88,23 @@ public class CP56Time2a {
public static void main(String[] args) throws InterruptedException {
- Date time = Calendar.getInstance().getTime();
- System.out.println(String.format("--未编码--: %s", time));
- String hex = toCp56Hex(time);
- System.out.println("--编码1--:" + hex);
- System.out.println("--解码1--:" + DateUtil.format(cp56toDate(hex), NORM_DATETIME_FORMAT));
- System.out.println("--D0073211110815--:" + DateUtil.format(cp56toDate("D0073211110815"), NORM_DATETIME_FORMAT));
- System.out.println("--A85B3411110815--:" + DateUtil.format(cp56toDate("A85B3411110815"), NORM_DATETIME_FORMAT));
+// Date time = Calendar.getInstance().getTime();
+// System.out.println(String.format("--未编码--: %s", time));
+// String hex = toCp56Hex(time);
+// System.out.println("--编码1--:" + hex);
+ System.out.println("--下达1--:" + DateUtil.format(cp56toDate("F0552E151E0815"),
+ NORM_DATETIME_FORMAT));
+// System.out.println("--下达2--:" + DateUtil.format(cp56toDate(""), NORM_DATETIME_FORMAT));
+
+
+ String dateStr = "2017-03-01 22:33:23";
+ Date date = DateUtil.parse(dateStr);
+ Date newDate = DateUtil.offset(date, DateField.DAY_OF_MONTH, 2);
+
+ System.out.println("--变为--:" + newDate.toString());
+ System.out.println("sudo date " + newDate.getTime());
+// System.out.println("--D0073211110815--:" + DateUtil.format(cp56toDate("D0073211110815"), NORM_DATETIME_FORMAT));
+// System.out.println("--A85B3411110815--:" + DateUtil.format(cp56toDate("A85B3411110815"), NORM_DATETIME_FORMAT));
// String encode = encode(time);
// System.out.println(String.format("--编码2--:%s", encode));
// System.out.println("--解码2--:" + decode(HexUtils.toBytes(encode)));
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/HexUtils.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/HexUtils.java
index dd16e33a..dfa2b2c8 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/HexUtils.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/HexUtils.java
@@ -182,15 +182,13 @@ public class HexUtils {
// System.out.println(Integer.parseInt("FF00", 16));
// System.out.println(reverseHexInt("FF00"));
-// byte[] data1 = toBytes(reverseHex("FC080000"));
-// System.out.println(toInteger(data1, 0, 4));
-// System.out.println(reverseHexInt("FC080000"));
+ byte[] data1 = toBytes(reverseHex("10270000"));
+ System.out.println(toInteger(data1, 0, 4));
+ System.out.println(reverseHexInt("A0860100"));
// System.out.println(toHexInt(100000));
// System.out.println(toBits("1000"));
- System.out.println(toHex(new byte[]{104, 48, 0, 119, 0, 37, 105, -123, 33, 69, -119, 101, 72, 2, 33, 9, 21, 22, 2, 40
- , 1, 121, 105, -123, 33, 69, -119, 101, 72, 2, 17, 34, 51, 68, 85, 0, -48, 61, 46}));
- System.out.println(toHex(new byte[]{104, 48, 0, -19, 0, 37, 105, -123, 33, 69, -119, 101, 72, 2, 33, 9, 21, 22, 2, 40
- , 1, 121, 105, -123, 33, 69, -119, 101, 72, 2, 17, 34, 51, 68, 85, 0, -48, 14, 12}));
+ System.out.println(toHex(new byte[]{104, 13, 19, 123, 0, 3, 105, -123, 71, -123, -106, 50, 84, 1, 0, 72, 106, 104, -94, 19, 124, 0, 59, 105, -123, 71, -123, -106, 50, 84, 1, 33, 9, 24, 9, 67, 57, 0, 2, 105, -123, 71, -123, -106, 50, 84, 1, -88, 97, 43, 9, 50, 9, 21, 48, 117, 50, 9, 50, 9, 21, -64, 87, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -40, 83, 1, 0}));
+
}
}