diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/xhpc/common/security/service/TokenService.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/xhpc/common/security/service/TokenService.java index cf61dbf0..f13c4ebb 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/xhpc/common/security/service/TokenService.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/xhpc/common/security/service/TokenService.java @@ -52,7 +52,7 @@ public class TokenService { redisService.setCacheObject(ACCESS_TOKEN + token, loginUser, EXPIRE_TIME, TimeUnit.SECONDS); Map map1 = new HashMap<>(); map1.put("privilege", loginUser.getSysUser().getDataPowerType()); - redisService.setCacheMap(loginUser.getSysUser().getUserId() + ":privilege", map1); + redisService.setCacheMap("privilege:" + loginUser.getSysUser().getUserId(), map1); return map; } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java index 032cd781..8fa12bee 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java @@ -530,12 +530,12 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi } //费率 List> xhpcRateList = xhpcChargingStationMapper.getXhpcRateList(chargingStationId); - map.put("rateList",xhpcRateList); + map.put("xhpcRateList", xhpcRateList); //费率时段,先反设置时段，在反默认时段 List> xhpcRateTimeTypeList = xhpcChargingStationMapper.getXhpcRateTimeTypeList(chargingStationId, 1); xhpcRateTimeTypeList.addAll(xhpcChargingStationMapper.getXhpcRateTimeTypeList(chargingStationId, 2)); - map.put("rateTimeList",xhpcRateTimeTypeList); + map.put("xhpcRateTimeList", xhpcRateTimeTypeList); if(type ==2){ //统计终端（充redis获取终端信息） diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml index df8f6ec0..a86e1b77 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -183,7 +183,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ct.station_type as stationType, op.name as operatorName, ct.type as type, - ct.station_type as stationType, (select dict_value from xhpc_dict_biz where code ='charging_station_type' and dict_key =ct.station_type) as stationTypeName, ct.serial_number as serialNumber, ct.construction_site as constructionSite, diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml index 0e703ce6..a6328e7d 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml @@ -222,7 +222,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rt.start_time as startTime, replace(rt.end_time,'00:00:00','24:00:00') AS endTime, rt.rate_id as rateId, - rate_value as rateValue, + rt.rate_value as rateValue, ra.name as rateName from xhpc_rate_time as rt left join xhpc_rate as ra on ra.rate_id =rt.rate_id diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/OrderApplication.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/OrderApplication.java index eb649f83..df870d56 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/OrderApplication.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/OrderApplication.java @@ -16,6 +16,16 @@ public class OrderApplication { public static void main(String[] args) { SpringApplication.run(OrderApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ 订单服务启动成功 ლ(´ڡ`ლ)ﾞ \n" + + " .-------. ____ __ \n" + + " | _ _ \\ \\ \\ / / \n" + + " | ( ' ) | \\ _. / ' \n" + + " |(_ o _) / _( )_ .' \n" + + " | (_,_).' __ ___(_ o _)' \n" + + " | |\\ \\ | || |(_,_)' \n" + + " | | \\ `' /| `-' / \n" + + " | | \\ / \\ / \n" + + " ''-' `'-' `-..-' "); } } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java index a06734be..8021da79 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java @@ -93,7 +93,7 @@ public class XhpcHistoryOrderReconciliationStatusServiceImpl implements IXhpcHis */ @Override public AjaxResult internetUser(Long userId) { - Map map = redisService.getCacheMap(userId + ":privilege"); + Map map = redisService.getCacheMap("privilege:" + userId); if (StringUtils.isNotNull(map)) { String privilege = StringUtils.valueOf(map.get("privilege")); if (StringUtils.isNotEmpty(privilege)) { @@ -122,7 +122,7 @@ public class XhpcHistoryOrderReconciliationStatusServiceImpl implements IXhpcHis */ @Override public List> page(Long userId, String serialNumber, String createTimeStart, String createTimeEnd, String chargingStationName, String status) { - Map map = redisService.getCacheMap(userId + ":privilege"); + Map map = redisService.getCacheMap("privilege:" + userId); if (StringUtils.isNotNull(map)) { String privilege = StringUtils.valueOf(map.get("privilege")); if (StringUtils.isNotEmpty(privilege)) { diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java index 791f6fb9..f3b06e2a 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java @@ -93,7 +93,7 @@ public class XhpcHistoryOrderSortingStatusServiceImpl implements IXhpcHistoryOrd */ @Override public AjaxResult operatorUser(Long userId) { - Map map = redisService.getCacheMap(userId + ":privilege"); + Map map = redisService.getCacheMap("privilege:" + userId); if (StringUtils.isNotNull(map)) { String privilege = StringUtils.valueOf(map.get("privilege")); if (StringUtils.isNotEmpty(privilege)) { @@ -123,7 +123,7 @@ public class XhpcHistoryOrderSortingStatusServiceImpl implements IXhpcHistoryOrd */ @Override public List> page(Long userId, String serialNumber, String createTimeStart, String createTimeEnd, String chargingStationName, String status) { - Map map = redisService.getCacheMap(userId + ":privilege"); + Map map = redisService.getCacheMap("privilege:" + userId); if (StringUtils.isNotNull(map)) { String privilege = StringUtils.valueOf(map.get("privilege")); if (StringUtils.isNotEmpty(privilege)) { diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml index cf3b9fa0..eae023c6 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -321,7 +321,8 @@ te.name as terminalName, ho.act_price as actPrice, ho.act_power_price as actPowerPrice, - (select charging_time from xhpc_real_time_order where charging_order_id=ho.charging_order_id ORDER BY create_time desc LIMIT 1) as chargingTime + (select charging_time from xhpc_real_time_order where charging_order_id=ho.charging_order_id ORDER BY + create_time desc LIMIT 1) as chargingTime, (select charging_degree from xhpc_real_time_order where charging_order_id=ho.charging_order_id ORDER BY create_time desc LIMIT 1) as chargingDegree, (select DATE_FORMAT(create_time,'%m月%d日') from xhpc_real_time_order where charging_order_id=ho.charging_order_id ORDER BY create_time asc LIMIT 1) as daysOne, (select DATE_FORMAT(create_time,'%H:%m') from xhpc_real_time_order where charging_order_id=ho.charging_order_id ORDER BY create_time asc LIMIT 1) as timeOne, diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/PaymentApplication.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/PaymentApplication.java index c5b830c2..c7ae5bf9 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/PaymentApplication.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/PaymentApplication.java @@ -16,6 +16,16 @@ public class PaymentApplication { public static void main(String[] args) { SpringApplication.run(PaymentApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ 支付服务启动成功 ლ(´ڡ`ლ)ﾞ \n" + + " .-------. ____ __ \n" + + " | _ _ \\ \\ \\ / / \n" + + " | ( ' ) | \\ _. / ' \n" + + " |(_ o _) / _( )_ .' \n" + + " | (_,_).' __ ___(_ o _)' \n" + + " | |\\ \\ | || |(_,_)' \n" + + " | | \\ `' /| `-' / \n" + + " | | \\ / \\ / \n" + + " ''-' `'-' `-..-' "); } } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/UserApplication.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/UserApplication.java index 47cbc963..8accc4ab 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/UserApplication.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/UserApplication.java @@ -16,6 +16,16 @@ public class UserApplication { public static void main(String[] args) { SpringApplication.run(UserApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ 账号服务启动成功 ლ(´ڡ`ლ)ﾞ \n" + + " .-------. ____ __ \n" + + " | _ _ \\ \\ \\ / / \n" + + " | ( ' ) | \\ _. / ' \n" + + " |(_ o _) / _( )_ .' \n" + + " | (_,_).' __ ___(_ o _)' \n" + + " | |\\ \\ | || |(_,_)' \n" + + " | | \\ `' /| `-' / \n" + + " | | \\ / \\ / \n" + + " ''-' `'-' `-..-' "); } }