Merge remote-tracking branch 'origin/master'

src/main/java/com/ruoyi/project/ys/controller/HyjyxxFileController.java

+package com.ruoyi.project.ys.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.ys.domain.HyjyxxFile;
+import com.ruoyi.project.ys.service.IHyjyxxFileService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 会议纪要_附件Controller
+ * 
+ * @author ruoyi
+ * @date 2025-11-03
+ */
+@RestController
+@RequestMapping("/hyjyxxFile/file")
+public class HyjyxxFileController extends BaseController
+{
+    @Autowired
+    private IHyjyxxFileService hyjyxxFileService;
+
+    /**
+     * 查询会议纪要_附件列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(HyjyxxFile hyjyxxFile)
+    {
+        startPage();
+        List<HyjyxxFile> list = hyjyxxFileService.selectHyjyxxFileList(hyjyxxFile);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出会议纪要_附件列表
+     */
+    @Log(title = "会议纪要_附件", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, HyjyxxFile hyjyxxFile)
+    {
+        List<HyjyxxFile> list = hyjyxxFileService.selectHyjyxxFileList(hyjyxxFile);
+        ExcelUtil<HyjyxxFile> util = new ExcelUtil<HyjyxxFile>(HyjyxxFile.class);
+        util.exportExcel(response, list, "会议纪要_附件数据");
+    }
+
+    /**
+     * 获取会议纪要_附件详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(hyjyxxFileService.selectHyjyxxFileById(id));
+    }
+
+    /**
+     * 新增会议纪要_附件
+     */
+    @Log(title = "会议纪要_附件", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody HyjyxxFile hyjyxxFile)
+    {
+        return toAjax(hyjyxxFileService.insertHyjyxxFile(hyjyxxFile));
+    }
+
+    /**
+     * 修改会议纪要_附件
+     */
+    @Log(title = "会议纪要_附件", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody HyjyxxFile hyjyxxFile)
+    {
+        return toAjax(hyjyxxFileService.updateHyjyxxFile(hyjyxxFile));
+    }
+
+    /**
+     * 删除会议纪要_附件
+     */
+    @Log(title = "会议纪要_附件", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(hyjyxxFileService.deleteHyjyxxFileByIds(ids));
+    }
+}

src/main/java/com/ruoyi/project/ys/domain/HyjyxxFile.java

+package com.ruoyi.project.ys.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+
+/**
+ * 会议纪要_附件对象 hyjyxx_file
+ * 
+ * @author ruoyi
+ * @date 2025-11-03
+ */
+public class HyjyxxFile extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 会议id */
+    @Excel(name = "会议id")
+    private Long hyid;
+
+    /** 附件路径 */
+    @Excel(name = "附件路径")
+    private String fileUrl;
+
+    /** 附件名字 */
+    @Excel(name = "附件名字")
+    private String fileName;
+
+    /** 附件时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "附件时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fileTime;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdTime;
+
+    /** 备用1 */
+    @Excel(name = "备用1")
+    private String ext1;
+
+    /** 备用2 */
+    @Excel(name = "备用2")
+    private String ext2;
+
+    /** 备用3 */
+    @Excel(name = "备用3")
+    private String ext3;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public void setHyid(Long hyid) 
+    {
+        this.hyid = hyid;
+    }
+
+    public Long getHyid() 
+    {
+        return hyid;
+    }
+
+    public void setFileUrl(String fileUrl) 
+    {
+        this.fileUrl = fileUrl;
+    }
+
+    public String getFileUrl() 
+    {
+        return fileUrl;
+    }
+
+    public void setFileName(String fileName) 
+    {
+        this.fileName = fileName;
+    }
+
+    public String getFileName() 
+    {
+        return fileName;
+    }
+
+    public void setFileTime(Date fileTime) 
+    {
+        this.fileTime = fileTime;
+    }
+
+    public Date getFileTime() 
+    {
+        return fileTime;
+    }
+
+    public void setCreatedBy(String createdBy) 
+    {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedBy() 
+    {
+        return createdBy;
+    }
+
+    public void setCreatedTime(Date createdTime) 
+    {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() 
+    {
+        return createdTime;
+    }
+
+    public void setExt1(String ext1) 
+    {
+        this.ext1 = ext1;
+    }
+
+    public String getExt1() 
+    {
+        return ext1;
+    }
+
+    public void setExt2(String ext2) 
+    {
+        this.ext2 = ext2;
+    }
+
+    public String getExt2() 
+    {
+        return ext2;
+    }
+
+    public void setExt3(String ext3) 
+    {
+        this.ext3 = ext3;
+    }
+
+    public String getExt3() 
+    {
+        return ext3;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("hyid", getHyid())
+            .append("fileUrl", getFileUrl())
+            .append("fileName", getFileName())
+            .append("fileTime", getFileTime())
+            .append("createdBy", getCreatedBy())
+            .append("createdTime", getCreatedTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("ext1", getExt1())
+            .append("ext2", getExt2())
+            .append("ext3", getExt3())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/project/ys/mapper/HyjyxxFileMapper.java

+package com.ruoyi.project.ys.mapper;
+
+import java.util.List;
+import com.ruoyi.project.ys.domain.HyjyxxFile;
+
+/**
+ * 会议纪要_附件Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-11-03
+ */
+public interface HyjyxxFileMapper 
+{
+    /**
+     * 查询会议纪要_附件
+     * 
+     * @param id 会议纪要_附件主键
+     * @return 会议纪要_附件
+     */
+    public HyjyxxFile selectHyjyxxFileById(Long id);
+
+    /**
+     * 查询会议纪要_附件列表
+     * 
+     * @param hyjyxxFile 会议纪要_附件
+     * @return 会议纪要_附件集合
+     */
+    public List<HyjyxxFile> selectHyjyxxFileList(HyjyxxFile hyjyxxFile);
+
+    /**
+     * 新增会议纪要_附件
+     * 
+     * @param hyjyxxFile 会议纪要_附件
+     * @return 结果
+     */
+    public int insertHyjyxxFile(HyjyxxFile hyjyxxFile);
+
+    /**
+     * 修改会议纪要_附件
+     * 
+     * @param hyjyxxFile 会议纪要_附件
+     * @return 结果
+     */
+    public int updateHyjyxxFile(HyjyxxFile hyjyxxFile);
+
+    /**
+     * 删除会议纪要_附件
+     * 
+     * @param id 会议纪要_附件主键
+     * @return 结果
+     */
+    public int deleteHyjyxxFileById(Long id);
+
+    /**
+     * 批量删除会议纪要_附件
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteHyjyxxFileByIds(Long[] ids);
+}

src/main/java/com/ruoyi/project/ys/service/IHyjyxxFileService.java

+package com.ruoyi.project.ys.service;
+
+import java.util.List;
+import com.ruoyi.project.ys.domain.HyjyxxFile;
+
+/**
+ * 会议纪要_附件Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-11-03
+ */
+public interface IHyjyxxFileService 
+{
+    /**
+     * 查询会议纪要_附件
+     * 
+     * @param id 会议纪要_附件主键
+     * @return 会议纪要_附件
+     */
+    public HyjyxxFile selectHyjyxxFileById(Long id);
+
+    /**
+     * 查询会议纪要_附件列表
+     * 
+     * @param hyjyxxFile 会议纪要_附件
+     * @return 会议纪要_附件集合
+     */
+    public List<HyjyxxFile> selectHyjyxxFileList(HyjyxxFile hyjyxxFile);
+
+    /**
+     * 新增会议纪要_附件
+     * 
+     * @param hyjyxxFile 会议纪要_附件
+     * @return 结果
+     */
+    public int insertHyjyxxFile(HyjyxxFile hyjyxxFile);
+
+    /**
+     * 修改会议纪要_附件
+     * 
+     * @param hyjyxxFile 会议纪要_附件
+     * @return 结果
+     */
+    public int updateHyjyxxFile(HyjyxxFile hyjyxxFile);
+
+    /**
+     * 批量删除会议纪要_附件
+     * 
+     * @param ids 需要删除的会议纪要_附件主键集合
+     * @return 结果
+     */
+    public int deleteHyjyxxFileByIds(Long[] ids);
+
+    /**
+     * 删除会议纪要_附件信息
+     * 
+     * @param id 会议纪要_附件主键
+     * @return 结果
+     */
+    public int deleteHyjyxxFileById(Long id);
+}

src/main/java/com/ruoyi/project/ys/service/impl/HyjyxxFileServiceImpl.java

+package com.ruoyi.project.ys.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.ys.mapper.HyjyxxFileMapper;
+import com.ruoyi.project.ys.domain.HyjyxxFile;
+import com.ruoyi.project.ys.service.IHyjyxxFileService;
+
+/**
+ * 会议纪要_附件Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-11-03
+ */
+@Service
+public class HyjyxxFileServiceImpl implements IHyjyxxFileService 
+{
+    @Autowired
+    private HyjyxxFileMapper hyjyxxFileMapper;
+
+    /**
+     * 查询会议纪要_附件
+     * 
+     * @param id 会议纪要_附件主键
+     * @return 会议纪要_附件
+     */
+    @Override
+    public HyjyxxFile selectHyjyxxFileById(Long id)
+    {
+        return hyjyxxFileMapper.selectHyjyxxFileById(id);
+    }
+
+    /**
+     * 查询会议纪要_附件列表
+     * 
+     * @param hyjyxxFile 会议纪要_附件
+     * @return 会议纪要_附件
+     */
+    @Override
+    public List<HyjyxxFile> selectHyjyxxFileList(HyjyxxFile hyjyxxFile)
+    {
+        return hyjyxxFileMapper.selectHyjyxxFileList(hyjyxxFile);
+    }
+
+    /**
+     * 新增会议纪要_附件
+     * 
+     * @param hyjyxxFile 会议纪要_附件
+     * @return 结果
+     */
+    @Override
+    public int insertHyjyxxFile(HyjyxxFile hyjyxxFile)
+    {
+        return hyjyxxFileMapper.insertHyjyxxFile(hyjyxxFile);
+    }
+
+    /**
+     * 修改会议纪要_附件
+     * 
+     * @param hyjyxxFile 会议纪要_附件
+     * @return 结果
+     */
+    @Override
+    public int updateHyjyxxFile(HyjyxxFile hyjyxxFile)
+    {
+        hyjyxxFile.setUpdateTime(DateUtils.getNowDate());
+        return hyjyxxFileMapper.updateHyjyxxFile(hyjyxxFile);
+    }
+
+    /**
+     * 批量删除会议纪要_附件
+     * 
+     * @param ids 需要删除的会议纪要_附件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHyjyxxFileByIds(Long[] ids)
+    {
+        return hyjyxxFileMapper.deleteHyjyxxFileByIds(ids);
+    }
+
+    /**
+     * 删除会议纪要_附件信息
+     * 
+     * @param id 会议纪要_附件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHyjyxxFileById(Long id)
+    {
+        return hyjyxxFileMapper.deleteHyjyxxFileById(id);
+    }
+}

src/main/resources/mybatis/hyjyxxFile/HyjyxxFileMapper.xml

+<?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.project.ys.mapper.HyjyxxFileMapper">
+    
+    <resultMap type="HyjyxxFile" id="HyjyxxFileResult">
+        <result property="id"    column="id"    />
+        <result property="hyid"    column="hyid"    />
+        <result property="fileUrl"    column="file_url"    />
+        <result property="fileName"    column="file_name"    />
+        <result property="fileTime"    column="file_time"    />
+        <result property="createdBy"    column="created_by"    />
+        <result property="createdTime"    column="created_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="ext1"    column="ext1"    />
+        <result property="ext2"    column="ext2"    />
+        <result property="ext3"    column="ext3"    />
+    </resultMap>
+
+    <sql id="selectHyjyxxFileVo">
+        select id, hyid, file_url, file_name, file_time, created_by, created_time, update_by, update_time, ext1, ext2, ext3 from hyjyxx_file
+    </sql>
+
+    <select id="selectHyjyxxFileList" parameterType="HyjyxxFile" resultMap="HyjyxxFileResult">
+        <include refid="selectHyjyxxFileVo"/>
+        <where>  
+            <if test="id != null "> and id = #{id}</if>
+            <if test="hyid != null "> and hyid = #{hyid}</if>
+            <if test="fileUrl != null  and fileUrl != ''"> and file_url = #{fileUrl}</if>
+            <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
+            <if test="fileTime != null "> and file_time = #{fileTime}</if>
+            <if test="createdBy != null  and createdBy != ''"> and created_by = #{createdBy}</if>
+            <if test="createdTime != null "> and created_time = #{createdTime}</if>
+            <if test="ext1 != null  and ext1 != ''"> and ext1 = #{ext1}</if>
+            <if test="ext2 != null  and ext2 != ''"> and ext2 = #{ext2}</if>
+            <if test="ext3 != null  and ext3 != ''"> and ext3 = #{ext3}</if>
+        </where>
+    </select>
+    
+    <select id="selectHyjyxxFileById" parameterType="Long" resultMap="HyjyxxFileResult">
+        <include refid="selectHyjyxxFileVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertHyjyxxFile" parameterType="HyjyxxFile" useGeneratedKeys="true" keyProperty="id">
+        insert into hyjyxx_file
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="hyid != null">hyid,</if>
+            <if test="fileUrl != null">file_url,</if>
+            <if test="fileName != null">file_name,</if>
+            <if test="fileTime != null">file_time,</if>
+            <if test="createdBy != null">created_by,</if>
+            <if test="createdTime != null">created_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="ext1 != null">ext1,</if>
+            <if test="ext2 != null">ext2,</if>
+            <if test="ext3 != null">ext3,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="hyid != null">#{hyid},</if>
+            <if test="fileUrl != null">#{fileUrl},</if>
+            <if test="fileName != null">#{fileName},</if>
+            <if test="fileTime != null">#{fileTime},</if>
+            <if test="createdBy != null">#{createdBy},</if>
+            <if test="createdTime != null">#{createdTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="ext1 != null">#{ext1},</if>
+            <if test="ext2 != null">#{ext2},</if>
+            <if test="ext3 != null">#{ext3},</if>
+         </trim>
+    </insert>
+
+    <update id="updateHyjyxxFile" parameterType="HyjyxxFile">
+        update hyjyxx_file
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="hyid != null">hyid = #{hyid},</if>
+            <if test="fileUrl != null">file_url = #{fileUrl},</if>
+            <if test="fileName != null">file_name = #{fileName},</if>
+            <if test="fileTime != null">file_time = #{fileTime},</if>
+            <if test="createdBy != null">created_by = #{createdBy},</if>
+            <if test="createdTime != null">created_time = #{createdTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="ext1 != null">ext1 = #{ext1},</if>
+            <if test="ext2 != null">ext2 = #{ext2},</if>
+            <if test="ext3 != null">ext3 = #{ext3},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteHyjyxxFileById" parameterType="Long">
+        delete from hyjyxx_file where id = #{id}
+    </delete>
+
+    <delete id="deleteHyjyxxFileByIds" parameterType="String">
+        delete from hyjyxx_file where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file