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
3b538da7
Commit
3b538da7
authored
Jul 30, 2025
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refact(检验开通):需求变更
1.3库数据单位类型调整为已单位信息表
parent
35e87aeb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
DataHandlerServiceImpl.java
...ot/module/jg/biz/service/impl/DataHandlerServiceImpl.java
+5
-1
EnterpriseRefreshHandler.java
...ule/tcm/biz/refresh/handler/EnterpriseRefreshHandler.java
+6
-1
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataHandlerServiceImpl.java
View file @
3b538da7
...
@@ -53,6 +53,7 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
...
@@ -53,6 +53,7 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.CollectionUtils
;
...
@@ -143,6 +144,9 @@ public class DataHandlerServiceImpl {
...
@@ -143,6 +144,9 @@ public class DataHandlerServiceImpl {
private
final
IdxBizJgRegisterInfoMapper
registerInfoMapper
;
private
final
IdxBizJgRegisterInfoMapper
registerInfoMapper
;
@Value
(
"${jyjc.open.online: true}"
)
private
Boolean
onlineJyjc
;
/**
/**
* 安装告知压力管道历史数据修复-详情中的设备列表修改为汇总表格式
* 安装告知压力管道历史数据修复-详情中的设备列表修改为汇总表格式
...
@@ -1442,7 +1446,7 @@ public class DataHandlerServiceImpl {
...
@@ -1442,7 +1446,7 @@ public class DataHandlerServiceImpl {
esBaseEnterpriseInfo
.
setLicenses
(
licenses
);
esBaseEnterpriseInfo
.
setLicenses
(
licenses
);
try
{
try
{
esBaseEnterpriseInfo
.
setLicenseMinExpiryDate
(
RefreshCmService
.
getMinDateFromLicensesEp
(
licenses
));
esBaseEnterpriseInfo
.
setLicenseMinExpiryDate
(
RefreshCmService
.
getMinDateFromLicensesEp
(
licenses
));
esBaseEnterpriseInfo
.
setUnitType
(
RefreshCmService
.
updateJyjcUnitType
(
enterpriseInfo
.
getUnitType
(),
licenses
));
esBaseEnterpriseInfo
.
setUnitType
(
onlineJyjc
?
enterpriseInfo
.
getUnitType
()
:
RefreshCmService
.
updateJyjcUnitType
(
enterpriseInfo
.
getUnitType
(),
licenses
));
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"企业信息单位类型或者取资质最小日期失败:{}"
,
enterpriseInfo
,
e
);
log
.
error
(
"企业信息单位类型或者取资质最小日期失败:{}"
,
enterpriseInfo
,
e
);
}
}
...
...
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/refresh/handler/EnterpriseRefreshHandler.java
View file @
3b538da7
...
@@ -20,6 +20,7 @@ import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseUnitLicenceMapper;
...
@@ -20,6 +20,7 @@ import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseUnitLicenceMapper;
import
com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper
;
import
com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
java.util.List
;
import
java.util.List
;
...
@@ -41,6 +42,10 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler {
...
@@ -41,6 +42,10 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler {
private
final
EsUserInfoDao
esUserInfoDao
;
private
final
EsUserInfoDao
esUserInfoDao
;
@Value
(
"${jyjc.open.online: true}"
)
private
Boolean
onlineJyjc
;
@Override
@Override
public
String
supportType
()
{
public
String
supportType
()
{
return
"enterprise"
;
return
"enterprise"
;
...
@@ -78,7 +83,7 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler {
...
@@ -78,7 +83,7 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler {
esBaseEnterpriseInfo
.
setLicenses
(
licenses
);
esBaseEnterpriseInfo
.
setLicenses
(
licenses
);
try
{
try
{
esBaseEnterpriseInfo
.
setLicenseMinExpiryDate
(
RefreshCmService
.
getMinDateFromLicensesEp
(
licenses
));
esBaseEnterpriseInfo
.
setLicenseMinExpiryDate
(
RefreshCmService
.
getMinDateFromLicensesEp
(
licenses
));
esBaseEnterpriseInfo
.
setUnitType
(
RefreshCmService
.
updateJyjcUnitType
(
enterpriseInfo
.
getUnitType
(),
licenses
));
esBaseEnterpriseInfo
.
setUnitType
(
onlineJyjc
?
enterpriseInfo
.
getUnitType
()
:
RefreshCmService
.
updateJyjcUnitType
(
enterpriseInfo
.
getUnitType
(),
licenses
));
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"企业信息单位类型或者取资质最小日期失败:{}"
,
enterpriseInfo
,
e
);
log
.
error
(
"企业信息单位类型或者取资质最小日期失败:{}"
,
enterpriseInfo
,
e
);
}
}
...
...
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