From 904756cf5ded717c1610f0d4db3e743f1dbb70ad Mon Sep 17 00:00:00 2001 From: zch Date: Wed, 27 May 2026 16:32:40 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=B9=B6=E7=A7=BB=E9=99=A4=E6=9C=AA=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/portal/ai/config/AiProperties.java | 6 +-- .../ai/service/IKnowledgeBaseService.java | 4 +- .../ai/service/impl/AiChatModelFactory.java | 12 +++--- .../ai/service/impl/AiChatServiceImpl.java | 6 +-- .../ai/service/impl/AiPromptBuilder.java | 10 ++--- .../impl/KnowledgeBaseServiceImpl.java | 37 ++++--------------- .../controller/HwAboutUsInfoController.java | 10 ++--- .../HwAboutUsInfoDetailController.java | 10 ++--- .../controller/HwAnalyticsController.java | 7 +--- .../controller/HwContactUsInfoController.java | 10 ++--- .../controller/HwPortalConfigController.java | 10 ++--- .../HwPortalConfigTypeController.java | 10 ++--- .../portal/controller/HwPortalController.java | 8 ++-- .../HwProductCaseInfoController.java | 10 ++--- .../controller/HwProductInfoController.java | 10 ++--- .../HwProductInfoDetailController.java | 10 ++--- .../portal/controller/HwWebController.java | 33 ++++++----------- .../portal/controller/HwWebController1.java | 10 ++--- .../controller/HwWebDocumentController.java | 34 ++++++----------- .../controller/HwWebMenuController.java | 27 +++++--------- .../controller/HwWebMenuController1.java | 10 ++--- .../controller/HwWebNewsController.java | 9 +---- .../ruoyi/portal/domain/HwPortalConfig.java | 2 - .../portal/domain/HwPortalConfigType.java | 3 -- .../java/com/ruoyi/portal/domain/HwWeb.java | 6 +-- .../java/com/ruoyi/portal/domain/HwWeb1.java | 4 +- .../ruoyi/portal/domain/HwWebDocument.java | 6 +-- .../com/ruoyi/portal/domain/HwWebMenu.java | 6 +-- .../com/ruoyi/portal/domain/HwWebMenu1.java | 7 +--- .../com/ruoyi/portal/domain/HwWebNews.java | 4 +- .../portal/domain/SecureDocumentRequest.java | 2 - .../portal/domain/vo/PortalTreeSelect.java | 5 ++- .../portal/mapper/HwWebDocumentMapper.java | 3 +- .../com/ruoyi/portal/mapper/HwWebMapper.java | 3 +- .../ruoyi/portal/mapper/HwWebMenuMapper.java | 3 +- .../ruoyi/portal/mapper/HwWebMenuMapper1.java | 2 - .../convert/PortalSearchDocConverter.java | 12 +----- .../impl/PortalSearchEsServiceImpl.java | 2 +- .../portal/service/IHwWebDocumentService.java | 3 +- .../portal/service/IHwWebMenuService.java | 3 +- .../portal/service/IHwWebMenuService1.java | 1 - .../ruoyi/portal/service/IHwWebService.java | 3 +- .../ruoyi/portal/service/IHwWebService1.java | 1 + .../service/impl/HwAnalyticsServiceImpl.java | 6 +-- .../impl/HwPortalConfigTypeServiceImpl.java | 4 +- .../impl/HwProductInfoDetailServiceImpl.java | 1 - .../impl/HwProductInfoServiceImpl.java | 1 - .../impl/HwSearchRebuildServiceImpl.java | 12 +----- .../service/impl/HwSearchServiceImpl.java | 6 +-- .../impl/HwWebDocumentServiceImpl.java | 10 ++--- .../service/impl/HwWebMenuServiceImpl.java | 21 +++++------ .../portal/service/impl/HwWebServiceImpl.java | 11 +++--- .../service/impl/HwWebServiceImpl1.java | 6 +-- 53 files changed, 162 insertions(+), 290 deletions(-) diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/config/AiProperties.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/config/AiProperties.java index 2ae3171..f910460 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/config/AiProperties.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/config/AiProperties.java @@ -1,11 +1,11 @@ package com.ruoyi.portal.ai.config; -import java.util.HashMap; -import java.util.Map; - import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; +import java.util.HashMap; +import java.util.Map; + /** * 官网 AI 配置属性映射类。 * diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/IKnowledgeBaseService.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/IKnowledgeBaseService.java index 5c26481..a9a0444 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/IKnowledgeBaseService.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/IKnowledgeBaseService.java @@ -1,9 +1,9 @@ package com.ruoyi.portal.ai.service; -import java.util.List; - import com.ruoyi.portal.ai.domain.TextChunk; +import java.util.List; + /** * 官网知识库检索服务。 */ diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/impl/AiChatModelFactory.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/impl/AiChatModelFactory.java index 5d33ad7..3f42a60 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/impl/AiChatModelFactory.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/impl/AiChatModelFactory.java @@ -1,11 +1,5 @@ package com.ruoyi.portal.ai.service.impl; -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - import com.ruoyi.portal.ai.config.AiProperties; import org.apache.hc.client5.http.config.ConnectionConfig; import org.apache.hc.client5.http.config.RequestConfig; @@ -21,6 +15,12 @@ import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.stereotype.Component; import org.springframework.web.client.RestClient; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + /** * OpenAI-compatible 大模型客户端工厂。 * diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/impl/AiChatServiceImpl.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/impl/AiChatServiceImpl.java index ce48543..49fbf3f 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/impl/AiChatServiceImpl.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/impl/AiChatServiceImpl.java @@ -1,8 +1,5 @@ package com.ruoyi.portal.ai.service.impl; -import java.util.ArrayList; -import java.util.List; - import com.ruoyi.portal.ai.config.AiProperties; import com.ruoyi.portal.ai.domain.AiChatRequest; import com.ruoyi.portal.ai.domain.AiChatResponse; @@ -16,6 +13,9 @@ import org.springframework.ai.chat.model.ChatResponse; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import java.util.ArrayList; +import java.util.List; + /** * 基于 Spring AI 1.1.7 的 OpenAI-compatible 官网 AI 问答业务实现。 * diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/impl/AiPromptBuilder.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/impl/AiPromptBuilder.java index 803f9c3..caa586f 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/impl/AiPromptBuilder.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/impl/AiPromptBuilder.java @@ -1,10 +1,5 @@ package com.ruoyi.portal.ai.service.impl; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.regex.Pattern; - import com.ruoyi.portal.ai.config.AiProperties; import com.ruoyi.portal.ai.domain.TextChunk; import org.springframework.ai.chat.messages.SystemMessage; @@ -14,6 +9,11 @@ import org.springframework.ai.openai.OpenAiChatOptions; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; + /** * 官网 AI Prompt 构建器。 * diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/impl/KnowledgeBaseServiceImpl.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/impl/KnowledgeBaseServiceImpl.java index cbaa525..291b316 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/impl/KnowledgeBaseServiceImpl.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/ai/service/impl/KnowledgeBaseServiceImpl.java @@ -1,44 +1,21 @@ package com.ruoyi.portal.ai.service.impl; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Locale; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.lang.reflect.Field; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.ruoyi.portal.ai.config.AiProperties; import com.ruoyi.portal.ai.domain.TextChunk; import com.ruoyi.portal.ai.service.IKnowledgeBaseService; -import com.ruoyi.portal.domain.HwAboutUsInfo; -import com.ruoyi.portal.domain.HwAboutUsInfoDetail; -import com.ruoyi.portal.domain.HwPortalConfig; -import com.ruoyi.portal.domain.HwProductCaseInfo; -import com.ruoyi.portal.domain.HwProductInfo; -import com.ruoyi.portal.domain.HwProductInfoDetail; -import com.ruoyi.portal.domain.HwWeb; -import com.ruoyi.portal.domain.HwWeb1; -import com.ruoyi.portal.domain.HwWebDocument; -import com.ruoyi.portal.domain.HwWebNews; -import com.ruoyi.portal.service.IHwAboutUsInfoDetailService; -import com.ruoyi.portal.service.IHwAboutUsInfoService; -import com.ruoyi.portal.service.IHwPortalConfigService; -import com.ruoyi.portal.service.IHwProductCaseInfoService; -import com.ruoyi.portal.service.IHwProductInfoDetailService; -import com.ruoyi.portal.service.IHwProductInfoService; -import com.ruoyi.portal.service.IHwWebDocumentService; -import com.ruoyi.portal.service.IHwWebNewsService; -import com.ruoyi.portal.service.IHwWebService; -import com.ruoyi.portal.service.IHwWebService1; +import com.ruoyi.portal.domain.*; +import com.ruoyi.portal.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import java.lang.reflect.Field; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** * 基于现有官网 JSON 的轻量本地知识库检索服务实现。 * diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoController.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoController.java index f95fd09..277c5c8 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoController.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoController.java @@ -1,20 +1,18 @@ package com.ruoyi.portal.controller; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.annotation.RepeatSubmit; 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.annotation.Log; -import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.portal.domain.HwAboutUsInfo; import com.ruoyi.portal.service.IHwAboutUsInfoService; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; -import com.ruoyi.common.annotation.Anonymous; -import com.ruoyi.common.annotation.RepeatSubmit; /** * 关于我们信息Controller diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoDetailController.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoDetailController.java index 803a6f6..390fc36 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoDetailController.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoDetailController.java @@ -1,20 +1,18 @@ package com.ruoyi.portal.controller; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.annotation.RepeatSubmit; 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.annotation.Log; -import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.portal.domain.HwAboutUsInfoDetail; import com.ruoyi.portal.service.IHwAboutUsInfoDetailService; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; -import com.ruoyi.common.annotation.Anonymous; -import com.ruoyi.common.annotation.RepeatSubmit; /** * 关于我们信息明细Controller diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwAnalyticsController.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwAnalyticsController.java index 4ed19cc..8edc7ba 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwAnalyticsController.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwAnalyticsController.java @@ -14,12 +14,7 @@ import com.ruoyi.portal.service.IHwAnalyticsService; import jakarta.servlet.http.HttpServletRequest; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.http.MediaType; -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.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.time.LocalDate; diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwContactUsInfoController.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwContactUsInfoController.java index b8b7f91..192a607 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwContactUsInfoController.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwContactUsInfoController.java @@ -1,20 +1,18 @@ package com.ruoyi.portal.controller; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.annotation.RepeatSubmit; 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.annotation.Log; -import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.portal.domain.HwContactUsInfo; import com.ruoyi.portal.service.IHwContactUsInfoService; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; -import com.ruoyi.common.annotation.Anonymous; -import com.ruoyi.common.annotation.RepeatSubmit; /** * 联系我们信息Controller diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigController.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigController.java index 846ffc1..9d57b5b 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigController.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigController.java @@ -1,22 +1,20 @@ package com.ruoyi.portal.controller; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.annotation.RepeatSubmit; 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.annotation.Log; -import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.portal.domain.HwPortalConfig; import com.ruoyi.portal.domain.HwPortalConfigType; import com.ruoyi.portal.service.IHwPortalConfigService; import com.ruoyi.portal.service.IHwPortalConfigTypeService; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; -import com.ruoyi.common.annotation.Anonymous; -import com.ruoyi.common.annotation.RepeatSubmit; /** * 门户网站配置Controller diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigTypeController.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigTypeController.java index 9e70a76..e0c1188 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigTypeController.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigTypeController.java @@ -1,19 +1,17 @@ package com.ruoyi.portal.controller; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.portal.domain.HwPortalConfigType; import com.ruoyi.portal.service.IHwPortalConfigTypeService; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; -import com.ruoyi.common.annotation.Anonymous; -import com.ruoyi.common.annotation.RepeatSubmit; /** * 门户网站配置类型Controller diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwPortalController.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwPortalController.java index da03f4b..f66cf9e 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwPortalController.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwPortalController.java @@ -1,19 +1,17 @@ package com.ruoyi.portal.controller; -import com.ruoyi.common.utils.ip.IpUtils; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.annotation.RepeatSubmit; 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.annotation.Log; -import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.ip.IpUtils; import com.ruoyi.portal.domain.*; import com.ruoyi.portal.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.ruoyi.common.annotation.Anonymous; -import com.ruoyi.common.annotation.RepeatSubmit; /** * 门户网站前端Controller diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwProductCaseInfoController.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwProductCaseInfoController.java index fc4dcf0..d8ce80f 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwProductCaseInfoController.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwProductCaseInfoController.java @@ -1,22 +1,20 @@ package com.ruoyi.portal.controller; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.annotation.RepeatSubmit; 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.annotation.Log; -import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.portal.domain.HwPortalConfigType; import com.ruoyi.portal.domain.HwProductCaseInfo; import com.ruoyi.portal.service.IHwPortalConfigTypeService; import com.ruoyi.portal.service.IHwProductCaseInfoService; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; -import com.ruoyi.common.annotation.Anonymous; -import com.ruoyi.common.annotation.RepeatSubmit; /** * 案例内容Controller diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoController.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoController.java index 78087ed..b377fc9 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoController.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoController.java @@ -1,22 +1,20 @@ package com.ruoyi.portal.controller; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.annotation.RepeatSubmit; 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.annotation.Log; -import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.portal.domain.HwPortalConfigType; import com.ruoyi.portal.domain.HwProductInfo; import com.ruoyi.portal.service.IHwPortalConfigTypeService; import com.ruoyi.portal.service.IHwProductInfoService; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; -import com.ruoyi.common.annotation.Anonymous; -import com.ruoyi.common.annotation.RepeatSubmit; /** * 产品信息配置Controller diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoDetailController.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoDetailController.java index 5ff52f9..e8138ae 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoDetailController.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoDetailController.java @@ -1,19 +1,17 @@ package com.ruoyi.portal.controller; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.portal.domain.HwProductInfoDetail; import com.ruoyi.portal.service.IHwProductInfoDetailService; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; -import com.ruoyi.common.annotation.Anonymous; -import com.ruoyi.common.annotation.RepeatSubmit; /** * 产品信息明细配置Controller diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebController.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebController.java index c95693f..394371b 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebController.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebController.java @@ -1,29 +1,18 @@ package com.ruoyi.portal.controller; -import java.util.List; -import java.io.IOException; -import jakarta.servlet.http.HttpServletResponse; - -import com.ruoyi.portal.domain.HwWeb1; -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.common.annotation.Log; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.portal.domain.HwWeb; -import com.ruoyi.portal.service.IHwWebService; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.annotation.RepeatSubmit; +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.utils.poi.ExcelUtil; +import com.ruoyi.portal.domain.HwWeb; +import com.ruoyi.portal.service.IHwWebService; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * haiwei官网jsonController diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebController1.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebController1.java index fa67a67..31a9d86 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebController1.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebController1.java @@ -1,20 +1,18 @@ package com.ruoyi.portal.controller; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.annotation.RepeatSubmit; 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.annotation.Log; -import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.portal.domain.HwWeb1; import com.ruoyi.portal.service.IHwWebService1; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; -import com.ruoyi.common.annotation.Anonymous; -import com.ruoyi.common.annotation.RepeatSubmit; /** * haiwei官网jsonController diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebDocumentController.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebDocumentController.java index a15e7b8..f42f804 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebDocumentController.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebDocumentController.java @@ -1,29 +1,19 @@ package com.ruoyi.portal.controller; -import java.util.List; -import java.io.IOException; -import jakarta.servlet.http.HttpServletResponse; - -import com.ruoyi.portal.domain.SecureDocumentRequest; -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.common.annotation.Log; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.portal.domain.HwWebDocument; -import com.ruoyi.portal.service.IHwWebDocumentService; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.annotation.RepeatSubmit; +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.utils.poi.ExcelUtil; +import com.ruoyi.portal.domain.HwWebDocument; +import com.ruoyi.portal.domain.SecureDocumentRequest; +import com.ruoyi.portal.service.IHwWebDocumentService; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * Hw资料文件Controller diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebMenuController.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebMenuController.java index 91baff6..16a7a56 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebMenuController.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebMenuController.java @@ -1,26 +1,17 @@ package com.ruoyi.portal.controller; -import java.util.List; -import java.io.IOException; -import jakarta.servlet.http.HttpServletResponse; -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.common.annotation.Log; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.portal.domain.HwWebMenu; -import com.ruoyi.portal.service.IHwWebMenuService; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.annotation.Anonymous; -import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.portal.domain.HwWebMenu; +import com.ruoyi.portal.service.IHwWebMenuService; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * haiwei官网菜单Controller diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebMenuController1.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebMenuController1.java index 270da47..a6a223c 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebMenuController1.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebMenuController1.java @@ -1,19 +1,17 @@ package com.ruoyi.portal.controller; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.portal.domain.HwWebMenu1; import com.ruoyi.portal.service.IHwWebMenuService1; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; -import com.ruoyi.common.annotation.Anonymous; -import com.ruoyi.common.annotation.RepeatSubmit; /** * haiwei官网菜单Controller diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebNewsController.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebNewsController.java index 20d5f13..02198b3 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebNewsController.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/controller/HwWebNewsController.java @@ -10,14 +10,7 @@ import com.ruoyi.portal.domain.HwWebNews; import com.ruoyi.portal.service.IHwWebNewsService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -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 java.util.List; diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwPortalConfig.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwPortalConfig.java index ba4250b..c43e6d7 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwPortalConfig.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwPortalConfig.java @@ -4,8 +4,6 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import java.io.Serial; diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwPortalConfigType.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwPortalConfigType.java index b2a692e..2c64845 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwPortalConfigType.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwPortalConfigType.java @@ -2,11 +2,8 @@ package com.ruoyi.portal.domain; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.core.domain.TreeEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import java.io.Serial; import java.util.ArrayList; diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWeb.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWeb.java index fe82220..8bcf1d1 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWeb.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWeb.java @@ -1,12 +1,10 @@ package com.ruoyi.portal.domain; import com.fasterxml.jackson.databind.JsonNode; -import lombok.Data; -import lombok.EqualsAndHashCode; -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; +import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serial; diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWeb1.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWeb1.java index 45a5cd7..22b0297 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWeb1.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWeb1.java @@ -1,11 +1,9 @@ package com.ruoyi.portal.domain; import com.fasterxml.jackson.databind.JsonNode; -import lombok.Data; -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; +import lombok.Data; import java.io.Serial; diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWebDocument.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWebDocument.java index 0cd6d10..6b7ccbf 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWebDocument.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWebDocument.java @@ -1,10 +1,10 @@ package com.ruoyi.portal.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.fasterxml.jackson.annotation.JsonProperty; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; -import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import java.io.Serial; diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWebMenu.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWebMenu.java index b757ddb..bdc5818 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWebMenu.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWebMenu.java @@ -1,11 +1,9 @@ package com.ruoyi.portal.domain; -import lombok.Data; -import lombok.EqualsAndHashCode; -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.TreeEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serial; diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWebMenu1.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWebMenu1.java index 6e85d13..e7115c8 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWebMenu1.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWebMenu1.java @@ -1,14 +1,11 @@ package com.ruoyi.portal.domain; -import lombok.Data; -import lombok.EqualsAndHashCode; -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.TreeEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serial; -import java.util.List; /** * haiwei官网菜单对象 hw_web_menu1 diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWebNews.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWebNews.java index d5d2ef6..546c364 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWebNews.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWebNews.java @@ -1,12 +1,10 @@ package com.ruoyi.portal.domain; +import com.fasterxml.jackson.databind.JsonNode; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; -import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import java.io.Serial; diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/SecureDocumentRequest.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/SecureDocumentRequest.java index 7544231..37098b6 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/SecureDocumentRequest.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/SecureDocumentRequest.java @@ -2,8 +2,6 @@ package com.ruoyi.portal.domain; import lombok.Data; -import java.io.Serial; - /** * 官网安全文档请求体。 * diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/vo/PortalTreeSelect.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/vo/PortalTreeSelect.java index 8e400bd..f2fe637 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/vo/PortalTreeSelect.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/domain/vo/PortalTreeSelect.java @@ -1,10 +1,11 @@ package com.ruoyi.portal.domain.vo; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.ruoyi.portal.domain.HwPortalConfigType; + import java.io.Serializable; import java.util.List; import java.util.stream.Collectors; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.ruoyi.portal.domain.HwPortalConfigType; /** * 门户配置类型下拉树结构实体类 diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/mapper/HwWebDocumentMapper.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/mapper/HwWebDocumentMapper.java index 842af2d..8d97899 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/mapper/HwWebDocumentMapper.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/mapper/HwWebDocumentMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.mapper; -import java.util.List; import com.ruoyi.portal.domain.HwWebDocument; +import java.util.List; + /** * Hw资料文件Mapper接口 * diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/mapper/HwWebMapper.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/mapper/HwWebMapper.java index d2a23b1..ce25be3 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/mapper/HwWebMapper.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/mapper/HwWebMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.mapper; -import java.util.List; import com.ruoyi.portal.domain.HwWeb; +import java.util.List; + /** * haiwei官网jsonMapper接口 * diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/mapper/HwWebMenuMapper.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/mapper/HwWebMenuMapper.java index 101ccb1..48b616f 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/mapper/HwWebMenuMapper.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/mapper/HwWebMenuMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.mapper; -import java.util.List; import com.ruoyi.portal.domain.HwWebMenu; +import java.util.List; + /** * haiwei官网菜单Mapper接口 * diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/mapper/HwWebMenuMapper1.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/mapper/HwWebMenuMapper1.java index 8a7967c..6c07b27 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/mapper/HwWebMenuMapper1.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/mapper/HwWebMenuMapper1.java @@ -1,7 +1,5 @@ package com.ruoyi.portal.mapper; -import com.ruoyi.portal.domain.HwWebMenu; -import com.ruoyi.portal.domain.HwWebMenu1; import com.ruoyi.portal.domain.HwWebMenu1; import java.util.List; diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/search/convert/PortalSearchDocConverter.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/search/convert/PortalSearchDocConverter.java index 683c943..8dcc08e 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/search/convert/PortalSearchDocConverter.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/search/convert/PortalSearchDocConverter.java @@ -3,19 +3,11 @@ package com.ruoyi.portal.search.convert; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.portal.domain.HwPortalConfigType; -import com.ruoyi.portal.domain.HwWeb; -import com.ruoyi.portal.domain.HwWeb1; -import com.ruoyi.portal.domain.HwWebDocument; -import com.ruoyi.portal.domain.HwWebMenu; +import com.ruoyi.portal.domain.*; import com.ruoyi.portal.search.es.entity.PortalSearchDoc; import org.springframework.stereotype.Component; -import java.util.Arrays; -import java.util.Date; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/search/service/impl/PortalSearchEsServiceImpl.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/search/service/impl/PortalSearchEsServiceImpl.java index f95beec..a2a2f00 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/search/service/impl/PortalSearchEsServiceImpl.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/search/service/impl/PortalSearchEsServiceImpl.java @@ -13,9 +13,9 @@ import com.ruoyi.portal.search.support.PortalSearchRouteResolver; import com.ruoyi.portal.service.IHwSearchRebuildService; import org.dromara.easyes.core.biz.EsPageInfo; import org.dromara.easyes.core.conditions.select.LambdaEsQueryWrapper; -import org.springframework.beans.factory.annotation.Autowired; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.HashMap; diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebDocumentService.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebDocumentService.java index 8f883c9..ffa1812 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebDocumentService.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebDocumentService.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.service; -import java.util.List; import com.ruoyi.portal.domain.HwWebDocument; +import java.util.List; + /** * Hw资料文件Service接口 * diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebMenuService.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebMenuService.java index b2da20b..96372e0 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebMenuService.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebMenuService.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.service; -import java.util.List; import com.ruoyi.portal.domain.HwWebMenu; +import java.util.List; + /** * haiwei官网菜单Service接口 * diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebMenuService1.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebMenuService1.java index 2a666a1..e7e2fa5 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebMenuService1.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebMenuService1.java @@ -1,6 +1,5 @@ package com.ruoyi.portal.service; -import com.ruoyi.portal.domain.HwWebMenu1; import com.ruoyi.portal.domain.HwWebMenu1; import java.util.List; diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebService.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebService.java index 5781e7f..02f65a2 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebService.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebService.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.service; -import java.util.List; import com.ruoyi.portal.domain.HwWeb; +import java.util.List; + /** * haiwei官网jsonService接口 * diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebService1.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebService1.java index 2221b4e..11711f0 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebService1.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/IHwWebService1.java @@ -1,6 +1,7 @@ package com.ruoyi.portal.service; import com.ruoyi.portal.domain.HwWeb1; + import java.util.List; /** diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwAnalyticsServiceImpl.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwAnalyticsServiceImpl.java index e2368f7..b3edfb2 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwAnalyticsServiceImpl.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwAnalyticsServiceImpl.java @@ -19,11 +19,7 @@ import java.security.MessageDigest; import java.time.Instant; import java.time.LocalDate; import java.time.ZoneId; -import java.util.Arrays; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.*; /** * 官网访问监控服务实现 diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwPortalConfigTypeServiceImpl.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwPortalConfigTypeServiceImpl.java index 223c6e1..79626b1 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwPortalConfigTypeServiceImpl.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwPortalConfigTypeServiceImpl.java @@ -1,10 +1,8 @@ package com.ruoyi.portal.service.impl; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.portal.domain.HwPortalConfigType; import com.ruoyi.portal.domain.vo.PortalTreeSelect; import com.ruoyi.portal.mapper.HwPortalConfigTypeMapper; diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductInfoDetailServiceImpl.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductInfoDetailServiceImpl.java index 6177a31..79adb16 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductInfoDetailServiceImpl.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductInfoDetailServiceImpl.java @@ -2,7 +2,6 @@ package com.ruoyi.portal.service.impl; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.portal.domain.HwPortalConfigType; import com.ruoyi.portal.domain.HwProductInfoDetail; import com.ruoyi.portal.mapper.HwProductInfoDetailMapper; import com.ruoyi.portal.service.IHwProductInfoDetailService; diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductInfoServiceImpl.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductInfoServiceImpl.java index 633859f..fc35fc7 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductInfoServiceImpl.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductInfoServiceImpl.java @@ -1,6 +1,5 @@ package com.ruoyi.portal.service.impl; -import com.ruoyi.common.constant.HwPortalConstants; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.portal.domain.HwProductInfo; diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwSearchRebuildServiceImpl.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwSearchRebuildServiceImpl.java index 6317f60..21f69aa 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwSearchRebuildServiceImpl.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwSearchRebuildServiceImpl.java @@ -1,16 +1,8 @@ package com.ruoyi.portal.service.impl; import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.portal.domain.HwPortalConfigType; -import com.ruoyi.portal.domain.HwWeb; -import com.ruoyi.portal.domain.HwWeb1; -import com.ruoyi.portal.domain.HwWebDocument; -import com.ruoyi.portal.domain.HwWebMenu; -import com.ruoyi.portal.mapper.HwPortalConfigTypeMapper; -import com.ruoyi.portal.mapper.HwWebDocumentMapper; -import com.ruoyi.portal.mapper.HwWebMapper; -import com.ruoyi.portal.mapper.HwWebMapper1; -import com.ruoyi.portal.mapper.HwWebMenuMapper; +import com.ruoyi.portal.domain.*; +import com.ruoyi.portal.mapper.*; import com.ruoyi.portal.search.convert.PortalSearchDocConverter; import com.ruoyi.portal.search.es.entity.PortalSearchDoc; import com.ruoyi.portal.search.es.mapper.PortalSearchMapper; diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwSearchServiceImpl.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwSearchServiceImpl.java index 9fc88e7..1f7fc60 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwSearchServiceImpl.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwSearchServiceImpl.java @@ -15,11 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebDocumentServiceImpl.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebDocumentServiceImpl.java index aa6488c..b73b6a6 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebDocumentServiceImpl.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebDocumentServiceImpl.java @@ -1,17 +1,17 @@ package com.ruoyi.portal.service.impl; -import java.util.List; - import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.portal.mapper.HwWebDocumentMapper; import com.ruoyi.portal.domain.HwWebDocument; +import com.ruoyi.portal.mapper.HwWebDocumentMapper; import com.ruoyi.portal.service.IHwSearchRebuildService; import com.ruoyi.portal.service.IHwWebDocumentService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * Hw资料文件Service业务层处理 diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebMenuServiceImpl.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebMenuServiceImpl.java index ab7471c..efaec39 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebMenuServiceImpl.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebMenuServiceImpl.java @@ -1,21 +1,20 @@ package com.ruoyi.portal.service.impl; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.portal.domain.HwWebMenu; +import com.ruoyi.portal.mapper.HwWebMenuMapper; +import com.ruoyi.portal.service.IHwSearchRebuildService; +import com.ruoyi.portal.service.IHwWebMenuService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.stream.Collectors; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.portal.domain.HwProductInfoDetail; -import com.ruoyi.portal.service.IHwSearchRebuildService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.portal.mapper.HwWebMenuMapper; -import com.ruoyi.portal.domain.HwWebMenu; -import com.ruoyi.portal.service.IHwWebMenuService; - /** * haiwei官网菜单Service业务层处理 * diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebServiceImpl.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebServiceImpl.java index b923bab..7877558 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebServiceImpl.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebServiceImpl.java @@ -1,16 +1,17 @@ package com.ruoyi.portal.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.portal.mapper.HwWebMapper; import com.ruoyi.portal.domain.HwWeb; -import com.ruoyi.portal.service.IHwWebService; +import com.ruoyi.portal.mapper.HwWebMapper; import com.ruoyi.portal.service.IHwSearchRebuildService; +import com.ruoyi.portal.service.IHwWebService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + /** * haiwei官网jsonService业务层处理 * diff --git a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebServiceImpl1.java b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebServiceImpl1.java index 46f7a96..0d95315 100644 --- a/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebServiceImpl1.java +++ b/ruoyi-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebServiceImpl1.java @@ -1,6 +1,7 @@ package com.ruoyi.portal.service.impl; +import com.ruoyi.portal.domain.HwWeb1; import com.ruoyi.portal.mapper.HwWebMapper1; import com.ruoyi.portal.service.IHwSearchRebuildService; import com.ruoyi.portal.service.IHwWebService1; @@ -8,11 +9,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; -import com.ruoyi.portal.domain.HwWeb1; -import com.ruoyi.portal.domain.HwWeb; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + /** * haiwei官网jsonService业务层处理 *