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:
yuyang 2022-02-22 11:48:28 +08:00
parent b2eb21a6fc
commit 7c8bc950ef
3 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/constant/Constants.java
View File

@ -109,41 +109,41 @@ public class Constants
/** /**
* 帐户不足 * 帐户不足
*/ */
public static final String INSUFFICIENT_ACCOUNT = "insufficient account"; public static final String INSUFFICIENT_ACCOUNT = "03";
/** /**
* 锁定帐户 * 锁定帐户
*/ */
public static final String LOCKED_ACCOUNT = "locked account"; public static final String LOCKED_ACCOUNT = "02";
/** /**
* 无效终端 * 无效终端
*/ */
public static final String LNVALID_TERMINAL = "lnvalid terminal"; public static final String LNVALID_TERMINAL = "0C";
/** /**
* 无效运营商（桩的运营商和卡不对应） * 无效运营商（桩的运营商和卡不对应）
*/ */
public static final String LNVALID_OPERATOR = "lnvalid operator"; public static final String LNVALID_OPERATOR = "06";
/** /**
* 无效卡 * 无效卡
*/ */
public static final String LNVALID_CARD = "lnvalid card"; public static final String LNVALID_CARD = "0D";
/** /**
* 无效用户 * 无效用户
*/ */
public static final String LNVALID_USER = "lnvalid user"; public static final String LNVALID_USER = "0E";
/** /**
* 离线卡 * 离线卡
*/ */
public static final String OFFLINE_CARD = "offline card"; public static final String OFFLINE_CARD = "0F";
/** /**
* 初始化 * 初始化
*/ */
public static final String ZERO_CARD = "zero card"; public static final String ZERO_CARD = "0G";
/** /**
* 正常 * 正常
@ -153,53 +153,53 @@ public class Constants
/** /**
* 锁卡 * 锁卡
*/ */
public static final String TWO_CARD = "two card"; public static final String TWO_CARD = "0H";
/** /**
* 挂失 * 挂失
*/ */
public static final String THREE_CARD = "three card"; public static final String THREE_CARD = "0I";
/** /**
* 作废 * 作废
*/ */
public static final String FOUR_CARD = "four card"; public static final String FOUR_CARD = "0J";
//你有异常订单未解决，请拨打客服电话进行解决 //你有异常订单未解决，请拨打客服电话进行解决
public static final String EXCEPTION_ORDER = "exception order"; public static final String EXCEPTION_ORDER = "04";
//你有申请退款订单在审核中,需要充电请取消申请退款 //你有申请退款订单在审核中,需要充电请取消申请退款
public static final String REFUND_ORDER = "refund order"; public static final String REFUND_ORDER = "0K";
//车辆正在充电,请查询车辆充电信息 //车辆正在充电,请查询车辆充电信息
public static final String CHARGE_ORDER = "charge order"; public static final String CHARGE_ORDER = "0L";
//未注册的终端,请选择其他终端充电 //未注册的终端,请选择其他终端充电
public static final String UNREGISTERED_TERMINAL = "unregistered terminal"; public static final String UNREGISTERED_TERMINAL = "0C";
//未知的终端状态,请选择其他终端充电 //未知的终端状态,请选择其他终端充电
public static final String UNKNOWN_TERMINAL = "unknown terminal"; public static final String UNKNOWN_TERMINAL = "0C";
//离线终端 //离线终端
public static final String OFFLINE_TERMINAL = "offline terminal"; public static final String OFFLINE_TERMINAL = "0M";
//故障终端 //故障终端
public static final String FAULT_TERMINAL = "fault terminal"; public static final String FAULT_TERMINAL = "0N";
//充电终端 //充电终端
public static final String CHARGE_TERMINAL = "charge terminal"; public static final String CHARGE_TERMINAL = "0O";
//未知的枪 //未知的枪
public static final String UNKNOWN_GUN = "unknown gun"; public static final String UNKNOWN_GUN = "0P";
//请插好充电枪 //请插好充电枪
public static final String INSERT_THE_GUN = "insert the gun"; public static final String INSERT_THE_GUN = "0Q";
/** /**
* 模板id为null * 模板id为null
*/ */
public static final String LNVALID_RATE_MODE = "lnvalid rateModelId"; public static final String LNVALID_RATE_MODE = "0R";
/** /**
* 数据问题（报错） * 数据问题（报错）
*/ */
public static final String DATA_EXCEPTION = "data exception"; public static final String DATA_EXCEPTION = "0S";
} }

7
xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/api/XhpcChargingStationApiController.java
View File

@ -87,4 +87,11 @@ public class XhpcChargingStationApiController extends BaseController {
public AjaxResult getWXpNumMessage(@RequestParam(value = "pNum") String pNum) { public AjaxResult getWXpNumMessage(@RequestParam(value = "pNum") String pNum) {
return xhpcTerminalService.getWXpNumMessage(pNum); return xhpcTerminalService.getWXpNumMessage(pNum);
} }
} }

7
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml
View File

@ -162,7 +162,12 @@
</select> </select>
<select id="getXhpcTerminalSerialNumber" resultMap="BaseResultMap"> <select id="getXhpcTerminalSerialNumber" resultMap="BaseResultMap">
select * from xhpc_terminal where serial_number=#{serialNumber} and tenant_id=#{tenantId} and del_flag=0 limit 1 select * from xhpc_terminal
where serial_number=#{serialNumber}
<if test="tenantId !=null and ''!=tenantId">
and tenant_id=#{tenantId}
</if>
and del_flag=0 limit 1
</select> </select>
<insert id="addXhpcChargeOrder" parameterType="com.xhpc.order.domain.XhpcChargeOrder" useGeneratedKeys="true" <insert id="addXhpcChargeOrder" parameterType="com.xhpc.order.domain.XhpcChargeOrder" useGeneratedKeys="true"