diff --git a/src/main/java/com/project/ding/application/AdminWhitrListApplicationService.java b/src/main/java/com/project/ding/application/AdminWhiteListApplicationService.java similarity index 77% rename from src/main/java/com/project/ding/application/AdminWhitrListApplicationService.java rename to src/main/java/com/project/ding/application/AdminWhiteListApplicationService.java index 810e943..e190d4b 100644 --- a/src/main/java/com/project/ding/application/AdminWhitrListApplicationService.java +++ b/src/main/java/com/project/ding/application/AdminWhiteListApplicationService.java @@ -1,6 +1,6 @@ package com.project.ding.application; -public interface AdminWhitrListApplicationService { +public interface AdminWhiteListApplicationService { /** * 查询用户职位为经理、主管、总监的用户,添加进白名单 */ diff --git a/src/main/java/com/project/ding/application/impl/AdminWhitrListApplicationServiceImpl.java b/src/main/java/com/project/ding/application/impl/AdminWhiteListApplicationServiceImpl.java similarity index 84% rename from src/main/java/com/project/ding/application/impl/AdminWhitrListApplicationServiceImpl.java rename to src/main/java/com/project/ding/application/impl/AdminWhiteListApplicationServiceImpl.java index 90f01c3..7f8dfb5 100644 --- a/src/main/java/com/project/ding/application/impl/AdminWhitrListApplicationServiceImpl.java +++ b/src/main/java/com/project/ding/application/impl/AdminWhiteListApplicationServiceImpl.java @@ -1,11 +1,10 @@ package com.project.ding.application.impl; -import com.project.ding.application.AdminWhitrListApplicationService; +import com.project.ding.application.AdminWhiteListApplicationService; import com.project.ding.domain.entity.AdminWhiteListEntity; import com.project.ding.domain.entity.UserEntity; -import com.project.ding.domain.service.AdminWhitrListBaseService; +import com.project.ding.domain.service.AdminWhiteListBaseService; import com.project.ding.mapper.AdminWhiteListMapper; -import com.project.ding.mapper.DepartmentMapper; import com.project.ding.mapper.UserMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -17,13 +16,13 @@ import java.util.stream.Collectors; @Service @Slf4j -public class AdminWhitrListApplicationServiceImpl implements AdminWhitrListApplicationService { +public class AdminWhiteListApplicationServiceImpl implements AdminWhiteListApplicationService { @Autowired private UserMapper userMapper; @Autowired private AdminWhiteListMapper adminWhiteListMapper; @Autowired - private AdminWhitrListBaseService adminWhitrListBaseService; + private AdminWhiteListBaseService adminWhiteListBaseService; @Override @@ -59,7 +58,7 @@ public class AdminWhitrListApplicationServiceImpl implements AdminWhitrListAppli } //新增 - adminWhitrListBaseService.saveBatch(toSaveList); + adminWhiteListBaseService.saveBatch(toSaveList); log.info("成功添加 " + toSaveList.size() + " 人到 admin 白名单"); return toSaveList.size(); diff --git a/src/main/java/com/project/ding/controller/AdminWhitrListController.java b/src/main/java/com/project/ding/controller/AdminWhiteListController.java similarity index 68% rename from src/main/java/com/project/ding/controller/AdminWhitrListController.java rename to src/main/java/com/project/ding/controller/AdminWhiteListController.java index db467f9..c06d4b8 100644 --- a/src/main/java/com/project/ding/controller/AdminWhitrListController.java +++ b/src/main/java/com/project/ding/controller/AdminWhiteListController.java @@ -1,7 +1,7 @@ package com.project.ding.controller; import com.project.base.domain.result.Result; -import com.project.ding.application.AdminWhitrListApplicationService; +import com.project.ding.application.AdminWhiteListApplicationService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -10,15 +10,15 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Slf4j -@RequestMapping("/api/admin/adminWhitr") -public class AdminWhitrListController { +@RequestMapping("/api/admin/adminWhite") +public class AdminWhiteListController { @Autowired - private AdminWhitrListApplicationService adminWhitrApplicationService; + private AdminWhiteListApplicationService adminWhiteApplicationService; @PostMapping("/addAdmin") public Result addAdmin(){ - int count = adminWhitrApplicationService.addManagersToAdminWhiteList(); + int count = adminWhiteApplicationService.addManagersToAdminWhiteList(); return Result.success("已将" + count + "名管理人员加入 admin 白名单"); } } diff --git a/src/main/java/com/project/ding/domain/service/AdminWhitrListBaseService.java b/src/main/java/com/project/ding/domain/service/AdminWhiteListBaseService.java similarity index 73% rename from src/main/java/com/project/ding/domain/service/AdminWhitrListBaseService.java rename to src/main/java/com/project/ding/domain/service/AdminWhiteListBaseService.java index 74caf43..5243848 100644 --- a/src/main/java/com/project/ding/domain/service/AdminWhitrListBaseService.java +++ b/src/main/java/com/project/ding/domain/service/AdminWhiteListBaseService.java @@ -3,5 +3,5 @@ package com.project.ding.domain.service; import com.project.base.domain.service.IBaseService; import com.project.ding.domain.entity.AdminWhiteListEntity; -public interface AdminWhitrListBaseService extends IBaseService { +public interface AdminWhiteListBaseService extends IBaseService { } diff --git a/src/main/java/com/project/ding/domain/service/impl/AdminWhitrListBaseServiceImpl.java b/src/main/java/com/project/ding/domain/service/impl/AdminWhiteListBaseServiceImpl.java similarity index 55% rename from src/main/java/com/project/ding/domain/service/impl/AdminWhitrListBaseServiceImpl.java rename to src/main/java/com/project/ding/domain/service/impl/AdminWhiteListBaseServiceImpl.java index 8d7c6f0..1317581 100644 --- a/src/main/java/com/project/ding/domain/service/impl/AdminWhitrListBaseServiceImpl.java +++ b/src/main/java/com/project/ding/domain/service/impl/AdminWhiteListBaseServiceImpl.java @@ -1,12 +1,11 @@ package com.project.ding.domain.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.project.base.domain.service.IBaseService; import com.project.ding.domain.entity.AdminWhiteListEntity; -import com.project.ding.domain.service.AdminWhitrListBaseService; +import com.project.ding.domain.service.AdminWhiteListBaseService; import com.project.ding.mapper.AdminWhiteListMapper; import org.springframework.stereotype.Service; @Service -public class AdminWhitrListBaseServiceImpl extends ServiceImpl implements AdminWhitrListBaseService { +public class AdminWhiteListBaseServiceImpl extends ServiceImpl implements AdminWhiteListBaseService { }