Merge remote-tracking branch 'origin/V0.0.1' into V0.0.1

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteTaskService.java

@@ -0,0 +1,35 @@
+package com.xunmei.system.api;
+
+import com.xunmei.common.core.constant.ServiceNameConstants;
+import com.xunmei.common.core.domain.R;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.system.api.factory.RemoteTaskFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@FeignClient(contextId = "remoteTaskService", value = ServiceNameConstants.CORE_SERVICE, fallbackFactory = RemoteTaskFallbackFactory.class)
+public interface RemoteTaskService {
+    /**
+     * 执行每日每小时履职任务生成任务
+     *
+     * @return
+     */
+    @GetMapping("/task/dayTask")
+    R<AjaxResult> dayTask();
+
+    /**
+     * 每周履职任务生成任务
+     *
+     * @return
+     */
+    @GetMapping("/task/weekTask")
+    R<AjaxResult> weekTask();
+
+    /**
+     * 每月，每季，每半年，每年履职任务生成任务
+     *
+     * @return
+     */
+    @GetMapping("/task/monthTask")
+    R<AjaxResult> monthTask();
+}

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteTaskFallbackFactory.java

@@ -0,0 +1,39 @@
+package com.xunmei.system.api.factory;
+
+import com.xunmei.common.core.domain.R;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.system.api.RemoteTaskService;
+import com.xunmei.system.api.RemoteUserService;
+import com.xunmei.system.api.model.LoginUser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RemoteTaskFallbackFactory implements FallbackFactory<RemoteTaskService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
+    @Override
+    public RemoteTaskService create(Throwable throwable) {
+
+        log.error("用户服务调用失败:{}", throwable.getMessage());
+        return new RemoteTaskService()
+        {
+
+            @Override
+            public R<AjaxResult> dayTask() {
+                return null;
+            }
+
+            @Override
+            public R<AjaxResult> weekTask() {
+                return null;
+            }
+
+            @Override
+            public R<AjaxResult> monthTask() {
+                return null;
+            }
+        };
+    }
+}

soc-api/soc-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -4,3 +4,4 @@ com.xunmei.system.api.factory.RemoteFileFallbackFactory
 com.xunmei.system.api.factory.RemoteOrgFallbackFactory
 com.xunmei.system.api.factory.RemoteConfigFallbackFactory
 com.xunmei.system.api.factory.RemoteWorkTimesFallbackFactory
+com.xunmei.system.api.factory.RemoteTaskFallbackFactory

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/TaskController.java

