代码及提示语优化

zd-auth/src/main/java/com/zd/auth/controller/TokenController.java

@@ -71,7 +71,7 @@ public class TokenController {
                 if (userR.getCode() == HttpStatus.SUCCESS && userR.getData() != null) {
                     userInfo = userR.getData();
                 } else {
-                    throw new ServiceException("系统异常");
+                    throw new ServiceException("服务未知异常，请稍后重试");
                 }
             } else {
                 throw new ServiceException("验证码不正确", 503);
@@ -229,7 +229,7 @@ public class TokenController {
             throw new ServiceException(user.getMsg());
         }
         if (StringUtils.isNull(user.getData())) {
-            return R.fail("登录用户不存在！");
+            return R.fail("账号信息不存在");
         }
         R<LoginUser> userResult = remoteUserService.getUserInfo(user.getData().getUserName(), aioType, SecurityConstants.INNER);
         if (R.FAIL == userResult.getCode() || 503 == userResult.getCode()) {
@@ -240,7 +240,7 @@ public class TokenController {
             userInfo.setLoginType(aioType);
             userInfo.setMachineCode(machineCode);
             if (userInfo.getSysUser() == null) {
-                return R.fail("登录用户不存在！");
+                return R.fail("账号信息不存在");
             }
             Map<String, Object> map = null;
             if (type == 1) {
@@ -271,7 +271,7 @@ public class TokenController {
             }
             return R.ok(map);
         } else {
-            return R.fail("登录用户不存在！");
+            return R.fail("账号信息不存在");
         }
     }
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysDeptManager.java

@@ -36,14 +36,11 @@ public class SysDeptManager {
     @Autowired
     RemoteLaboratoryService remoteLaboratoryService;
 
-//    @DataScope(deptAlias = "d")
+    //@DataScope(deptAlias = "d")
     @Deprecated
     public List<SysDeptListVO> querySysDeptListVO(SysDept dept) {
-
         List<SysDept> depts = deptMapper.selectDeptList(dept);
-
         //组合人数、实验室数量信息
-
         return joinDetailCount(depts);
     }
 
@@ -64,15 +61,11 @@ public class SysDeptManager {
         //因为现在楼栋和组织机构没有分开，并且在实验室使用两个字段存储（组织机构中院系和楼栋关系的改变会导致，实验室中院系与楼栋关系的不一致）
         //所以获取也分两种
         //2.1 查楼栋下的实验是
-
         //2.2 查院系下的实验室
-
         //3 组合对应数量到楼栋和院系
         //4 计算根节点的数量 ， 根节点的数量是院系数量之和
         //4.1 人员之和和实验室之和计算不一样 ，人员是下级加上自己的等于自己总的
         //4.2 实验室里院系不能加下级，因为下级是楼，院系的数量已经包括楼了，但是楼之上的节点需要求总
-
-
         //5 算球 ，直接交给前端计算 ，我只给出每个节点的数据（院系不找实验室数量，只要楼栋的实验室就可以解决这个问题） 这样最简单
         //存在的问题，如果数据权限不可见”楼栋“则没有实验室数量
         //5.1 查询本级人数
@@ -102,5 +95,4 @@ public class SysDeptManager {
         }).collect(Collectors.toList());
 
     }
-
 }

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysDeptServiceImpl.java

@@ -67,7 +67,6 @@ public class SysDeptServiceImpl implements ISysDeptService {
         }else{
             dept.setParentId(sysDept.getParentId());
         }
-
         List<SysDept> depts = deptMapper.treeselectByUser(dept);
         return depts;
     }
@@ -412,9 +411,6 @@ public class SysDeptServiceImpl implements ISysDeptService {
                 lineCompletion = true;
             }
         }
-//        if(lineCompletion){
-//
-//        }
         return 1;
     }
 
