统一命名风格

ruoyi-common/yingpaipay-common-ai/src/main/java/com/yingpaipay/common/ai/client/SiliconFlowClient.java

@@ -5,7 +5,7 @@ import cn.hutool.http.Header;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.yingpaipay.common.ai.config.SiliconConfig;
-import com.yingpaipay.common.ai.enumeration.SiliconModel;
+import com.yingpaipay.common.ai.enums.SiliconModel;
 import com.yingpaipay.common.ai.pojo.SiliconFlowMessage;
 import com.yingpaipay.common.ai.pojo.SiliconFlowReq;
 import com.yingpaipay.common.ai.pojo.SiliconFlowResp;

ruoyi-common/yingpaipay-common-ai/src/main/java/com/yingpaipay/common/ai/enumeration/SiliconFlowRole.java → ruoyi-common/yingpaipay-common-ai/src/main/java/com/yingpaipay/common/ai/enums/SiliconFlowRole.java

@@ -1,4 +1,4 @@
-package com.yingpaipay.common.ai.enumeration;
+package com.yingpaipay.common.ai.enums;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

ruoyi-common/yingpaipay-common-ai/src/main/java/com/yingpaipay/common/ai/enumeration/SiliconModel.java → ruoyi-common/yingpaipay-common-ai/src/main/java/com/yingpaipay/common/ai/enums/SiliconModel.java

@@ -1,4 +1,4 @@
-package com.yingpaipay.common.ai.enumeration;
+package com.yingpaipay.common.ai.enums;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

ruoyi-common/yingpaipay-common-ai/src/main/java/com/yingpaipay/common/ai/pojo/SiliconFlowMessage.java

@@ -1,6 +1,6 @@
 package com.yingpaipay.common.ai.pojo;
 
-import com.yingpaipay.common.ai.enumeration.SiliconFlowRole;
+import com.yingpaipay.common.ai.enums.SiliconFlowRole;
 import lombok.Getter;
 
 @Getter

ruoyi-common/yingpaipay-common-ai/src/main/java/com/yingpaipay/common/ai/pojo/SiliconFlowReq.java

@@ -1,6 +1,6 @@
 package com.yingpaipay.common.ai.pojo;
 
-import com.yingpaipay.common.ai.enumeration.SiliconModel;
+import com.yingpaipay.common.ai.enums.SiliconModel;
 import lombok.Data;
 
 import java.util.ArrayList;

ruoyi-common/yingpaipay-common-document/src/main/java/com/yingpaipay/common/file/util/PdfUtils.java → ruoyi-common/yingpaipay-common-document/src/main/java/com/yingpaipay/common/file/utils/PdfUtils.java

@@ -1,4 +1,4 @@
-package com.yingpaipay.common.file.util;
+package com.yingpaipay.common.file.utils;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.io.MemoryUsageSetting;

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/constant/AiAuditResultConst.java → ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/constant/AiAuditResultConstants.java

@@ -1,6 +1,6 @@
 package com.yingpaipay.business.constant;
 