@@ -0,0 +1,91 @@
+package com.xunmei.core.resumption.controller;
+
+import cn.hutool.core.date.DateTime;
+import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.domain.R;
+import com.xunmei.common.core.utils.DateHelper;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.core.resumption.task.ResumptionTaskBusiness;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.TimeZone;
+
+/**
+ * @author LuoJun
+ */
+@RestController
+@RequestMapping("/task")
+public class TaskController {
+    @Autowired
+    ResumptionTaskBusiness taskBusiness;
+
+    @GetMapping("/dayTask")
+    public AjaxResult dayTask() {
+//        //执行周期为每周的履职计划Plan_cycle=0,6
+//        DateTime datetime = new DateTime();
+//        datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+//        JobLog jobLog = JobLog.builder().id(IDHelper.id()).jobCode("dayTask").jobName("每小时每日履职任务生成job").jobDate(datetime).createTime(datetime).build();
+//        boolean flag = jobLogService.isJobRunning(jobLog);
+//        if(flag){
+//            SCHEDULEDTASKSLOG.info("每小时每日履职任务生成job已执行，本次不执行");
+//            return;
+//        }
+//        SCHEDULEDTASKSLOG.info("================开始执行每日每小时履职任务生成任务================");
+//        taskBusiness.syncHour(datetime,6);
+//        taskBusiness.syncDay(datetime,0);
+//        SCHEDULEDTASKSLOG.info("================每日每小时履职任务生成任务执行结束================");
+        DateTime datetime = new DateTime();
+        datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+//        SCHEDULEDTASKSLOG.info("================开始执行每日每小时履职任务生成任务================");
+        taskBusiness.syncHour(datetime,6);
+        taskBusiness.syncDay(datetime,0);
+//        SCHEDULEDTASKSLOG.info("================每日每小时履职任务生成任务执行结束================");
+        return AjaxResult.success();
+    }
+
+    @GetMapping("/weekTask")
+    public AjaxResult weekTask() {
+        DateTime datetime = new DateTime();
+        datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+//        SCHEDULEDTASKSLOG.info("================开始执行每周履职任务生成任务================");
+        taskBusiness.syncWeek(datetime,1);
+//        SCHEDULEDTASKSLOG.info("================每周履职任务生成任务执行结束================");
+        return AjaxResult.success();
+    }
+
+    @GetMapping("/monthTask")
+    public AjaxResult monthTask() {
+        DateTime datetime = new DateTime();
+        datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+        DateHelper dateHelper = new DateHelper(datetime);
+        int month =dateHelper.getMonth();
+        int day = dateHelper.getDay();
+//        SCHEDULEDTASKSLOG.info("================开始执行每月，每季，每半年，每年履职任务生成任务================");
+        if(month==1&&day==1){
+            //1.1日获取执行周期为每月，每季，每半年，每年的履职计划Plan_cycle=2,3,4,5
+            taskBusiness.syncMonth(datetime,2);
+            taskBusiness.syncQuarter(datetime,3);
+            taskBusiness.syncHalfYear(datetime,4);
+            taskBusiness.syncYear(datetime,5);
+        }else if((month==4&&day==1)||(month==10&&day==1)){
+            //4.1||10.1日获取执行周期为每月，每季的履职计划Plan_cycle=2,3
+            taskBusiness.syncMonth(datetime,2);
+            taskBusiness.syncQuarter(datetime,3);
+        }else if(month==7&&day==1){
+            //7.1日获取执行周期为每月，每季,每半年的履职计划Plan_cycle=2,3,4
+            taskBusiness.syncMonth(datetime,2);
+            taskBusiness.syncQuarter(datetime,3);
+            taskBusiness.syncHalfYear(datetime,4);
+
+        }else {
+            //其他获取每月履职计划Plan_cycle=2
+            taskBusiness.syncMonth(datetime,2);
+        }
+//        SCHEDULEDTASKSLOG.info("================每月，每季，每半年，每年履职任务生成任务执行结束================");
+        return AjaxResult.success();
+    }
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysRoleController.java

@@ -12,6 +12,7 @@ import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.domain.SysUserRole;
+import com.xunmei.system.domain.vo.SysUserVO;
 import com.xunmei.system.service.ISysDeptService;
 import com.xunmei.system.service.ISysRoleService;
 import com.xunmei.system.service.ISysUserService;
@@ -134,10 +135,10 @@ public class SysRoleController extends BaseController
      */
     @RequiresPermissions("system:role:remove")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{roleIds}")
-    public AjaxResult remove(@PathVariable Long[] roleIds)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(roleService.deleteRoleByIds(roleIds));
+        return toAjax(roleService.deleteRoleByIds(ids));
     }
 
     /**
@@ -154,10 +155,9 @@ public class SysRoleController extends BaseController
      */
     @RequiresPermissions("system:role:list")
     @GetMapping("/authUser/allocatedList")
-    public TableDataInfo allocatedList(SysUser user)
+    public TableDataInfo allocatedList(SysUserVO user)
     {
-        List<SysUser> list = userService.selectAllocatedList(user);
-        return null;
+        return userService.selectAllocatedList(user);
     }
 
     /**
@@ -165,10 +165,9 @@ public class SysRoleController extends BaseController
      */
     @RequiresPermissions("system:role:list")
     @GetMapping("/authUser/unallocatedList")
