Merge branch 'dev' into update_dept

This commit is contained in:
2023-10-31 15:17:59 +08:00
11 changed files with 400 additions and 207 deletions

View File

@@ -343,7 +343,7 @@ public class LianLianController extends BaseController {
String dataStr = new String(plainText, StandardCharsets.UTF_8);
// 转换成相应对象
QueryStartChargeDTO queryStartChargeDTO = JSONObject.parseObject(dataStr, QueryStartChargeDTO.class);
queryStartChargeDTO.setOperatorID(dto.getOperatorID());
queryStartChargeDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = lianLianService.query_start_charge(queryStartChargeDTO);
return CommonResult.success(0, "请求启动充电成功!", map.get("Data"), map.get("Sig"));
@@ -467,7 +467,7 @@ public class LianLianController extends BaseController {
String dataStr = new String(plainText, StandardCharsets.UTF_8);
// 转换成相应对象
QueryStartChargeDTO queryStartChargeDTO = JSONObject.parseObject(dataStr, QueryStartChargeDTO.class);
queryStartChargeDTO.setOperatorID(dto.getOperatorID());
queryStartChargeDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = lianLianService.query_stop_charge(queryStartChargeDTO);
return CommonResult.success(0, "请求停止充电成功!", map.get("Data"), map.get("Sig"));