-public interface AiAuditResultConst {
+public interface AiAuditResultConstants {
 
     Integer PASS = 0;
 

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/constant/DictTypeConst.java → ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/constant/DictTypeConstants.java

@@ -7,7 +7,7 @@ package com.yingpaipay.business.constant;
  * @Version: 1.0
  */
 
-public interface DictTypeConst {
+public interface DictTypeConstants {
 
     String PROJECT_TYPE = "project_type";
 

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/constant/DocumentAuditorTypeConst.java → ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/constant/DocumentAuditorTypeConstants.java

@@ -1,6 +1,6 @@
 package com.yingpaipay.business.constant;
 
-public interface DocumentAuditorTypeConst {
+public interface DocumentAuditorTypeConstants {
 
     String AI = "0";
 

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/constant/DocumentNameConst.java → ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/constant/DocumentNameConstants.java

@@ -1,6 +1,6 @@
 package com.yingpaipay.business.constant;
 
-public interface DocumentNameConst {
+public interface DocumentNameConstants {
 
     /**
      * 项目号(别问我为什么这么命名,客户自己的说法)

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/constant/DocumentTypeConst.java → ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/constant/DocumentTypeConstants.java

@@ -1,6 +1,6 @@
 package com.yingpaipay.business.constant;
 
-public interface DocumentTypeConst {
+public interface DocumentTypeConstants {
 
     Integer NOT_PLAN = 0;
 

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/constant/FolderTypeConst.java → ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/constant/FolderTypeConstants.java

@@ -1,6 +1,6 @@
 package com.yingpaipay.business.constant;
 
-public interface FolderTypeConst {
+public interface FolderTypeConstants {
 
     Integer NORMAL = 0;
     Integer COUNTRY = 1;

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/constant/QcTaskDetailStatusConst.java → ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/constant/QcTaskDetailStatusConstants.java

@@ -1,6 +1,6 @@
 package com.yingpaipay.business.constant;
 
-public interface QcTaskDetailStatusConst {
+public interface QcTaskDetailStatusConstants {
 
     Integer UN_AUDIT = 0;
 

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/constant/QcTaskStatusConst.java → ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/constant/QcTaskStatusConstants.java

@@ -1,6 +1,6 @@
 package com.yingpaipay.business.constant;
 
-public interface QcTaskStatusConst {
+public interface QcTaskStatusConstants {
 
     Integer NOT_STARTED = 0;
 

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/constant/SpecificationTypeConst.java → ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/constant/SpecificationTypeConstants.java

@@ -1,6 +1,6 @@
 package com.yingpaipay.business.constant;
 
-public interface SpecificationTypeConst {
+public interface SpecificationTypeConstants {
 
     Integer CENTER = 0;
 

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/controller/DashboardController.java

@@ -6,7 +6,7 @@ import com.yingpaipay.business.domain.bo.ProjectListOnDashboardWorkbenchBo;
 import com.yingpaipay.business.domain.vo.OverviewVo;
 import com.yingpaipay.business.domain.vo.ProjectInDashboardWorkbenchVo;
 import com.yingpaipay.business.domain.vo.TaskTodoCountVo;
-import com.yingpaipay.business.enumeration.DocumentStatusEnum;
+import com.yingpaipay.business.enums.DocumentStatusEnum;
 import com.yingpaipay.business.service.IDocumentQcTaskDetailService;
 import com.yingpaipay.business.service.IDocumentService;
 import com.yingpaipay.business.service.IProjectService;

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/domain/vo/DocumentAuditLogVo.java

@@ -1,12 +1,9 @@
 package com.yingpaipay.business.domain.vo;
 
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
-import cn.idev.excel.annotation.ExcelProperty;
-import com.yingpaipay.business.constant.DictTypeConst;
 import com.yingpaipay.business.domain.DocumentAuditLog;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
 

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/enumeration/AiAuditRejectReasonEnum.java → ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/enums/AiAuditRejectReasonEnum.java

@@ -1,4 +1,4 @@
-package com.yingpaipay.business.enumeration;
+package com.yingpaipay.business.enums;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/enumeration/DocumentQcStatusEnum.java → ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/enums/DocumentQcStatusEnum.java

@@ -1,4 +1,4 @@
-package com.yingpaipay.business.enumeration;
+package com.yingpaipay.business.enums;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/enumeration/DocumentStatusEnum.java → ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/enums/DocumentStatusEnum.java

@@ -1,12 +1,10 @@
-package com.yingpaipay.business.enumeration;
+package com.yingpaipay.business.enums;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.springframework.context.i18n.LocaleContextHolder;
 
-import java.util.Locale;
-
 @Getter
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 public enum DocumentStatusEnum {

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/enumeration/MailTemplateEnum.java → ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/enums/MailTemplateEnum.java

@@ -1,4 +1,4 @@
-package com.yingpaipay.business.enumeration;
+package com.yingpaipay.business.enums;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/enumeration/ProjectStatusEnum.java → ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/enums/ProjectStatusEnum.java

@@ -1,4 +1,4 @@
-package com.yingpaipay.business.enumeration;
+package com.yingpaipay.business.enums;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/AiAuditService.java

@@ -1,16 +1,13 @@
 package com.yingpaipay.business.service;
 
-import cn.hutool.core.lang.Dict;
-import com.yingpaipay.business.constant.AiAuditResultConst;
 import com.yingpaipay.business.domain.dto.AiAuditDTO;
 import com.yingpaipay.business.domain.dto.TextInPdfToMarkdownDTO;
 import com.yingpaipay.common.ai.client.SiliconFlowClient;
-import com.yingpaipay.common.ai.enumeration.SiliconFlowRole;
-import com.yingpaipay.common.ai.enumeration.SiliconModel;
+import com.yingpaipay.common.ai.enums.SiliconFlowRole;
+import com.yingpaipay.common.ai.enums.SiliconModel;
 import com.yingpaipay.common.ai.pojo.SiliconFlowMessage;
 import com.yingpaipay.common.ai.pojo.SiliconFlowResp;
 import com.yingpaipay.setting.service.IAiSettingService;
-import io.swagger.v3.core.util.Json;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.json.utils.JsonUtils;

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/common/CommonDocumentService.java

@@ -2,7 +2,7 @@ package com.yingpaipay.business.service.common;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yingpaipay.business.domain.Document;
-import com.yingpaipay.business.enumeration.DocumentStatusEnum;
+import com.yingpaipay.business.enums.DocumentStatusEnum;
 import com.yingpaipay.business.mapper.DocumentMapper;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.StringUtils;

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/common/CommonFolderService.java

@@ -2,8 +2,8 @@ package com.yingpaipay.business.service.common;
 
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.yingpaipay.business.constant.FolderTypeConst;
-import com.yingpaipay.business.constant.SpecificationTypeConst;
+import com.yingpaipay.business.constant.FolderTypeConstants;
+import com.yingpaipay.business.constant.SpecificationTypeConstants;
 import com.yingpaipay.business.domain.Folder;
 import com.yingpaipay.business.mapper.FolderMapper;
 import com.yingpaipay.system.domain.SysUserFolders;
@@ -78,15 +78,15 @@ public class CommonFolderService {
 
         while (true) {
             Folder folder = folderMap.get(currentId);
-            if (folder == null || folder.getType().equals(FolderTypeConst.COUNTRY)) {
-                return SpecificationTypeConst.PROJECT;
+            if (folder == null || folder.getType().equals(FolderTypeConstants.COUNTRY)) {
+                return SpecificationTypeConstants.PROJECT;
             }
-            if (folder.getType().equals(FolderTypeConst.CENTER)) {
-                return SpecificationTypeConst.CENTER;
+            if (folder.getType().equals(FolderTypeConstants.CENTER)) {
+                return SpecificationTypeConstants.CENTER;
             }
-            if (folder.getType().equals(FolderTypeConst.NORMAL)) {
+            if (folder.getType().equals(FolderTypeConstants.NORMAL)) {
                 if (folder.getParentId() == null) {
-                    return SpecificationTypeConst.PROJECT;
+                    return SpecificationTypeConstants.PROJECT;
                 }
                 currentId = folder.getParentId();
             }

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/common/CommonProjectService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yingpaipay.business.domain.Project;
-import com.yingpaipay.business.enumeration.ProjectStatusEnum;
+import com.yingpaipay.business.enums.ProjectStatusEnum;
 import com.yingpaipay.business.mapper.ProjectMapper;
 import com.yingpaipay.system.domain.SysUserProjects;
 import com.yingpaipay.system.mapper.SysUserProjectsMapper;

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/impl/DocumentQcTaskDetailServiceImpl.java

@@ -1,11 +1,9 @@
 package com.yingpaipay.business.service.impl;
 
-import cn.hutool.core.lang.Dict;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.yingpaipay.business.constant.DictTypeConst;
-import com.yingpaipay.business.constant.QcTaskStatusConst;
+import com.yingpaipay.business.constant.QcTaskStatusConstants;
 import com.yingpaipay.business.domain.*;
 import com.yingpaipay.business.domain.bo.DocumentQcAuditBo;
 import com.yingpaipay.business.domain.bo.DocumentQcTaskDetailListBo;
@@ -14,9 +12,8 @@ import com.yingpaipay.business.domain.bo.TaskCenterQcSubmitBo;
 import com.yingpaipay.business.domain.vo.DocumentQcGenerateVo;
 import com.yingpaipay.business.domain.vo.DocumentQcTaskDetailListVo;
 import com.yingpaipay.business.domain.vo.TaskCenterQcListVo;
-import com.yingpaipay.business.enumeration.DocumentQcStatusEnum;
-import com.yingpaipay.business.enumeration.DocumentStatusEnum;
-import com.yingpaipay.business.enumeration.MailTemplateEnum;
+import com.yingpaipay.business.enums.DocumentQcStatusEnum;
+import com.yingpaipay.business.enums.DocumentStatusEnum;
 import com.yingpaipay.business.mapper.DocumentQcTaskLogMapper;
 import com.yingpaipay.business.mapper.DocumentQcTaskMapper;
 import com.yingpaipay.business.service.common.CommonDocumentService;
@@ -25,25 +22,19 @@ import com.yingpaipay.common.mabatis.utils.WrapperUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.exception.BusinessException;
-import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.json.utils.JsonUtils;
-import org.dromara.common.mail.utils.MailUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.system.domain.SysUser;
-import org.dromara.system.domain.vo.SysUserVo;
 import org.dromara.system.service.ISysDictTypeService;
 import org.dromara.system.service.ISysUserService;
-import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
 import com.yingpaipay.business.mapper.DocumentQcTaskDetailMapper;
 import com.yingpaipay.business.service.IDocumentQcTaskDetailService;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.text.MessageFormat;
 import java.util.*;
 
 /**
@@ -223,7 +214,7 @@ public class DocumentQcTaskDetailServiceImpl implements IDocumentQcTaskDetailSer
             boolean taskFlag = taskMapper.update(
                 Wrappers.lambdaUpdate(DocumentQcTask.class)
                     .eq(DocumentQcTask::getId, detail.getTaskId())
-                    .set(DocumentQcTask::getStatus, QcTaskStatusConst.FINISHED)
+                    .set(DocumentQcTask::getStatus, QcTaskStatusConstants.FINISHED)
             ) == 0;
             if (taskFlag) {
                 throw new RuntimeException("更新质控任务状态失败");

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/impl/DocumentQcTaskServiceImpl.java

@@ -3,14 +3,14 @@ package com.yingpaipay.business.service.impl;
 import com.baomidou.lock.LockInfo;
 import com.baomidou.lock.LockTemplate;
 import com.baomidou.lock.executor.RedissonLockExecutor;
-import com.yingpaipay.business.constant.QcTaskDetailStatusConst;
-import com.yingpaipay.business.constant.QcTaskStatusConst;
+import com.yingpaipay.business.constant.QcTaskDetailStatusConstants;
+import com.yingpaipay.business.constant.QcTaskStatusConstants;
 import com.yingpaipay.business.domain.Document;
 import com.yingpaipay.business.domain.DocumentQcTask;
 import com.yingpaipay.business.domain.DocumentQcTaskDetail;
 import com.yingpaipay.business.domain.bo.DocumentQcTaskBo;
 import com.yingpaipay.business.domain.vo.DocumentQcTaskVo;
-import com.yingpaipay.business.enumeration.DocumentStatusEnum;
+import com.yingpaipay.business.enums.DocumentStatusEnum;
 import com.yingpaipay.business.mapper.DocumentQcTaskDetailMapper;
 import com.yingpaipay.business.service.common.CommonDocumentService;
 import com.yingpaipay.business.service.common.CommonFolderService;
@@ -72,7 +72,7 @@ public class DocumentQcTaskServiceImpl implements IDocumentQcTaskService {
             Wrappers.lambdaQuery(DocumentQcTaskDetail.class)
                 .eq(DocumentQcTaskDetail::getTaskId, vo.getId())
         );
-        long count = details.stream().filter(e -> !Objects.equals(e.getStatus(), QcTaskDetailStatusConst.UN_AUDIT)).count();
+        long count = details.stream().filter(e -> !Objects.equals(e.getStatus(), QcTaskDetailStatusConstants.UN_AUDIT)).count();
         vo.setSchedule(count / details.size());
         return vo;
     }
@@ -110,7 +110,7 @@ public class DocumentQcTaskServiceImpl implements IDocumentQcTaskService {
 
         detailMap.forEach((projectId, list) -> {
             List<DocumentQcTaskDetail> details = detailMap.get(projectId);
-            long count = details.stream().filter(e -> !Objects.equals(e.getStatus(), QcTaskDetailStatusConst.UN_AUDIT)).count();
+            long count = details.stream().filter(e -> !Objects.equals(e.getStatus(), QcTaskDetailStatusConstants.UN_AUDIT)).count();
             scheduleMap.put(projectId, count / details.size());
         });
 
@@ -300,7 +300,7 @@ public class DocumentQcTaskServiceImpl implements IDocumentQcTaskService {
         return baseMapper.update(
             Wrappers.lambdaUpdate(DocumentQcTask.class)
                 .eq(DocumentQcTask::getId, id)
-                .set(DocumentQcTask::getStatus, QcTaskStatusConst.UNDERWAY)
+                .set(DocumentQcTask::getStatus, QcTaskStatusConstants.UNDERWAY)
         ) > 0;
     }
 }

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/impl/DocumentServiceImpl.java

@@ -15,15 +15,15 @@ import com.yingpaipay.business.domain.bo.*;
 import com.yingpaipay.business.domain.dto.AiAuditDTO;
 import com.yingpaipay.business.domain.excel.ProjectExcel;
 import com.yingpaipay.business.domain.vo.*;
-import com.yingpaipay.business.enumeration.DocumentStatusEnum;
-import com.yingpaipay.business.enumeration.MailTemplateEnum;
+import com.yingpaipay.business.enums.DocumentStatusEnum;
+import com.yingpaipay.business.enums.MailTemplateEnum;
 import com.yingpaipay.business.mapper.DocumentAuditLogMapper;
 import com.yingpaipay.business.mapper.DocumentMapper;
 import com.yingpaipay.business.service.*;
 import com.yingpaipay.business.service.AiAuditService;
 import com.yingpaipay.business.service.common.CommonFolderService;
 import com.yingpaipay.business.service.common.CommonProjectService;
-import com.yingpaipay.common.file.util.PdfUtils;
+import com.yingpaipay.common.file.utils.PdfUtils;
 import com.yingpaipay.common.mabatis.utils.WrapperUtils;
 import com.yingpaipay.setting.domain.vo.KeywordSettingVo;
 import com.yingpaipay.setting.service.IKeywordSettingService;
@@ -41,7 +41,6 @@ import org.dromara.common.core.utils.MessageUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.file.FileUtils;
 import org.dromara.common.json.utils.JsonUtils;
-import org.dromara.common.mail.utils.MailUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.helper.DataBaseHelper;
@@ -66,7 +65,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.text.MessageFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
@@ -205,7 +203,7 @@ public class DocumentServiceImpl implements IDocumentService {
             Document::getUpdateTime, params.get("beginUpdateTime"), params.get("endUpdateTime"));
 
         // 如果为待归档,那么就只能看到自己的上传的
-        if (bo.getFolderId().equals(FolderTypeConst.UN_UPLOAD)) {
+        if (bo.getFolderId().equals(FolderTypeConstants.UN_UPLOAD)) {
             lqw.eq(Document::getCreateBy, LoginHelper.getUserId());
         }
 
@@ -386,7 +384,7 @@ public class DocumentServiceImpl implements IDocumentService {
             throw new RuntimeException("修改文档状态失败");
         }
 
-        boolean logFlag = auditLogMapper.insert(buildLog(document, DocumentAuditorTypeConst.MANUAL, bo)) == 0;
+        boolean logFlag = auditLogMapper.insert(buildLog(document, DocumentAuditorTypeConstants.MANUAL, bo)) == 0;
         if (logFlag) {
             throw new RuntimeException("新增审核日志失败");
         }
@@ -842,7 +840,7 @@ public class DocumentServiceImpl implements IDocumentService {
         document.setStatus(DocumentStatusEnum.UN_AUDIT.getValue());
         document.setActualDocument(ossVo.getOssId());
         document.setNote(bo.getNote());
-        document.setType(DocumentTypeConst.NOT_PLAN);
+        document.setType(DocumentTypeConstants.NOT_PLAN);
         document.setSubmitter(LoginHelper.getUserId());
         document.setSubmitTime(new Date());
         document.setProjectId(bo.getProjectId());
@@ -950,12 +948,12 @@ public class DocumentServiceImpl implements IDocumentService {
         document.setName(bo.getName());
         document.setStatus(DocumentStatusEnum.UN_AUDIT.getValue());
         document.setActualDocument(ossVo.getOssId());
-        document.setType(DocumentTypeConst.NOT_PLAN);
+        document.setType(DocumentTypeConstants.NOT_PLAN);
         document.setSubmitter(LoginHelper.getUserId());
         document.setSubmitTime(new Date());
         document.setProjectId(bo.getProjectId());
         document.setEffectiveDate(bo.getEffectiveDate());
-        document.setSpecificationType(bo.getFolder() != 0L ? SpecificationTypeConst.CENTER : SpecificationTypeConst.PROJECT);
+        document.setSpecificationType(bo.getFolder() != 0L ? SpecificationTypeConstants.CENTER : SpecificationTypeConstants.PROJECT);
         document.setTenantId(TenantHelper.getTenantId());
 
         boolean documentInserFlag = baseMapper.insert(document) == 0;
@@ -978,7 +976,7 @@ public class DocumentServiceImpl implements IDocumentService {
             DocumentAuditLog log = new DocumentAuditLog();
             log.setDocumentId(document.getId());
             log.setUploadVersion(document.getActualDocument());
-            log.setAuditorType(DocumentAuditorTypeConst.AI);
+            log.setAuditorType(DocumentAuditorTypeConstants.AI);
             log.setResult(result.getResult() ? DocumentStatusEnum.ARCHIEVED.getValue() : DocumentStatusEnum.AUDIT_REJECT.getValue());
             log.setAuditor(0L);
             log.setRejectReason(result.getRejectReason());
@@ -1096,7 +1094,7 @@ public class DocumentServiceImpl implements IDocumentService {
         });
         ossService.queryListByIds(ossIds).forEach(e -> ossMap.put(e.getOssId(), e));
         userService.selectUserByIds(userIds).forEach(e -> userMap.put(e.getUserId(), e));
-        dictTypeService.selectDictDataByType(DictTypeConst.PLAN_DOCUMENT_TYPE).forEach(e -> planType.put(e.getDictValue(), e.getDictLabel()));
+        dictTypeService.selectDictDataByType(DictTypeConstants.PLAN_DOCUMENT_TYPE).forEach(e -> planType.put(e.getDictValue(), e.getDictLabel()));
         Project project = projectService.queryById(projectId);
         List<Folder> folders = folderService.queryByProjectId(projectId);
         Map<Long, Folder> folderMap = new HashMap<>();
@@ -1117,12 +1115,12 @@ public class DocumentServiceImpl implements IDocumentService {
             if (currentFolder != 0L) {
                 for (;;) {
                     Folder folder = folderMap.get(currentFolder);
-                    if (folder.getType().equals(FolderTypeConst.CENTER)) {
+                    if (folder.getType().equals(FolderTypeConstants.CENTER)) {
                         excel.setCenterId(currentFolder);
                         excel.setCenterName(folder.getName());
                         break;
                     }
-                    if (folder.getType().equals(FolderTypeConst.NORMAL)) {
+                    if (folder.getType().equals(FolderTypeConstants.NORMAL)) {
                         if (folder.getParentId() != null) {
                             currentFolder = folder.getParentId();
                             continue;

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/impl/FolderServiceImpl.java

@@ -3,7 +3,7 @@ package com.yingpaipay.business.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.yingpaipay.business.constant.FolderTypeConst;
+import com.yingpaipay.business.constant.FolderTypeConstants;
 import com.yingpaipay.business.domain.Folder;
 import com.yingpaipay.business.domain.FolderKeyword;
 import com.yingpaipay.business.domain.Project;
@@ -321,11 +321,11 @@ public class FolderServiceImpl implements IFolderService {
             });
         Map<Long, List<Folder>> childerMap = folderList.stream().filter(e -> e.getParentId() != null).collect(Collectors.groupingBy(Folder::getParentId));
         for (Folder folder : folderList) {
-            if (folder.getType().equals(FolderTypeConst.CENTER)) {
+            if (folder.getType().equals(FolderTypeConstants.CENTER)) {
                 centerIds.add(folder.getId());
-            } else if (folder.getType().equals(FolderTypeConst.COUNTRY)) {
+            } else if (folder.getType().equals(FolderTypeConstants.COUNTRY)) {
                 List<Folder> childrens = childerMap.getOrDefault(folder.getId(), Collections.emptyList());
-                if (childrens.stream().anyMatch(e -> e.getType().equals(FolderTypeConst.CENTER))) {
+                if (childrens.stream().anyMatch(e -> e.getType().equals(FolderTypeConstants.CENTER))) {
                     centerIds.add(folder.getId());
                 }
             }
@@ -363,13 +363,13 @@ public class FolderServiceImpl implements IFolderService {
             Set<Folder> centers = new HashSet<>();
             if (e.getFolders().equals("*")) {
                 for (Folder root : roots) {
-                    if (root.getType().equals(FolderTypeConst.CENTER)) {
+                    if (root.getType().equals(FolderTypeConstants.CENTER)) {
                         centers.add(root);
                         continue;
                     }
                     List<Folder> childrens = childerMap.getOrDefault(root.getId(), Collections.emptyList());
                     for (Folder children : childrens) {
-                        if (children.getType().equals(FolderTypeConst.CENTER)) {
+                        if (children.getType().equals(FolderTypeConstants.CENTER)) {
                             centers.add(children);
                         }
                     }
@@ -378,13 +378,13 @@ public class FolderServiceImpl implements IFolderService {
                 Long[] folderIds = Arrays.stream(e.getFolders().split(",")).map(Long::valueOf).toArray(Long[]::new);
                 for (Long folderId : folderIds) {
                     Folder current = folderMap.get(folderId);
-                    if (current.getType().equals(FolderTypeConst.CENTER)) {
+                    if (current.getType().equals(FolderTypeConstants.CENTER)) {
                         centers.add(current);
-                    } else if (current.getType().equals(FolderTypeConst.COUNTRY)) {
+                    } else if (current.getType().equals(FolderTypeConstants.COUNTRY)) {
                         // 国家就看有没有子中心
                         List<Folder> folders = childerMap.getOrDefault(current.getId(), Collections.emptyList());
                         for (Folder folder : folders) {
-                            if (folder.getType().equals(FolderTypeConst.CENTER)) {
+                            if (folder.getType().equals(FolderTypeConstants.CENTER)) {
                                 centers.add(folder);
                             }
                         }
@@ -394,13 +394,13 @@ public class FolderServiceImpl implements IFolderService {
                             continue;
                         }
                         Folder parent = folderMap.get(current.getParentId());
-                        while (parent.getType().equals(FolderTypeConst.NORMAL)) {
-                            if (parent.getType().equals(FolderTypeConst.CENTER) || parent.getParentId() == null) {
+                        while (parent.getType().equals(FolderTypeConstants.NORMAL)) {
+                            if (parent.getType().equals(FolderTypeConstants.CENTER) || parent.getParentId() == null) {
                                 break;
                             }
                             parent = folderMap.get(parent.getParentId());
                         }
-                        if (parent.getType().equals(FolderTypeConst.CENTER)) {
+                        if (parent.getType().equals(FolderTypeConstants.CENTER)) {
                             centers.add(parent);
                         }
                     }
@@ -430,7 +430,7 @@ public class FolderServiceImpl implements IFolderService {
 
     private LambdaQueryWrapper<Folder> buildCenterQueryWrapper(ProjectCenterListBo bo) {
         return Wrappers.lambdaQuery(Folder.class)
-            .eq(Folder::getType, FolderTypeConst.CENTER)
+            .eq(Folder::getType, FolderTypeConstants.CENTER)
             .eq(Folder::getProjectId, bo.getProjectId())
             .like(StringUtils.isNotBlank(bo.getName()), Folder::getName, bo.getName())
             .orderByDesc(Folder::getId);

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/impl/ProjectServiceImpl.java

@@ -2,14 +2,14 @@ package com.yingpaipay.business.service.impl;
 
 import cn.hutool.crypto.digest.BCrypt;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yingpaipay.business.constant.DocumentTypeConst;
+import com.yingpaipay.business.constant.DocumentTypeConstants;
 import com.yingpaipay.business.service.common.CommonDocumentService;
 import com.yingpaipay.common.mabatis.utils.WrapperUtils;
 import com.yingpaipay.system.constant.UserAppletStatusConst;
 import com.yingpaipay.business.domain.Document;
 import com.yingpaipay.business.domain.bo.*;
 import com.yingpaipay.business.domain.vo.*;
-import com.yingpaipay.business.enumeration.ProjectStatusEnum;
+import com.yingpaipay.business.enums.ProjectStatusEnum;
 import com.yingpaipay.system.domain.SysUserFolders;
 import com.yingpaipay.system.domain.SysUserProjects;
 import com.yingpaipay.system.mapper.SysUserFoldersMapper;
@@ -365,7 +365,7 @@ public class ProjectServiceImpl implements IProjectService {
             long total = 1L, onTimeSubmit = 0L, lateSubmit = 0L, notSubmit = 0L;
             if (documentList != null) {
                 List<Document> planDocuments = documentList.stream()
-                    .filter(item -> item.getType().equals(DocumentTypeConst.PLAN))
+                    .filter(item -> item.getType().equals(DocumentTypeConstants.PLAN))
                     .toList();
                 total = planDocuments.size();
                 if (total > 0L) {

ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/constant/AiEnabledFlagConst.java → ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/constant/AiEnabledFlagConstants.java

@@ -1,6 +1,6 @@
 package com.yingpaipay.setting.constant;
 
-public interface AiEnabledFlagConst {
+public interface AiEnabledFlagConstants {
 
     Integer BANNED = 0;