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 2021-11-12 16:39:25 +08:00
parent 7da229de62
commit 69f6a205c3
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/XhpcUserPrivilegeMapper.xml
View File

@ -45,7 +45,7 @@
JOIN xhpc_charging_station xcs on xcs.operator_id = xo.operator_id
where xo.del_flag = 0
<if test="null != operatorIds and '' != operatorIds">
operator_id in
and operator_id in
<foreach collection="operatorIds" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>

21
xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java
View File

@ -628,7 +628,7 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi
//桩（空闲和使用从redis获取）
Map<String, Object> map1 =new HashMap<>();
map1 = getTerminalStatusSum(map1, Long.valueOf(map.get("chargingStationId").toString()), 0);
if(map1 !=null && map1.get("free") !=null){
if(map1 !=null && map1.get("freeTime") !=null){
map.put("free", map1.get("freeTime").toString());
}else{
map.put("free", 0);
@ -651,7 +651,7 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi
Map<String, Object> map1 =new HashMap<>();
map1 = getTerminalStatusSum(map1, chargingStationId, 0);
if(map1 !=null && map1.get("free") !=null){
if(map1 !=null && map1.get("freeTime") !=null){
map.put("free", map1.get("freeTime").toString());
}else{
map.put("free", 0);
@ -726,10 +726,10 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi
}else{
int mins = number % 60;
int hours = number / 60;
if(mins>0){
map.put("remainingTime", mins+"小时"+hours+"分钟");
if(hours>0){
map.put("remainingTime", hours+"小时"+mins+"分钟");
}else{
map.put("remainingTime", hours+"分钟");
map.put("remainingTime", mins+"分钟");
}
}
}else{
@ -1160,6 +1160,17 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi
System.out.println("111????????????????"+i);
i=i++;
System.out.println("222????????????????"+i);
int number =23;
int mins = number % 60;
int hours = number / 60;
if(hours>0){
System.out.println("111");
System.out.println(hours+"小时"+mins+"分钟");
}else{
System.out.println("222");
System.out.println(mins+"分钟");
}
}