yonge 3 lat temu
rodzic
commit
b31fc97cc6

+ 77 - 0
cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/EmployeeController.java

@@ -0,0 +1,77 @@
+package com.yonge.cooleshow.admin.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.RestController;
+
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dao.EmployeeDao;
+import com.yonge.cooleshow.biz.dal.entity.Employee;
+import com.yonge.cooleshow.biz.dal.service.EmployeeService;
+import com.yonge.cooleshow.common.controller.BaseController;
+
+@RequestMapping("employee")
+@Api(tags = "员工管理")
+@RestController
+public class EmployeeController extends BaseController {
+
+    @Autowired
+    private EmployeeService employeeService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private EmployeeDao employeeDao;
+
+    @ApiOperation(value = "新增员工")
+    @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('employee/add')")
+    public Object add(@RequestBody Employee employee) throws Exception {
+        employeeService.add(employee);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改员工")
+    @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('employee/update')")
+    public Object update(@RequestBody Employee employee) {
+        employee.setUpdateTime(new Date());
+        employeeService.updateEmployee(employee);
+        return succeed();
+    }
+
+    @ApiOperation(value = "获取所有员工")
+    @GetMapping("/findAll")
+    @PreAuthorize("@pcs.hasPermissions('employee/findAll')")
+    public Object findAll() {
+        return succeed(employeeService.findAll(null));
+    }
+
+    @ApiOperation(value = "获取用户信息")
+    @GetMapping("/queryUserInfo")
+    public Object apiQueryUserInfo() {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser != null && sysUser.getId() != null){
+            Employee employee = employeeService.get(sysUser.getId());
+            employee.setRoles(employeeDao.queryUserRole(sysUser.getId()));
+            employee.setContactAddress(employee.getContactAddress());
+            employee.setPostalCode(employee.getPostalCode());
+            
+            return succeed(employee);
+        }
+        return failed("获取用户信息失败");
+    }
+
+}

+ 10 - 10
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/EmployeeDao.java

@@ -9,7 +9,7 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.Employee;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 
-public interface EmployeeDao extends BaseDAO<Integer, Employee> {
+public interface EmployeeDao extends BaseDAO<Long, Employee> {
 
     /**
      * 修改密码
@@ -17,24 +17,24 @@ public interface EmployeeDao extends BaseDAO<Integer, Employee> {
      * @param userID
      * @param password
      */
-    void updatePassword(@Param("userID") Integer userID, @Param("password") String password);
+    void updatePassword(@Param("userID") Long userID, @Param("password") String password);
 
     /**
      * @Author: Joburgess
      * @Date: 2019/9/17
      * 修改用户账户锁定状态
      */
-    int updateUserLockStatus(@Param("userID") Integer userID);
+    int updateUserLockStatus(@Param("userID") Long userID);
 
 
-    void updateUserLock(@Param("userID") Integer userID, @Param("status") int status);
+    void updateUserLock(@Param("userID") Long userID, @Param("status") int status);
 
     /**
      * @Author: Joburgess
      * @Date: 2019/9/25
      * 修改用户离职日期
      */
-    int updateUserDemissionDate(@Param("userID") Integer userID);
+    int updateUserDemissionDate(@Param("userID") Long userID);
 
     /**
      * 根据手机号查询对象
@@ -49,7 +49,7 @@ public interface EmployeeDao extends BaseDAO<Integer, Employee> {
      *
      * @param userId
      */
-    void delEmployeeRole(Integer userId);
+    void delEmployeeRole(Long userId);
 
     /**
      * 批量新增用户角色
@@ -57,7 +57,7 @@ public interface EmployeeDao extends BaseDAO<Integer, Employee> {
      * @param id
      * @param roleIds
      */
-    void batchAddEmployeeRole(@Param("userId") Integer id, @Param("roleIds") List<Integer> roleIds, @Param("tenantId") Integer tenantId);
+    void batchAddEmployeeRole(@Param("userId") Long id, @Param("roleIds") List<Integer> roleIds);
 
     /**
      * 获取用户权限列表
@@ -65,7 +65,7 @@ public interface EmployeeDao extends BaseDAO<Integer, Employee> {
      * @param userId
      * @return
      */
-    List<Integer> queryUserRole(Integer userId);
+    List<Long> queryUserRole(Long userId);
 
     /**
      * 获取用户信息
@@ -73,7 +73,7 @@ public interface EmployeeDao extends BaseDAO<Integer, Employee> {
      * @param userIds
      * @return
      */
-    List<SysUser> getUsers(@Param("userIds") List<Integer> userIds);
+    List<SysUser> getUsers(@Param("userIds") List<Long> userIds);
 
     /**
      * 批量添加角色和菜单关系
@@ -81,7 +81,7 @@ public interface EmployeeDao extends BaseDAO<Integer, Employee> {
      * @param roleId  角色id
      * @param menuIds 菜单集合
      */
-    int batchInsertRoleMenu(@Param("roleId") Integer roleId, @Param("menuIds") List<Integer> menuIds);
+    int batchInsertRoleMenu(@Param("roleId") Long roleId, @Param("menuIds") List<Integer> menuIds);
 
     /**
      * 根据机构id,和菜单id删除

+ 3 - 3
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/EmployeeService.java

@@ -6,7 +6,7 @@ import com.yonge.cooleshow.auth.api.entity.SysRole;
 import com.yonge.cooleshow.biz.dal.entity.Employee;
 import com.yonge.cooleshow.common.service.BaseService;
 
-public interface EmployeeService extends BaseService<Integer, Employee> {
+public interface EmployeeService extends BaseService<Long, Employee> {
 
     /**
      * 新增员工
@@ -20,9 +20,9 @@ public interface EmployeeService extends BaseService<Integer, Employee> {
      */
     void updateEmployee(Employee employee);
 
-    List<Integer> queryUserRole(Integer sysUserId);
+    List<Long> queryUserRole(Long sysUserId);
 
-    int batchInsertRoleMenu( Integer roleId, List<Integer> menuIds);
+    int batchInsertRoleMenu( Long roleId, List<Integer> menuIds);
 
     int insertSysRole(SysRole sysRole);
 

+ 4 - 4
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/EmployeeServiceImpl.java

@@ -17,7 +17,7 @@ import com.yonge.cooleshow.common.dal.BaseDAO;
 import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 
 @Service
-public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> implements EmployeeService {
+public class EmployeeServiceImpl extends BaseServiceImpl<Long, Employee> implements EmployeeService {
 
     @Autowired
     private EmployeeDao employeeDao;
@@ -26,7 +26,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
     private TeacherDao teacherDao;
 
     @Override
-    public BaseDAO<Integer, Employee> getDAO() {
+    public BaseDAO<Long, Employee> getDAO() {
         return employeeDao;
     }
 
@@ -50,7 +50,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
     }
 
     @Override
-    public List<Integer> queryUserRole(Integer sysUserId) {
+    public List<Long> queryUserRole(Long sysUserId) {
         return employeeDao.queryUserRole(sysUserId);
     }
 
@@ -61,7 +61,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
      * @param menuIds 菜单集合
      */
     @Override
-    public int batchInsertRoleMenu(Integer roleId, List<Integer> menuIds) {
+    public int batchInsertRoleMenu(Long roleId, List<Integer> menuIds) {
         return employeeDao.batchInsertRoleMenu(roleId, menuIds);
     }