|
@@ -1,13 +1,18 @@
|
|
package com.fs.company.controller;
|
|
package com.fs.company.controller;
|
|
|
|
|
|
-import java.util.Date;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
-
|
|
|
|
import cn.hutool.json.JSONUtil;
|
|
import cn.hutool.json.JSONUtil;
|
|
|
|
+import com.fs.common.annotation.Log;
|
|
|
|
+import com.fs.common.constant.UserConstants;
|
|
|
|
+import com.fs.common.core.controller.BaseController;
|
|
|
|
+import com.fs.common.core.domain.AjaxResult;
|
|
import com.fs.common.core.domain.R;
|
|
import com.fs.common.core.domain.R;
|
|
-
|
|
|
|
|
|
+import com.fs.common.core.page.TableDataInfo;
|
|
|
|
+import com.fs.common.enums.BusinessType;
|
|
import com.fs.common.utils.DomainUtil;
|
|
import com.fs.common.utils.DomainUtil;
|
|
|
|
+import com.fs.common.utils.PatternUtils;
|
|
|
|
+import com.fs.common.utils.ServletUtils;
|
|
|
|
+import com.fs.common.utils.StringUtils;
|
|
|
|
+import com.fs.common.utils.poi.ExcelUtil;
|
|
import com.fs.company.domain.*;
|
|
import com.fs.company.domain.*;
|
|
import com.fs.company.param.CompanyUserAreaParam;
|
|
import com.fs.company.param.CompanyUserAreaParam;
|
|
import com.fs.company.param.CompanyUserQwParam;
|
|
import com.fs.company.param.CompanyUserQwParam;
|
|
@@ -15,27 +20,20 @@ import com.fs.company.service.*;
|
|
import com.fs.company.vo.CompanyUserQwListVO;
|
|
import com.fs.company.vo.CompanyUserQwListVO;
|
|
import com.fs.company.vo.CompanyUserVO;
|
|
import com.fs.company.vo.CompanyUserVO;
|
|
import com.fs.core.security.LoginUser;
|
|
import com.fs.core.security.LoginUser;
|
|
|
|
+import com.fs.core.security.SecurityUtils;
|
|
import com.fs.core.web.service.TokenService;
|
|
import com.fs.core.web.service.TokenService;
|
|
import com.fs.course.config.CourseConfig;
|
|
import com.fs.course.config.CourseConfig;
|
|
-import com.fs.qw.vo.CompanyUserQwVO;
|
|
|
|
-import com.fs.qw.vo.QwUserVO;
|
|
|
|
import com.fs.his.vo.OptionsVO;
|
|
import com.fs.his.vo.OptionsVO;
|
|
|
|
+import com.fs.qw.vo.QwUserVO;
|
|
import com.fs.system.service.ISysConfigService;
|
|
import com.fs.system.service.ISysConfigService;
|
|
-import com.fs.system.vo.DictVO;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
-import com.fs.common.annotation.Log;
|
|
|
|
-import com.fs.common.constant.UserConstants;
|
|
|
|
-import com.fs.common.core.controller.BaseController;
|
|
|
|
-import com.fs.common.core.domain.AjaxResult;
|
|
|
|
-import com.fs.common.core.page.TableDataInfo;
|
|
|
|
-import com.fs.common.enums.BusinessType;
|
|
|
|
-import com.fs.core.security.SecurityUtils;
|
|
|
|
-import com.fs.common.utils.ServletUtils;
|
|
|
|
-import com.fs.common.utils.StringUtils;
|
|
|
|
-import com.fs.common.utils.poi.ExcelUtil;
|
|
|
|
|
|
+
|
|
|
|
+import java.util.Date;
|
|
|
|
+import java.util.List;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -175,6 +173,10 @@ public class CompanyUserController extends BaseController
|
|
@PostMapping
|
|
@PostMapping
|
|
public AjaxResult add(@Validated @RequestBody CompanyUser user)
|
|
public AjaxResult add(@Validated @RequestBody CompanyUser user)
|
|
{
|
|
{
|
|
|
|
+ if (!PatternUtils.checkPassword(user.getPassword())) {
|
|
|
|
+ return AjaxResult.error("密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
|
|
|
|
+ }
|
|
|
|
+
|
|
//判断用户数量是否已达到上线
|
|
//判断用户数量是否已达到上线
|
|
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
|
|
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
|
|
Integer count=companyUserService.selectCompanyUserCountByCompanyId(loginUser.getCompany().getCompanyId());
|
|
Integer count=companyUserService.selectCompanyUserCountByCompanyId(loginUser.getCompany().getCompanyId());
|
|
@@ -240,6 +242,9 @@ public class CompanyUserController extends BaseController
|
|
@PutMapping("/resetPwd")
|
|
@PutMapping("/resetPwd")
|
|
public AjaxResult resetPwd(@RequestBody CompanyUser user)
|
|
public AjaxResult resetPwd(@RequestBody CompanyUser user)
|
|
{
|
|
{
|
|
|
|
+ if (!PatternUtils.checkPassword(user.getPassword())) {
|
|
|
|
+ return AjaxResult.error("密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
|
|
|
|
+ }
|
|
return toAjax(companyUserService.resetUserPwdByUserId(user.getUserId(), SecurityUtils.encryptPassword(user.getPassword())));
|
|
return toAjax(companyUserService.resetUserPwdByUserId(user.getUserId(), SecurityUtils.encryptPassword(user.getPassword())));
|
|
}
|
|
}
|
|
|
|
|