-    public TableDataInfo unallocatedList(SysUser user)
+    public TableDataInfo unallocatedList(SysUserVO user)
     {
-        List<SysUser> list = userService.selectUnallocatedList(user);
-        return null;
+        return userService.selectUnallocatedList(user);
     }
 
     /**

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysUserMapper.java

@@ -2,6 +2,7 @@ package com.xunmei.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.system.api.domain.SysUser;
+import com.xunmei.system.domain.vo.SysUserVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -27,7 +28,7 @@ public interface SysUserMapper extends BaseMapper<SysUser>
      * @param user 用户信息
      * @return 用户信息集合信息
      */
-    public List<SysUser> selectAllocatedList(SysUser user);
+    public List<SysUser> selectAllocatedList(SysUserVO user);
 
     /**
      * 根据条件分页查询未分配用户角色列表
@@ -35,7 +36,7 @@ public interface SysUserMapper extends BaseMapper<SysUser>
      * @param user 用户信息
      * @return 用户信息集合信息
      */
-    public List<SysUser> selectUnallocatedList(SysUser user);
+    public List<SysUser> selectUnallocatedList(SysUserVO user);
 
     public List<SysUser> selectSyncUserList(SysUser user);
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysUserService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.system.api.domain.SysUser;
+import com.xunmei.system.domain.vo.SysUserVO;
 import com.xunmei.system.mapper.SysUserMapper;
 
 import java.util.List;
@@ -31,7 +32,7 @@ public interface ISysUserService extends IService<SysUser>
      * @param user 用户信息
      * @return 用户信息集合信息
      */
-    public List<SysUser> selectAllocatedList(SysUser user);
+    public TableDataInfo selectAllocatedList(SysUserVO user);
 
     /**
      * 根据条件分页查询未分配用户角色列表
@@ -39,7 +40,7 @@ public interface ISysUserService extends IService<SysUser>
      * @param user 用户信息
      * @return 用户信息集合信息
      */
-    public List<SysUser> selectUnallocatedList(SysUser user);
+    public TableDataInfo selectUnallocatedList(SysUserVO user);
 
     /**
      * 通过用户名查询用户

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysRoleServiceImpl.java

@@ -12,10 +12,7 @@ import com.xunmei.common.datascope.annotation.DataScope;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.domain.SysUser;
-import com.xunmei.system.domain.SysPost;
-import com.xunmei.system.domain.SysRoleDept;
-import com.xunmei.system.domain.SysRoleMenu;
-import com.xunmei.system.domain.SysUserRole;
+import com.xunmei.system.domain.*;
 import com.xunmei.system.mapper.*;
 import com.xunmei.system.service.ISysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,8 +55,19 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         } else {
             page = new Page<>();
         }
-        role.setDelFlag(0);
-        page = roleMapper.selectPage(page, new QueryWrapper<>(role));
+        SysRole sysRole=new SysRole();
+        QueryWrapper<SysRole> query = new QueryWrapper<>(sysRole);
+        query.eq("del_flag", 0);
+        if (null != role.getRoleKey()) {
+            query.like("role_key", role.getRoleKey());
+        }
+        if (null != role.getRoleName()) {
+            query.like("role_name", role.getRoleName());
+        }
+        if (role.getParams().get("beginTime") != null && role.getParams().get("endTime") != null) {
+            query.between("create_time", role.getParams().get("beginTime"), role.getParams().get("endTime"));
+        }
+        page = roleMapper.selectPage(page, query);
         TableDataInfo tableDataInfo = new TableDataInfo();
         tableDataInfo.setMsg("操作成功");
         tableDataInfo.setCode(200);

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysUserServiceImpl.java

@@ -10,11 +10,13 @@ import com.xunmei.common.core.utils.bean.BeanValidators;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.datascope.annotation.DataScope;
 import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.system.api.domain.SysArea;
 import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.domain.SysPost;
 import com.xunmei.system.domain.SysUserPost;
 import com.xunmei.system.domain.SysUserRole;
+import com.xunmei.system.domain.vo.SysUserVO;
 import com.xunmei.system.mapper.*;
 import com.xunmei.system.service.ISysConfigService;
 import com.xunmei.system.service.ISysOrgService;
@@ -34,12 +36,11 @@ import java.util.stream.Collectors;
 
 /**
  * 用户 业务层处理
- * 
+ *
  * @author xunmei
  */
 @Service
