完善管理员删除用户功能，缺少对话删除功能

--AdminController.java 修改调用的方法名字
--AgentService.java 添加了指定用户id智能体批量删除定义
--AgentServiceImpl.java 实现了删除方法
--DeviceService.java添加了指定用户id设备批量删除定义
--DeviceServiceImpl.java 实现了删除方法
--SysUserService.java 修改删除定义的方法名字
--SysUserServiceImpl.java 完成用户删除实现

main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentService.java

@@ -22,4 +22,10 @@ public interface AgentService extends BaseService<AgentEntity> {
      * 获取智能体详情
      */
     AgentEntity getAgentById(String id);
+
+    /**
+     * 删除这个用户的所有
+     * @param userId
+     */
+    void deleteAgentByUserId(String userId);
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java

@@ -4,16 +4,19 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import org.springframework.transaction.annotation.Transactional;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.modules.agent.dao.AgentDao;
 import xiaozhi.modules.agent.entity.AgentEntity;
 import xiaozhi.modules.agent.service.AgentService;
+import xiaozhi.modules.device.entity.DeviceEntity;
 
 @Service
 public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> implements AgentService {
@@ -62,4 +65,11 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
 
         return super.insert(entity);
     }
+
+    @Override
+    public void deleteAgentByUserId(String userId) {
+        UpdateWrapper<AgentEntity> wrapper = new UpdateWrapper<>();
+        wrapper.eq("user_id", userId);
+        baseDao.delete(wrapper);
+    }
 }

main/manager-api/src/main/java/xiaozhi/modules/device/service/DeviceService.java

@@ -26,7 +26,7 @@ public interface DeviceService {
     DeviceEntity bindDevice(DeviceBindDTO deviceHeader);
 
     /**
-     * 获取用户设备列表
+     * 获取用户指定智能体的设备列表，
      */
     List<DeviceEntity> getUserDevices(Long userId, String agentId);
 
@@ -39,4 +39,10 @@ public interface DeviceService {
      * 设备激活
      */
     Boolean deviceActivation(String activationCode);
+
+    /**
+     * 删除此用户的所有设备
+     * @param userId 用户id
+     */
+    void deleteByUserId(Long userId);
 }

main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java

@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 
 import cn.hutool.core.util.RandomUtil;
+import org.springframework.transaction.annotation.Transactional;
 import xiaozhi.common.exception.RenException;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.common.user.UserDetail;
@@ -197,6 +198,13 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
         baseDao.delete(wrapper);
     }
 
+    @Override
+    public void deleteByUserId(Long userId) {
+        UpdateWrapper<DeviceEntity> wrapper = new UpdateWrapper<>();
+        wrapper.eq("user_id", userId);
+        baseDao.delete(wrapper);
+    }
+
     private DeviceReportRespDTO.ServerTime buildServerTime() {
         DeviceReportRespDTO.ServerTime serverTime = new DeviceReportRespDTO.ServerTime();
         TimeZone tz = TimeZone.getDefault();

main/manager-api/src/main/java/xiaozhi/modules/sys/controller/AdminController.java

@@ -70,7 +70,7 @@ public class AdminController {
     @Operation(summary = "用户删除")
     @RequiresPermissions("sys:role:superAdmin")
     public Result<Void> delete(@PathVariable Long id) {
-        sysUserService.delete(new Long[] { id });
+        sysUserService.deleteById( id );
         return new Result<>();
     }
 

main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java

@@ -19,7 +19,11 @@ public interface SysUserService extends BaseService<SysUserEntity> {
 
     void save(SysUserDTO dto);
 
-    void delete(Long[] ids);
+    /**
+     * 删除指定用户，且有关联的数据设备和智能体
+     * @param ids
+     */
+    void deleteById(Long ids);
 
     /**
      * 验证是否允许修改密码更改

main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java

@@ -1,6 +1,5 @@
 package xiaozhi.modules.sys.service.impl;
 
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -22,6 +21,8 @@ import xiaozhi.common.exception.RenException;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.common.utils.ConvertUtils;
+import xiaozhi.modules.agent.service.AgentService;
+import xiaozhi.modules.device.service.DeviceService;
 import xiaozhi.modules.security.password.PasswordUtils;
 import xiaozhi.modules.sys.dao.SysUserDao;
 import xiaozhi.modules.sys.dto.AdminPageUserDTO;
@@ -40,6 +41,10 @@ import xiaozhi.modules.sys.vo.AdminPageUserVO;
 public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntity> implements SysUserService {
     private final SysUserDao sysUserDao;
 
+    private final DeviceService deviceService;
+
+    private final AgentService agentService;
+
     @Override
     public SysUserDTO getByUsername(String username) {
         QueryWrapper<SysUserEntity> queryWrapper = new QueryWrapper<>();
@@ -87,10 +92,14 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void delete(Long[] ids) {
+    public void deleteById(Long id) {
         // 删除用户
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-        // TODO 除了要删除用户还要删除用户关联的设备，对话，智能体。等此3个功能完善在添加
+        baseDao.deleteById(id);
+        // 删除设备
+        deviceService.deleteByUserId(id);
+        // 删除智能体
+        agentService.deleteById(id);
+        // TODO 除了要删除用户还要删除用户关联的对话
     }
 
     @Override