Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
766517d0
Commit
766517d0
authored
Oct 26, 2022
by
limei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加企业注册组织机构接口
parent
7f7daa92
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
148 additions
and
12 deletions
+148
-12
CompanyController.java
...mos/boot/module/ugp/biz/controller/CompanyController.java
+148
-12
No files found.
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/CompanyController.java
View file @
766517d0
...
@@ -7,6 +7,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
...
@@ -7,6 +7,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.sun.org.apache.xpath.internal.objects.XObject
;
import
com.sun.org.apache.xpath.internal.objects.XObject
;
import
com.yeejoin.amos.boot.biz.common.bo.CompanyBo
;
import
com.yeejoin.amos.boot.biz.common.bo.DepartmentBo
;
import
com.yeejoin.amos.boot.biz.common.bo.ReginParams
;
import
com.yeejoin.amos.boot.biz.common.bo.RoleBo
;
import
com.yeejoin.amos.boot.biz.common.constants.CommonConstant
;
import
com.yeejoin.amos.boot.biz.common.constants.CommonConstant
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisKey
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisKey
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisUtils
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisUtils
;
...
@@ -21,14 +25,15 @@ import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
...
@@ -21,14 +25,15 @@ import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
import
com.yeejoin.amos.boot.module.ugp.api.entity.Company
;
import
com.yeejoin.amos.boot.module.ugp.api.entity.Company
;
import
com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper
;
import
com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper
;
import
com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl
;
import
com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl
;
import
com.yeejoin.amos.component.feign.config.TokenOperation
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
import
com.yeejoin.amos.component.robot.AmosRequestContext
;
import
com.yeejoin.amos.feign.privilege.Privilege
;
import
com.yeejoin.amos.feign.privilege.Privilege
;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
import
com.yeejoin.amos.feign.privilege.model.*
;
import
com.yeejoin.amos.feign.privilege.model.CompanyModel
;
import
com.yeejoin.amos.feign.privilege.model.RoleModel
;
import
com.yeejoin.amos.feign.privilege.util.DesUtil
;
import
com.yeejoin.amos.feign.privilege.util.DesUtil
;
import
com.yeejoin.amos.feign.systemctl.Systemctl
;
import
com.yeejoin.amos.feign.systemctl.Systemctl
;
import
com.yeejoin.amos.feign.systemctl.model.RegionModel
;
import
com.yeejoin.amos.feign.systemctl.model.RegionModel
;
import
io.swagger.annotations.ApiParam
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
...
@@ -38,6 +43,9 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
...
@@ -38,6 +43,9 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import
java.util.*
;
import
java.util.*
;
import
com.yeejoin.amos.boot.module.ugp.biz.service.impl.CompanyServiceImpl
;
import
com.yeejoin.amos.boot.module.ugp.biz.service.impl.CompanyServiceImpl
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.typroject.tyboot.core.foundation.context.RequestContext
;
import
org.typroject.tyboot.core.foundation.utils.Bean
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.restful.exception.instance.BadRequest
;
import
org.typroject.tyboot.core.restful.exception.instance.BadRequest
;
import
org.typroject.tyboot.core.restful.utils.ResponseHelper
;
import
org.typroject.tyboot.core.restful.utils.ResponseHelper
;
...
@@ -76,6 +84,18 @@ public class CompanyController extends BaseController {
...
@@ -76,6 +84,18 @@ public class CompanyController extends BaseController {
@Value
(
"${ugp.sms.tempCode}"
)
@Value
(
"${ugp.sms.tempCode}"
)
private
String
smsTempCode
;
private
String
smsTempCode
;
@Value
(
"${ugp.user.name}"
)
private
String
ugpUserName
;
@Value
(
"${ugp.user.pwd}"
)
private
String
ugpUserPwd
;
/**
* saveUserRedis设置过期时间
*/
@Value
(
"${redis.cache.failure.time}"
)
private
Long
redisRegionTimeSecond
;
@Autowired
@Autowired
RedisUtils
redisUtils
;
RedisUtils
redisUtils
;
...
@@ -227,15 +247,6 @@ public class CompanyController extends BaseController {
...
@@ -227,15 +247,6 @@ public class CompanyController extends BaseController {
return
ResponseHelper
.
buildResponse
(
CompanyTypeEnum
.
mapList
);
return
ResponseHelper
.
buildResponse
(
CompanyTypeEnum
.
mapList
);
}
}
// /**
// * 企业注册:3、账号信息提交
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
// @PostMapping(value = "/saveInfo")
// @ApiOperation(httpMethod = "POST", value = "", notes = "")
// public ResponseModel<String> saveInfo(Object object){
// return ResponseHelper.buildResponse(companyServiceImpl.saveInfo(object));
// }
/**
/**
* 获取组织机构树
* 获取组织机构树
...
@@ -267,6 +278,114 @@ public class CompanyController extends BaseController {
...
@@ -267,6 +278,114 @@ public class CompanyController extends BaseController {
}
}
/**
/**
* 管理员身份证图片上传 无token
*
* @return
*/
@TycloudOperation
(
needAuth
=
false
,
ApiLevel
=
UserType
.
AGENCY
)
@PostMapping
(
value
=
"/uploadFile"
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"管理员身份证图片上传 无token"
,
notes
=
"管理员身份证图片上传 无token"
)
public
ResponseModel
<
String
>
uploadFile
(
@ApiParam
(
value
=
"文件"
,
required
=
true
)
@RequestParam
MultipartFile
adminLicensePic
)
{
if
(
ValidationUtil
.
isEmpty
(
adminLicensePic
)){
throw
new
BadRequest
(
"参数校验失败."
);
}
RequestContext
.
setAppKey
(
"AMOS_STUDIO"
);
RequestContext
.
setProduct
(
"AMOS_STUDIO_WEB"
);
RequestContext
.
setToken
(
requestContext
.
getToken
());
FeignClientResult
<
Map
<
String
,
String
>>
date
=
Systemctl
.
fileStorageClient
.
updateCommonFile
(
adminLicensePic
);
String
urlString
=
""
;
if
(
date
!=
null
)
{
Map
<
String
,
String
>
map
=
date
.
getResult
();
Iterator
<
String
>
it
=
map
.
keySet
().
iterator
();
while
(
it
.
hasNext
())
{
urlString
=
it
.
next
();
}
}
return
ResponseHelper
.
buildResponse
(
urlString
);
}
@Autowired
AmosRequestContext
requestContext
;
// public void setRequestContext() {
// RequestContext.setAppKey("AMOS_STUDIO");
// RequestContext.setProduct("AMOS_STUDIO_WEB");
// RequestContext.setToken(requestContext.getToken());
// // 需要登录后台账号
// RequestContext.setAppKey("AMOS_STUDIO");
// RequestContext.setProduct("AMOS_STUDIO_WEB");
// if(redisUtils.hasKey(RedisKey.CTI_USER_TOKEN)) {
// // 验证token
// boolean validToken = TokenOperation.refresh(redisUtils.get(RedisKey.CTI_USER_TOKEN).toString());
// // 登陆
// if(!validToken) {
// this.loginCtiUser();
// }
// } else { // 登陆
// this.loginCtiUser();
// }
// String ctiToken = redisUtils.get(RedisKey.CTI_USER_TOKEN).toString();
// RequestContext.setToken(ctiToken);
// try {
// FeignClientResult<AgencyUserModel> agencyUserModel = Privilege.agencyUserClient.queryByUserName(ugpUserName);
// AgencyUserModel userModel = agencyUserModel.getResult();
// RequestContext.setExeUserId(userModel.getUserId());
// saveUserRedis(userModel, ctiToken);
// } catch (Exception e) {
// //删除失效token缓存
// throw new RuntimeException(e.getMessage());
// }
// }
//
// private void loginCtiUser() {
// String passwd = DesUtil.encode(ugpUserPwd, "qaz");
// IdPasswordAuthModel loninData = new IdPasswordAuthModel();
// loninData.setLoginId(ugpUserName);
// loninData.setPassword(passwd);
// FeignClientResult loginResult = Privilege.authClient.idpassword(loninData);
// if(loginResult.getStatus() == 200) {
// HashMap resultMap = (HashMap) loginResult.getResult();
// redisUtils.set(RedisKey.CTI_USER_TOKEN, resultMap.get("token").toString(), redisRegionTimeSecond);
// }
// }
private
void
saveUserRedis
(
AgencyUserModel
user
,
String
token
)
{
String
authToken
=
RedisKey
.
buildReginKey
(
user
.
getUserId
(),
token
);
if
(
redisUtils
.
hasKey
(
authToken
))
{
return
;
}
CompanyBo
company
=
new
CompanyBo
();
DepartmentBo
department
=
new
DepartmentBo
();
RoleBo
role
=
new
RoleBo
();
CompanyModel
companyM
=
user
.
getCompanys
()
!=
null
?
user
.
getCompanys
().
get
(
0
)
:
null
;
Bean
.
copyExistPropertis
(
companyM
,
company
);
Map
<
Long
,
List
<
DepartmentModel
>>
mapDepartments
=
user
.
getCompanyDepartments
();
DepartmentModel
departmentM
=
companyM
!=
null
?
mapDepartments
.
get
(
companyM
.
getSequenceNbr
()).
get
(
0
)
:
null
;
Bean
.
copyExistPropertis
(
departmentM
,
department
);
Map
<
Long
,
List
<
RoleModel
>>
roles
=
user
.
getOrgRoles
();
Long
sequenceNbr
;
if
(
departmentM
==
null
)
{
sequenceNbr
=
null
;
}
else
{
sequenceNbr
=
departmentM
.
getSequenceNbr
();
}
RoleModel
roleM
=
null
;
if
(
sequenceNbr
==
null
)
{
roleM
=
companyM
!=
null
?
roles
.
get
(
companyM
.
getSequenceNbr
()).
get
(
0
)
:
null
;
}
else
{
roleM
=
roles
.
get
(
sequenceNbr
).
get
(
0
);
}
Bean
.
copyExistPropertis
(
roleM
,
role
);
ReginParams
reginParams
=
new
ReginParams
();
reginParams
.
setCompany
(
company
);
reginParams
.
setRole
(
role
);
reginParams
.
setDepartment
(
department
);
reginParams
.
setUserModel
(
user
);
redisUtils
.
set
(
authToken
,
JSONObject
.
toJSONString
(
reginParams
),
redisRegionTimeSecond
);
}
/**
* 判断手机号是否已经注册
* 判断手机号是否已经注册
*
*
* @return
* @return
...
@@ -284,6 +403,23 @@ public class CompanyController extends BaseController {
...
@@ -284,6 +403,23 @@ public class CompanyController extends BaseController {
}
}
/**
/**
* 判断组织机构是否存在
*
* @return
*/
@TycloudOperation
(
needAuth
=
false
,
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/hasExistUnit/{creditCode}"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"判断组织机构是否存在"
,
notes
=
"判断组织机构是否存在"
)
public
ResponseModel
<
Boolean
>
hasExistUnit
(
@PathVariable
(
value
=
"creditCode"
)
String
creditCode
)
{
Boolean
flag
=
false
;
Company
company
=
companyServiceImpl
.
getOne
(
new
LambdaQueryWrapper
<
Company
>().
eq
(
Company:
:
getCreditCode
,
creditCode
));
if
(!
ValidationUtil
.
isEmpty
(
company
))
{
flag
=
true
;
}
return
ResponseHelper
.
buildResponse
(
flag
);
}
/**
* 发送手机号验证码
* 发送手机号验证码
*
*
* @return
* @return
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment