fei
18 小时以前 cb703ae5b5afdd4a7d614a948ee4d4c457b77185
增加了签名和注解接口
6个文件已修改
188 ■■■■ 已修改文件
archiveManager/src/main/java/com/ruoyi/service/IArchiveAnnotationService.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
archiveManager/src/main/java/com/ruoyi/service/IArchiveSignatureService.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveAnnotationServiceImpl.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveSignatureServiceImpl.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveAnnotationController.java 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveSignatureController.java 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
archiveManager/src/main/java/com/ruoyi/service/IArchiveAnnotationService.java
@@ -3,6 +3,9 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.ArchiveAnnotation;
import com.ruoyi.domain.ArchiveRecords;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -21,7 +24,9 @@
     * @return 【请填写功能名称】
     */
    public ArchiveAnnotation selectArchiveAnnotationById(Long id);
    public List<ArchiveAnnotation> selectArchiveRecordsByIds(Long[] ids);
    @Transactional
    public AjaxResult importExcel(MultipartFile file) ;
    /**
     * 查询【请填写功能名称】列表
     *
archiveManager/src/main/java/com/ruoyi/service/IArchiveSignatureService.java
@@ -2,8 +2,11 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.ArchiveAnnotation;
import com.ruoyi.domain.ArchiveRecords;
import com.ruoyi.domain.ArchiveSignature;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -28,7 +31,8 @@
     * @return 【请填写功能名称】
     */
    public ArchiveSignature selectArchiveSignatureById(Long id);
    @Transactional
    public AjaxResult importExcel(MultipartFile file) ;
    /**
     * 查询【请填写功能名称】列表
     *
@@ -36,6 +40,7 @@
     * @return 【请填写功能名称】集合
     */
    public List<ArchiveSignature> selectArchiveSignatureList(ArchiveSignature archiveSignature);
    public List<ArchiveSignature> selectArchiveSignatureByIds(Long[] ids);
    /**
     * 新增【请填写功能名称】
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveAnnotationServiceImpl.java
@@ -7,12 +7,16 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ArchiveAnnotation;
import com.ruoyi.domain.ArchivePlaceName;
import com.ruoyi.domain.ArchiveRecords;
import com.ruoyi.domain.ArchiveSignature;
import com.ruoyi.mapper.ArchiveAnnotationMapper;
import com.ruoyi.service.IArchiveAnnotationService;
import com.ruoyi.util.ErrorcodeExceptionextends;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -41,6 +45,44 @@
    }
    @Override
    public List<ArchiveAnnotation> selectArchiveRecordsByIds(Long[] ids) {
        // 创建查询条件
        LambdaQueryWrapper<ArchiveAnnotation> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        // 根据ids查询
        lambdaQueryWrapper.in(ArchiveAnnotation::getId, Arrays.asList(ids));
        // 如果不是管理员,需要考虑权限过滤(可根据实际权限需求调整)
//        if (userid != 1) {
//            // 这里可以添加权限相关的过滤条件
//        }
        List<ArchiveAnnotation> beanRecords = list(lambdaQueryWrapper);
        return beanRecords;
    }
    @Override
    public AjaxResult importExcel(MultipartFile file) {
        ExcelUtil<ArchiveAnnotation> util = new ExcelUtil<>(ArchiveAnnotation.class);
        List<ArchiveAnnotation> dataList = null;
        try {
            dataList = util.importExcel(file.getInputStream());
        } catch (Exception e) {
            throw new RuntimeException("没有按照规则导入数据");
        }
        assert dataList != null;
        for (ArchiveAnnotation archiveAnnotation : dataList) {
            // physcialService.mySave(physcial);
            this.insertArchiveAnnotation(archiveAnnotation);
        }
        return AjaxResult.success();
    }
    @Override
    public AjaxResult selectArchiveAnnotationList(ArchiveAnnotation archiveAnnotation, Integer pageNum, Integer pageSize) {
        LambdaQueryWrapper<ArchiveAnnotation> lqw = buildCondition(archiveAnnotation);
@@ -63,7 +105,10 @@
    @Override
    public List<ArchiveAnnotation> selectArchiveAnnoList(ArchiveAnnotation archiveAnnotation) {
        return Collections.emptyList();
        LambdaQueryWrapper<ArchiveAnnotation> lqw = new LambdaQueryWrapper<>();
        LambdaQueryWrapper<ArchiveAnnotation> lambdaQueryWrapper = buildCondition(archiveAnnotation);
        List<ArchiveAnnotation> beanRecords = list(lambdaQueryWrapper);
        return beanRecords;
    }
    @Override
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveSignatureServiceImpl.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.*;
import com.ruoyi.mapper.ArchiveSignatureMapper;
import com.ruoyi.mapper.ArchiverecordstouserMapper;
@@ -14,6 +15,7 @@
import com.ruoyi.service.IArchiverecordstouserService;
import com.ruoyi.util.ErrorcodeExceptionextends;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -65,8 +67,49 @@
    }
    @Override
    public AjaxResult importExcel(MultipartFile file) {
        ExcelUtil<ArchiveSignature> util = new ExcelUtil<>(ArchiveSignature.class);
        List<ArchiveSignature> dataList = null;
        try {
            dataList = util.importExcel(file.getInputStream());
        } catch (Exception e) {
            throw new RuntimeException("没有按照规则导入数据");
        }
        assert dataList != null;
        for (ArchiveSignature archiveSignature : dataList) {
            // physcialService.mySave(physcial);
            this.insertArchiveSignature(archiveSignature);
        }
        return AjaxResult.success();
    }
    @Override
    public List<ArchiveSignature> selectArchiveSignatureList(ArchiveSignature archiveSignature) {
        return Collections.emptyList();
        LambdaQueryWrapper<ArchiveSignature> lqw = new LambdaQueryWrapper<>();
        LambdaQueryWrapper<ArchiveSignature> lambdaQueryWrapper = buildCondition(archiveSignature);
        List<ArchiveSignature> beanRecords = list(lambdaQueryWrapper);
        return beanRecords;
    }
    @Override
    public List<ArchiveSignature> selectArchiveSignatureByIds(Long[] ids) {
        // 创建查询条件
        LambdaQueryWrapper<ArchiveSignature> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        // 根据ids查询
        lambdaQueryWrapper.in(ArchiveSignature::getId, Arrays.asList(ids));
        // 如果不是管理员,需要考虑权限过滤(可根据实际权限需求调整)
//        if (userid != 1) {
//            // 这里可以添加权限相关的过滤条件
//        }
        List<ArchiveSignature> beanRecords = list(lambdaQueryWrapper);
        return beanRecords;
    }
    @Override
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveAnnotationController.java
@@ -1,23 +1,18 @@
package com.ruoyi.web.controller.archive;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.domain.ArchiveAnnotation;
import com.ruoyi.domain.ArchiveSignature;
import com.ruoyi.service.IArchiveAnnotationService;
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 org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -25,12 +20,13 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
/**
 * 【请填写功能名称】Controller
 * 【注释的接口】Controller
 *
 * @author ruoyi
 * @date 2026-01-19
@@ -61,13 +57,35 @@
    @PreAuthorize("@ss.hasPermi('system:annotation:export')")
    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ArchiveAnnotation archiveAnnotation)
    public void export(HttpServletResponse response, ArchiveAnnotation archiveAnnotation, @RequestParam(value = "ids", required = false) Long[] ids)
    {
        List<ArchiveAnnotation> list = archiveAnnotationService.selectArchiveAnnoList(archiveAnnotation);
        List<ArchiveAnnotation> list = new ArrayList<>();
        // 如果提供了ids参数,则根据ids导出指定记录
        if (ids != null && ids.length > 0) {
            list = archiveAnnotationService.selectArchiveRecordsByIds(ids);
        } else {
            // 否则根据查询条件导出
            list = archiveAnnotationService.selectArchiveAnnoList(archiveAnnotation);
        }
        ExcelUtil<ArchiveAnnotation> util = new ExcelUtil<ArchiveAnnotation>(ArchiveAnnotation.class);
        util.exportExcel(response, list, "【请填写功能名称】数据");
    }
    @PreAuthorize("@ss.hasPermi('system:annotation:list')")
    @GetMapping("/listAll")
    public AjaxResult selectAllAnnotation(ArchiveAnnotation archiveAnnotation )
    {
        List<ArchiveAnnotation> list = archiveAnnotationService.selectArchiveAnnoList(archiveAnnotation);
        return new AjaxResult(200, "",list);
    }
    @PreAuthorize("@ss.hasPermi('system:annotation:edit')")
    @Log(title = "注释记录导入", businessType = BusinessType.IMPORT)
    @PostMapping("/importData")
    public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception {
        return archiveAnnotationService.importExcel(file);
    }
    /**
     * 获取【请填写功能名称】详细信息
     */
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveSignatureController.java
@@ -1,23 +1,18 @@
package com.ruoyi.web.controller.archive;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.domain.ArchiveAnnotation;
import com.ruoyi.domain.ArchiveSignature;
import com.ruoyi.service.IArchiveSignatureService;
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 org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -25,6 +20,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
@@ -55,16 +51,38 @@
        // return archiveCategoryService.selectDataList(archiveCategory, pageNum, pageSize);
    }
    @PreAuthorize("@ss.hasPermi('system:signature:edit')")
    @Log(title = "签名记录导入", businessType = BusinessType.IMPORT)
    @PostMapping("/importData")
    public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception {
        return archiveSignatureService.importExcel(file);
    }
    @PreAuthorize("@ss.hasPermi('system:signature:list')")
    @GetMapping("/listAll")
    public AjaxResult selectAllSignature(ArchiveSignature archiveSignature)
    {
        List<ArchiveSignature> list = archiveSignatureService.selectArchiveSignatureList(archiveSignature);
        return new AjaxResult(200, "",list);
    }
    /**
     * 导出签名列表
     */
    @PreAuthorize("@ss.hasPermi('system:signature:export')")
    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ArchiveSignature archiveSignature)
    public void export(HttpServletResponse response, ArchiveSignature archiveSignature, @RequestParam(value = "ids", required = false) Long[] ids)
    {
        List<ArchiveSignature> list = archiveSignatureService.selectArchiveSignatureList(archiveSignature);
        List<ArchiveSignature> list = new ArrayList<>();
        // 如果提供了ids参数,则根据ids导出指定记录
        if (ids != null && ids.length > 0) {
            list = archiveSignatureService.selectArchiveSignatureByIds(ids);
        } else {
            // 否则根据查询条件导出
            list = archiveSignatureService.selectArchiveSignatureList(archiveSignature);
        }
        ExcelUtil<ArchiveSignature> util = new ExcelUtil<ArchiveSignature>(ArchiveSignature.class);
        util.exportExcel(response, list, "【请填写功能名称】数据");
    }