Browse Source

问题修复

master
luogw 1 week ago
parent
commit
143f1e5b22
  1. 2
      src/main/java/com/project/ding/application/AdminWhiteListApplicationService.java
  2. 11
      src/main/java/com/project/ding/application/impl/AdminWhiteListApplicationServiceImpl.java
  3. 10
      src/main/java/com/project/ding/controller/AdminWhiteListController.java
  4. 2
      src/main/java/com/project/ding/domain/service/AdminWhiteListBaseService.java
  5. 5
      src/main/java/com/project/ding/domain/service/impl/AdminWhiteListBaseServiceImpl.java

2
src/main/java/com/project/ding/application/AdminWhitrListApplicationService.java → src/main/java/com/project/ding/application/AdminWhiteListApplicationService.java

@ -1,6 +1,6 @@
package com.project.ding.application; package com.project.ding.application;
public interface AdminWhitrListApplicationService { public interface AdminWhiteListApplicationService {
/** /**
* 查询用户职位为经理主管总监的用户添加进白名单 * 查询用户职位为经理主管总监的用户添加进白名单
*/ */

11
src/main/java/com/project/ding/application/impl/AdminWhitrListApplicationServiceImpl.java → src/main/java/com/project/ding/application/impl/AdminWhiteListApplicationServiceImpl.java

@ -1,11 +1,10 @@
package com.project.ding.application.impl; 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.AdminWhiteListEntity;
import com.project.ding.domain.entity.UserEntity; 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.AdminWhiteListMapper;
import com.project.ding.mapper.DepartmentMapper;
import com.project.ding.mapper.UserMapper; import com.project.ding.mapper.UserMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -17,13 +16,13 @@ import java.util.stream.Collectors;
@Service @Service
@Slf4j @Slf4j
public class AdminWhitrListApplicationServiceImpl implements AdminWhitrListApplicationService { public class AdminWhiteListApplicationServiceImpl implements AdminWhiteListApplicationService {
@Autowired @Autowired
private UserMapper userMapper; private UserMapper userMapper;
@Autowired @Autowired
private AdminWhiteListMapper adminWhiteListMapper; private AdminWhiteListMapper adminWhiteListMapper;
@Autowired @Autowired
private AdminWhitrListBaseService adminWhitrListBaseService; private AdminWhiteListBaseService adminWhiteListBaseService;
@Override @Override
@ -59,7 +58,7 @@ public class AdminWhitrListApplicationServiceImpl implements AdminWhitrListAppli
} }
//新增 //新增
adminWhitrListBaseService.saveBatch(toSaveList); adminWhiteListBaseService.saveBatch(toSaveList);
log.info("成功添加 " + toSaveList.size() + " 人到 admin 白名单"); log.info("成功添加 " + toSaveList.size() + " 人到 admin 白名单");
return toSaveList.size(); return toSaveList.size();

10
src/main/java/com/project/ding/controller/AdminWhitrListController.java → src/main/java/com/project/ding/controller/AdminWhiteListController.java

@ -1,7 +1,7 @@
package com.project.ding.controller; package com.project.ding.controller;
import com.project.base.domain.result.Result; 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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -10,15 +10,15 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@Slf4j @Slf4j
@RequestMapping("/api/admin/adminWhitr") @RequestMapping("/api/admin/adminWhite")
public class AdminWhitrListController { public class AdminWhiteListController {
@Autowired @Autowired
private AdminWhitrListApplicationService adminWhitrApplicationService; private AdminWhiteListApplicationService adminWhiteApplicationService;
@PostMapping("/addAdmin") @PostMapping("/addAdmin")
public Result addAdmin(){ public Result addAdmin(){
int count = adminWhitrApplicationService.addManagersToAdminWhiteList(); int count = adminWhiteApplicationService.addManagersToAdminWhiteList();
return Result.success("已将" + count + "名管理人员加入 admin 白名单"); return Result.success("已将" + count + "名管理人员加入 admin 白名单");
} }
} }

2
src/main/java/com/project/ding/domain/service/AdminWhitrListBaseService.java → 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.base.domain.service.IBaseService;
import com.project.ding.domain.entity.AdminWhiteListEntity; import com.project.ding.domain.entity.AdminWhiteListEntity;
public interface AdminWhitrListBaseService extends IBaseService<AdminWhiteListEntity> { public interface AdminWhiteListBaseService extends IBaseService<AdminWhiteListEntity> {
} }

5
src/main/java/com/project/ding/domain/service/impl/AdminWhitrListBaseServiceImpl.java → src/main/java/com/project/ding/domain/service/impl/AdminWhiteListBaseServiceImpl.java

@ -1,12 +1,11 @@
package com.project.ding.domain.service.impl; package com.project.ding.domain.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.entity.AdminWhiteListEntity;
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.AdminWhiteListMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
public class AdminWhitrListBaseServiceImpl extends ServiceImpl<AdminWhiteListMapper, AdminWhiteListEntity> implements AdminWhitrListBaseService { public class AdminWhiteListBaseServiceImpl extends ServiceImpl<AdminWhiteListMapper, AdminWhiteListEntity> implements AdminWhiteListBaseService {
} }
Loading…
Cancel
Save