-public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService
-{
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
     private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
 
     @Autowired
@@ -68,49 +69,47 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 根据条件分页查询用户列表
-     * 
+     *
      * @param user 用户信息
      * @return 用户信息集合信息
      */
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
-    public TableDataInfo selectUserList(SysUser user)
-    {
+    public TableDataInfo selectUserList(SysUser user) {
         //未删除
         user.setDeleted(0L);
         Page<SysUser> page;
         //分页
-        if (user.getPageNum()!=null&&user.getPageSize()!=null)
-        {
+        if (user.getPageNum() != null && user.getPageSize() != null) {
             page = new Page<>(user.getPageNum(), user.getPageSize());
-        }else{
+        } else {
             page = new Page<>();
         }
         //查询条件
         QueryWrapper<SysUser> query = new QueryWrapper<>(user);
         //下穿
-        if (user.getCheckSub()){
+        if (user.getCheckSub()) {
             List<Long> ids = orgService.selectCheckSubOrgIdList(user.getOrgId());
             //清空前端传递的org_id
             user.setOrgId(null);
             //添加in条件
-            query.in("org_id",ids);
+            query.in("org_id", ids);
 
         }
         //时间范围查询
-        if (user.getParams().get("beginTime")!=null&&user.getParams().get("endTime")!=null){
+        if (user.getParams().get("beginTime") != null && user.getParams().get("endTime") != null) {
             query.between("create_time", user.getParams().get("beginTime"), user.getParams().get("endTime"));
         }
         //模糊查询
-        if (StringUtils.isNotNull(user.getUsername())){
-            query.like("username",user.getUsername());
+        if (StringUtils.isNotNull(user.getUsername())) {
+            query.like("username", user.getUsername());
             user.setUsername(null);
         }
         //获取数据
         page = userMapper.selectPage(page, query);
-        for (SysUser u:
-             page.getRecords()) {
-            u.setOrgName(orgService.selectSysOrgById(user.getOrgId()).getName());
+        for (SysUser u :
+                page.getRecords()) {
+            u.setOrgName(orgService.selectSysOrgById(u.getOrgId()).getName());
         }
         //抓换为TableDataInfo适配前端
         TableDataInfo tableDataInfo = new TableDataInfo();
@@ -136,66 +135,78 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 根据条件分页查询已分配用户角色列表
-     * 
+     *
      * @param user 用户信息
      * @return 用户信息集合信息
      */
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
-    public List<SysUser> selectAllocatedList(SysUser user)
-    {
-        return userMapper.selectAllocatedList(user);
+    public TableDataInfo selectAllocatedList(SysUserVO user) {
+        Page<SysUserVO> page;
+        if (user.getPageNum() != null && user.getPageSize() != null) {
+            page = new Page<>(user.getPageNum(), user.getPageSize());
+        } else {
+            page = new Page<>();
+        }
+        TableDataInfo tableDataInfo = new TableDataInfo();
+        tableDataInfo.setMsg("操作成功");
+        tableDataInfo.setCode(200);
+        tableDataInfo.setTotal(page.getTotal());
+        tableDataInfo.setRows(userMapper.selectAllocatedList(user));
+        return tableDataInfo;
     }
 
     /**
      * 根据条件分页查询未分配用户角色列表
-     * 
+     *
      * @param user 用户信息
      * @return 用户信息集合信息
      */
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
-    public List<SysUser> selectUnallocatedList(SysUser user)
-    {
-        return userMapper.selectUnallocatedList(user);
+    public TableDataInfo selectUnallocatedList(SysUserVO user) {
+        TableDataInfo tableDataInfo = new TableDataInfo();
+        tableDataInfo.setMsg("操作成功");
+        tableDataInfo.setCode(200);
+        // tableDataInfo.setTotal(page.getTotal());
+        tableDataInfo.setRows(userMapper.selectUnallocatedList(user));
+        return tableDataInfo;
+
+
     }
 
     /**
      * 通过用户名查询用户
-     * 
+     *
      * @param userName 用户名
      * @return 用户对象信息
      */
     @Override
-    public SysUser selectUserByUserName(String userName)
-    {
-        return userMapper.selectOne(new QueryWrapper<SysUser>().eq("username",userName));
+    public SysUser selectUserByUserName(String userName) {
+        return userMapper.selectOne(new QueryWrapper<SysUser>().eq("username", userName));
     }
 
     /**
      * 通过用户ID查询用户
-     * 
+     *
      * @param userId 用户ID
      * @return 用户对象信息
      */
     @Override
-    public SysUser selectUserById(Long userId)
-    {
+    public SysUser selectUserById(Long userId) {
         return userMapper.selectById(userId);
     }
 
     /**
      * 查询用户所属角色组
-     * 
+     *
      * @param userName 用户名
      * @return 结果
      */
     @Override
-    public String selectUserRoleGroup(String userName)
-    {
+    public String selectUserRoleGroup(String userName) {
         List<SysRole> list = roleMapper.selectRolesByUserName(userName);
-        if (CollectionUtils.isEmpty(list))
-        {
+        if (CollectionUtils.isEmpty(list)) {
             return StringUtils.EMPTY;
         }
         return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
@@ -203,16 +214,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 查询用户所属岗位组
-     * 
+     *
      * @param userName 用户名
      * @return 结果
      */
     @Override
-    public String selectUserPostGroup(String userName)
-    {
+    public String selectUserPostGroup(String userName) {
         List<SysPost> list = postMapper.selectPostsByUserName(userName);
-        if (CollectionUtils.isEmpty(list))
-        {
+        if (CollectionUtils.isEmpty(list)) {
             return StringUtils.EMPTY;
         }
         return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
@@ -220,17 +229,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 校验用户名称是否唯一
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
     @Override
-    public boolean checkUserNameUnique(SysUser user)
-    {
+    public boolean checkUserNameUnique(SysUser user) {
         Long userId = StringUtils.isNull(user.getId()) ? -1L : user.getId();
         SysUser info = userMapper.checkUserNameUnique(user.getUsername());
-        if (StringUtils.isNotNull(info) && info.getId().longValue() != userId.longValue())
-        {
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != userId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -243,12 +250,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * @return
      */
     @Override
-    public boolean checkPhoneUnique(SysUser user)
-    {
+    public boolean checkPhoneUnique(SysUser user) {
         Long userId = StringUtils.isNull(user.getId()) ? -1L : user.getId();
         SysUser info = userMapper.checkPhoneUnique(user.getPhone());
-        if (StringUtils.isNotNull(info) && info.getId().longValue() != userId.longValue())
-        {
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != userId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -261,8 +266,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * @return
      */
     @Override
-    public boolean checkEmailUnique(SysUser user)
-    {
+    public boolean checkEmailUnique(SysUser user) {
 //        Long userId = StringUtils.isNull(user.getId()) ? -1L : user.getId();
 //        SysUser info = userMapper.checkEmailUnique(user.getEmail());
 //        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
@@ -274,33 +278,28 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 校验用户是否允许操作
-     * 
+     *
      * @param user 用户信息
      */
     @Override
-    public void checkUserAllowed(SysUser user)
-    {
-        if (StringUtils.isNotNull(user.getId()) && user.isAdmin())
-        {
+    public void checkUserAllowed(SysUser user) {
+        if (StringUtils.isNotNull(user.getId()) && user.isAdmin()) {
             throw new ServiceException("不允许操作超级管理员用户");
         }
     }
 
     /**
      * 校验用户是否有数据权限
-     * 
+     *
      * @param userId 用户id
      */
     @Override
-    public void checkUserDataScope(Long userId)
-    {
-        if (!SysUser.isAdmin(SecurityUtils.getUserId()))
-        {
+    public void checkUserDataScope(Long userId) {
+        if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
             SysUser user = new SysUser();
             user.setId(userId);
             List<SysUser> users = userMapper.selectList(new QueryWrapper<>(user));
-            if (StringUtils.isEmpty(users))
-            {
+            if (StringUtils.isEmpty(users)) {
                 throw new ServiceException("没有权限访问用户数据！");
             }
         }
@@ -308,14 +307,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 新增保存用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int insertUser(SysUser user)
-    {
+    public int insertUser(SysUser user) {
+        user.setCreateTime(new Date());
         // 新增用户信息
         int rows = userMapper.insert(user);
         // 新增用户岗位关联
@@ -327,26 +326,24 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 注册用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
     @Override
-    public boolean registerUser(SysUser user)
-    {
+    public boolean registerUser(SysUser user) {
         return userMapper.insertUser(user) > 0;
     }
 
     /**
      * 修改保存用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int updateUser(SysUser user)
-    {
+    public int updateUser(SysUser user) {
         Long userId = user.getId();
         // 删除用户与角色关联
         userRoleMapper.deleteUserRoleByUserId(userId);
@@ -361,104 +358,94 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 用户授权角色
-     * 
-     * @param userId 用户ID
+     *
+     * @param userId  用户ID
      * @param roleIds 角色组
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertUserAuth(Long userId, Long[] roleIds)
-    {
+    public void insertUserAuth(Long userId, Long[] roleIds) {
         userRoleMapper.deleteUserRoleByUserId(userId);
         insertUserRole(userId, roleIds);
     }
 
     /**
      * 修改用户状态
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
     @Override
-    public int updateUserStatus(SysUser user)
-    {
+    public int updateUserStatus(SysUser user) {
         return userMapper.updateUser(user);
     }
 
     /**
      * 修改用户基本信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
     @Override
-    public int updateUserProfile(SysUser user)
-    {
+    public int updateUserProfile(SysUser user) {
         return userMapper.updateUser(user);
     }
 
     /**
      * 修改用户头像
-     * 
+     *
      * @param userName 用户名
-     * @param avatar 头像地址
+     * @param avatar   头像地址
      * @return 结果
      */
     @Override
-    public boolean updateUserAvatar(String userName, String avatar)
-    {
+    public boolean updateUserAvatar(String userName, String avatar) {
         return userMapper.updateUserAvatar(userName, avatar) > 0;
     }
 
     /**
      * 重置用户密码
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
     @Override
-    public int resetPwd(SysUser user)
-    {
+    public int resetPwd(SysUser user) {
         return userMapper.updateById(user);
     }
 
     /**
      * 重置用户密码
-     * 
+     *
      * @param userName 用户名
      * @param password 密码
      * @return 结果
      */
     @Override
-    public int resetUserPwd(String userName, String password)
-    {
+    public int resetUserPwd(String userName, String password) {
         return userMapper.resetUserPwd(userName, password);
     }
 
     /**
      * 新增用户角色信息
-     * 
+     *
      * @param user 用户对象
      */
-    public void insertUserRole(SysUser user)
-    {
+    public void insertUserRole(SysUser user) {
         this.insertUserRole(user.getId(), user.getRoleIds());
     }
 
     /**
      * 新增用户岗位信息
-     * 
+     *
      * @param user 用户对象
      */
-    public void insertUserPost(SysUser user)
-    {
+    public void insertUserPost(SysUser user) {
         Long[] posts = user.getRoleIds();
-        if (StringUtils.isNotEmpty(posts))
-        {
+        if (StringUtils.isNotEmpty(posts)) {
             // 新增用户与岗位管理
             List<SysUserPost> list = new ArrayList<SysUserPost>();
-            for (Long postId : posts)
-            {
+            for (Long postId : posts) {
                 SysUserPost up = new SysUserPost();
                 up.setUserId(user.getId());
                 up.setPostId(postId);
@@ -470,18 +457,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 新增用户角色信息
-     * 
-     * @param userId 用户ID
+     *
+     * @param userId  用户ID
      * @param roleIds 角色组
      */
-    public void insertUserRole(Long userId, Long[] roleIds)
-    {
-        if (StringUtils.isNotEmpty(roleIds))
-        {
+    public void insertUserRole(Long userId, Long[] roleIds) {
+        if (StringUtils.isNotEmpty(roleIds)) {
             // 新增用户与角色管理
             List<SysUserRole> list = new ArrayList<SysUserRole>();
-            for (Long roleId : roleIds)
-            {
+            for (Long roleId : roleIds) {
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(userId);
                 ur.setRoleId(roleId);
@@ -495,14 +479,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 通过用户ID删除用户
-     * 
+     *
      * @param userId 用户ID
      * @return 结果
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int deleteUserById(Long userId)
-    {
+    public int deleteUserById(Long userId) {
         // 删除用户与角色关联
         userRoleMapper.deleteUserRoleByUserId(userId);
         // 删除用户与岗位表
@@ -512,16 +495,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 批量删除用户信息
-     * 
+     *
      * @param userIds 需要删除的用户ID
      * @return 结果
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int deleteUserByIds(Long[] userIds)
-    {
-        for (Long userId : userIds)
-        {
+    public int deleteUserByIds(Long[] userIds) {
+        for (Long userId : userIds) {
             checkUserAllowed(new SysUser());
             checkUserDataScope(userId);
         }
@@ -534,17 +515,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 导入用户数据
-     * 
-     * @param userList 用户数据列表
+     *
+     * @param userList        用户数据列表
      * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
-     * @param operName 操作用户
+     * @param operName        操作用户
      * @return 结果
      */
     @Override
-    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
-    {
-        if (StringUtils.isNull(userList) || userList.size() == 0)
-        {
+    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
+        if (StringUtils.isNull(userList) || userList.size() == 0) {
             throw new ServiceException("导入用户数据不能为空！");
         }
         int successNum = 0;
@@ -552,23 +531,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
         String password = configService.selectConfigByKey("sys.user.initPassword");
-        for (SysUser user : userList)
-        {
-            try
-            {
+        for (SysUser user : userList) {
+            try {
                 // 验证是否存在这个用户
                 SysUser u = userMapper.selectUserByUserName(user.getUsername());
-                if (StringUtils.isNull(u))
-                {
+                if (StringUtils.isNull(u)) {
                     BeanValidators.validateWithException(validator, user);
                     user.setPassword(SecurityUtils.encryptPassword(password));
                     user.setCreateBy(operName);
                     userMapper.insertUser(user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUsername() + " 导入成功");
-                }
-                else if (isUpdateSupport)
-                {
+                } else if (isUpdateSupport) {
                     BeanValidators.validateWithException(validator, user);
                     checkUserAllowed(u);
                     checkUserDataScope(u.getId());
@@ -577,28 +551,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     userMapper.updateUser(user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUsername() + " 更新成功");
-                }
-                else
-                {
+                } else {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUsername() + " 已存在");
                 }
-            }
-            catch (Exception e)
-            {
+            } catch (Exception e) {
                 failureNum++;
                 String msg = "<br/>" + failureNum + "、账号 " + user.getUsername() + " 导入失败：";
                 failureMsg.append(msg + e.getMessage());
                 log.error(msg, e);
             }
         }
-        if (failureNum > 0)
-        {
+        if (failureNum > 0) {
             failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
             throw new ServiceException(failureMsg.toString());
-        }
-        else
-        {
+        } else {
             successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
         }
         return successMsg.toString();

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="avatar"       column="avatar"       />
         <result property="password"     column="password"     />
         <result property="status"       column="status"       />
-        <result property="delFlag"      column="del_flag"     />
+        <result property="deleted"      column="deleted"     />
         <result property="loginIp"      column="login_ip"     />
         <result property="loginDate"    column="login_date"   />
         <result property="createBy"     column="create_by"    />
@@ -69,27 +69,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
+        select u.id, u.dept_id, u.user_name, u.nick_name, u.avatar, u.phonenumber, u.password, u.sex, u.is_lock, u.deleted, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+        r.id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id
-		    left join sys_user_role ur on u.user_id = ur.user_id
-		    left join sys_role r on r.role_id = ur.role_id
+		    left join sys_user_role ur on u.id = ur.user_id
+		    left join sys_role r on r.id = ur.role_id
     </sql>
     
     <select id="selectUserList" parameterType="com.xunmei.system.api.domain.SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.is_lock, u.deleted, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
-		where u.del_flag = '0'
+		where u.deleted = '0'
 		<if test="userId != null and userId != 0">
-			AND u.user_id = #{userId}
+			AND u.id = #{userId}
 		</if>
 		<if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
 		<if test="status != null and status != ''">
-			AND u.status = #{status}
+			AND u.is_lock = #{isLock}
 		</if>
 		<if test="phonenumber != null and phonenumber != ''">
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
@@ -107,8 +107,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 	</select>
 	
-	<select id="selectAllocatedList" parameterType="com.xunmei.system.domain.vo.SysUserVO" resultMap="SysUserResult">
-		select distinct u.id as  id, u.dept_id as deptId, u.username as  username, u.phone as  phone, u.create_time as createTime
+	<select id="selectAllocatedList" parameterType="com.xunmei.system.domain.vo.SysUserVO" resultType="com.xunmei.system.domain.vo.SysUserVO">
+		select distinct u.name as name,u.is_lock as isLock, u.id as  id, u.dept_id as deptId, u.username as  username, u.phone as  phone, u.create_time as createTime
 		from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		left join sys_user_role ur on u.id = ur.user_id
@@ -124,19 +124,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 	</select>
 	
-	<select id="selectUnallocatedList" parameterType="com.xunmei.system.api.domain.SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+	<select id="selectUnallocatedList" parameterType="com.xunmei.system.domain.vo.SysUserVO" resultType="com.xunmei.system.domain.vo.SysUserVO">
+	    select distinct u.id, u.dept_id, u.username, u.name, u.phone, u.is_lock, u.create_time
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
-			 left join sys_user_role ur on u.user_id = ur.user_id
-			 left join sys_role r on r.role_id = ur.role_id
-	    where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
-	    and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
-	    <if test="userName != null and userName != ''">
-			AND u.user_name like concat('%', #{userName}, '%')
+			 left join sys_user_role ur on u.id = ur.user_id
+			 left join sys_role r on r.id = ur.role_id
+	    where u.deleted = 0 and (r.id != #{roleId} or r.id IS NULL)
+	    and u.id not in (select u.id from sys_user u inner join sys_user_role ur on u.id = ur.user_id and ur.role_id = #{roleId})
+	    <if test="username != null and username != ''">
+			AND u.username like concat('%', #{username}, '%')
 		</if>
-		<if test="phonenumber != null and phonenumber != ''">
-			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+		<if test="phone != null and phone != ''">
+			AND u.phone like concat('%', #{phone}, '%')
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
@@ -154,12 +154,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
-		where u.user_name = #{userName} and u.del_flag = '0'
+		where u.user_name = #{userName} and u.deleted = 0
 	</select>
 	
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
-		where u.user_id = #{userId}
+		where u.id = #{userId}
 	</select>
 	
 	<select id="checkUserNameUnique" parameterType="String" resultType="com.xunmei.system.api.domain.SysUser">
@@ -171,7 +171,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
+		select user_id, email from sys_user where email = #{email} and deleted = '0' limit 1
 	</select>
 	
 	<insert id="insertUser" parameterType="com.xunmei.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
@@ -240,7 +240,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
 	
 	<delete id="deleteUserById" parameterType="Long">
- 		update sys_user set del_flag = '2' where user_id = #{userId}
+ 		update sys_user set deleted = '2' where user_id = #{userId}
  	</delete>
  	
  	<delete id="deleteUserByIds" parameterType="Long">