ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBatteryInfoController.java

@@ -51,14 +51,11 @@ public class EbikeBatteryInfoController {
      * @return {@code true} 添加成功，{@code false} 添加失败
      */
     @GetMapping("bind")
-    public JsonResult<?> bind(@RequestParam("batteryId") Long batteryId) {
+    public JsonResult<?> bind(@RequestParam("batteryId")Long batteryId){
         EbikeBatteryInfo batteryInfo = ebikeBatteryInfoService.getById(batteryId);
         if (batteryInfo == null) {
             throw new EbikeException("电池ID错误");
         }
-        if (batteryInfo.getStatus() == BatteryStatus.BIND) {
-            throw new EbikeException("该电池已绑定");
-        }
         batteryInfo.setStatus(BatteryStatus.BIND);
         ebikeBatteryInfoService.updateById(batteryInfo);
         return JsonResult.success();
@@ -71,14 +68,7 @@ public class EbikeBatteryInfoController {
      * @return {@code true} 添加成功，{@code false} 添加失败
      */
     @GetMapping("batchBind")
-    public JsonResult<?> batchBind(@RequestBody EbikeBatteryInfoIdVo ids) {
-        QueryWrapper queryWrapper = QueryWrapper.create()
-                .where(EBIKE_BATTERY_INFO.BATTERY_ID.in(ids.getBatteryIds()))
-                .where(EBIKE_BATTERY_INFO.STATUS.eq(BatteryStatus.BIND));
-        long count = ebikeBatteryInfoService.count(queryWrapper);
-        if (count > 0) {
-            throw new EbikeException("选择电池集合中包含已绑定电池");
-        }
+    public JsonResult<?> batchBind(@RequestBody EbikeBatteryInfoIdVo ids){
         UpdateChain.of(EbikeBatteryInfo.class)
                 .set(EbikeBatteryInfo::getStatus, BatteryStatus.BIND)
                 .where(EbikeBatteryInfo::getBatteryId).in(ids.getBatteryIds());
@@ -91,7 +81,7 @@ public class EbikeBatteryInfoController {
      * @param batteryId 主键
      * @return {@code true} 删除成功，{@code false} 删除失败
      */
-    @GetMapping("remove")
+    @PostMapping("remove")
     public JsonResult<?> remove(@RequestParam(value = "batteryId") Long batteryId) {
         ebikeBatteryInfoService.removeById(batteryId);
         return JsonResult.success();
@@ -116,10 +106,10 @@ public class EbikeBatteryInfoController {
      * @return 分页对象
      */
     @GetMapping("page")
-    public JsonResult<?> page(PageParam pageParam, Integer status) {
+    public JsonResult<?> page(PageParam pageParam,Integer status) {
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .where(EBIKE_BATTERY_INFO.STATUS.eq(status, Objects.nonNull(status)));
-        Page<EbikeBatteryInfo> page = ebikeBatteryInfoService.page(pageParam.getPage(), queryWrapper);
+        Page<EbikeBatteryInfo> page = ebikeBatteryInfoService.page(pageParam.getPage(),queryWrapper);
         return JsonResult.success(page);
     }
 

ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeEcuInfoController.java

@@ -75,7 +75,6 @@ public class EbikeEcuInfoController {
         return JsonResult.success();
     }
 
-    
     /**
      * 查询所有中控基本信息。
      *