missing Ret content

evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/encryption/Aes128Cbc.java

@@ -61,8 +61,7 @@ public class Aes128Cbc {
             NoSuchAlgorithmException, IllegalBlockSizeException, UnsupportedEncodingException, NoSuchPaddingException,
             InvalidKeyException {
 
-        System.out.println(decryptString("gbmqQAsXVr/c1cvxNkxog7GXLZMMLEp9vGV3O/aW60ZkWNzFsLkwMd0tqb7nU6SKR0QrNL9n" +
+        System.out.println(decryptString("Fa09StzEtf3Qfmr/b91gfg==",
-                        "+ayJRaL0LTjPRA==",
                 "8LpncubmWiPCzY3V", "av6A8QdnRaVRMXu6"
         ));
         //ujNoGsWRo5MyPKYOxeofKwgPEng3xF+yhM8DDjwtwHo=

evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipAuthController.java

@@ -53,6 +53,7 @@ public class QueryEquipAuthController {
         if (xhpcInternetUserList.isEmpty()) {
             equipAuthResponse.setSuccStat(1);
             equipAuthResponse.setFailReason(2);
+            resp.setRet("500");
             resp.setMsg("auth denied");
         } else {
             Long internetUserId = xhpcInternetUserList.get(0).getId();
@@ -62,6 +63,7 @@ public class QueryEquipAuthController {
             if (null != xhpcStationInternetBlacklist) {
                 equipAuthResponse.setSuccStat(1);
                 equipAuthResponse.setFailReason(2);
+                resp.setRet("500");
                 resp.setMsg("auth denied");
             } else {
                 Map<String, Object> realTimeTerminalData = REDIS.getCacheMap("gun:".concat(connectorId));
@@ -69,15 +71,16 @@ public class QueryEquipAuthController {
                 String status = (String) realTimeTerminalData.get("status");
                 if (!"空闲".equals(status)) {
                     resp.setMsg("终端状态异常:[".concat(status == null ? "未注册" : status).concat("]"));
-                    resp.setRet("1");
+                    resp.setRet("500");
                     equipAuthResponse.setSuccStat(1);
                     equipAuthResponse.setFailReason(1);
                 } else if ("否".equals(terminalStatus)) {
                     resp.setMsg("未插枪");
-                    resp.setRet("1");
+                    resp.setRet("500");
                     equipAuthResponse.setSuccStat(1);
                     equipAuthResponse.setFailReason(1);
                 } else {
+                    resp.setRet("0");
                     resp.setMsg("success");
                     equipAuthResponse.setSuccStat(0);
                     equipAuthResponse.setFailReason(0);

evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java

@@ -61,7 +61,7 @@ public class QueryEquipChargeStatusController {
             case "停止中":
                 startChargeSeqStat = 3;
                 break;
-            case "结束中":
+            case "已结束":
                 startChargeSeqStat = 4;
                 break;
             default:
@@ -101,7 +101,7 @@ public class QueryEquipChargeStatusController {
         equipChargeStatus.setVoltageA(voltageA);
         //电池剩余电量
         Integer endSoc = (Integer) order.get("endSoc");
-        Double soc = Double.valueOf(endSoc);
+        Double soc = Double.valueOf(endSoc == null ? 0 : endSoc);
         equipChargeStatus.setSoc(soc);
         //开始充电时间
         String startTime = (String) order.get("startTime");
@@ -111,14 +111,14 @@ public class QueryEquipChargeStatusController {
         Integer chargeModel = (Integer) order.get("chargeModel");
         equipChargeStatus.setChargeModel(chargeModel == null ? 0 : chargeModel);
         //累计充电量
-        CacheRealtimeData orderLord = REDIS.getCacheObject("order:" + internalOrderNum + ".lord");
+        CacheRealtimeData lord = REDIS.getCacheObject("order:" + internalOrderNum + ".lord");
-        Double chargingDegree = Double.valueOf(orderLord.getChargingDegree());
+        Double chargingDegree = Double.valueOf(lord.getChargingDegree() == null ? 0 : lord.getChargingDegree());
         equipChargeStatus.setTotalPower(chargingDegree / 10000);
         //总金额
-        equipChargeStatus.setTotalMoney(orderLord.getAmountCharged() / 10000.0);
+        equipChargeStatus.setTotalMoney(lord.getAmountCharged() == null ? 0 : lord.getAmountCharged() / 10000.0);
         final Long rateModelId = REDIS.getCacheMapValue("pile:".concat(connectorId.substring(0, 14)), "rateModelId");
         final CacheRateModel cacheRateModel = REDIS.getCacheObject("rateModel:" + rateModelId);
-        calculateEm(equipChargeStatus, cacheRateModel);
+        if (cacheRateModel != null) calculateEm(equipChargeStatus, cacheRateModel);
         CommonResponse response = new CommonResponse();
         response.setRet(EvcsConst.RET_SUCC);
         response.setData(JSONUtil.toJSONString(equipChargeStatus));

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java

@@ -238,6 +238,7 @@ public class ChargingController {
             Map<String, Object> cacheGun = REDIS.getCacheMap(gunkey);
             String gunstatus = (String) cacheGun.get("status");
             if (!"空闲".equals(gunstatus)) {
+
                 return R.fail("端口不在空闲或正常状态,稍后再试");
             }
             if (CacheDataUtils.hori(gunkey)) return R.fail("请检查枪号是否正确,稍后再试");