Merge branch 'master' of http://114.55.171.231:3000/Euni4U/backend

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<Boolean> deleteDeviceId(@RequestParam("devicecode") Integer devicecode) {
+        deviceService.deleteDeviceId(devicecode);
+        return success(true);
+    }
     @GetMapping("/get")
     @Operation(summary = "获得设备")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")

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")

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<Integer> getDeviceusercount(@RequestParam("devicecode") Integer devicecode) {
+        return success(deviceuserService.getDeviceusercount(devicecode));
+    }
     @GetMapping("/get")
     @Operation(summary = "获得设备人员关联")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")

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<DeviceuserDO> {
 
     default PageResult<DeviceuserDO> selectPage(DeviceuserPageReqVO reqVO) {

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);
 
     /**
      * 获得设备

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<DeviceDO> 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);

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);
 
     /**
      * 获得设备人员关联分页

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceuser/DeviceuserServiceImpl.java

@@ -4,13 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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;
@@ -66,7 +63,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<DeviceuserDO> getDeviceuserPage(DeviceuserPageReqVO pageReqVO) {
         return deviceuserMapper.selectPage(pageReqVO);