From 15fc9d5311f96545dab8ae1f18685ab46c37fa7c Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Tue, 10 Jun 2025 14:51:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87=E5=A4=84?= =?UTF-8?q?=E7=90=86=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/admin/device/DeviceController.java | 7 ++++++- .../controller/admin/device/vo/DeviceSaveReqVO.java | 1 - .../admin/deviceuser/DeviceuserController.java | 6 +++++- .../system/dal/dataobject/deviceuser/DeviceuserDO.java | 3 +-- .../system/dal/mysql/deviceuser/DeviceuserMapper.java | 2 ++ .../module/system/service/device/DeviceService.java | 4 ++++ .../module/system/service/device/DeviceServiceImpl.java | 9 +++++++++ .../system/service/deviceuser/DeviceuserService.java | 4 ++++ .../system/service/deviceuser/DeviceuserServiceImpl.java | 8 ++++---- 9 files changed, 35 insertions(+), 9 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/DeviceController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/DeviceController.java index 03ed5706a0..4fcac0a1d1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/DeviceController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/DeviceController.java @@ -58,7 +58,12 @@ public class DeviceController { deviceService.deleteDevice(id); return success(true); } - + @DeleteMapping("/deletecode") + @Operation(summary = "根据设备ID删除设备") + public CommonResult deleteDeviceId(@RequestParam("devicecode") Integer devicecode) { + deviceService.deleteDeviceId(devicecode); + return success(true); + } @GetMapping("/get") @Operation(summary = "获得设备") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceSaveReqVO.java index df955ff6c2..5700d710e8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceSaveReqVO.java @@ -19,7 +19,6 @@ public class DeviceSaveReqVO { private String devicename; @Schema(description = "设备ID/编号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "设备ID/编号不能为空") private Integer devicecode; @Schema(description = "设备类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/deviceuser/DeviceuserController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/deviceuser/DeviceuserController.java index 148b219492..d4bef5de03 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/deviceuser/DeviceuserController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/deviceuser/DeviceuserController.java @@ -58,7 +58,11 @@ public class DeviceuserController { deviceuserService.deleteDeviceuser(id); return success(true); } - + @GetMapping("/getDevCount") + @Operation(summary = "获得关联设备人员数量") + public CommonResult getDeviceusercount(@RequestParam("devicecode") Integer devicecode) { + return success(deviceuserService.getDeviceusercount(devicecode)); + } @GetMapping("/get") @Operation(summary = "获得设备人员关联") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/deviceuser/DeviceuserDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/deviceuser/DeviceuserDO.java index ce7f26b090..5ac281aa82 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/deviceuser/DeviceuserDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/deviceuser/DeviceuserDO.java @@ -15,12 +15,11 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; @TableName("tb_deviceuser") @KeySequence("tb_deviceuser_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data -@EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor -public class DeviceuserDO extends BaseDO { +public class DeviceuserDO { /** * 主键ID diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/deviceuser/DeviceuserMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/deviceuser/DeviceuserMapper.java index 1b09af2655..d52091a0eb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/deviceuser/DeviceuserMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/deviceuser/DeviceuserMapper.java @@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.module.system.dal.dataobject.deviceuser.DeviceuserDO; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import org.apache.ibatis.annotations.Mapper; import cn.iocoder.yudao.module.system.controller.admin.deviceuser.vo.*; @@ -15,6 +16,7 @@ import cn.iocoder.yudao.module.system.controller.admin.deviceuser.vo.*; * @author 全智安 */ @Mapper +@InterceptorIgnore(tenantLine = "true") public interface DeviceuserMapper extends BaseMapperX { default PageResult selectPage(DeviceuserPageReqVO reqVO) { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceService.java index 7955814869..6f90d73b09 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceService.java @@ -35,6 +35,10 @@ public interface DeviceService { * @param id 编号 */ void deleteDevice(Integer id); + /* + * 根据设备ID 删除数据 + * */ + void deleteDeviceId(Integer devicecode); /** * 获得设备 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceServiceImpl.java index ebd165a7f6..1e8ad8728d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceServiceImpl.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.system.service.device; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -51,7 +52,15 @@ public class DeviceServiceImpl implements DeviceService { // 删除 deviceMapper.deleteById(id); } + @Override + public void deleteDeviceId(Integer devicecode) + { + // 创建 QueryWrapper 实例，并指定删除条件 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("devicecode", devicecode); // 按 device_name 字段删除 + deviceMapper.delete(wrapper); + } private void validateDeviceExists(Integer id) { if (deviceMapper.selectById(id) == null) { throw exception(DEVICE_NOT_EXISTS); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceuser/DeviceuserService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceuser/DeviceuserService.java index f7f0ca9c18..c32cd809cc 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceuser/DeviceuserService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceuser/DeviceuserService.java @@ -43,6 +43,10 @@ public interface DeviceuserService { * @return 设备人员关联 */ DeviceuserDO getDeviceuser(Integer id); + /* + * 设备ID 查询设备人员数量 + * */ + Integer getDeviceusercount(Integer devicecode); /** * 获得设备人员关联分页 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceuser/DeviceuserServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceuser/DeviceuserServiceImpl.java index a24da6e105..7cea5ac305 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceuser/DeviceuserServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceuser/DeviceuserServiceImpl.java @@ -3,13 +3,10 @@ package cn.iocoder.yudao.module.system.service.deviceuser; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; -import java.util.*; import cn.iocoder.yudao.module.system.controller.admin.deviceuser.vo.*; import cn.iocoder.yudao.module.system.dal.dataobject.deviceuser.DeviceuserDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.system.dal.mysql.deviceuser.DeviceuserMapper; @@ -65,7 +62,10 @@ public class DeviceuserServiceImpl implements DeviceuserService { public DeviceuserDO getDeviceuser(Integer id) { return deviceuserMapper.selectById(id); } - + @Override + public Integer getDeviceusercount(Integer devicecode) { + return deviceuserMapper.selectCount(DeviceuserDO::getDeviceid, devicecode).intValue(); + } @Override public PageResult getDeviceuserPage(DeviceuserPageReqVO pageReqVO) { return deviceuserMapper.selectPage(pageReqVO);