diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java index 86ec268c..ec4ff859 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package org.springblade.desk.device.controller; import io.swagger.v3.oas.annotations.Parameters; @@ -141,6 +116,19 @@ public class FeiBaSetController extends BladeController { return R.status(feiBaSetService.deleteLogic(Func.toLongList(ids))); } + /** + * 飞靶设置 绑定设备 + */ + @PostMapping("/bind") + @ApiOperationSupport(order = 8) + @Operation(summary = "绑定设备", description = "传入飞靶ids和设备id") + public R bind( + @Parameter(description = "主键集合", required = true) @RequestParam String ids, + @Parameter(description = "设备id", required = true) @RequestParam Integer deviceId) { + Boolean result = feiBaSetService.bind(Func.toLongList(ids), deviceId); + return R.status(result); + } + /** * 导出数据 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RackSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RackSetController.java index ad183a91..7e00d93e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RackSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RackSetController.java @@ -141,6 +141,18 @@ public class RackSetController extends BladeController { return R.status(rackSetService.deleteLogic(Func.toLongList(ids))); } + /** + * 挂具设置 绑定设备 + */ + @PostMapping("/bind") + @ApiOperationSupport(order = 8) + @Operation(summary = "绑定设备", description = "传入挂具ids和设备id") + public R bind( + @Parameter(description = "主键集合", required = true) @RequestParam String ids, + @Parameter(description = "设备id", required = true) @RequestParam Integer deviceId) { + Boolean result = rackSetService.bind(Func.toLongList(ids), deviceId); + return R.status(result); + } /** * 导出数据 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IEquipmentService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IEquipmentService.java index 89a3b742..468f5fd1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IEquipmentService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IEquipmentService.java @@ -28,6 +28,7 @@ package org.springblade.desk.device.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.springblade.desk.device.pojo.entity.EquipmentEntity; import org.springblade.desk.device.pojo.excel.EquipmentExcel; +import org.springblade.desk.device.pojo.vo.EquipmentStatusStatisticsVO; import org.springblade.desk.device.pojo.vo.EquipmentVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; @@ -58,4 +59,10 @@ public interface IEquipmentService extends BaseService { */ List exportEquipment(Wrapper queryWrapper); + /** + * 设备状态统计 + * + * @return + */ + EquipmentStatusStatisticsVO stateStatistics(); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IFeiBaSetService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IFeiBaSetService.java index 08e789ef..f9f76789 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IFeiBaSetService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IFeiBaSetService.java @@ -1,32 +1,8 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package org.springblade.desk.device.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.validation.constraints.NotEmpty; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.device.pojo.entity.FeiBaSetEntity; import org.springblade.desk.device.pojo.excel.FeiBaSetExcel; @@ -58,4 +34,12 @@ public interface IFeiBaSetService extends BaseService { */ List exportFeiBaSet(Wrapper queryWrapper); + /** + * 飞靶批量绑定设备 + * + * @param ids + * @param deviceId + * @return + */ + Boolean bind(@NotEmpty List ids, Integer deviceId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRackSetService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRackSetService.java index 00559087..2c2f7aef 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRackSetService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRackSetService.java @@ -27,6 +27,7 @@ package org.springblade.desk.device.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.validation.constraints.NotEmpty; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.device.pojo.entity.RackSetEntity; import org.springblade.desk.device.pojo.excel.RackSetExcel; @@ -58,4 +59,12 @@ public interface IRackSetService extends BaseService { */ List exportRackSet(Wrapper queryWrapper); + /** + * 挂具批量绑定设备 + * + * @param ids + * @param deviceId + * @return + */ + Boolean bind(@NotEmpty List ids, Integer deviceId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java index 84a2d0fd..8f497f29 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package org.springblade.desk.device.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -32,11 +7,13 @@ import org.springblade.desk.device.pojo.entity.EquipmentEntity; import org.springblade.desk.device.pojo.entity.FeiBaSetEntity; import org.springblade.desk.device.pojo.excel.FeiBaSetExcel; import org.springblade.desk.device.service.IFeiBaSetService; +import org.springblade.desk.order.pojo.entity.YieldOrder; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -75,4 +52,17 @@ public class FeiBaSetServiceImpl extends BaseServiceImpl ids, Integer deviceId) { + List feiBaSetEntityList = new ArrayList<>(); + ids.forEach(id -> { + FeiBaSetEntity feiBaSet = new FeiBaSetEntity(); + feiBaSet.setId(id); + feiBaSet.setBindQty(deviceId.shortValue()); + feiBaSetEntityList.add(feiBaSet); + }); + + return this.updateBatchById(feiBaSetEntityList); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RackSetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RackSetServiceImpl.java index ae578b28..0bd06535 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RackSetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RackSetServiceImpl.java @@ -37,6 +37,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -75,4 +76,16 @@ public class RackSetServiceImpl extends BaseServiceImpl ids, Integer deviceId) { + List rackSetEntityList = new ArrayList<>(); + ids.forEach(id -> { + RackSetEntity rackSet = new RackSetEntity(); + rackSet.setId(id); + rackSet.setBindQty(deviceId.shortValue()); + rackSetEntityList.add(rackSet); + }); + + return this.updateBatchById(rackSetEntityList); + } }