From 7708f7b3194851a64df279b1af80f8cc1496e59b Mon Sep 17 00:00:00 2001 From: liyd <1419499670@qq.com> Date: Wed, 30 Nov 2022 20:06:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/DictDetailRepository.java | 35 --------------- .../system/repository/DictRepository.java | 43 ------------------- .../system/rest/DictDetailController.java | 8 ---- .../system/service/DictDetailService.java | 2 - .../service/impl/DictDetailServiceImpl.java | 10 +---- .../system/service/impl/DictServiceImpl.java | 13 +++--- 6 files changed, 9 insertions(+), 102 deletions(-) delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/repository/DictDetailRepository.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/repository/DictRepository.java diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/repository/DictDetailRepository.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/repository/DictDetailRepository.java deleted file mode 100644 index 02c670e..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/repository/DictDetailRepository.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2019-2020 Zheng Jie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.nl.modules.system.repository; - -import org.nl.modules.system.domain.DictDetail; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -import java.util.List; - -/** -* @author Zheng Jie -* @date 2019-04-10 -*/ -public interface DictDetailRepository extends JpaRepository, JpaSpecificationExecutor { - - /** - * 根据字典名称查询 - * @param name / - * @return / - */ -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/repository/DictRepository.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/repository/DictRepository.java deleted file mode 100644 index 059278c..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/repository/DictRepository.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2019-2020 Zheng Jie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.nl.modules.system.repository; - -import org.nl.modules.system.domain.Dict; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -import java.util.List; -import java.util.Set; - -/** -* @author Zheng Jie -* @date 2019-04-10 -*/ -public interface DictRepository extends JpaRepository, JpaSpecificationExecutor { - - /** - * 删除 - * @param ids / - */ - void deleteByIdIn(Set ids); - - /** - * 查询 - * @param ids / - * @return / - */ - List findByIdIn(Set ids); -} \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/DictDetailController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/DictDetailController.java index bad6e1e..7e8a547 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/DictDetailController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/DictDetailController.java @@ -15,17 +15,11 @@ */ package org.nl.modules.system.rest; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.logging.annotation.Log; -import org.nl.modules.system.domain.Dict; -import org.nl.modules.system.domain.DictDetail; -import org.nl.modules.system.repository.DictRepository; import org.nl.modules.system.service.DictDetailService; -import org.nl.modules.system.service.dto.DictDetailDto; import org.nl.modules.system.service.dto.DictDetailQueryCriteria; import org.nl.modules.system.service.dto.DictDto; import org.springframework.data.domain.Pageable; @@ -33,13 +27,11 @@ import org.springframework.data.domain.Sort; import org.springframework.data.web.PageableDefault; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Optional; /** * @author Zheng Jie diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/DictDetailService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/DictDetailService.java index 340a178..b7661c2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/DictDetailService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/DictDetailService.java @@ -15,8 +15,6 @@ */ package org.nl.modules.system.service; -import org.nl.modules.system.domain.DictDetail; -import org.nl.modules.system.service.dto.DictDetailDto; import org.nl.modules.system.service.dto.DictDetailQueryCriteria; import org.nl.modules.system.service.dto.DictDto; import org.springframework.data.domain.Pageable; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java index c5051aa..f6b8284 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java @@ -23,22 +23,16 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.*; -import org.nl.modules.system.domain.Dict; -import org.nl.modules.system.domain.DictDetail; -import org.nl.modules.system.repository.DictDetailRepository; -import org.nl.modules.system.repository.DictRepository; +import org.nl.modules.common.utils.RedisUtils; +import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.service.DictDetailService; -import org.nl.modules.system.service.dto.DictDetailDto; import org.nl.modules.system.service.dto.DictDetailQueryCriteria; import org.nl.modules.system.service.dto.DictDto; -import org.nl.modules.system.service.mapstruct.DictDetailMapper; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictServiceImpl.java index 846957d..e989621 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictServiceImpl.java @@ -23,13 +23,12 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.*; -import org.nl.modules.system.domain.Dict; -import org.nl.modules.system.repository.DictRepository; +import org.nl.modules.common.utils.FileUtil; +import org.nl.modules.common.utils.RedisUtils; +import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.service.DictService; import org.nl.modules.system.service.dto.DictDto; import org.nl.modules.system.service.dto.DictQueryCriteria; -import org.nl.modules.system.service.mapstruct.DictMapper; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; @@ -40,8 +39,10 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author Zheng Jie