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
c4dc9c94
Commit
c4dc9c94
authored
Jul 01, 2025
by
yangyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor(amos-boot): 优化企业信息更新逻辑
- 重构了 updateCompanyInfoById 方法,提高了代码可读性和维护性 - 移除了冗余的工商信息和许可信息修改逻辑 -优化了单位类型处理和 Redis缓存清理 - 调整了日志记录和异常处理方式
parent
e63ee483
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
53 deletions
+16
-53
TzBaseEnterpriseInfoServiceImpl.java
...tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java
+14
-52
RegUnitInfoServiceImpl.java
...dule/tcm/flc/biz/service/impl/RegUnitInfoServiceImpl.java
+2
-1
No files found.
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java
View file @
c4dc9c94
...
@@ -1057,6 +1057,7 @@ public class TzBaseEnterpriseInfoServiceImpl
...
@@ -1057,6 +1057,7 @@ public class TzBaseEnterpriseInfoServiceImpl
@Override
@Override
public
TzBaseEnterpriseInfoDto
updateCompanyInfoById
(
Map
<
String
,
Object
>
map
,
ReginParams
reginParams2
)
{
public
TzBaseEnterpriseInfoDto
updateCompanyInfoById
(
Map
<
String
,
Object
>
map
,
ReginParams
reginParams2
)
{
log
.
info
(
"根据ID修改企业信息 => {}, 更新人 => {}"
,
map
,
RequestContext
.
getExeUserId
());
log
.
info
(
"根据ID修改企业信息 => {}, 更新人 => {}"
,
map
,
RequestContext
.
getExeUserId
());
try
{
TzBaseEnterpriseInfo
tzBaseEnterpriseInfo
=
new
TzBaseEnterpriseInfo
();
TzBaseEnterpriseInfo
tzBaseEnterpriseInfo
=
new
TzBaseEnterpriseInfo
();
tzBaseEnterpriseInfo
.
setSequenceNbr
(
Long
.
valueOf
(
map
.
get
(
"sequenceNbr"
).
toString
()));
tzBaseEnterpriseInfo
.
setSequenceNbr
(
Long
.
valueOf
(
map
.
get
(
"sequenceNbr"
).
toString
()));
tzBaseEnterpriseInfo
=
tzBaseEnterpriseInfoService
.
getById
(
tzBaseEnterpriseInfo
.
getSequenceNbr
());
tzBaseEnterpriseInfo
=
tzBaseEnterpriseInfoService
.
getById
(
tzBaseEnterpriseInfo
.
getSequenceNbr
());
...
@@ -1122,49 +1123,7 @@ public class TzBaseEnterpriseInfoServiceImpl
...
@@ -1122,49 +1123,7 @@ public class TzBaseEnterpriseInfoServiceImpl
regUnitInfoService
.
saveOrUpdate
(
regUnitInfo
);
regUnitInfoService
.
saveOrUpdate
(
regUnitInfo
);
// -- 20250627 调整为监管单位不能修改工商信息和资质
// -- 20250627 调整为监管单位不能修改工商信息和资质
//修改工商信息
// RegUnitIc regUnitIc = new RegUnitIc();
// RegUnitIcDto regUnitIcDto = JSON.parseObject(JSON.toJSONString(map.get("regUnitIcDto")), new TypeReference<RegUnitIcDto>() {
// });
// if (!ValidationUtil.isEmpty(regUnitIcDto.getSequenceNbr())) {
// List<String> addressList = (List<String>) map.get("registerAddressList");
// tzBaseEnterpriseInfo.setProvince(addressList.get(0));
// tzBaseEnterpriseInfo.setCity(addressList.get(1));
// tzBaseEnterpriseInfo.setDistrict(addressList.get(2));
// tzBaseEnterpriseInfo.setCommunity(ObjectUtils.isEmpty(map.get("community")) ? null : String.valueOf(map.get("community")));
// tzBaseEnterpriseInfo.setStreet(ObjectUtils.isEmpty(map.get("street")) ? null : String.valueOf(map.get("street")));
// // tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map.get("regAddress")) ? null : String.valueOf(map.get("regAddress")));
// tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : String.valueOf(map.get("legalPerson")));
// regUnitIc.setIndustryName(ObjectUtils.isEmpty(map.get("industryName")) ? null : String.valueOf(map.get("industryName")));
// DataDictionary regOrganCodeDict = iDataDictionaryService.getByCode(String.valueOf(map.get("registeredOrganCode")),"DJJG");
// regUnitIc.setRegisteredOrgan(ObjectUtils.isEmpty(regOrganCodeDict) ? null : String.valueOf(regOrganCodeDict.getName()));
// regUnitIc.setRegisteredOrganCode(ObjectUtils.isEmpty(map.get("registeredOrganCode")) ? null : String.valueOf(map.get("registeredOrganCode")));
// Date approvedDate;
// try {
// approvedDate = DateUtils.dateParse(String.valueOf(map.get("approvedDate")), "yyyy-MM-dd");
// } catch (ParseException e) {
// throw new RuntimeException(e);
// }
// regUnitIc.setBusinessStateCode(ObjectUtils.isEmpty(map.get("businessState")) ? null : String.valueOf(map.get("businessState")));
// DataDictionary businessStateDict = iDataDictionaryService.getByCode(String.valueOf(map.get("businessState")),"jyzt");
// regUnitIc.setBusinessState(ObjectUtils.isEmpty(businessStateDict) ? null : businessStateDict.getName());
// regUnitIc.setApprovedDate(ObjectUtils.isEmpty(map.get("approvedDate")) ? null : approvedDate);
//
// regUnitIcService.update(regUnitIc, new QueryWrapper<RegUnitIc>().eq("unit_code", regUnitIcDto.getUnitCode()));
// }
//许可信息先登录人选择的身份删除相应的许可信息,原因前端列表对数据可增减
// String useCode = tzBaseEnterpriseInfo.getUseCode();
// String certTypeCodes = Arrays.stream(unitTypes).map(e -> COMPANY_TYPE_CERT_TYPE_MAP.getOrDefault(e, "")).collect(Collectors.joining(","));
// if (useCode != null && !certTypeCodes.isEmpty()) {
// LambdaQueryWrapper<BaseUnitLicence> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(BaseUnitLicence::getUnitCode, useCode);
// wrapper.and(w -> Arrays.stream(certTypeCodes.split(","))
// .forEach(certTypeCode -> w.or().likeRight(BaseUnitLicence::getCertTypeCode, certTypeCode)));
// baseUnitLicenceService.remove(wrapper);
// }
// //报错许可许可信息
// saveLicenceData(map);
// 企业信息变更-同步修改企业下人员绑定设备类型
// 企业信息变更-同步修改企业下人员绑定设备类型
ArrayList
<
String
>
newData
=
new
ArrayList
<>();
ArrayList
<
String
>
newData
=
new
ArrayList
<>();
JSONArray
objects
=
JSON
.
parseArray
(
tzBaseEnterpriseInfo
.
getEquipCategory
());
JSONArray
objects
=
JSON
.
parseArray
(
tzBaseEnterpriseInfo
.
getEquipCategory
());
...
@@ -1175,18 +1134,17 @@ public class TzBaseEnterpriseInfoServiceImpl
...
@@ -1175,18 +1134,17 @@ public class TzBaseEnterpriseInfoServiceImpl
boolean
b
=
tzBaseEnterpriseInfoService
.
updateById
(
tzBaseEnterpriseInfo
);
boolean
b
=
tzBaseEnterpriseInfoService
.
updateById
(
tzBaseEnterpriseInfo
);
if
(
b
)
{
if
(
b
)
{
CompanyModel
updateModel
;
CompanyModel
updateModel
=
Privilege
.
companyClient
.
queryByCompanyCode
(
String
.
valueOf
(
map
.
get
(
"useCode"
))).
getResult
();
try
{
updateModel
=
Privilege
.
companyClient
.
queryByCompanyCode
(
String
.
valueOf
(
map
.
get
(
"useCode"
))).
getResult
();
HashMap
<
String
,
Object
>
parentMessage
=
(
HashMap
<
String
,
Object
>)
Privilege
.
companyClient
.
queryByOrgcode
(
String
.
valueOf
(
map
.
get
(
"superviseOrgCode"
))).
getResult
();
HashMap
<
String
,
Object
>
parentMessage
=
(
HashMap
<
String
,
Object
>)
Privilege
.
companyClient
.
queryByOrgcode
(
String
.
valueOf
(
map
.
get
(
"superviseOrgCode"
))).
getResult
();
// 目前平台返回key为compnay(存在拼写错误)
// 目前平台返回key为compnay(存在拼写错误)
CompanyModel
parentModel
=
JSON
.
parseObject
(
JSON
.
toJSONString
(
parentMessage
.
get
(
"compnay"
)),
CompanyModel
.
class
);
CompanyModel
parentModel
=
JSON
.
parseObject
(
JSON
.
toJSONString
(
parentMessage
.
get
(
"compnay"
)),
CompanyModel
.
class
);
updateModel
.
setParentId
(
parentModel
.
getSequenceNbr
());
updateModel
.
setParentId
(
parentModel
.
getSequenceNbr
());
updateModel
.
setCompanyType
(
regUnitInfo
.
getUnitType
());
// 更新单位类型
updateModel
.
setCompanyType
(
regUnitInfo
.
getUnitType
());
// 更新单位类型
Privilege
.
companyClient
.
update
(
updateModel
,
updateModel
.
getSequenceNbr
());
FeignClientResult
<
CompanyModel
>
companyResult
=
Privilege
.
companyClient
.
update
(
updateModel
,
updateModel
.
getSequenceNbr
());
}
catch
(
Exception
e
)
{
if
(
companyResult
==
null
||
companyResult
.
getStatus
()
!=
200
)
{
throw
new
BadRequest
(
"操作失败!"
);
log
.
error
(
"更新单位错误: {}"
,
companyResult
);
throw
new
BadRequest
(
"更新单位失败!"
);
}
}
updateUnit
(
map
,
regUnitInfo
,
agencyUserModel
,
updateModel
);
updateUnit
(
map
,
regUnitInfo
,
agencyUserModel
,
updateModel
);
updateUserInfo
(
newData
,
String
.
valueOf
(
map
.
get
(
"useCode"
)));
updateUserInfo
(
newData
,
String
.
valueOf
(
map
.
get
(
"useCode"
)));
...
@@ -1197,6 +1155,10 @@ public class TzBaseEnterpriseInfoServiceImpl
...
@@ -1197,6 +1155,10 @@ public class TzBaseEnterpriseInfoServiceImpl
}
else
{
}
else
{
return
null
;
return
null
;
}
}
}
catch
(
Exception
e
)
{
log
.
error
(
"更新失败: "
,
e
);
throw
new
BadRequest
(
"更新失败!"
);
}
}
}
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
...
@@ -1237,10 +1199,10 @@ public class TzBaseEnterpriseInfoServiceImpl
...
@@ -1237,10 +1199,10 @@ public class TzBaseEnterpriseInfoServiceImpl
regUnitInfo
.
setUnitTypeCode
(
unitTypeCodesStr
);
regUnitInfo
.
setUnitTypeCode
(
unitTypeCodesStr
);
// 省内充装单位1231:生成对接数据账号
// 省内充装单位1231:生成对接数据账号
final
String
FILLING_UNIT_TYPE
=
RegUnitInfoServiceImpl
.
FILLING_UNIT_TYPE
;
//
final String FILLING_UNIT_TYPE = RegUnitInfoServiceImpl.FILLING_UNIT_TYPE;
if
(
unitTypeCodes
.
contains
(
FILLING_UNIT_TYPE
)
//
if (unitTypeCodes.contains(FILLING_UNIT_TYPE)
&&
(
ValidationUtil
.
isEmpty
(
regUnitInfo
.
getIsNationwide
())
||
"0"
.
equals
(
regUnitInfo
.
getIsNationwide
())))
{
//
&& (ValidationUtil.isEmpty(regUnitInfo.getIsNationwide()) || "0".equals(regUnitInfo.getIsNationwide()))) {
if
(
ValidationUtil
.
isEmpty
(
regUnitInfo
.
getIsNationwide
())
||
"0"
.
equals
(
regUnitInfo
.
getIsNationwide
()))
{
if
(
ValidationUtil
.
isEmpty
(
regUnitInfo
.
getAppId
()))
{
if
(
ValidationUtil
.
isEmpty
(
regUnitInfo
.
getAppId
()))
{
String
appId
=
DesUtil
.
encode
(
regUnitInfo
.
getAdminUserId
(),
RegUnitInfoServiceImpl
.
SECRETKEY
);
String
appId
=
DesUtil
.
encode
(
regUnitInfo
.
getAdminUserId
(),
RegUnitInfoServiceImpl
.
SECRETKEY
);
...
...
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/service/impl/RegUnitInfoServiceImpl.java
View file @
c4dc9c94
...
@@ -819,7 +819,8 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
...
@@ -819,7 +819,8 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
String
adminUserId
=
userResult
.
getResult
().
getUserId
();
String
adminUserId
=
userResult
.
getResult
().
getUserId
();
// 省内充装单位1231:生成对接数据账号
// 省内充装单位1231:生成对接数据账号
if
(
Arrays
.
asList
(
units
).
contains
(
FILLING_UNIT_TYPE
)
&&
(
ValidationUtil
.
isEmpty
(
regUnitInfo
.
getIsNationwide
())
||
"0"
.
equals
(
regUnitInfo
.
getIsNationwide
())))
{
// if (Arrays.asList(units).contains(FILLING_UNIT_TYPE) && (ValidationUtil.isEmpty(regUnitInfo.getIsNationwide()) || "0".equals(regUnitInfo.getIsNationwide()))) {
if
(
ValidationUtil
.
isEmpty
(
regUnitInfo
.
getIsNationwide
())
||
"0"
.
equals
(
regUnitInfo
.
getIsNationwide
()))
{
AgencyUserModel
shadowUser
=
new
AgencyUserModel
();
AgencyUserModel
shadowUser
=
new
AgencyUserModel
();
shadowUser
.
setUserId
(
adminUserId
);
shadowUser
.
setUserId
(
adminUserId
);
String
appId
=
DesUtil
.
encode
(
adminUserId
,
SECRETKEY
);
String
appId
=
DesUtil
.
encode
(
adminUserId
,
SECRETKEY
);
...
...
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