debug

src/main/java/com/cmeeting/ad/controller/UserController.java

@@ -2,6 +2,7 @@ package com.cmeeting.ad.controller;
 
 import com.cmeeting.ad.service.UserService;
 import com.cmeeting.ad.vo.UserVo;
+import com.cmeeting.annotation.OperLog;
 import com.cmeeting.constant.RecordTemplateConstant;
 import com.cmeeting.util.IPUtils;
 import com.cmeeting.util.R;
@@ -47,6 +48,7 @@ public class UserController {
      * @param vo
      * @return
      */
+    @OperLog(location = "角色扮演页面", operation = "进入系统")
     @PostMapping(value = "/userAuth")
     public R userAuth(@Validated @RequestBody UserVo.Auth vo) {
         return R.ok(userService.auth(vo, RecordTemplateConstant.TEMPLATE_TYPE_CUSTOM));

src/main/java/com/cmeeting/aspect/OperLogAspect.java

@@ -3,6 +3,7 @@ package com.cmeeting.aspect;
 import com.cmeeting.ad.entity.RobotSecurityUser;
 import com.cmeeting.ad.util.SecurityUtil;
 import com.cmeeting.annotation.OperLog;
+import com.cmeeting.constant.RecordTemplateConstant;
 import com.cmeeting.pojo.OperationLog;
 import com.cmeeting.service.OperationLogService;
 import lombok.extern.slf4j.Slf4j;
@@ -26,7 +27,6 @@ public class OperLogAspect {
 
     @After(value = "@annotation(operLog)")
     public void after(JoinPoint point, OperLog operLog) {
-
         Date now = new Date();
         RobotSecurityUser user = SecurityUtil.getUser();
 
@@ -38,7 +38,11 @@ public class OperLogAspect {
             operationLog.setLocation(location);
             operationLog.setOperation(operation);
             operationLog.setUserId(user.getId());
+            if (user.getRole().equals(RecordTemplateConstant.TEMPLATE_TYPE_SYSTEM)) {
+                operationLog.setUserName("管理员");
+            } else {
                 operationLog.setUserName(user.getUsername());
+            }
             operationLog.setCreateTime(now);
 
             operationLogService.save(operationLog);

src/main/java/com/cmeeting/constant/RecordTemplateConstant.java

@@ -18,4 +18,6 @@ public interface RecordTemplateConstant {
      * 用户
      */
     Integer REL_TYPE_USER = 1;
+
+    Long COMMON_MEET_TYPE = 1L;
 }

src/main/java/com/cmeeting/controller/EmailController.java

 package com.cmeeting.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.cmeeting.annotation.OperLog;
 import com.cmeeting.pojo.MeetEmailTemplate;
 import com.cmeeting.service.MeetEmailTemplateService;
 import com.cmeeting.util.R;
@@ -22,6 +23,7 @@ public class EmailController {
     @Autowired
     private MeetEmailTemplateService meetEmailTemplateService;
 
+    @OperLog(location = "邮件通知内容管理", operation = "修改邮件通知内容")
     @PostMapping("/edit")
     public R edit(@RequestBody MeetEmailTemplate param){
         String content = param.getContent();

src/main/java/com/cmeeting/controller/MeetingInfoController.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.cmeeting.ad.entity.RobotSecurityUser;
 import com.cmeeting.ad.util.SecurityUtil;
+import com.cmeeting.annotation.OperLog;
 import com.cmeeting.email.EmailSender;
 import com.cmeeting.mapper.primary.MeetingRecordTemplateMapper;
 import com.cmeeting.mapper.primary.UserIdMapper;
@@ -66,6 +67,7 @@ public class MeetingInfoController {
     @Value(value = "${userAdmin.file-download-path}")
     private String fileDownloadPath;
 
+    @OperLog(location = "历史会议纪要详情页面", operation = "修改会议纪要")
     @PostMapping("/updateRecordXml")
     public R updateRecordXml(@RequestBody MeetingInfoVO vo) {
         boolean save = meetingInfoService.updateRecordXml(vo);
@@ -78,6 +80,7 @@ public class MeetingInfoController {
      * @param vo
      * @return
      */
+    @OperLog(location = "历史会议纪要详情页面", operation = "重新生成会议纪要")
     @PostMapping("/regenerateXml")
     public R regenerateXml(@RequestBody MeetingInfoVO vo) {
         boolean isSuccess = meetingInfoService.regenerateXml(vo);
@@ -122,6 +125,7 @@ public class MeetingInfoController {
     /**
      * 导出转写原文
      */
+    @OperLog(location = "历史会议纪要详情页面", operation = "导出转写原文")
     @PostMapping("/exportMeetingRecord")
     public void exportMeetingRecord(@RequestBody MeetingInfoVO vo, HttpServletResponse response) {
         try {
@@ -157,6 +161,7 @@ public class MeetingInfoController {
     /**
      * 导出会议纪要（本地下载）
      */
+    @OperLog(location = "历史会议纪要详情页面", operation = "导出会议纪要（本地下载）")
     @PostMapping("/downloadMeetingMinutes")
     public void downloadMeetingMinutes(@RequestBody MeetingInfoVO vo, HttpServletResponse response) {
         try {
@@ -198,6 +203,7 @@ public class MeetingInfoController {
     /**
      * 导出会议纪要（推送邮件）
      */
+    @OperLog(location = "历史会议纪要详情页面", operation = "导出会议纪要成文件（推送邮件）")
     @PostMapping("/pushMeetingMinutes")
     public R exportMeetingMinutes(@RequestBody MeetingInfoVO vo, HttpServletResponse response) {
         try {

src/main/java/com/cmeeting/controller/PermissionController.java

@@ -2,6 +2,7 @@ package com.cmeeting.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.cmeeting.ad.util.SecurityUtil;
+import com.cmeeting.annotation.OperLog;
 import com.cmeeting.constant.CategoryConstant;
 import com.cmeeting.constant.PermissionPruposeType;
 import com.cmeeting.pojo.ModulePermission;
@@ -49,6 +50,7 @@ public class PermissionController {
      * @param vo
      * @return
      */
+    @OperLog(location = "授权页面", operation = "授权用户")
     @PostMapping("/auth")
     public R auth(@Validated @RequestBody AuthVO vo) {
         return R.ok(modulePermissionService.auth(vo.getAuthData()));
@@ -59,6 +61,7 @@ public class PermissionController {
      * @param vo
      * @return
      */
+    @OperLog(location = "授权页面", operation = "取消授权")
     @PostMapping("/remove")
     @Transactional(rollbackFor = Exception.class)
     public R remove(@Validated @RequestBody AuthVO vo) {

src/main/java/com/cmeeting/controller/StatisticsController.java

 package com.cmeeting.controller;
 
+import com.cmeeting.annotation.OperLog;
 import com.cmeeting.service.MeetingInfoService;
 import com.cmeeting.service.MeetingRecordTemplateService;
 import com.cmeeting.util.R;
@@ -54,6 +55,7 @@ public class StatisticsController {
      * @param createTimeEnd   结束时间
      * @return
      */
+    @OperLog(location = "统计日志", operation = "导出统计日志")
     @GetMapping("/exportRecordTemplateUsingInfo")
     public R exportRecordTemplateUsingInfo(String searchValue,
                                            @RequestParam("createTimeStart") Date createTimeStart,

src/main/java/com/cmeeting/controller/WeComcontroller.java

 package com.cmeeting.controller;
 
+import com.cmeeting.annotation.OperLog;
 import com.cmeeting.pojo.WeComUser;
 import com.cmeeting.service.WeComService;
 import com.cmeeting.util.R;
@@ -37,6 +38,7 @@ public class WeComcontroller {
      * @param params
      * @return
      */
+    @OperLog(location = "推送管理页面", operation = "修改是否推送")
     @PostMapping("/updateEmailPushAccess")
     public R updateEmailPushAccess(@RequestBody Map<String,Object> params) {
         if(!params.containsKey("emailPushAccess")){

src/main/java/com/cmeeting/mapper/primary/MeetingRecordTemplateMapper.java

@@ -54,12 +54,10 @@ public interface MeetingRecordTemplateMapper extends BaseMapper<MeetingRecordTem
     /**
      * 获取启用的模板
      * @param meetTypeId 会议类型id，允许为空
-     * @param templateType 模板类型，system-系统通用，custom-用户自定义
      * @param userId     userId
      * @return
      */
     MeetingRecordTemplate selectEnabledTemplate(@Param("meetTypeId") Long meetTypeId,
-                                                @Param("templateType") String templateType,
                                                 @Param("userId") String userId);
 
     /**

src/main/java/com/cmeeting/service/impl/MeetingInfoServiceImpl.java

@@ -117,6 +117,7 @@ public class MeetingInfoServiceImpl extends ServiceImpl<MeetingInfoMapper, Meeti
                 .eq(user.getRole().equals(RecordTemplateConstant.TEMPLATE_TYPE_CUSTOM), MeetingInfo::getHostUid, tid)
                 .like(StringUtils.isNotEmpty(vo.getSubject()),MeetingInfo::getSubject,vo.getSubject())
                 .between(vo.getStartTime() != null, MeetingInfo::getStartTime, vo.getStartTime(), vo.getEndTime())
+                .orderByDesc(MeetingInfo::getStartTime)
                 .select(MeetingInfo::getId, MeetingInfo::getMeetingId, MeetingInfo::getSubject, MeetingInfo::getHost, MeetingInfo::getHostUid,
                         MeetingInfo::getStartTime, MeetingInfo::getEndTime, MeetingInfo::getIsGenerated, MeetingInfo::getIsPushed);
         Page<MeetingInfo> meetingInfoPage = mapper.selectPage(new Page<>(vo.getCurrent(), vo.getSize()), queryWrapper);

src/main/java/com/cmeeting/service/impl/MeetingRecordTemplateServiceImpl.java

@@ -372,11 +372,16 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
      */
     @Override
     public MeetingRecordTemplate getEnabledRecordTemplate(Long meetType, String userId) {
-        MeetingRecordTemplate template = baseMapper.selectEnabledTemplate(meetType, RecordTemplateConstant.TEMPLATE_TYPE_CUSTOM, userId);
+        MeetingRecordTemplate template = baseMapper.selectEnabledTemplate(meetType, userId);
         if (!ObjectUtils.isEmpty(template)) {
             return template;
         }
-        return baseMapper.selectEnabledTemplate(null, RecordTemplateConstant.TEMPLATE_TYPE_SYSTEM, userId);
+        template = baseMapper.selectEnabledTemplate(RecordTemplateConstant.COMMON_MEET_TYPE, userId);
+        if (!ObjectUtils.isEmpty(template)) {
+            return template;
+        }
+        // TODO
+        return baseMapper.selectEnabledTemplate(RecordTemplateConstant.COMMON_MEET_TYPE, userId);
     }
 
     /**

src/main/resources/mapper/primary/MeetingRecordTemplateMapper.xml

@@ -214,19 +214,10 @@
 
 
     <select id="selectEnabledTemplate" resultType="com.cmeeting.pojo.MeetingRecordTemplate">
-        select
-            cmt_meeting_record_template.*
-        from
-            cmt_meeting_record_template,
-            meet_template_enable
-        <where>
-            cmt_meeting_record_template.is_del = 0
-            and cmt_meeting_record_template.type = #｛templateType}
-            <if test="meetTypeId != null"> and cmt_meeting_record_template.meeting_type = #{meetTypeId} </if>
-
-            and cmt_meeting_record_template.id = meet_template_enable.rel_id
-            and meet_template_enable.user_id = #{userId}
-        </where>
+        select t2.* from
+        meet_template_enable t1
+        inner join cmt_meeting_record_template t2 on t2.is_del = 0 and t2.id = t1.rel_id
+        where t1.user_id = #{userId} and t1.meet_type_id = #{meetTypeId};
     </select>
 
 

src/test/java/com/cmeeting/MeetingApiTest.java

@@ -24,8 +24,8 @@ public class MeetingApiTest {
     private MeetingRecordTemplateService meetingRecordTemplateService;
     @Test
     public void test2(){
-        String userId = "";
-        Long templateType = 0L;
+        String userId = "00010786";
+        Long templateType = 1L;
         MeetingRecordTemplate enabledRecordTemplate = meetingRecordTemplateService.getEnabledRecordTemplate(templateType, userId);
         System.out.println(enabledRecordTemplate.getName());
     }