autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.46:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2024-08-23 10:44:57 +08:00
parent 8bebed20bf 4925eb1755
commit 9f24f3f002
5 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java
View File

@@ -451,7 +451,7 @@ public class PersonPileController extends BaseController {
logger.error("根据充电桩查询预约状态error, params:{}", dto, e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_QUERY_RESERVATION_STATUS_ERROR);
}
logger.info("根据充电桩查询预约状态params:{}, result:{}", dto, response);
logger.info("根据充电桩查询预约状态params:{}, result:{}", dto, JSON.toJSONString(response));
return response;
}
}

2
jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysLoginController.java
View File

@@ -84,7 +84,7 @@ public class SysLoginController {
public AjaxResult getRouters() {
Long userId = SecurityUtils.getUserId();
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
logs.info("获取路由信息userId:{}, menus:{}, 菜单数量:{}", userId, menus, menus.size());
// logs.info("获取路由信息userId:{}, menus:{}, 菜单数量:{}", userId, menus, menus.size());
return AjaxResult.success(menuService.buildMenus(menus));
}
}

2
jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingStartupResultHandler.java
View File

@@ -99,7 +99,7 @@ public class ReservationChargingStartupResultHandler extends AbstractYkcHandler
.failReason(failReasonMsg)
.build();
pileBasicInfoService.startupResult(chargingStartupResult);
}catch (Exception e) {
} catch (Exception e) {
log.error("预约充电启动结果上送error", e);
confirmResultBytes = Constants.oneByteArray;
}

2
jsowell-pile/src/main/java/com/jsowell/wxpay/dto/AppletTemplateMessageSendDTO.java
View File

@@ -11,7 +11,7 @@ import java.io.Serializable;
public class AppletTemplateMessageSendDTO implements Serializable {
private static final long serialVersionUID = 2234575457450378840L;
// 场景类型（1-开始充电；2-结束充电）
// 场景类型（1-开始充电；2-结束充电; 3-预约充电启动结果通知）
private String type;
//接收者（用户）的 openid

27
jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java
View File

@@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import com.jsowell.common.constant.CacheConstants;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.redis.RedisCache;
@@ -14,10 +15,9 @@ import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.http.HttpUtils;
import com.jsowell.pile.domain.MemberBasicInfo;
import com.jsowell.pile.dto.ReservationChargingStartupResult;
import com.jsowell.pile.service.MemberBasicInfoService;
import com.jsowell.pile.service.PileBillingTemplateService;
import com.jsowell.pile.service.OrderBasicInfoService;
import com.jsowell.pile.service.PileBillingTemplateService;
import com.jsowell.pile.vo.uniapp.customer.CurrentTimePriceDetails;
import com.jsowell.pile.vo.uniapp.customer.SendMessageVO;
import com.jsowell.wxpay.config.WeixinLoginProperties;
@@ -278,7 +278,7 @@ public class WxAppletRemoteService {
*/
public Map<String, String> reservationStartupResultSendMsg(String openId, String startTime, String endTime, String startUpResult, String failReason) {
AppletTemplateMessageSendDTO msgInfo = new AppletTemplateMessageSendDTO();
msgInfo.setType("2"); // 2-结束充电推送消息
msgInfo.setType(Constants.THREE); // 2-结束充电推送消息
msgInfo.setTouser(openId);
// 封装对象并调用发送消息的方法
AppletTemplateMessageSendDTO.StartUpResultMessage startUpResultMessage = new AppletTemplateMessageSendDTO.StartUpResultMessage();
@@ -299,39 +299,34 @@ public class WxAppletRemoteService {
// 判断是什么场景调用此方法（1-开始充电推送消息；2-充电结束推送消息）
String type = dto.getType();
// 根据不同的场景set不同的对象
Map<String, Object> map = Maps.newHashMap();
String templateId = null;
if (StringUtils.equals("1", type)) {
// 开始充电
String templateId = startChargingTmpId;
dto.setTemplate_id(templateId);
Map<String, Object> map = new HashMap<>();
templateId = startChargingTmpId;
map.put("thing5", ImmutableMap.of("value", dto.getStartChargingMessage().getStationName())); // 充电站名称
map.put("time2", ImmutableMap.of("value", dto.getStartChargingMessage().getStartTime())); // 开始时间
map.put("character_string11", ImmutableMap.of("value", dto.getStartChargingMessage().getOrderCode())); // 订单编号
map.put("thing7", ImmutableMap.of("value", dto.getStartChargingMessage().getPileConnectorCode())); // 充电插座
map.put("thing13", ImmutableMap.of("value", dto.getStartChargingMessage().getTotalPrice())); // 收费标准
dto.setData(map);
} else if (StringUtils.equals("2", type)) {
// 结束充电
String templateId = stopChargingTmpId;
dto.setTemplate_id(templateId);
Map<String, Object> map = new HashMap<>();
templateId = stopChargingTmpId;
map.put("character_string5", ImmutableMap.of("value", dto.getStopChargingMessage().getOrderCode())); // 充电金额
map.put("amount17", ImmutableMap.of("value", dto.getStopChargingMessage().getChargingAmount())); // 充电金额
map.put("thing7", ImmutableMap.of("value", dto.getStopChargingMessage().getEndReason())); // 结束原因
map.put("thing22", ImmutableMap.of("value", dto.getStopChargingMessage().getChargingTime())); // 充电时长
map.put("number13", ImmutableMap.of("value", dto.getStopChargingMessage().getChargingDegree())); // 充电度数
dto.setData(map);
} else if (StringUtils.equals("3", type)) {
// 结束充电
String templateId = stopChargingTmpId;
dto.setTemplate_id(templateId);
Map<String, Object> map = new HashMap<>();
// 预约充电启动通知
templateId = stopChargingTmpId;
map.put("time2", ImmutableMap.of("value", dto.getStartUpResultMessage().getStartTime())); // 开始时间
map.put("time3", ImmutableMap.of("value", dto.getStartUpResultMessage().getEndTime())); // 结束时间
map.put("phrase20", ImmutableMap.of("value", dto.getStartUpResultMessage().getStartUpResult())); // 启动结果
map.put("thing21", ImmutableMap.of("value", dto.getStartUpResultMessage().getFailReason())); // 失败原因
}
dto.setTemplate_id(templateId);
dto.setData(map);
// 调用下面的发送消息接口
return uniformMessageSend(dto);
}