Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
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
fangxinjiang
yifu-mvp
Commits
6b4c989e
Commit
6b4c989e
authored
May 19, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
项目配置限制项日志调整-fxj
parent
a17fd9aa
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
27 deletions
+45
-27
TAutoMainRelServiceImpl.java
...1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
+35
-22
TEmpContractAlertServiceImpl.java
...u/archives/service/impl/TEmpContractAlertServiceImpl.java
+1
-1
InsuranceDaprUtil.java
...loud/plus/v1/yifu/common/dapr/util/InsuranceDaprUtil.java
+1
-1
TInsurancesWarnController.java
...yifu/insurances/controller/TInsurancesWarnController.java
+8
-3
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
View file @
6b4c989e
...
...
@@ -1889,31 +1889,36 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
entity
.
setRuleUpdateTime
(
DateUtil
.
getCurrentDateTime
());
baseMapper
.
updateById
(
entity
);
// 记录变更日志
// 记录变更日志
- 整合所有限制项到 autoMailRel
Map
<
String
,
String
>
diffKeyMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
oldMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
newMap
=
new
HashMap
<>();
// 添加有变化的字段到差异映射
// 收集所有变化的字段名
List
<
String
>
changedFields
=
new
ArrayList
<>();
if
(!
oldEntity
.
getAutoFlag
().
equals
(
entity
.
getAutoFlag
()))
{
diffKeyMap
.
put
(
"autoFlag"
,
"autoFlag"
);
changedFields
.
add
(
"autoFlag"
);
}
if
(!
oldEntity
.
getRestrictArchive
().
equals
(
entity
.
getRestrictArchive
()))
{
diffKeyMap
.
put
(
"restrictArchive"
,
"restrictArchive"
);
changedFields
.
add
(
"restrictArchive"
);
}
if
(!
oldEntity
.
getRestrictInsurance
().
equals
(
entity
.
getRestrictInsurance
()))
{
diffKeyMap
.
put
(
"restrictInsurance"
,
"restrictInsurance"
);
changedFields
.
add
(
"restrictInsurance"
);
}
if
(!
oldEntity
.
getRestrictContract
().
equals
(
entity
.
getRestrictContract
()))
{
diffKeyMap
.
put
(
"restrictContract"
,
"restrictContract"
);
changedFields
.
add
(
"restrictContract"
);
}
if
(!
oldEntity
.
getRestrictSocialFund
().
equals
(
entity
.
getRestrictSocialFund
()))
{
diffKeyMap
.
put
(
"restrictSocialFund"
,
"restrictSocialFund"
);
changedFields
.
add
(
"restrictSocialFund"
);
}
oldMap
.
put
(
"oldAutoMainRel"
,
oldEntity
);
newMap
.
put
(
"newAutoMainRel"
,
entity
);
// 将变化的字段名用逗号分隔
if
(!
changedFields
.
isEmpty
())
{
diffKeyMap
.
put
(
"autoMailRel"
,
String
.
join
(
","
,
changedFields
));
oldMap
.
put
(
"oldAutoMailRel"
,
oldEntity
);
newMap
.
put
(
"newAutoMailRel"
,
entity
);
insertLog
(
entity
,
diffKeyMap
,
oldMap
,
newMap
);
}
log
.
info
(
"更新限制项, 项目配置ID: {}, 用户: {}"
,
vo
.
getId
(),
user
.
getNickname
());
}
...
...
@@ -2093,31 +2098,36 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
entity
.
setRuleUpdateTime
(
DateUtil
.
getCurrentDateTime
());
baseMapper
.
updateById
(
entity
);
// 记录变更日志
// 记录变更日志
- 整合所有限制项到 autoMailRel
Map
<
String
,
String
>
diffKeyMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
oldMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
newMap
=
new
HashMap
<>();
// 添加有变化的字段到差异映射
// 收集所有变化的字段名
List
<
String
>
changedFields
=
new
ArrayList
<>();
if
(!
oldEntity
.
getAutoFlag
().
equals
(
entity
.
getAutoFlag
()))
{
diffKeyMap
.
put
(
"autoFlag"
,
"autoFlag"
);
changedFields
.
add
(
"autoFlag"
);
}
if
(!
oldEntity
.
getRestrictArchive
().
equals
(
entity
.
getRestrictArchive
()))
{
diffKeyMap
.
put
(
"restrictArchive"
,
"restrictArchive"
);
changedFields
.
add
(
"restrictArchive"
);
}
if
(!
oldEntity
.
getRestrictInsurance
().
equals
(
entity
.
getRestrictInsurance
()))
{
diffKeyMap
.
put
(
"restrictInsurance"
,
"restrictInsurance"
);
changedFields
.
add
(
"restrictInsurance"
);
}
if
(!
oldEntity
.
getRestrictContract
().
equals
(
entity
.
getRestrictContract
()))
{
diffKeyMap
.
put
(
"restrictContract"
,
"restrictContract"
);
changedFields
.
add
(
"restrictContract"
);
}
if
(!
oldEntity
.
getRestrictSocialFund
().
equals
(
entity
.
getRestrictSocialFund
()))
{
diffKeyMap
.
put
(
"restrictSocialFund"
,
"restrictSocialFund"
);
changedFields
.
add
(
"restrictSocialFund"
);
}
oldMap
.
put
(
"oldAutoMainRel"
,
oldEntity
);
newMap
.
put
(
"newAutoMainRel"
,
entity
);
// 将变化的字段名用逗号分隔
if
(!
changedFields
.
isEmpty
())
{
diffKeyMap
.
put
(
"autoMailRel"
,
String
.
join
(
","
,
changedFields
));
oldMap
.
put
(
"oldAutoMailRel"
,
oldEntity
);
newMap
.
put
(
"newAutoMailRel"
,
entity
);
insertLog
(
entity
,
diffKeyMap
,
oldMap
,
newMap
);
}
log
.
info
(
"更新限制项, 项目编码: {}, 用户: {}"
,
excel
.
getDeptNo
(),
user
.
getNickname
());
}
...
...
@@ -2226,9 +2236,11 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
if
(!
errorMessages
.
isEmpty
())
{
resultMsg
=
"错误: "
+
String
.
join
(
"; "
,
errorMessages
);
logId
=
UUID
.
randomUUID
().
toString
().
replace
(
"-"
,
""
);
saveRefreshLog
(
logId
,
tAutoMainRel
,
"ERROR"
,
resultMsg
,
duration
);
}
else
{
resultMsg
=
"合同和商险续签刷新成功"
;
logId
=
UUID
.
randomUUID
().
toString
().
replace
(
"-"
,
""
);
saveRefreshLog
(
logId
,
tAutoMainRel
,
"SUCCESS"
,
resultMsg
,
duration
);
}
...
...
@@ -2239,6 +2251,7 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
}
catch
(
Exception
e
)
{
long
duration
=
System
.
currentTimeMillis
()
-
startTime
;
logId
=
UUID
.
randomUUID
().
toString
().
replace
(
"-"
,
""
);
saveRefreshLog
(
logId
,
tAutoMainRel
,
"EXCEPTION"
,
e
.
getMessage
(),
duration
);
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java
View file @
6b4c989e
...
...
@@ -500,7 +500,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
}
//更新自动化的所有的合同办理状态--这里如果项目编码不为空要传参
baseMapper
.
updateProcessStatus
(
deptNo
);
return
R
.
ok
();
return
R
.
ok
(
true
);
}
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/InsuranceDaprUtil.java
View file @
6b4c989e
...
...
@@ -301,7 +301,7 @@ public class InsuranceDaprUtil {
R
<
Boolean
>
res
=
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
(),
daprInsurancesProperties
.
getAppId
(),
"/
tinsurancew
arn/inner/createInsuranceAlert"
,
"/
insuranceW
arn/inner/createInsuranceAlert"
,
paramVo
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsurancesWarnController.java
View file @
6b4c989e
...
...
@@ -210,9 +210,14 @@ public class TInsurancesWarnController {
@Operation
(
description
=
"每天刷新商险到期提醒信息"
)
@Inner
@PostMapping
(
"/inner/createInsuranceAlert"
)
public
void
createInsuranceAlert
(
@RequestBody
(
required
=
false
)
BaseSearchVO
paramVo
)
{
public
Boolean
createInsuranceAlert
(
@RequestBody
(
required
=
false
)
BaseSearchVO
paramVo
)
{
try
{
String
deptNo
=
Common
.
isNotNull
(
paramVo
)
?
paramVo
.
getDeptNo
()
:
null
;
insuranceWarnService
.
createInsuranceAlert
(
deptNo
);
return
true
;
}
catch
(
Exception
e
){
return
false
;
}
}
/**
...
...
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