@@ -437,7 +433,6 @@ public class SysDeptServiceImpl implements ISysDeptService {
 
     @Override
     public SysDept updateDeptSign(SysDept dept) {
-
         SysDept sysDept = new SysDept();
         sysDept.setDeptId(dept.getDeptId());
         sysDept.setDeptSign(dept.getDeptSign());
@@ -451,10 +446,8 @@ public class SysDeptServiceImpl implements ISysDeptService {
      */
     @Override
     public Map<String, Object> queryDeptSignByUserId(Long userId) {
-
         String deptSignUrl = deptMapper.queryDeptSignByUserId(userId);
         Map<String, Object> map = new HashMap<>();
-
         map.put("isUpload", StringUtils.isNotBlank(deptSignUrl) ? true : false);
         map.put("deptSignUrl", deptSignUrl);
         return map;

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysPermissionServiceImpl.java

@@ -50,18 +50,16 @@ public class SysPermissionServiceImpl implements ISysPermissionService {
         if (SysUser.isAdmin(sysUser.getUserId())) {
             perms.add("*:*:*");
         } else {
-            if(UserConstants.USER_TYPE_STUDENT.equals(sysUser.getUserType())){
+            if (UserConstants.USER_TYPE_STUDENT.equals(sysUser.getUserType())) {
                 // TODO 学生权限暂处理，项目拆分之后需要删除
                 perms.addAll(menuService.selectMenuByStudent());
-            }else {
+            } else {
                 Set<String> data = menuService.selectNewMenuPermsByUserId(sysUser.getUserId());
 
-                if(data.size() == 0 && UserConstants.USER_TYPE_TEACHER.equals(sysUser.getUserType())){
+                if (data.size() == 0 && UserConstants.USER_TYPE_TEACHER.equals(sysUser.getUserType())) {
                     data = menuService.selectMenuByTeacher();
                 }
                 perms.addAll(data);
-                //perms.addAll(menuService.selectMenuPermsByUserId(userId));
-
             }
         }
         return perms;

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysPermitMenuServiceImpl.java

@@ -99,25 +99,22 @@ public class SysPermitMenuServiceImpl implements ISysPermitMenuService {
     @Override
     public List<SysPermitInfo> selectPerMitByUserId(SysUser sysUser) {
         List<SysPermitInfo> list;
-        if(UserConstants.USER_TYPE_SUPPLIER.equals(sysUser.getUserType())){
+        if (UserConstants.USER_TYPE_SUPPLIER.equals(sysUser.getUserType())) {
             return null;
-        }else if(UserConstants.USER_TYPE_STUDENT.equals(sysUser.getUserType())){
+        } else if (UserConstants.USER_TYPE_STUDENT.equals(sysUser.getUserType())) {
             list = sysPermitMenuMapper.selectPerMitByStudent();
-        }else {
+        } else {
             list = sysPermitMenuMapper.selectPerMitByUserId(sysUser.getUserId());
 
-            if(list.size() == 0 && UserConstants.USER_TYPE_TEACHER.equals(sysUser.getUserType())){
+            if (list.size() == 0 && UserConstants.USER_TYPE_TEACHER.equals(sysUser.getUserType())) {
                 list = sysPermitMenuMapper.selectPerMitByTeacher();
             }
         }
-
-        if(CollectionUtils.isEmpty(list) && !sysUser.isAdmin()){
-//            throw new PreAuthorizeException();
-            throw new ServiceException("用户未配置菜单权限，请联系管理员！", 530);
+        if (CollectionUtils.isEmpty(list) && !sysUser.isAdmin()) {
+            throw new ServiceException("无操作权限，请联系管理员", 530);
         }
-
         for (SysPermitInfo sysPermitInfo : list) {
-            if(sysPermitInfo.getDataScope() == 3 && sysUser.getDept().getDeptId() != null){
+            if (sysPermitInfo.getDataScope() == 3 && sysUser.getDept().getDeptId() != null) {
                 sysPermitInfo.getDeptIds().add(sysUser.getDept().getDeptId());
             }
         }
@@ -134,57 +131,50 @@ public class SysPermitMenuServiceImpl implements ISysPermitMenuService {
     @Override
     public void insertSysPermitMenuList(Long permitId, Long userId, List<SysPermitMenu> permitMenus) {
         List<Long> permitMenuIds;
-        if(permitId != null){
+        if (permitId != null) {
             permitMenuIds = sysPermitMenuMapper.selectIdByRelation(permitId, null);
             sysPermitMenuMapper.deleteSysPermitMenuByMenuId(null, permitId, null);
-            if(CollectionUtils.isNotEmpty(permitMenus)){
+            if (CollectionUtils.isNotEmpty(permitMenus)) {
                 permitMenus.forEach(p -> {
-                    if(p.getMenuId() == null || p.getDataScope() == null){
-                        throw new ServiceException("数据异常，菜单ID或者权限类型错误！");
+                    if (p.getMenuId() == null || p.getDataScope() == null) {
+                        throw new ServiceException("数据异常，菜单权限有误");
                     }
-                    if(p.getDataScope() == 3 && CollectionUtils.isEmpty(p.getDeptIds())){
-                        throw new ServiceException("权限数据异常，未选择指定部门！");
+                    if (p.getDataScope() == 3 && CollectionUtils.isEmpty(p.getDeptIds())) {
+                        throw new ServiceException("数据异常，未指定部门");
                     }
-
                     p.setType(1);
                     p.setPermitId(permitId);
-
                     p.setUserId(0L);
                 });
             }
-        }else if(userId != null){
+        } else if (userId != null) {
             permitMenuIds = sysPermitMenuMapper.selectIdByRelation(null, userId);
             sysPermitMenuMapper.deleteSysPermitMenuByMenuId(null, null, userId);
-            if(CollectionUtils.isNotEmpty(permitMenus)){
+            if (CollectionUtils.isNotEmpty(permitMenus)) {
                 permitMenus.forEach(p -> {
-                    if(p.getMenuId() == null || p.getDataScope() == null){
-                        throw new ServiceException("数据异常，菜单ID或者权限类型错误！");
+                    if (p.getMenuId() == null || p.getDataScope() == null) {
+                        throw new ServiceException("数据异常，菜单权限有误");
                     }
-
-                    if(p.getDataScope() == 3 && CollectionUtils.isEmpty(p.getDeptIds())){
-                        throw new ServiceException("权限数据异常，未选择指定部门！");
+                    if (p.getDataScope() == 3 && CollectionUtils.isEmpty(p.getDeptIds())) {
+                        throw new ServiceException("数据异常，未指定部门");
                     }
-
                     p.setType(2);
                     p.setUserId(userId);
-
                     p.setPermitId(0L);
-
                 });
             }
-        }else {
-            throw new ServiceException("参数异常：数据来源不明确！");
+        } else {
+            throw new ServiceException("未知的源数据");
         }
-
-        if(permitMenuIds.size() > 0){
+        if (permitMenuIds.size() > 0) {
             sysPermitMenuDeptMapper.deleteSysPermitMenuDeptByPermitMenuIds(permitMenuIds.toArray(new Long[permitMenuIds.size()]));
         }
-        if(CollectionUtils.isNotEmpty(permitMenus)){
+        if (CollectionUtils.isNotEmpty(permitMenus)) {
             sysPermitMenuMapper.insertBatch(permitMenus);
 
             List<SysPermitMenuDept> permitMenuDeptList = new ArrayList<>();
             for (SysPermitMenu permitMenu : permitMenus) {
-                if(permitMenu.getDataScope() == 3){
+                if (permitMenu.getDataScope() == 3) {
                     for (Long deptId : permitMenu.getDeptIds()) {
                         SysPermitMenuDept permitMenuDept = new SysPermitMenuDept();
                         permitMenuDept.setPermitMenuId(permitMenu.getId());
@@ -193,10 +183,9 @@ public class SysPermitMenuServiceImpl implements ISysPermitMenuService {
                     }
                 }
             }
-            if(permitMenuDeptList.size() > 0){
+            if (permitMenuDeptList.size() > 0) {
                 sysPermitMenuDeptMapper.insertBatch(permitMenuDeptList);
             }
         }
-
     }
 }

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysPermitServiceImpl.java

@@ -38,9 +38,8 @@ public class SysPermitServiceImpl implements ISysPermitService {
     public SysPermit selectSysPermitById(Long id) {
         SysPermit permit = sysPermitMapper.selectSysPermitById(id);
         if(permit == null){
-            throw new ServiceException("数据不存在，或者参数无效，请刷新重试！");
+            throw new ServiceException("数据不存在");
         }
-
         SysPermitMenu sysPermitMenu = new SysPermitMenu();
         sysPermitMenu.setPermitId(permit.getId());
         sysPermitMenu.setType(1);
@@ -79,9 +78,7 @@ public class SysPermitServiceImpl implements ISysPermitService {
         //设置其他公共字段
         SaveUtil.setCommonAttr(sysPermit);
         sysPermitMapper.insertSysPermit(sysPermit);
-
         sysPermitMenuService.insertSysPermitMenuList(sysPermit.getId(), null, sysPermit.getPermitMenus());
-
         return sysPermit;
     }
 
@@ -96,7 +93,6 @@ public class SysPermitServiceImpl implements ISysPermitService {
     public SysPermit updateSysPermit(SysPermit sysPermit) {
         sysPermit.setUpdateTime(DateUtils.getNowDate());
         sysPermit.setUpdateBy(SecurityUtils.getUsername());
-
         sysPermitMapper.updateSysPermit(sysPermit);
         sysPermitMenuService.insertSysPermitMenuList(sysPermit.getId(), null, sysPermit.getPermitMenus());
         return sysPermit;

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

@@ -169,13 +169,11 @@ public class SysRoleServiceImpl implements ISysRoleService {
      */
     @Override
     public void checkRoleAllowed(SysRole role) {
-        if (StringUtils.isNotNull(role.getRoleId())) {
-
-            if (SecurityUtils.getUserId() != 1 && role.getRoleId() == 2) {
-                throw new ServiceException("不允许操作管理员角色");
-            }
-            if (role.isAdmin()) {
-                throw new ServiceException("不允许操作超级管理员角色");
+        if (role.getRoleId() != null) {
+            if ((SecurityUtils.getUserId() != 1 && role.getRoleId() == 2)
+                    || role.isAdmin()) {
+                //不允许操作管理员角色  或  不允许操作超级管理员角色
+                throw new ServiceException("不允许操作");
             }
         }
     }
@@ -379,14 +377,14 @@ public class SysRoleServiceImpl implements ISysRoleService {
     @Override
     public Map<String, Object> selectAuthUserPower(Long userId) {
         // 1.0 需求
-//        userRoleMapper.selectAuthUserPower(SecurityUtils.getUserId());
-//        List<SysRole> role = roleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
+        //userRoleMapper.selectAuthUserPower(SecurityUtils.getUserId());
+        //List<SysRole> role = roleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
 
         // 2.0 需求
-//         List<Map<String, Object>> map = deptMapper.selectLayoutOrderByUserId(SecurityUtils.getUserId());
+        //List<Map<String, Object>> map = deptMapper.selectLayoutOrderByUserId(SecurityUtils.getUserId());
 
         // 2.4 需求 查询是校级1 还是院级 2
-//        Integer type = userId == 1 ? 1: userRoleMapper.selectLevelByUserId(userId);
+        //Integer type = userId == 1 ? 1: userRoleMapper.selectLevelByUserId(userId);
 
         // 2.6 权限变更 属于校级权限，其他则院级权限 必须是教职工
         Integer type = deptMapper.selectLevelByUserId(userId) > 0 ? 1 : 2;

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysStudentServiceImpl.java

@@ -91,29 +91,29 @@ public class SysStudentServiceImpl implements ISysStudentService {
 
         List<SysMajor> sysMajorList = sysMajorMapper.selectSysMajorList(new SysMajor());
         Optional.ofNullable(sysUserList).orElseGet(Collections::emptyList)
-                .stream().forEach(a->{
+                .stream().forEach(a -> {
             Optional.ofNullable(proDictDatas).orElseGet(Collections::emptyList)
-                    .stream().forEach(b->{
-                    if(b.getDictValue().equals(a.getCategory())){
-                        a.setCategory(b.getDictLabel());
-                    }
+                    .stream().forEach(b -> {
+                if (b.getDictValue().equals(a.getCategory())) {
+                    a.setCategory(b.getDictLabel());
+                }
             });
             Optional.ofNullable(edDictDatas).orElseGet(Collections::emptyList)
-                    .stream().forEach(b->{
-                if(b.getDictValue().equals(a.getEducation())){
+                    .stream().forEach(b -> {
+                if (b.getDictValue().equals(a.getEducation())) {
                     a.setEducation(b.getDictLabel());
                 }
             });
             Optional.ofNullable(stDictDatas).orElseGet(Collections::emptyList)
-                    .stream().forEach(b->{
-                if(b.getDictValue().equals(a.getWorkStatus())){
+                    .stream().forEach(b -> {
+                if (b.getDictValue().equals(a.getWorkStatus())) {
                     a.setWorkStatus(b.getDictLabel());
                 }
             });
 
             Optional.ofNullable(sysMajorList).orElseGet(Collections::emptyList)
-                    .stream().forEach(b->{
-                if(b.getId()==a.getMajorId()){
+                    .stream().forEach(b -> {
+                if (b.getId() == a.getMajorId()) {
                     a.setMajor(b.getMajorName());
                 }
             });
@@ -282,14 +282,10 @@ public class SysStudentServiceImpl implements ISysStudentService {
      */
     @Override
     public void checkUserAllowed(SysUser user) {
-        if (StringUtils.isNotNull(user.getUserId())) {
-
-            if (SecurityUtils.getUserId() != 1 && user.getUserId() == 2) {
-                throw new ServiceException("不允许操作管理员用户");
-            }
-
-            if (user.isAdmin()) {
-                throw new ServiceException("不允许操作超级管理员用户");
+        if (user.getUserId() != null) {
+            if ((SecurityUtils.getUserId() != 1 && user.getUserId() == 2) || user.isAdmin()) {
+                //不允许操作管理员用户 或 不允许操作超级管理员用户
+                throw new ServiceException("不允许操作");
             }
         }
     }
@@ -304,31 +300,29 @@ public class SysStudentServiceImpl implements ISysStudentService {
     @Transactional
     public int insertUser(SysUser user) {
         //将10进制卡号转换至16进制
-        if(StringUtils.isNotEmpty(user.getCardNum())){
-            if(StringUtils.isNumeric(user.getCardNum())){
+        if (StringUtils.isNotEmpty(user.getCardNum())) {
+            if (StringUtils.isNumeric(user.getCardNum())) {
                 Long carNum10 = Long.parseLong(user.getCardNum());
                 String carNum16 = carNum10.toHexString(carNum10).toUpperCase();
                 user.setCardNum(carNum16);
-            }else{
+            } else {
                 throw new ServiceException("卡号只能是数字，不能包含字母！");
             }
-
-        }else{
+        } else {
             user.setCardNum(null);
         }
-
         // 新增用户信息
         int rows = userMapper.insertUser(user);
         //处理Object 转换实体类
-        List <Object> permitMenus = user.getPermitMenus();
+        List<Object> permitMenus = user.getPermitMenus();
         List<SysPermitMenu> newPermitMenus = new ArrayList<>();
-        for(Object obj:permitMenus){
-            SysPermitMenu sysPermitMenu = JSONArray.parseObject(JSONArray.toJSONString(obj),SysPermitMenu.class);
+        for (Object obj : permitMenus) {
+            SysPermitMenu sysPermitMenu = JSONArray.parseObject(JSONArray.toJSONString(obj), SysPermitMenu.class);
             newPermitMenus.add(sysPermitMenu);
         }
-        if(newPermitMenus.size()>0){
+        if (newPermitMenus.size() > 0) {
             // 插入最新用户绑定的权限数据
-            sysPermitMenuService.insertSysPermitMenuList(null,user.getUserId(),newPermitMenus);
+            sysPermitMenuService.insertSysPermitMenuList(null, user.getUserId(), newPermitMenus);
         }
         // 新增用户岗位关联
         insertUserPost(user);
@@ -368,19 +362,19 @@ public class SysStudentServiceImpl implements ISysStudentService {
         insertUserPost(user);
         try {
             //将10进制卡号转换至16进制
-            if(StringUtils.isNotEmpty(user.getCardNum())){
-                if(StringUtils.isNumeric(user.getCardNum())){
+            if (StringUtils.isNotEmpty(user.getCardNum())) {
+                if (StringUtils.isNumeric(user.getCardNum())) {
                     Long carNum10 = Long.parseLong(user.getCardNum());
                     String carNum16 = carNum10.toHexString(carNum10).toUpperCase();
                     user.setCardNum(carNum16);
-                }else{
+                } else {
                     throw new ServiceException("卡号只能是数字，不能包含字母！");
                 }
-            }else{
+            } else {
                 user.setCardNum(null);
             }
             return userMapper.updateUser(user);
-        }catch (DuplicateKeyException e){
+        } catch (DuplicateKeyException e) {
             throw new ServiceException("卡号已经存在，保存失败！");
         }
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysTeacherServiceImpl.java

@@ -263,14 +263,10 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
      */
     @Override
     public void checkUserAllowed(SysUser user) {
-        if (StringUtils.isNotNull(user.getUserId())) {
-
-            if (SecurityUtils.getUserId() != 1 && user.getUserId() == 2) {
-                throw new ServiceException("不允许操作管理员用户");
-            }
-
-            if (user.isAdmin()) {
-                throw new ServiceException("不允许操作超级管理员用户");
+        if (user.getUserId() != null) {
+            if ((SecurityUtils.getUserId() != 1 && user.getUserId() == 2) || user.isAdmin()) {
+                //不允许操作管理员用户 或 不允许操作超级管理员用户
+                throw new ServiceException("不允许操作");
             }
         }
     }

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysUrlConfigServiceImpl.java

@@ -45,7 +45,6 @@ public class SysUrlConfigServiceImpl implements SysUrlConfigService {
         if(list.size() > 0){
             return list.get(0);
         }
-
         return new SysUrlConfig();
     }
 
@@ -69,11 +68,10 @@ public class SysUrlConfigServiceImpl implements SysUrlConfigService {
      */
     @Override
     public SysUrlConfig update(SysUrlConfig sysUrlConfig) {
-
-        if(sysUrlConfig.getId() == null){
+        if (sysUrlConfig.getId() == null) {
             SaveUtil.setCommonAttr(sysUrlConfig);
             this.sysUrlConfigDao.insert(sysUrlConfig);
-        }else {
+        } else {
             sysUrlConfig.setUpdateBy(SecurityUtils.getUsername());
             sysUrlConfig.setUpdateTime(DateUtils.getNowDate());
             this.sysUrlConfigDao.update(sysUrlConfig);

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

@@ -260,14 +260,10 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     public void checkUserAllowed(SysUser user) {
-        if (StringUtils.isNotNull(user.getUserId())) {
-
-            if (SecurityUtils.getUserId() != 1 && user.getUserId() == 2) {
-                throw new ServiceException("不允许操作管理员用户");
-            }
-
-            if (user.isAdmin()) {
-                throw new ServiceException("不允许操作超级管理员用户");
+        if (user.getUserId() != null) {
+            if ((SecurityUtils.getUserId() != 1 && user.getUserId() == 2) || user.isAdmin()) {
+                //不允许操作管理员用户 或 不允许操作超级管理员用户
+                throw new ServiceException("不允许操作");
             }
         }
     }
@@ -282,19 +278,17 @@ public class SysUserServiceImpl implements ISysUserService {
     @Transactional
     public int insertUser(SysUser user) {
         //将10进制卡号转换至16进制
-        if(StringUtils.isNotEmpty(user.getCardNum())){
-            if(StringUtils.isNumeric(user.getCardNum())){
+        if (StringUtils.isNotEmpty(user.getCardNum())) {
+            if (StringUtils.isNumeric(user.getCardNum())) {
                 Long carNum10 = Long.parseLong(user.getCardNum());
                 String carNum16 = carNum10.toHexString(carNum10).toUpperCase();
                 user.setCardNum(carNum16);
-            }else{
+            } else {
                 throw new ServiceException("卡号只能是数字，不能包含字母！");
             }
-
-        }else{
+        } else {
             user.setCardNum(null);
         }
-
         // 新增用户信息
         int rows = userMapper.insertUser(user);
         //处理Object 转换实体类
@@ -678,22 +672,21 @@ public class SysUserServiceImpl implements ISysUserService {
         return failSysUserList;
     }
 
-    private void flowLineCheck(SysUserTeaCherByExcel user, List<SysUserTeaCherByExcel> failSysUserList, String password, SysUserTeaCherByExcel sysUserTeaCherByExcel){
+    private void flowLineCheck(SysUserTeaCherByExcel user, List<SysUserTeaCherByExcel> failSysUserList, String password, SysUserTeaCherByExcel sysUserTeaCherByExcel) {
         // 校验是否装入错误数据
         boolean checkBox = true;
 
         //验证必填字段是否为空
-        if(StringUtils.isEmpty(user.getNickName())){
-            if(checkBox){
+        if (StringUtils.isEmpty(user.getNickName())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
             }
             user.getFailRemark().append("姓名不能为空,");
         }
-
-        if(StringUtils.isEmpty(user.getUserName())){
-            if(checkBox){
+        if (StringUtils.isEmpty(user.getUserName())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -701,8 +694,8 @@ public class SysUserServiceImpl implements ISysUserService {
             user.getFailRemark().append("工号不能为空,");
         }
 
-        if(StringUtils.isEmpty(user.getDeptName())){
-            if(checkBox){
+        if (StringUtils.isEmpty(user.getDeptName())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -710,8 +703,8 @@ public class SysUserServiceImpl implements ISysUserService {
             user.getFailRemark().append("所在部门不能为空,");
         }
 
-        if(StringUtils.isEmpty(user.getPistionName())){
-            if(checkBox){
+        if (StringUtils.isEmpty(user.getPistionName())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -719,21 +712,19 @@ public class SysUserServiceImpl implements ISysUserService {
             user.getFailRemark().append("身份不能为空,");
         }
 
-        if(StringUtils.isNotEmpty(user.getCardNum()) && !StringUtils.isNumeric(user.getCardNum())){
-            if(checkBox){
+        if (StringUtils.isNotEmpty(user.getCardNum()) && !StringUtils.isNumeric(user.getCardNum())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
             }
             user.getFailRemark().append("卡号只能为数字,");
         }
-
-
         // 验证是否存在这个用户
         SysUser checkUser = userMapper.selectUserByUserName(user.getUserName());
         if (StringUtils.isNotNull(user.getUserName()) && StringUtils.isNotNull(checkUser)) {
-            if(!sysUserTeaCherByExcel.getUpDate()){
-                if(checkBox){
+            if (!sysUserTeaCherByExcel.getUpDate()) {
+                if (checkBox) {
                     user.getFailRemark().append("失败：");
                     failSysUserList.add(user);
                     checkBox = false;
@@ -744,7 +735,7 @@ public class SysUserServiceImpl implements ISysUserService {
         // 验证部门是否存在
         SysDept checkDept = deptMapper.getDeptNameUnique(user.getDeptName());
         if (StringUtils.isNotEmpty(user.getDeptName()) && StringUtils.isNull(checkDept)) {
-            if(checkBox){
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -753,20 +744,20 @@ public class SysUserServiceImpl implements ISysUserService {
         }
         //联系电话重复
         SysUser info = null;
-        if(StringUtils.isNotNull(checkUser) && sysUserTeaCherByExcel.getUpDate()){
-            if(StringUtils.isNotEmpty(user.getPhonenumber())){
+        if (StringUtils.isNotNull(checkUser) && sysUserTeaCherByExcel.getUpDate()) {
+            if (StringUtils.isNotEmpty(user.getPhonenumber())) {
                 SysUser userInfo = new SysUser();
                 userInfo.setUserName(checkUser.getUserName());
                 userInfo.setPhonenumber(user.getPhonenumber());
                 info = userMapper.checkPhoneUniqueNotOwn(userInfo);
             }
-        }else{
-            if(StringUtils.isNull(checkUser) && StringUtils.isNotEmpty(user.getPhonenumber())){
+        } else {
+            if (StringUtils.isNull(checkUser) && StringUtils.isNotEmpty(user.getPhonenumber())) {
                 info = userMapper.checkPhoneUnique(user.getPhonenumber());
             }
         }
-        if(StringUtils.isNotNull(info)){
-            if(checkBox){
+        if (StringUtils.isNotNull(info)) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -777,7 +768,7 @@ public class SysUserServiceImpl implements ISysUserService {
         //身份是否存在
         SysPost sysPost = postMapper.checkPostNameUnique(user.getPistionName());
         if (StringUtils.isNotEmpty(user.getPistionName()) && StringUtils.isNull(sysPost)) {
-            if(checkBox){
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -785,14 +776,14 @@ public class SysUserServiceImpl implements ISysUserService {
             user.getFailRemark().append("身份不存在,");
         }
         //日期格式转换
-        if(StringUtils.isNotNull(user.getDateBirth())){
+        if (StringUtils.isNotNull(user.getDateBirth())) {
             Date time = user.getDateBirth();
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-            try{
+            try {
                 int year = time.getYear();
                 int month = time.getMonth();
                 int date = time.getDate();
-                if(year > new Date().getYear()-15) {
+                if (year > new Date().getYear() - 15) {
                     if (checkBox) {
                         user.getFailRemark().append("失败：");
                         failSysUserList.add(user);
@@ -800,7 +791,7 @@ public class SysUserServiceImpl implements ISysUserService {
                     }
                     user.getFailRemark().append("出生日期异常最少应大于15岁,");
                 }
-            }catch (Exception e){
+            } catch (Exception e) {
                 if (checkBox) {
                     user.getFailRemark().append("失败：");
                     failSysUserList.add(user);
@@ -810,29 +801,28 @@ public class SysUserServiceImpl implements ISysUserService {
                 log.error("日期格式错误");
             }
         }
-
         //插入正确数据
-        if(StringUtils.isEmpty(user.getFailRemark())){
+        if (StringUtils.isEmpty(user.getFailRemark())) {
             SysUser newSysUser = new SysUser();
             newSysUser.setNickName(user.getNickName());
             newSysUser.setUserName(user.getUserName());
             newSysUser.setDeptId(checkDept.getDeptId());
-            newSysUser.setPosition(sysPost.getPostId()+"");
+            newSysUser.setPosition(sysPost.getPostId() + "");
             newSysUser.setPhonenumber(user.getPhonenumber());
             newSysUser.setEmail(user.getEmail());
             newSysUser.setUserType("11");
             newSysUser.setSex(user.getSex());
             newSysUser.setDateBirth(user.getDateBirth());
             newSysUser.setCardNum(user.getCardNum());
-            if(!sysUserTeaCherByExcel.getSysUserEnable()){
-                newSysUser.setStatus(1+"");
+            if (!sysUserTeaCherByExcel.getSysUserEnable()) {
+                newSysUser.setStatus(1 + "");
             }
             newSysUser.setPassword(SecurityUtils.encryptPassword(password));
             newSysUser.setCreateBy(tokenService.getLoginUser().getNickName());
-            if(StringUtils.isNotNull(checkUser)){
+            if (StringUtils.isNotNull(checkUser)) {
                 newSysUser.setUserId(checkUser.getUserId());
                 this.updateUser(newSysUser);
-            }else{
+            } else {
                 this.insertUser(newSysUser);
             }
         }
@@ -855,19 +845,19 @@ public class SysUserServiceImpl implements ISysUserService {
         String password = configService.selectConfigByKey("sys.user.initPassword");
         for (SysUserStudentByExcel user : userList) {
             //流水线验证
-            flowLineCheckByStudent(user,failSysUserList,password, sysUserStudentByExcel);
+            flowLineCheckByStudent(user, failSysUserList, password, sysUserStudentByExcel);
         }
         return failSysUserList;
     }
 
 
-    private void flowLineCheckByStudent(SysUserStudentByExcel user, List<SysUserStudentByExcel> failSysUserList, String password, SysUserStudentByExcel sysUserStudentByExcel){
+    private void flowLineCheckByStudent(SysUserStudentByExcel user, List<SysUserStudentByExcel> failSysUserList, String password, SysUserStudentByExcel sysUserStudentByExcel) {
         // 校验是否装入错误数据
         Boolean checkBox = true;
 
         //验证必填字段是否为空
-        if(StringUtils.isEmpty(user.getNickName())){
-            if(checkBox){
+        if (StringUtils.isEmpty(user.getNickName())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -875,8 +865,8 @@ public class SysUserServiceImpl implements ISysUserService {
             user.getFailRemark().append("姓名不能为空,");
         }
 
-        if(StringUtils.isEmpty(user.getUserName())){
-            if(checkBox){
+        if (StringUtils.isEmpty(user.getUserName())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -884,8 +874,8 @@ public class SysUserServiceImpl implements ISysUserService {
             user.getFailRemark().append("学号不能为空,");
         }
 
-        if(StringUtils.isEmpty(user.getDeptName())){
-            if(checkBox){
+        if (StringUtils.isEmpty(user.getDeptName())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -893,8 +883,8 @@ public class SysUserServiceImpl implements ISysUserService {
             user.getFailRemark().append("所属学院不能为空,");
         }
 
-        if(StringUtils.isEmpty(user.getMajor())){
-            if(checkBox){
+        if (StringUtils.isEmpty(user.getMajor())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -902,8 +892,8 @@ public class SysUserServiceImpl implements ISysUserService {
             user.getFailRemark().append("专业不能为空,");
         }
 
-        if(StringUtils.isNotEmpty(user.getCardNum()) && !StringUtils.isNumeric(user.getCardNum())){
-            if(checkBox){
+        if (StringUtils.isNotEmpty(user.getCardNum()) && !StringUtils.isNumeric(user.getCardNum())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -914,8 +904,8 @@ public class SysUserServiceImpl implements ISysUserService {
         // 验证是否存在这个用户
         SysUser checkUser = userMapper.selectUserByUserName(user.getUserName());
         if (StringUtils.isNotEmpty(user.getUserName()) && StringUtils.isNotNull(checkUser)) {
-            if(!sysUserStudentByExcel.getUpDate()){
-                if(checkBox){
+            if (!sysUserStudentByExcel.getUpDate()) {
+                if (checkBox) {
                     user.getFailRemark().append("失败：");
                     failSysUserList.add(user);
                     checkBox = false;
@@ -926,7 +916,7 @@ public class SysUserServiceImpl implements ISysUserService {
         // 验证部门是否存在
         SysDept checkDept = deptMapper.getDeptNameUnique(user.getDeptName());
         if (StringUtils.isNotEmpty(user.getDeptName()) && StringUtils.isNull(checkDept)) {
-            if(checkBox){
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -935,31 +925,30 @@ public class SysUserServiceImpl implements ISysUserService {
         }
         //联系电话重复
         SysUser info = null;
-        if(StringUtils.isNotNull(checkUser) && sysUserStudentByExcel.getUpDate()){
+        if (StringUtils.isNotNull(checkUser) && sysUserStudentByExcel.getUpDate()) {
             SysUser userInfo = new SysUser();
             userInfo.setUserName(checkUser.getUserName());
             userInfo.setPhonenumber(user.getPhonenumber());
             info = userMapper.checkPhoneUniqueNotOwn(userInfo);
-        }else{
-            if(StringUtils.isNull(checkUser) && StringUtils.isNotEmpty(user.getPhonenumber())){
+        } else {
+            if (StringUtils.isNull(checkUser) && StringUtils.isNotEmpty(user.getPhonenumber())) {
                 info = userMapper.checkPhoneUnique(user.getPhonenumber());
             }
         }
-        if(StringUtils.isNotNull(info)){
-            if(checkBox){
+        if (StringUtils.isNotNull(info)) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
             }
             user.getFailRemark().append("联系电话重复,");
         }
-
         //专业是否存在
         SysMajor sysMajor = new SysMajor();
         sysMajor.setMajorName(user.getMajor());
         List<SysMajor> sysMajorList = sysMajorMapper.selectSysMajorList(sysMajor);
-        if (sysMajorList.size()==0) {
-            if(checkBox){
+        if (sysMajorList.size() == 0) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -967,15 +956,15 @@ public class SysUserServiceImpl implements ISysUserService {
             user.getFailRemark().append("专业不存在,");
         }
         //日期格式转换
-        if(StringUtils.isNotNull(user.getDateBirth())){
+        if (StringUtils.isNotNull(user.getDateBirth())) {
             Date time = user.getDateBirth();
-            if(StringUtils.isNotNull(time)){
+            if (StringUtils.isNotNull(time)) {
                 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                try{
+                try {
                     int year = time.getYear();
                     int month = time.getMonth();
                     int date = time.getDate();
-                    if(year > new Date().getYear()-15) {
+                    if (year > new Date().getYear() - 15) {
                         if (checkBox) {
                             user.getFailRemark().append("失败：");
                             failSysUserList.add(user);
@@ -983,7 +972,7 @@ public class SysUserServiceImpl implements ISysUserService {
                         }
                         user.getFailRemark().append("出生日期异常最少应大于15岁,");
                     }
-                }catch (Exception e){
+                } catch (Exception e) {
                     if (checkBox) {
                         user.getFailRemark().append("失败：");
                         failSysUserList.add(user);
@@ -994,15 +983,13 @@ public class SysUserServiceImpl implements ISysUserService {
                 }
             }
         }
-
         // 验证是否存在这个导师,如果通过名字查出两个或以上的，则不绑定老师
         List<SysUser> sysUserByTeacherList = userMapper.selectUserByNickName(user.getTutorUserName());
-        if(sysUserByTeacherList.size()==1){
+        if (sysUserByTeacherList.size() == 1) {
             user.setTutorUserId(sysUserByTeacherList.get(0).getUserId());
         }
-
         //插入正确数据
-        if(StringUtils.isEmpty(user.getFailRemark())){
+        if (StringUtils.isEmpty(user.getFailRemark())) {
             SysUser newSysUser = new SysUser();
             newSysUser.setNickName(user.getNickName());
             newSysUser.setUserName(user.getUserName());
@@ -1014,18 +1001,18 @@ public class SysUserServiceImpl implements ISysUserService {
             newSysUser.setSex(user.getSex());
             newSysUser.setDateBirth(user.getDateBirth());
             newSysUser.setCardNum(user.getCardNum());
-            if(!sysUserStudentByExcel.getSysUserEnable()){
-                newSysUser.setStatus(1+"");
+            if (!sysUserStudentByExcel.getSysUserEnable()) {
+                newSysUser.setStatus(1 + "");
             }
             newSysUser.setPassword(SecurityUtils.encryptPassword(password));
             newSysUser.setCreateBy(tokenService.getLoginUser().getNickName());
-            if(StringUtils.isNotNull(user.getTutorUserId())){
-                newSysUser.setTutorUserId(Integer.parseInt(user.getTutorUserId()+""));
+            if (StringUtils.isNotNull(user.getTutorUserId())) {
+                newSysUser.setTutorUserId(Integer.parseInt(user.getTutorUserId() + ""));
             }
-            if(StringUtils.isNotNull(checkUser)){
+            if (StringUtils.isNotNull(checkUser)) {
                 newSysUser.setUserId(checkUser.getUserId());
                 this.updateUser(newSysUser);
-            }else{
+            } else {
                 this.insertUser(newSysUser);
             }
         }

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/TeacherServiceImpl.java

@@ -33,7 +33,7 @@ public class TeacherServiceImpl {
      * @return
      */
     public void queryTeacherSuBCount(List<SysUser> list) {
-        if (CollUtil.isEmpty(list)) return ;
+        if (CollUtil.isEmpty(list)) return;
         final Map<Long, List<LabSubjectEntityVO>> collect = new HashMap<>();
         if (CollUtil.isNotEmpty(list)) {
             //得到ids
@@ -44,17 +44,5 @@ public class TeacherServiceImpl {
                 collect.putAll(infoByUserIds.getData().stream().collect(Collectors.groupingBy(LabSubjectEntityVO::getAdminId)));
             }
         }
-        /*list.stream().forEach(a -> {
-            if (collect.containsKey(a.getUserId())) {
-                a.setManageSubCount(collect.get(a.getUserId()).size());
-            } else {
-                a.setManageSubCount(0);
-            }
-        });*/
-
-
-
     }
-
-
 }