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
f699d069
Commit
f699d069
authored
Dec 22, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-配置修改
parent
244fed9f
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
57 additions
and
24 deletions
+57
-24
ElectronicArchiveImportServiceImpl.java
...atch/service/impl/ElectronicArchiveImportServiceImpl.java
+15
-6
TElectronicArchiveDetailServiceImpl.java
...tch/service/impl/TElectronicArchiveDetailServiceImpl.java
+2
-5
TElectronicArchiveTaskServiceImpl.java
...batch/service/impl/TElectronicArchiveTaskServiceImpl.java
+3
-5
SysHouseHoldInfoServiceImpl.java
...yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
+36
-7
SysHouseHoldInfoFailResMapper.xml
...c/main/resources/mapper/SysHouseHoldInfoFailResMapper.xml
+1
-1
No files found.
yifu-batch/yifu-batch-biz/src/main/java/com/yifu/cloud/plus/v1/batch/service/impl/ElectronicArchiveImportServiceImpl.java
View file @
f699d069
...
...
@@ -14,6 +14,7 @@ import com.yifu.cloud.plus.v1.batch.entity.TAttaInfo;
import
com.yifu.cloud.plus.v1.batch.entity.TElectronicArchiveDetail
;
import
com.yifu.cloud.plus.v1.batch.entity.TElectronicArchiveTask
;
import
com.yifu.cloud.plus.v1.batch.entity.TTaskArchiveRelation
;
import
com.yifu.cloud.plus.v1.batch.mapper.SysConfigLimitMapper
;
import
com.yifu.cloud.plus.v1.batch.service.*
;
import
com.yifu.cloud.plus.v1.batch.vo.ArchiveFeedbackVO
;
import
com.yifu.cloud.plus.v1.batch.vo.ArchiveImportVO
;
...
...
@@ -43,6 +44,7 @@ import java.io.File;
import
java.io.FileInputStream
;
import
java.io.InputStream
;
import
java.util.*
;
import
java.util.concurrent.atomic.AtomicInteger
;
import
java.util.stream.Collectors
;
/**
...
...
@@ -64,6 +66,14 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
private
final
ArchivesDaprUtil
archivesDaprUtil
;
private
final
CacheManager
cacheManager
;
//初始化zip导入上限值
private
int
maxLimit
=
1
;
private
AtomicInteger
atomicInteger
=
new
AtomicInteger
(
0
);
private
final
SysConfigLimitMapper
configLimitMapper
;
/**
* 第一步:导入Excel模板文件
*/
...
...
@@ -355,9 +365,9 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
}
// 3. 校验同时上传任务数
long
runningTaskCount
=
taskService
.
count
(
new
LambdaQueryWrapper
<
TElectronicArchiveTask
>()
.
eq
(
TElectronicArchiveTask:
:
getStatus
,
ArchiveConstants
.
TASK_STATUS_GENERATING
));
if
(
runningTaskCount
>=
ArchiveConstants
.
MAX_CONCURRENT_TASKS
)
{
maxLimit
=
configLimitMapper
.
getSysConfigLimitByKey
(
"UPDOLOAD_MAX_LIMIT"
);
if
(
atomicInteger
.
incrementAndGet
()
>
maxLimit
){
atomicInteger
.
decrementAndGet
();
return
R
.
failed
(
"有其他客服正在上传中,请5分钟后重试"
);
}
...
...
@@ -400,6 +410,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
// 回滚任务状态
task
.
setStatus
(
ArchiveConstants
.
TASK_STATUS_NOT_UPLOADED
);
taskService
.
updateById
(
task
);
atomicInteger
.
decrementAndGet
();
return
R
.
failed
(
"导入ZIP文件失败:"
+
e
.
getMessage
());
}
}
...
...
@@ -429,7 +440,6 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
.
eq
(
TAttaInfo:
:
getRelationType
,
ArchiveConstants
.
ATTA_RELATION_TYPE_ZIP
));
if
(
CollUtil
.
isEmpty
(
zipAttas
))
{
log
.
error
(
"ZIP附件不存在,任务ID:{}"
,
taskId
);
updateTaskStatus
(
task
,
ArchiveConstants
.
TASK_STATUS_NOT_UPLOADED
);
return
R
.
failed
(
"ZIP附件不存在"
);
}
...
...
@@ -520,8 +530,6 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
// 生成反馈表
generateFeedbackExcel
(
taskId
,
feedbackList
);
log
.
info
(
"任务处理完成,任务ID:{}"
,
taskId
);
return
R
.
ok
(
"处理完成"
);
}
catch
(
Exception
e
)
{
...
...
@@ -552,6 +560,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
log
.
error
(
"清理ZIP源文件失败:{}"
,
zipSourceFile
.
getAbsolutePath
(),
e
);
}
}
atomicInteger
.
decrementAndGet
();
}
}
...
...
yifu-batch/yifu-batch-biz/src/main/java/com/yifu/cloud/plus/v1/batch/service/impl/TElectronicArchiveDetailServiceImpl.java
View file @
f699d069
...
...
@@ -13,6 +13,7 @@ import com.yifu.cloud.plus.v1.batch.entity.TAttaInfo;
import
com.yifu.cloud.plus.v1.batch.entity.TElectronicArchiveDetail
;
import
com.yifu.cloud.plus.v1.batch.entity.TElectronicArchiveTask
;
import
com.yifu.cloud.plus.v1.batch.entity.TTaskArchiveRelation
;
import
com.yifu.cloud.plus.v1.batch.mapper.SysConfigLimitMapper
;
import
com.yifu.cloud.plus.v1.batch.mapper.TElectronicArchiveDetailMapper
;
import
com.yifu.cloud.plus.v1.batch.service.TAttaInfoService
;
import
com.yifu.cloud.plus.v1.batch.service.TElectronicArchiveDetailService
;
...
...
@@ -41,6 +42,7 @@ import java.net.URLEncoder;
import
java.time.LocalDateTime
;
import
java.time.format.DateTimeFormatter
;
import
java.util.*
;
import
java.util.concurrent.atomic.AtomicInteger
;
import
java.util.zip.ZipEntry
;
import
java.util.zip.ZipOutputStream
;
...
...
@@ -206,7 +208,6 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
*/
@Override
public
void
batchDownloadArchives
(
List
<
ArchiveBatchDownloadRequestVO
>
requestList
,
HttpServletResponse
response
)
{
log
.
info
(
"开始批量下载电子档案,请求数量:{}"
,
requestList
.
size
());
// 反馈列表
List
<
ArchiveDownloadFeedbackVO
>
feedbackList
=
new
ArrayList
<>();
...
...
@@ -274,12 +275,10 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
addFeedbackExcel
(
zipOut
,
feedbackList
);
zipOut
.
finish
();
log
.
info
(
"电子档案批量下载完成"
);
}
}
catch
(
Exception
e
)
{
log
.
error
(
"批量下载电子档案失败"
,
e
);
throw
new
RuntimeException
(
"批量下载失败:"
+
e
.
getMessage
(),
e
);
}
}
...
...
@@ -480,7 +479,6 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
}
catch
(
Exception
e
)
{
log
.
error
(
"生成反馈Excel失败"
,
e
);
throw
new
IOException
(
"生成反馈Excel失败"
,
e
);
}
}
...
...
@@ -818,7 +816,6 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
}
catch
(
Exception
e
)
{
log
.
error
(
"勾选导出电子档案失败"
,
e
);
throw
new
RuntimeException
(
"勾选导出失败:"
+
e
.
getMessage
(),
e
);
}
}
...
...
yifu-batch/yifu-batch-biz/src/main/java/com/yifu/cloud/plus/v1/batch/service/impl/TElectronicArchiveTaskServiceImpl.java
View file @
f699d069
...
...
@@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.batch.entity.TElectronicArchiveDetail
;
import
com.yifu.cloud.plus.v1.batch.entity.TElectronicArchiveTask
;
import
com.yifu.cloud.plus.v1.batch.entity.TTaskArchiveRelation
;
import
com.yifu.cloud.plus.v1.batch.mapper.TElectronicArchiveDetailMapper
;
import
com.yifu.cloud.plus.v1.batch.mapper.TElectronicArchiveTaskMapper
;
import
com.yifu.cloud.plus.v1.batch.service.TElectronicArchiveDetailService
;
import
com.yifu.cloud.plus.v1.batch.service.TElectronicArchiveTaskService
;
import
com.yifu.cloud.plus.v1.batch.service.TTaskArchiveRelationService
;
import
com.yifu.cloud.plus.v1.batch.vo.TElectronicArchiveTaskSearchVo
;
...
...
@@ -34,7 +33,7 @@ public class TElectronicArchiveTaskServiceImpl extends ServiceImpl<TElectronicAr
private
final
TTaskArchiveRelationService
relationService
;
private
final
TElectronicArchiveDetail
Service
detailService
;
private
final
TElectronicArchiveDetail
Mapper
detailMapper
;
/**
* 电子档案任务表简单分页查询
...
...
@@ -63,8 +62,7 @@ public class TElectronicArchiveTaskServiceImpl extends ServiceImpl<TElectronicAr
//删除关联关系表
relationService
.
removeById
(
relation
.
getId
());
//删除电子档案明细表
detailService
.
remove
(
Wrappers
.<
TElectronicArchiveDetail
>
query
().
lambda
()
.
eq
(
TElectronicArchiveDetail:
:
getId
,
relation
.
getArchiveDetailId
()));
detailMapper
.
deleteById
(
relation
.
getArchiveDetailId
());
}
}
return
R
.
ok
();
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @
f699d069
...
...
@@ -520,6 +520,23 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
holdInfo
.
setAuditUser
(
hold
.
getAuditUser
());
holdInfo
.
setHandleUser
(
hold
.
getHandleUser
());
holdInfo
.
setAreaCode
(
hold
.
getAreaCode
());
if
(
Common
.
isNotNull
(
hold
.
getResList
())
&&
hold
.
getResList
().
size
()
>
0
)
{
hold
.
getResList
().
forEach
(
e
->
{
e
.
setReasonKey
(
null
);
});
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
hold
.
getAutoStatus
()))
{
holdInfo
.
setIsSingle
(
hold
.
getIsSingle
());
holdInfo
.
setRosterAutoFlagYgs
(
hold
.
getRosterAutoFlagYgs
());
holdInfo
.
setIsSingleYgsPush
(
hold
.
getIsSingleYgsPush
());
holdInfo
.
setDataFlagYgs
(
hold
.
getDataFlagYgs
());
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
hold
.
getAutoStatusYsd
()))
{
holdInfo
.
setIsSingleYsd
(
hold
.
getIsSingleYsd
());
holdInfo
.
setRosterAutoFlagYsd
(
hold
.
getRosterAutoFlagYsd
());
holdInfo
.
setDataFlagYsd
(
hold
.
getDataFlagYsd
());
holdInfo
.
setIsSingleYsdPush
(
hold
.
getIsSingleYsdPush
());
}
if
(
Common
.
isEmpty
(
hold
.
getTown
())
&&
Common
.
isEmpty
(
holdInfo
.
getTown
()))
{
holdInfo
.
setTown
(
hold
.
getTown
());
}
...
...
@@ -1302,13 +1319,13 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
//校验手机号准确性
if
(
Common
.
isNotNull
(
excel
.
getPhone
()))
{
errorMsg
=
checkMobile
(
excel
.
getPhone
());
if
(!
errorMsg
.
contains
(
HouseConfigConstants
.
SUCESS
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
errorMsg
,
excel
));
continue
;
}
}
//
if (Common.isNotNull(excel.getPhone())) {
//
errorMsg = checkMobile(excel.getPhone());
//
if (!errorMsg.contains(HouseConfigConstants.SUCESS)) {
//
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), errorMsg, excel));
//
continue;
//
}
//
}
// 新老数据审核人办理人不同,先删除,再添加
if
(
Common
.
isNotNull
(
excel
.
getAuditUserName
())
&&
!
excel
.
getAuditUserName
().
equals
(
info
.
getAuditUserName
()))
{
tSocialfundHouseResService
.
deleteAuditUser
(
info
);
...
...
@@ -1485,6 +1502,18 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
oldInfo
.
setAuditUser
(
info
.
getAuditUser
());
oldInfo
.
setHandleUser
(
info
.
getHandleUser
());
oldInfo
.
setAreaCode
(
info
.
getAreaCode
());
if
(
CommonConstants
.
ONE_STRING
.
equals
(
info
.
getAutoStatus
()))
{
oldInfo
.
setIsSingle
(
info
.
getIsSingle
());
oldInfo
.
setRosterAutoFlagYgs
(
info
.
getRosterAutoFlagYgs
());
oldInfo
.
setIsSingleYgsPush
(
info
.
getIsSingleYgsPush
());
oldInfo
.
setDataFlagYgs
(
info
.
getDataFlagYgs
());
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
info
.
getAutoStatusYsd
()))
{
oldInfo
.
setIsSingleYsd
(
info
.
getIsSingleYsd
());
oldInfo
.
setRosterAutoFlagYsd
(
info
.
getRosterAutoFlagYsd
());
oldInfo
.
setDataFlagYsd
(
info
.
getDataFlagYsd
());
oldInfo
.
setIsSingleYsdPush
(
info
.
getIsSingleYsdPush
());
}
// 记录变更日志
tSocialLogService
.
saveModificationRecord
(
CommonConstants
.
FOUR_INT
,
oldInfo
.
getId
(),
oldInfo
,
info
);
baseMapper
.
updateById
(
info
);
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/SysHouseHoldInfoFailResMapper.xml
View file @
f699d069
...
...
@@ -24,7 +24,7 @@
<mapper
namespace=
"com.yifu.cloud.plus.v1.yifu.social.mapper.SysHouseHoldInfoFailResMapper"
>
<select
id=
"getListByHuId"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfoFailRes"
>
select
r.FAIL_ID failId,f.REASON_KEY reasonKey,r.REPLAY replay
r.
ID id,r.
FAIL_ID failId,f.REASON_KEY reasonKey,r.REPLAY replay
from sys_house_hold_info_fail_res r
LEFT JOIN fail_reason_config f on r.FAIL_ID=f.id
where r.ID=#{huId}
...
...
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