提交 fd3f45f3 作者: 洪东保

管理员的模板页面也能够停启用模板

父级 16e0183d
...@@ -74,13 +74,18 @@ public class RecordTemplateController { ...@@ -74,13 +74,18 @@ public class RecordTemplateController {
} }
/** /**
* 启用模板 ` * 通用模板/个人模板启用
*/ */
@OperLog(location = "模板页面", operation = "启用模板") @OperLog(location = "模板页面", operation = "启用模板")
@PostMapping("/enable") @PostMapping("/enable")
public R enable(@RequestBody @Validated(EditRecordTemplateVo.EnableGroup.class) EditRecordTemplateVo recordTemplate) { public R enable(@RequestBody @Validated(EditRecordTemplateVo.EnableGroup.class) EditRecordTemplateVo recordTemplate) {
return R.ok(recordTemplateService.enable(recordTemplate.getId())); return R.ok(recordTemplateService.enable(recordTemplate.getId()));
} }
@OperLog(location = "模板页面", operation = "停启用系统模板")
@PostMapping("/enableSysTemplate")
public R enableSysTemplate(@RequestBody @Validated(EditRecordTemplateVo.EnableGroup.class) EditRecordTemplateVo recordTemplate) {
return R.ok(recordTemplateService.enableSysTemplate(recordTemplate.getId()));
}
/** /**
* 获取会议模板下拉框,有权限控制 * 获取会议模板下拉框,有权限控制
......
...@@ -107,7 +107,7 @@ public class MeetingRecordTemplate implements Serializable { ...@@ -107,7 +107,7 @@ public class MeetingRecordTemplate implements Serializable {
private String referTemplateName; private String referTemplateName;
/** /**
* 停启用标示,只有系统模板才用,0-停用,1-启用(默认) * 停启用标示,0-停用,1-启用(默认)
*/ */
private Boolean enable; private Boolean enable;
} }
\ No newline at end of file
...@@ -95,4 +95,6 @@ public interface MeetingRecordTemplateService extends IService<MeetingRecordTemp ...@@ -95,4 +95,6 @@ public interface MeetingRecordTemplateService extends IService<MeetingRecordTemp
* @return * @return
*/ */
List<MeetTypeDto> getMeetTypeList(String userId, List<String> parentDeptIdList, String role); List<MeetTypeDto> getMeetTypeList(String userId, List<String> parentDeptIdList, String role);
Boolean enableSysTemplate(Long id);
} }
...@@ -30,8 +30,8 @@ import com.cmeeting.exception.RobotBaseException; ...@@ -30,8 +30,8 @@ import com.cmeeting.exception.RobotBaseException;
import com.cmeeting.log.service.ProcessLogService; import com.cmeeting.log.service.ProcessLogService;
import com.cmeeting.mapper.primary.MeetingInfoMapper; import com.cmeeting.mapper.primary.MeetingInfoMapper;
import com.cmeeting.mapper.primary.MeetingRecordTemplateMapper; import com.cmeeting.mapper.primary.MeetingRecordTemplateMapper;
import com.cmeeting.mapper.primary.UserIdMapper;
import com.cmeeting.mapper.primary.SysUserSyncMapper; import com.cmeeting.mapper.primary.SysUserSyncMapper;
import com.cmeeting.mapper.primary.UserIdMapper;
import com.cmeeting.pojo.MeetingInfo; import com.cmeeting.pojo.MeetingInfo;
import com.cmeeting.pojo.MeetingRecordTemplate; import com.cmeeting.pojo.MeetingRecordTemplate;
import com.cmeeting.pojo.SysUserSyncCategory; import com.cmeeting.pojo.SysUserSyncCategory;
...@@ -47,15 +47,8 @@ import com.cmeeting.util.page.PageUtil; ...@@ -47,15 +47,8 @@ import com.cmeeting.util.page.PageUtil;
import com.cmeeting.vo.MeetingInfoVO; import com.cmeeting.vo.MeetingInfoVO;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.xml.XmlMapper; import com.fasterxml.jackson.dataformat.xml.XmlMapper;
import com.tencentcloudapi.wemeet.Client;
import com.tencentcloudapi.wemeet.core.authenticator.AuthenticatorBuilder;
import com.tencentcloudapi.wemeet.core.authenticator.JWTAuthenticator;
import com.tencentcloudapi.wemeet.service.meetings.api.MeetingsApi;
import com.tencentcloudapi.wemeet.service.meetings.model.V1MeetingsMeetingIdParticipantsGet200Response; import com.tencentcloudapi.wemeet.service.meetings.model.V1MeetingsMeetingIdParticipantsGet200Response;
import com.tencentcloudapi.wemeet.service.meetings.model.V1MeetingsMeetingIdParticipantsGet200ResponseParticipantsInner; import com.tencentcloudapi.wemeet.service.meetings.model.V1MeetingsMeetingIdParticipantsGet200ResponseParticipantsInner;
import com.tencentcloudapi.wemeet.service.records.api.RecordsApi;
import com.tencentcloudapi.wemeet.service.records.model.V1AddressesRecordFileIdGet200Response;
import com.tencentcloudapi.wemeet.service.records.model.V1AddressesRecordFileIdGet200ResponseAiMeetingTranscriptsInner;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import okhttp3.Request; import okhttp3.Request;
...@@ -69,12 +62,13 @@ import org.springframework.util.ObjectUtils; ...@@ -69,12 +62,13 @@ import org.springframework.util.ObjectUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.*; import java.io.IOException;
import java.math.BigInteger; import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.security.SecureRandom;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
...@@ -193,7 +187,7 @@ public class MeetingInfoServiceImpl extends ServiceImpl<MeetingInfoMapper, Meeti ...@@ -193,7 +187,7 @@ public class MeetingInfoServiceImpl extends ServiceImpl<MeetingInfoMapper, Meeti
new LambdaUpdateWrapper<MeetingInfo>() new LambdaUpdateWrapper<MeetingInfo>()
.eq(MeetingInfo::getMeetingId, meetingInfo.getMeetingId()) .eq(MeetingInfo::getMeetingId, meetingInfo.getMeetingId())
.eq(meetingInfo.getSubMeetingId() != null, MeetingInfo::getSubMeetingId, meetingInfo.getSubMeetingId()) .eq(meetingInfo.getSubMeetingId() != null, MeetingInfo::getSubMeetingId, meetingInfo.getSubMeetingId())
.set(MeetingInfo::getReprocess, true) .set(MeetingInfo::getReprocess, false)
); );
redisUtils.del(key); redisUtils.del(key);
} }
......
...@@ -550,6 +550,16 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT ...@@ -550,6 +550,16 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
return meetTypeDtos; return meetTypeDtos;
} }
@Override
public Boolean enableSysTemplate(Long id) {
MeetingRecordTemplate template = baseMapper.selectById(id);
if (template == null) {
throw new RobotBaseException("模板不存在!");
}
template.setEnable(!template.getEnable());
return baseMapper.updateById(template) != 0;
}
/** /**
* 获取部门的路径 * 获取部门的路径
* *
......
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
ELSE NULL ELSE NULL
END AS `enable` END AS `enable`
from meet_type t1 from meet_type t1
left join cmt_meeting_record_template t2 on t2.meeting_type = t1.id and t2.is_del = 0 left join cmt_meeting_record_template t2 on t2.meeting_type = t1.id and t2.is_del = 0 and t2.enable = 1
and ((t2.type = 'system' and t2.enable = 1) or (t2.type = 'custom' and t2.create_user = #{userId})) and ((t2.type = 'system' and t2.enable = 1) or (t2.type = 'custom' and t2.create_user = #{userId}))
left join meet_template_enable t3 on t3.rel_id = t2.id and t3.user_id = #{userId} left join meet_template_enable t3 on t3.rel_id = t2.id and t3.user_id = #{userId}
where t1.is_del = 0 where t1.is_del = 0
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论