|
@@ -4,8 +4,10 @@ import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
+import cn.hutool.json.JSONUtil;
|
|
import com.fs.common.core.domain.R;
|
|
import com.fs.common.core.domain.R;
|
|
|
|
|
|
|
|
+import com.fs.common.utils.DomainUtil;
|
|
import com.fs.company.domain.*;
|
|
import com.fs.company.domain.*;
|
|
import com.fs.company.param.CompanyUserQwParam;
|
|
import com.fs.company.param.CompanyUserQwParam;
|
|
import com.fs.company.service.*;
|
|
import com.fs.company.service.*;
|
|
@@ -13,9 +15,11 @@ 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.web.service.TokenService;
|
|
import com.fs.core.web.service.TokenService;
|
|
|
|
+import com.fs.course.config.CourseConfig;
|
|
import com.fs.qw.vo.CompanyUserQwVO;
|
|
import com.fs.qw.vo.CompanyUserQwVO;
|
|
import com.fs.qw.vo.QwUserVO;
|
|
import com.fs.qw.vo.QwUserVO;
|
|
import com.fs.his.vo.OptionsVO;;
|
|
import com.fs.his.vo.OptionsVO;;
|
|
|
|
+import com.fs.system.service.ISysConfigService;
|
|
import com.fs.system.vo.DictVO;
|
|
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;
|
|
@@ -59,6 +63,8 @@ public class CompanyUserController extends BaseController
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private ICompanyVoiceCallerService callerService;
|
|
private ICompanyVoiceCallerService callerService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ISysConfigService configService;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 获取用户列表
|
|
* 获取用户列表
|
|
@@ -199,6 +205,21 @@ public class CompanyUserController extends BaseController
|
|
return toAjax(companyUserService.updateUser(user));
|
|
return toAjax(companyUserService.updateUser(user));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @PreAuthorize("@ss.hasPermi('company:user:query')")
|
|
|
|
+ @GetMapping(value = "generateSubDomain")
|
|
|
|
+ public AjaxResult generateSubDomain() {
|
|
|
|
+ // 获取配置中的主域名
|
|
|
|
+ String json = configService.selectConfigByKey("course.config");
|
|
|
|
+ CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
|
|
|
|
+
|
|
|
|
+ // 生成二级域名
|
|
|
|
+ String subDomain = DomainUtil.generateSubDomain(config.getCourseDomainName(), 6, String.valueOf(SecurityUtils.getLoginUser().getUser().getUserId()));
|
|
|
|
+
|
|
|
|
+ AjaxResult result = AjaxResult.success();
|
|
|
|
+ result.put("data", subDomain);
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 删除用户
|
|
* 删除用户
|
|
*/
|
|
*/
|