Merge branch 'master' of http://60.171.161.56:20000/tjf/yuanqu

ruoyi-admin/src/main/java/com/ruoyi/web/controller/meeting/MeetingRecordsController.java

@@ -0,0 +1,98 @@
+package com.ruoyi.web.controller.meeting;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.MeetingRecords;
+import com.ruoyi.system.service.IMeetingRecordsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 会议记录Controller
+ *
+ * @author boman
+ * @date 2024-10-22
+ */
+@RestController
+@RequestMapping("/system/records")
+public class MeetingRecordsController extends BaseController
+{
+    @Autowired
+    private IMeetingRecordsService meetingRecordsService;
+
+/**
+ * 查询会议记录列表
+ */
+@PreAuthorize("@ss.hasPermi('system:records:list')")
+@GetMapping("/list")
+    public TableDataInfo list(MeetingRecords meetingRecords)
+    {
+        startPage();
+        List<MeetingRecords> list = meetingRecordsService.selectMeetingRecordsList(meetingRecords);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出会议记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:records:export')")
+    @Log(title = "会议记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, MeetingRecords meetingRecords)
+    {
+        List<MeetingRecords> list = meetingRecordsService.selectMeetingRecordsList(meetingRecords);
+        ExcelUtil<MeetingRecords> util = new ExcelUtil<MeetingRecords>(MeetingRecords.class);
+        util.exportExcel(response, list, "会议记录数据");
+    }
+
+    /**
+     * 获取会议记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:records:query')")
+    @GetMapping(value = "/{recordId}")
+    public AjaxResult getInfo(@PathVariable("recordId") Long recordId)
+    {
+        return success(meetingRecordsService.selectMeetingRecordsByRecordId(recordId));
+    }
+
+    /**
+     * 新增会议记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:records:add')")
+    @Log(title = "会议记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MeetingRecords meetingRecords)
+    {
+        return toAjax(meetingRecordsService.insertMeetingRecords(meetingRecords));
+    }
+
+    /**
+     * 修改会议记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:records:edit')")
+    @Log(title = "会议记录", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody MeetingRecords meetingRecords)
+    {
+        return toAjax(meetingRecordsService.updateMeetingRecords(meetingRecords));
+    }
+
+    /**
+     * 删除会议记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:records:remove')")
+    @Log(title = "会议记录", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{recordIds}")
+    public AjaxResult remove(@PathVariable Long[] recordIds)
+    {
+        return toAjax(meetingRecordsService.deleteMeetingRecordsByRecordIds(recordIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -1,33 +1,30 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.ruoyi.common.core.domain.entity.SysUserVo;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.SysUserVo;
 import com.ruoyi.common.core.domain.model.LoginBody;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.web.service.SysLoginService;
 import com.ruoyi.framework.web.service.SysPermissionService;
+import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.system.service.ISysMenuService;
+import com.ruoyi.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 登录验证

ruoyi-generator/src/main/resources/generator.yml

@@ -1,7 +1,7 @@
 # 代码生成
 gen:
   # 作者
-  author: ruoyi
+  author: biman
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
   packageName: com.ruoyi.system
   # 自动去除表前缀，默认是false

ruoyi-system/src/main/java/com/ruoyi/system/domain/MeetingRecords.java

@@ -0,0 +1,69 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 会议记录对象 meeting_records
+ * 
+ * @author boman
+ * @date 2024-10-22
+ */
+public class MeetingRecords extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 记录id */
+    private Long recordId;
+
+    /** 会议id(关联会议预约表) */
+    @Excel(name = "会议id(关联会议预约表)")
+    private Long conferenceRoomOrderId;
+
+    /** 记录内容 */
+    @Excel(name = "记录内容")
+    private String recordContent;
+
+    public void setRecordId(Long recordId) 
+    {
+        this.recordId = recordId;
+    }
+
+    public Long getRecordId() 
+    {
+        return recordId;
+    }
+    public void setConferenceRoomOrderId(Long conferenceRoomOrderId) 
+    {
+        this.conferenceRoomOrderId = conferenceRoomOrderId;
+    }
+
+    public Long getConferenceRoomOrderId() 
+    {
+        return conferenceRoomOrderId;
+    }
+    public void setRecordContent(String recordContent) 
+    {
+        this.recordContent = recordContent;
+    }
+
+    public String getRecordContent() 
+    {
+        return recordContent;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("recordId", getRecordId())
+            .append("conferenceRoomOrderId", getConferenceRoomOrderId())
+            .append("recordContent", getRecordContent())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/MeetingRecordsMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.MeetingRecords;
+
+import java.util.List;
+
+/**
+ * 会议记录Mapper接口
+ * 
+ * @author boman
+ * @date 2024-10-22
+ */
+public interface MeetingRecordsMapper 
+{
+    /**
+     * 查询会议记录
+     * 
+     * @param recordId 会议记录主键
+     * @return 会议记录
+     */
+    public MeetingRecords selectMeetingRecordsByRecordId(Long recordId);
+
+    /**
+     * 查询会议记录列表
+     * 
+     * @param meetingRecords 会议记录
+     * @return 会议记录集合
+     */
+    public List<MeetingRecords> selectMeetingRecordsList(MeetingRecords meetingRecords);
+
+    /**
+     * 新增会议记录
+     * 
+     * @param meetingRecords 会议记录
+     * @return 结果
+     */
+    public int insertMeetingRecords(MeetingRecords meetingRecords);
+
+    /**
+     * 修改会议记录
+     * 
+     * @param meetingRecords 会议记录
+     * @return 结果
+     */
+    public int updateMeetingRecords(MeetingRecords meetingRecords);
+
+    /**
+     * 删除会议记录
+     * 
+     * @param recordId 会议记录主键
+     * @return 结果
+     */
+    public int deleteMeetingRecordsByRecordId(Long recordId);
+
+    /**
+     * 批量删除会议记录
+     * 
+     * @param recordIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMeetingRecordsByRecordIds(Long[] recordIds);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IMeetingRecordsService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.MeetingRecords;
+
+import java.util.List;
+
+/**
+ * 会议记录Service接口
+ * 
+ * @author boman
+ * @date 2024-10-22
+ */
+public interface IMeetingRecordsService 
+{
+    /**
+     * 查询会议记录
+     * 
+     * @param recordId 会议记录主键
+     * @return 会议记录
+     */
+    public MeetingRecords selectMeetingRecordsByRecordId(Long recordId);
+
+    /**
+     * 查询会议记录列表
+     * 
+     * @param meetingRecords 会议记录
+     * @return 会议记录集合
+     */
+    public List<MeetingRecords> selectMeetingRecordsList(MeetingRecords meetingRecords);
+
+    /**
+     * 新增会议记录
+     * 
+     * @param meetingRecords 会议记录
+     * @return 结果
+     */
+    public int insertMeetingRecords(MeetingRecords meetingRecords);
+
+    /**
+     * 修改会议记录
+     * 
+     * @param meetingRecords 会议记录
+     * @return 结果
+     */
+    public int updateMeetingRecords(MeetingRecords meetingRecords);
+
+    /**
+     * 批量删除会议记录
+     * 
+     * @param recordIds 需要删除的会议记录主键集合
+     * @return 结果
+     */
+    public int deleteMeetingRecordsByRecordIds(Long[] recordIds);
+
+    /**
+     * 删除会议记录信息
+     * 
+     * @param recordId 会议记录主键
+     * @return 结果
+     */
+    public int deleteMeetingRecordsByRecordId(Long recordId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MeetingRecordsServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.MeetingRecords;
+import com.ruoyi.system.mapper.MeetingRecordsMapper;
+import com.ruoyi.system.service.IMeetingRecordsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 会议记录Service业务层处理
+ * 
+ * @author boman
+ * @date 2024-10-22
+ */
+@Service
+public class MeetingRecordsServiceImpl implements IMeetingRecordsService 
+{
+    @Autowired
+    private MeetingRecordsMapper meetingRecordsMapper;
+
+    /**
+     * 查询会议记录
+     * 
+     * @param recordId 会议记录主键
+     * @return 会议记录
+     */
+    @Override
+    public MeetingRecords selectMeetingRecordsByRecordId(Long recordId)
+    {
+        return meetingRecordsMapper.selectMeetingRecordsByRecordId(recordId);
+    }
+
+    /**
+     * 查询会议记录列表
+     * 
+     * @param meetingRecords 会议记录
+     * @return 会议记录
+     */
+    @Override
+    public List<MeetingRecords> selectMeetingRecordsList(MeetingRecords meetingRecords)
+    {
+        return meetingRecordsMapper.selectMeetingRecordsList(meetingRecords);
+    }
+
+    /**
+     * 新增会议记录
+     * 
+     * @param meetingRecords 会议记录
+     * @return 结果
+     */
+    @Override
+    public int insertMeetingRecords(MeetingRecords meetingRecords)
+    {
+        meetingRecords.setCreateTime(DateUtils.getNowDate());
+        return meetingRecordsMapper.insertMeetingRecords(meetingRecords);
+    }
+
+    /**
+     * 修改会议记录
+     * 
+     * @param meetingRecords 会议记录
+     * @return 结果
+     */
+    @Override
+    public int updateMeetingRecords(MeetingRecords meetingRecords)
+    {
+        meetingRecords.setUpdateTime(DateUtils.getNowDate());
+        return meetingRecordsMapper.updateMeetingRecords(meetingRecords);
+    }
+
+    /**
+     * 批量删除会议记录
+     * 
+     * @param recordIds 需要删除的会议记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMeetingRecordsByRecordIds(Long[] recordIds)
+    {
+        return meetingRecordsMapper.deleteMeetingRecordsByRecordIds(recordIds);
+    }
+
+    /**
+     * 删除会议记录信息
+     * 
+     * @param recordId 会议记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMeetingRecordsByRecordId(Long recordId)
+    {
+        return meetingRecordsMapper.deleteMeetingRecordsByRecordId(recordId);
+    }
+}

ruoyi-system/src/main/resources/mapper/system/MeetingRecordsMapper.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.MeetingRecordsMapper">
+    
+    <resultMap type="MeetingRecords" id="MeetingRecordsResult">
+        <result property="recordId"    column="record_id"    />
+        <result property="conferenceRoomOrderId"    column="conference_room_order_id"    />
+        <result property="recordContent"    column="record_content"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectMeetingRecordsVo">
+        select record_id, conference_room_order_id, record_content, create_time, update_by, update_time, remark from meeting_records
+    </sql>
+
+    <select id="selectMeetingRecordsList" parameterType="MeetingRecords" resultMap="MeetingRecordsResult">
+        <include refid="selectMeetingRecordsVo"/>
+        <where>  
+            <if test="conferenceRoomOrderId != null "> and conference_room_order_id = #{conferenceRoomOrderId}</if>
+            <if test="recordContent != null  and recordContent != ''"> and record_content = #{recordContent}</if>
+        </where>
+    </select>
+    
+    <select id="selectMeetingRecordsByRecordId" parameterType="Long" resultMap="MeetingRecordsResult">
+        <include refid="selectMeetingRecordsVo"/>
+        where record_id = #{recordId}
+    </select>
+        
+    <insert id="insertMeetingRecords" parameterType="MeetingRecords" useGeneratedKeys="true" keyProperty="recordId">
+        insert into meeting_records
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="conferenceRoomOrderId != null">conference_room_order_id,</if>
+            <if test="recordContent != null">record_content,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="conferenceRoomOrderId != null">#{conferenceRoomOrderId},</if>
+            <if test="recordContent != null">#{recordContent},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateMeetingRecords" parameterType="MeetingRecords">
+        update meeting_records
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="conferenceRoomOrderId != null">conference_room_order_id = #{conferenceRoomOrderId},</if>
+            <if test="recordContent != null">record_content = #{recordContent},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where record_id = #{recordId}
+    </update>
+
+    <delete id="deleteMeetingRecordsByRecordId" parameterType="Long">
+        delete from meeting_records where record_id = #{recordId}
+    </delete>
+
+    <delete id="deleteMeetingRecordsByRecordIds" parameterType="String">
+        delete from meeting_records where record_id in 
+        <foreach item="recordId" collection="array" open="(" separator="," close=")">
+            #{recordId}
+        </foreach>
+    </delete>
+</mapper>