diff --git a/src/main/java/com/sczx/sync/controller/ReceiveBatteryController.java b/src/main/java/com/sczx/sync/controller/ReceiveBatteryController.java index bc84ce0..8be1992 100644 --- a/src/main/java/com/sczx/sync/controller/ReceiveBatteryController.java +++ b/src/main/java/com/sczx/sync/controller/ReceiveBatteryController.java @@ -36,11 +36,11 @@ public class ReceiveBatteryController { @ApiOperation(value = "接收租电数据接口") @PostMapping("/batterymeal") public Result batteryMeal(@RequestBody String receiveMealReq){ - Boolean bool = receiveService.recceiveMeals(receiveMealReq); - if (!bool.booleanValue()){ + String code = receiveService.recceiveMeals(receiveMealReq); + if (code.equals(NOT_PERMISSION.getCode())){ return Result.fail(NOT_PERMISSION); } - return Result.ok(); + return Result.ok("200","操作成功","操作成功","Cid",code); } @ApiOperation(value = "接收用户数据接口") diff --git a/src/main/java/com/sczx/sync/service/ReceiveService.java b/src/main/java/com/sczx/sync/service/ReceiveService.java index 47cbb28..5dd157e 100644 --- a/src/main/java/com/sczx/sync/service/ReceiveService.java +++ b/src/main/java/com/sczx/sync/service/ReceiveService.java @@ -2,7 +2,7 @@ package com.sczx.sync.service; public interface ReceiveService { - boolean recceiveMeals(String request); + String recceiveMeals(String request); String recceiveUserInfo(String request); diff --git a/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java b/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java index a1d7455..5560b0e 100644 --- a/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java +++ b/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java @@ -45,14 +45,14 @@ public class ReceiveServiceImpl implements ReceiveService { private String accessToken; @Override - public boolean recceiveMeals(String request) { + public String recceiveMeals(String request) { SyncRequest syncRequest = JSON.parseObject(request, SyncRequest.class); if(!syncRequest.getAppid().equals(appId)||!syncRequest.getAccessToken().equals(accessToken)){ - return false; + return NOT_PERMISSION.getCode(); } - BatteryRule batteryRule = syncRequest.getData(); + BatteryRule batteryRule = JSON.parseObject(String.valueOf(syncRequest.getData()), BatteryRule.class); batteryRule.setSyncTime(LocalDateTime.now()); QueryWrapper syncDataInfoQueryWrapper = new QueryWrapper<>(); QueryWrapper eq = syncDataInfoQueryWrapper.eq("meal_id", batteryRule.getMealId()); @@ -63,7 +63,7 @@ public class ReceiveServiceImpl implements ReceiveService { batteryMealMapper.insertZcRentBatteyRule(batteryRule); } - return true; + return batteryRule.getId() + ""; } @Override diff --git a/src/main/resources/mapper/BatteryMeal.xml b/src/main/resources/mapper/BatteryMeal.xml index e99467e..c86940e 100644 --- a/src/main/resources/mapper/BatteryMeal.xml +++ b/src/main/resources/mapper/BatteryMeal.xml @@ -39,6 +39,12 @@ + + SELECT + id + from zc_rent_battey_rule + where meal_id = #{mealId} + update zc_rent_battey_rule title = #{title},