1、添加获取会议类型列表接口

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

 package com.cmeeting.constant;
 
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * @Description
  * @Author zhang kaishi
@@ -24,4 +21,12 @@ public class MeetingTypeConstant {
      */
     public static final int PERSONAL_PERMISSION_NO = 0;
     public static final int PERSONAL_PERMISSION_yes = 1;
+
+    /**
+     * 会议类型
+     * system-系统会议类型
+     * custom-自定义会议类型
+     */
+    public static final String TYPE_SYSTEM = "system";
+    public static final String TYPE_CUSTOM = "custom";
 }

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

@@ -71,10 +71,10 @@ public class MeetingTypeController {
     /**
      * 获取系统通用的会议类型列表
      */
-    @GetMapping("/list/system")
+    @GetMapping("/list")
     public R list() {
 
-        List<MeetTypeDto> list =  meetTypeService.getSystemMeetTypeList();
+        List<MeetTypeDto> list =  meetTypeService.getMeetTypeList();
 
         return R.ok(list);
     }

src/main/java/com/cmeeting/dto/MeetTypeDto.java

@@ -40,6 +40,10 @@ class RecordTemplateDTO {
     private String name;
     // 模板描述
     private String typeDetail;
+    // 生成模板的提示词
+    private String prompt;
+    // 引用（参考）模板id
+    private Long referTemplateId;
     // 模板创建时间，格式：yyyy-MM-dd HH:mm:ss
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;

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

@@ -19,11 +19,17 @@ public interface MeetTypeMapper extends BaseMapper<MeetType> {
 
 
     /**
-     * 根据userId查询
+     * 根据userId查询系统通用的会议类型
      * @return
      */
     List<MeetTypeDto> selectSystemMeetTypeList(@Param("userId") String userId);
 
+    /**
+     * 根据userId查询自定义的模板
+     * todo 没有增加权限条件
+     * @return
+     */
+    List<MeetTypeDto> selectCustomMeetTypeList(@Param("userId") String userId);
 }
 
 

src/main/java/com/cmeeting/service/MeetTypeService.java

@@ -32,10 +32,23 @@ public interface MeetTypeService extends IService<MeetType> {
      */
     void delete(Long id);
 
+
+    /**
+     * 获取会议类型
+     * @return
+     */
+    List<MeetTypeDto> getMeetTypeList();
+
     /**
-     * 获取所有会议类型
+     * 获取系统通用会议类型
      * @return
      */
     List<MeetTypeDto> getSystemMeetTypeList();
 
+    /**
+     * 获取用户自定义会议类型
+     * @return
+     */
+    List<MeetTypeDto> getCustomMeetTypeList();
+
 }

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

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cmeeting.ad.entity.RobotSecurityUser;
 import com.cmeeting.ad.util.SecurityUtil;
+import com.cmeeting.constant.MeetingTypeConstant;
 import com.cmeeting.dto.MeetTypeDto;
+import com.cmeeting.exception.RobotBaseException;
 import com.cmeeting.mapper.primary.MeetTemplateEnableMapper;
 import com.cmeeting.mapper.primary.MeetingRecordTemplateMapper;
 import com.cmeeting.pojo.MeetTemplateEnable;
@@ -49,7 +51,11 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
         Date now = new Date();
 
         RobotSecurityUser loginUser = SecurityUtil.getUser();
-        // todo zhangks 校验管理员身份
+        // 校验管理员身份
+        String role = loginUser.getRole();
+        if (!"admin".equals(role)) {
+            throw new RobotBaseException("非管理员用户不允许创建会议类型");
+        }
 
         MeetType meetType = new MeetType();
         meetType.setName(meetingTypeVo.getName());
@@ -59,8 +65,8 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
         meetType.setContent(meetingTypeVo.getContent());
         meetType.setCreateTime(now);
         meetType.setUpdateTime(now);
-        meetType.setCreateUser(loginUser.getId());
-        meetType.setUpdateUser(loginUser.getId());
+        meetType.setCreateUser(loginUser.getUserId());
+        meetType.setUpdateUser(loginUser.getUserId());
         meetType.setCreateUserName(loginUser.getUsername());
         meetType.setUpdateUserName(loginUser.getUsername());
         meetTypeMapper.insert(meetType);
@@ -84,7 +90,7 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
         meetType.setRelId(meetingTypeVo.getRelId());
         meetType.setContent(meetingTypeVo.getContent());
         meetType.setUpdateTime(now);
-        meetType.setUpdateUser(loginUser.getId());
+        meetType.setUpdateUser(loginUser.getUserId());
         meetType.setUpdateUserName(loginUser.getUsername());
         meetTypeMapper.updateById(meetType);
     }
@@ -112,7 +118,27 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
     }
 
     /**
-     * 获取所有会议类型
+     * 获取会议类型
+     *
+     * @return
+     */
+    @Override
+    public List<MeetTypeDto> getMeetTypeList() {
+        List<MeetTypeDto> meetTypeDtoList = new ArrayList<>();
+
+        // 获取系统通用的会议类型
+        List<MeetTypeDto> systemMeetTypeList = getSystemMeetTypeList();
+        meetTypeDtoList.addAll(systemMeetTypeList);
+
+        // 获取用户自定义会议类型
+        List<MeetTypeDto> customMeetTypeList = getCustomMeetTypeList();
+        meetTypeDtoList.addAll(customMeetTypeList);
+
+        return meetTypeDtoList;
+    }
+
+    /**
+     * 获取系统通用会议类型
      *
      * @return
      */
