会议模板接口代码优化

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingTemplateController.java

@@ -72,7 +72,7 @@ public class MeetingTemplateController {
     @PutMapping("/batchPublishing")
     @Log(title = "批量发布会议屏模板", businessType = BusinessType.UPDATE)
     public ApiResult<Void> batchPublishing(@RequestParam Integer templateId,
-                                           @RequestParam List<String> deviceCodes) {
+                                           @RequestParam(required = false) List<String> deviceCodes) {
         meetingTemplateService.batchPublishing(templateId, deviceCodes);
         return ApiResult.success();
     }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingTemplate.java

@@ -58,7 +58,7 @@ public class MeetingTemplate implements Serializable {
     /**
      * 模板类型（1.系统模板、2.自定义模板）
      */
-    private Boolean type;
+    private Integer type;
 
     /**
      * 创建者

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingTemplateServiceImpl.java

@@ -10,6 +10,7 @@ import com.usky.meeting.mapper.MeetingDeviceMapper;
 import com.usky.meeting.mapper.MeetingTemplateMapper;
 import com.usky.meeting.service.MeetingTemplateService;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.system.domain.SysUserVO;
 import com.usky.system.model.LoginUser;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -19,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.security.Security;
 import java.time.LocalDateTime;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -40,12 +42,12 @@ public class MeetingTemplateServiceImpl extends AbstractCrudService<MeetingTempl
     @Transactional(rollbackFor = Exception.class)
     public void addAndUpdate(MeetingTemplate dto) {
 
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (loginUser == null || loginUser.getTenantId() == null) {
+        SysUserVO sysUser = SecurityUtils.getLoginUser().getSysUser();
+        if (sysUser == null || sysUser.getTenantId() == null) {
             throw new BusinessException("未获取到登录用户!");
         }
-        String username = loginUser.getUsername();
-        Integer tenantId = loginUser.getTenantId();
+        String username = sysUser.getUserName();
+        Integer tenantId = sysUser.getTenantId();
         LocalDateTime now = LocalDateTime.now();
 
         if (dto.getId() != null) {
@@ -53,12 +55,10 @@ public class MeetingTemplateServiceImpl extends AbstractCrudService<MeetingTempl
             dto.setUpdateBy(username);
             this.updateById(dto);
         } else {
-            MeetingTemplate tpl = new MeetingTemplate();
-            BeanUtils.copyProperties(dto, tpl);
-            tpl.setCreateTime(now);
-            tpl.setCreateBy(username);
-            tpl.setTenantId(tenantId);
-            this.save(tpl);
+            dto.setCreateTime(now);
+            dto.setCreateBy(username);
+            dto.setTenantId(tenantId);
+            this.save(dto);
         }
     }
 
@@ -70,25 +70,19 @@ public class MeetingTemplateServiceImpl extends AbstractCrudService<MeetingTempl
         }
         Integer tenantId = SecurityUtils.getTenantId();
 
-        LambdaQueryWrapper<MeetingTemplate> lambdaQuery = new LambdaQueryWrapper<MeetingTemplate>();
-        lambdaQuery.eq(MeetingTemplate::getId, templateId)
+        LambdaQueryWrapper<MeetingTemplate> tplWrap = new LambdaQueryWrapper<>();
+        tplWrap.eq(MeetingTemplate::getId, templateId)
                 .eq(MeetingTemplate::getTenantId, tenantId);
-        Integer i = baseMapper.selectCount(lambdaQuery);
-        if (i == 0) {
+        boolean deleted = remove(tplWrap);
+        if (!deleted) {
             throw new BusinessException("会议模板不存在！");
         }
 
-        LambdaUpdateWrapper<MeetingDevice> unwrap = new LambdaUpdateWrapper<>();
-        unwrap.eq(MeetingDevice::getTemplateId, templateId)
+        LambdaUpdateWrapper<MeetingDevice> deviceWrap = new LambdaUpdateWrapper<>();
+        deviceWrap.set(MeetingDevice::getTemplateId, null)
+                .eq(MeetingDevice::getTemplateId, templateId)
                 .eq(MeetingDevice::getTenantId, tenantId);
-        MeetingDevice updater = new MeetingDevice();
-        updater.setTemplateId(null);
-        meetingDeviceMapper.update(updater, unwrap);
-
-        LambdaQueryWrapper<MeetingTemplate> tplWrap = new LambdaQueryWrapper<>();
-        tplWrap.eq(MeetingTemplate::getId, templateId)
-                .eq(MeetingTemplate::getTenantId, tenantId);
-        remove(tplWrap);
+        meetingDeviceMapper.update(null, deviceWrap);
     }
 
     @Override
@@ -97,15 +91,15 @@ public class MeetingTemplateServiceImpl extends AbstractCrudService<MeetingTempl
         lambdaQuery.eq(MeetingTemplate::getTenantId, SecurityUtils.getTenantId())
                 .like(StringUtils.isNotBlank(name), MeetingTemplate::getName, name)
                 .eq(type != null, MeetingTemplate::getType, type)
-                .eq(StringUtils.isNotBlank(layout), MeetingTemplate::getLayout, layout);
+                .eq(StringUtils.isNotBlank(layout) && !"all".equals(layout), MeetingTemplate::getLayout, layout);
         return baseMapper.selectList(lambdaQuery);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void batchPublishing(Integer templateId, List<String> deviceCodes) {
-        if (deviceCodes == null || deviceCodes.isEmpty()) {
-            throw new BusinessException("模板ID和设备编码不能为空！");
+        if (templateId == null) {
+            throw new BusinessException("模板ID不能为空！");
         }
         Integer tenantId = SecurityUtils.getTenantId();
 
@@ -118,12 +112,12 @@ public class MeetingTemplateServiceImpl extends AbstractCrudService<MeetingTempl
         }
 
         LambdaUpdateWrapper<MeetingDevice> unwrap = new LambdaUpdateWrapper<>();
-        unwrap.eq(MeetingDevice::getTenantId, tenantId)
-                .in(MeetingDevice::getDeviceCode, deviceCodes);
+        unwrap.eq(MeetingDevice::getTenantId, tenantId);
+        if (deviceCodes != null && !deviceCodes.isEmpty()) {
+            unwrap.in(MeetingDevice::getDeviceCode, deviceCodes);
+        }
         MeetingDevice updater = new MeetingDevice();
         updater.setTemplateId(templateId);
         meetingDeviceMapper.update(updater, unwrap);
-
-        baseMapper.delete(lambdaQuery);
     }
 }