@@ -120,9 +146,27 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
     public List<MeetTypeDto> getSystemMeetTypeList() {
         RobotSecurityUser loginUser = SecurityUtil.getUser();
         // 查询系统通用会议类型
-        List<MeetTypeDto> systemMeetTypeList = meetTypeMapper.selectSystemMeetTypeList(loginUser.getUserId());
+        List<MeetTypeDto> meetTypeDtoList = meetTypeMapper.selectSystemMeetTypeList(loginUser.getUserId());
+        meetTypeDtoList.stream().forEach(meetTypeDto -> meetTypeDto.setType(MeetingTypeConstant.TYPE_SYSTEM));
+
+        return meetTypeDtoList;
+    }
+
+    /**
+     * 获取用户自定义会议类型
+     * 目前只有所有人的逻辑
+     * @return
+     */
+    @Override
+    public List<MeetTypeDto> getCustomMeetTypeList() {
+
+        RobotSecurityUser loginUser = SecurityUtil.getUser();
+        String userId = loginUser.getUserId();
+
+        List<MeetTypeDto> meetTypeDtoList = meetTypeMapper.selectCustomMeetTypeList(userId);
+        meetTypeDtoList.stream().forEach(meetTypeDto -> meetTypeDto.setType(MeetingTypeConstant.TYPE_CUSTOM));
 
-        return systemMeetTypeList;
+        return meetTypeDtoList;
     }
 
 

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

@@ -327,7 +327,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
     @Override
     public void enable(Long id) {
         RobotSecurityUser loginUser = SecurityUtil.getUser();
-        String userId = loginUser.getId();
+        String userId = loginUser.getUserId();
 
         MeetingRecordTemplate recordTemplate = baseMapper.selectOne(new QueryWrapper<MeetingRecordTemplate>().select("meeting_type")
                 .eq("rel_id", id));

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

@@ -28,6 +28,9 @@
     <resultMap id="MeetTypeDtoResultMap" type="com.cmeeting.dto.MeetTypeDto">
         <id property="id" column="meeting_type_id" />
         <result property="name" column="meeting_type_name" />
+        <result property="personalPermission" column="meeting_type_personal_permission" />
+        <result property="authType" column="meeting_type_auth_type" />
+        <result property="relId" column="meeting_type_rel_id" />
         <result property="content" column="meeting_type_content" />
         <collection property="recordTemplateDTOList" javaType="List" ofType="com.cmeeting.dto.RecordTemplateDTO">
             <id property="id" column="template_id" />
@@ -35,6 +38,8 @@
             <result property="typeDetail" column="template_type_detail" />
             <result property="createTime" column="template_create_time" />
             <result property="enable" column="template_enabled" />
+            <result property="prompt" column="template_prompt" />
+            <result property="referTemplateId" column="template_refer_template_id" />
         </collection>
     </resultMap>
 
@@ -42,10 +47,16 @@
         SELECT
             meet_type.id AS meeting_type_id,
             meet_type.`name` AS meeting_type_name,
+            meet_type.personal_permission AS meeting_type_personal_permission,
+            meet_type.auth_type AS meeting_type_auth_type,
+            meet_type.rel_id AS meeting_type_rel_id,
+            meet_type.content AS meeting_type_content,
             cmt_meeting_record_template.id AS template_id,
             cmt_meeting_record_template.`name` AS template_name,
             cmt_meeting_record_template.type_detail AS template_type_detail,
             cmt_meeting_record_template.create_time AS template_create_time,
+            cmt_meeting_record_template.prompt AS template_prompt,
+            cmt_meeting_record_template.refer_template_id AS template_refer_template_id,
             IF(meet_template_enable.id IS NULL, 0, 1) AS template_enabled
         FROM
             meet_type
@@ -58,4 +69,26 @@
           and cmt_meeting_record_template.`type` = 'system'
     </select>
 
+    <!-- 根据userId查询自定义的模板 -->
+    <select id="selectCustomMeetTypeList" resultMap="MeetTypeDtoResultMap">
+        SELECT
+            meet_type.id AS meeting_type_id,
+            meet_type.`name` AS meeting_type_name,
+            meet_type.content AS meeting_type_content,
+            cmt_meeting_record_template.id AS template_id,
+            cmt_meeting_record_template.`name` AS template_name,
+            cmt_meeting_record_template.`type` AS template_type,
+            cmt_meeting_record_template.type_detail AS template_type_detail,
+            cmt_meeting_record_template.create_time AS template_create_time,
+            IF(meet_template_enable.id IS NULL, 0, 1) AS template_enabled
+        FROM
+            meet_type
+                LEFT JOIN cmt_meeting_record_template ON cmt_meeting_record_template.meeting_type = meet_type.id
+                AND cmt_meeting_record_template.is_del = 0
+                LEFT JOIN meet_template_enable ON cmt_meeting_record_template.id = meet_template_enable.rel_id
+                AND meet_template_enable.user_id = #{userId}
+        WHERE
+            meet_type.is_del = 0
+          and cmt_meeting_record_template.`type` = 'custom'
+    </select>
 </mapper>