Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
L
leader-base
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
张京坤
leader-base
Commits
2881a8b1
提交
2881a8b1
authored
5月 06, 2024
作者:
ZhangJingKun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
删除无用代码
上级
9dc27b94
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
0 行增加
和
254 行删除
+0
-254
QiyegaoguanExcutor.java
...n/java/com/zzsn/leaderbase/config/QiyegaoguanExcutor.java
+0
-3
CharacterInfoController.java
...m/zzsn/leaderbase/controller/CharacterInfoController.java
+0
-25
CharacterInfoService.java
...ava/com/zzsn/leaderbase/service/CharacterInfoService.java
+0
-5
CharacterInfoServiceImpl.java
...zsn/leaderbase/service/impl/CharacterInfoServiceImpl.java
+0
-99
CharacterMergeStatus.java
...n/java/com/zzsn/leaderbase/util/CharacterMergeStatus.java
+0
-122
没有找到文件。
src/main/java/com/zzsn/leaderbase/config/QiyegaoguanExcutor.java
浏览文件 @
2881a8b1
...
@@ -5,7 +5,6 @@ import com.zzsn.leaderbase.entity.CharacterCorrelationEnterprise;
...
@@ -5,7 +5,6 @@ import com.zzsn.leaderbase.entity.CharacterCorrelationEnterprise;
import
com.zzsn.leaderbase.service.CharacterBasicInfoService
;
import
com.zzsn.leaderbase.service.CharacterBasicInfoService
;
import
com.zzsn.leaderbase.service.CharacterCorrelationEnterpriseService
;
import
com.zzsn.leaderbase.service.CharacterCorrelationEnterpriseService
;
import
com.zzsn.leaderbase.service.IGeneratorIdService
;
import
com.zzsn.leaderbase.service.IGeneratorIdService
;
import
com.zzsn.leaderbase.util.CharacterMergeStatus
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
...
@@ -34,8 +33,6 @@ public class QiyegaoguanExcutor implements CommandLineRunner {
...
@@ -34,8 +33,6 @@ public class QiyegaoguanExcutor implements CommandLineRunner {
//生成id
//生成id
@Autowired
@Autowired
IGeneratorIdService
generatorIdService
;
IGeneratorIdService
generatorIdService
;
@Autowired
CharacterMergeStatus
characterMergeStatus
;
@Autowired
@Autowired
CharacterBasicInfoService
characterBasicInfoService
;
CharacterBasicInfoService
characterBasicInfoService
;
...
...
src/main/java/com/zzsn/leaderbase/controller/CharacterInfoController.java
浏览文件 @
2881a8b1
...
@@ -152,31 +152,6 @@ public class CharacterInfoController {
...
@@ -152,31 +152,6 @@ public class CharacterInfoController {
/**
/**
* 审核(废弃)
* @param characterCheckVo
* @return
*/
@PostMapping
(
"/checkUpdate"
)
public
Result
<?>
checkUpdate
(
@RequestBody
CharacterCheckVo
characterCheckVo
){
if
(
characterCheckVo
.
getOriginalCharacter
()
==
null
||
characterCheckVo
.
getCharacter
()
==
null
)
return
Result
.
error
(
"参数有误:历史人物信息或新人物信息不能为空!"
);
return
characterInfoService
.
checkUpdate
(
characterCheckVo
);
}
/**
* 根据id 取消人物 审核 (废弃)
* @param id
* @return
*/
@GetMapping
(
"/checkCancelUpdate"
)
public
Result
<?>
checkCancelUpdate
(
@RequestParam
(
name
=
"id"
,
required
=
true
)
String
id
){
if
(
id
==
null
||
id
.
length
()
==
0
)
return
Result
.
error
(
"id不能为空!"
);
return
characterInfoService
.
checkCancelUpdate
(
id
);
}
/**
* 人物合并
* 人物合并
* 操作类型,1合并人物 2新增人物 3追加历任职务
* 操作类型,1合并人物 2新增人物 3追加历任职务
* @param characterMergeVo
* @param characterMergeVo
...
...
src/main/java/com/zzsn/leaderbase/service/CharacterInfoService.java
浏览文件 @
2881a8b1
...
@@ -46,11 +46,6 @@ public interface CharacterInfoService {
...
@@ -46,11 +46,6 @@ public interface CharacterInfoService {
Result
<?>
getListByName
(
String
id
,
String
Name
,
String
articleId
);
Result
<?>
getListByName
(
String
id
,
String
Name
,
String
articleId
);
Result
<?>
checkUpdate
(
CharacterCheckVo
characterCheckVo
);
Result
<?>
checkCancelUpdate
(
String
id
);
Result
<?>
merge
(
CharacterMergeVo
characterMergeVo
);
Result
<?>
merge
(
CharacterMergeVo
characterMergeVo
);
Result
<?>
mergeCancel
(
String
id
);
Result
<?>
mergeCancel
(
String
id
);
...
...
src/main/java/com/zzsn/leaderbase/service/impl/CharacterInfoServiceImpl.java
浏览文件 @
2881a8b1
...
@@ -8,7 +8,6 @@ import com.zzsn.leaderbase.entity.CharacterBasicInfoHistory;
...
@@ -8,7 +8,6 @@ import com.zzsn.leaderbase.entity.CharacterBasicInfoHistory;
import
com.zzsn.leaderbase.entity.CharacterChangeInfo
;
import
com.zzsn.leaderbase.entity.CharacterChangeInfo
;
import
com.zzsn.leaderbase.entity.CharacterTagMap
;
import
com.zzsn.leaderbase.entity.CharacterTagMap
;
import
com.zzsn.leaderbase.service.*
;
import
com.zzsn.leaderbase.service.*
;
import
com.zzsn.leaderbase.util.CharacterMergeStatus
;
import
com.zzsn.leaderbase.vo.*
;
import
com.zzsn.leaderbase.vo.*
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
...
@@ -39,8 +38,6 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
...
@@ -39,8 +38,6 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
//生成id
//生成id
@Autowired
@Autowired
IGeneratorIdService
generatorIdService
;
IGeneratorIdService
generatorIdService
;
@Autowired
CharacterMergeStatus
characterMergeStatus
;
//人物标签
//人物标签
@Autowired
@Autowired
...
@@ -297,102 +294,6 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
...
@@ -297,102 +294,6 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
}
}
/**
* 审核
* @param characterCheckVo
* @return
*/
@Override
public
Result
<?>
checkUpdate
(
CharacterCheckVo
characterCheckVo
)
{
//原人物信息
CharacterVo
originalCharacter
=
characterCheckVo
.
getOriginalCharacter
();
//新人物信息
CharacterVo
character
=
characterCheckVo
.
getCharacter
();
character
.
setCheckStatus
(
1L
);
//更新职务信息
//获取新的人物对象
CharacterVo
characterVoNew
=
characterMergeStatus
.
mergeNew
(
originalCharacter
,
character
);
//保存数据
//vo对象获取转entity对象,基本信息
CharacterBasicInfo
characterBasicInfo
=
new
CharacterBasicInfo
();
BeanUtils
.
copyProperties
(
characterVoNew
,
characterBasicInfo
);
characterBasicInfoService
.
save
(
characterBasicInfo
);
//vo对象获取转entity对象,任职变更信息
CharacterChangeInfo
characterChangeInfo
=
new
CharacterChangeInfo
();
BeanUtils
.
copyProperties
(
characterVoNew
,
characterChangeInfo
);
characterChangeInfoService
.
save
(
characterChangeInfo
);
//合并前的数据状态修改为停用
CharacterChangeInfo
cci1
=
new
CharacterChangeInfo
();
cci1
.
setId
(
originalCharacter
.
getId
());
cci1
.
setStatus
(
0L
);
characterChangeInfoService
.
updateById
(
cci1
);
CharacterChangeInfo
cci2
=
new
CharacterChangeInfo
();
cci2
.
setId
(
character
.
getId
());
cci2
.
setStatus
(
0L
);
characterChangeInfoService
.
updateById
(
cci2
);
//记录人物基本信息修改记录
// CharacterBasicInfoHistory characterBasicInfoHistory = new CharacterBasicInfoHistory();
// BeanUtils.copyProperties(characterBasicInfo, characterBasicInfoHistory);
// characterBasicInfoHistory.setId(null);
// characterBasicInfoHistoryService.save(characterBasicInfoHistory);
return
Result
.
OK
(
characterVoNew
);
}
/**
* 取消审核
* @param id
* @return
*/
@Override
public
Result
<?>
checkCancelUpdate
(
String
id
)
{
//根据id查询人物信息
CharacterVo
characterVo
=
characterBasicInfoService
.
getById
(
id
);
if
(
characterVo
==
null
){
log
.
info
(
"根据id未查询到人物信息:{}"
,
id
);
return
Result
.
error
(
"未查询到人物信息!"
);
}
//审核信息 原人物id
String
originalId
=
characterVo
.
getOriginalId
();
//审核信息 新人物id
String
newId
=
characterVo
.
getNewId
();
//审核信息 1:更新人物 2:添加职位
// Long mergeStatus = characterVo.getMergeStatus();
// if (originalId == null || newId == null){
// log.info("数据有误:{}---{}---{}", originalId, newId, mergeStatus);
// return Result.error("数据有误!");
// }
//恢复合并前的人物为启用
//合并前的数据状态修改为停用
List
<
CharacterChangeInfo
>
updateList
=
new
ArrayList
<>();
CharacterChangeInfo
cci1
=
new
CharacterChangeInfo
();
cci1
.
setId
(
originalId
);
cci1
.
setStatus
(
1L
);
characterChangeInfoService
.
updateById
(
cci1
);
updateList
.
add
(
cci1
);
CharacterChangeInfo
cci2
=
new
CharacterChangeInfo
();
cci2
.
setId
(
newId
);
cci2
.
setStatus
(
1L
);
updateList
.
add
(
cci2
);
characterChangeInfoService
.
updateById
(
cci1
);
//characterChangeInfoService.updateBatchById(updateList);
//删除合并人物
characterBasicInfoService
.
removeById
(
id
);
characterChangeInfoService
.
removeById
(
id
);
//查询新人物返回
CharacterVo
characterById
=
characterBasicInfoService
.
getById
(
newId
);
return
Result
.
OK
(
characterById
);
}
@Override
@Override
public
Result
<?>
merge
(
CharacterMergeVo
characterMergeVo
)
{
public
Result
<?>
merge
(
CharacterMergeVo
characterMergeVo
)
{
...
...
src/main/java/com/zzsn/leaderbase/util/CharacterMergeStatus.java
deleted
100644 → 0
浏览文件 @
9dc27b94
package
com
.
zzsn
.
leaderbase
.
util
;
import
com.zzsn.leaderbase.service.IGeneratorIdService
;
import
com.zzsn.leaderbase.vo.CharacterVo
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
java.util.Date
;
/**
* @Version 1.0
* @Author: ZhangJingKun
* @Date: 2024/3/7 11:33
* @Content: 人物审核时合并操作和取消合并
*/
@Component
public
class
CharacterMergeStatus
{
/**
* 生成id
*/
@Autowired
IGeneratorIdService
generatorIdService
;
/**
* 根据新老人物信息合并为一个新的人物信息
* @param originalCharacter
* @param character
* @return
*/
public
CharacterVo
mergeNew
(
CharacterVo
originalCharacter
,
CharacterVo
character
){
CharacterVo
characterVoNew
=
new
CharacterVo
();
String
id
=
Long
.
toString
(
generatorIdService
.
getOrderId
());
characterVoNew
.
setId
(
id
);
//人物id使用原人物uid
String
uid
=
originalCharacter
.
getUid
();
characterVoNew
.
setUid
(
uid
);
characterVoNew
.
setName
(
getValue
(
character
.
getName
(),
originalCharacter
.
getName
()));
characterVoNew
.
setSex
(
getValue
(
character
.
getSex
(),
originalCharacter
.
getSex
()));
characterVoNew
.
setBirthplace
(
getValue
(
character
.
getBirthplace
(),
originalCharacter
.
getBirthplace
()));
characterVoNew
.
setBirthday
(
getValue
(
character
.
getBirthday
(),
originalCharacter
.
getBirthday
()));
characterVoNew
.
setNativePlace
(
getValue
(
character
.
getNativePlace
(),
originalCharacter
.
getNativePlace
()));
characterVoNew
.
setSchool
(
getValue
(
character
.
getSchool
(),
originalCharacter
.
getSchool
()));
characterVoNew
.
setSpeciality
(
getValue
(
character
.
getSpeciality
(),
originalCharacter
.
getSpeciality
()));
characterVoNew
.
setEducation
(
getValue
(
character
.
getEducation
(),
originalCharacter
.
getEducation
()));
characterVoNew
.
setExpertOccupation
(
getValue
(
character
.
getExpertOccupation
(),
originalCharacter
.
getExpertOccupation
()));
characterVoNew
.
setHeadSculpture
(
getValue
(
character
.
getHeadSculpture
(),
originalCharacter
.
getHeadSculpture
()));
characterVoNew
.
setBiographicalNotes
(
getValue
(
character
.
getBiographicalNotes
(),
originalCharacter
.
getBiographicalNotes
()));
characterVoNew
.
setCategory
(
getValue
(
character
.
getCategory
(),
originalCharacter
.
getCategory
()));
characterVoNew
.
setAwardRecords
(
getValue
(
character
.
getAwardRecords
(),
originalCharacter
.
getAwardRecords
()));
characterVoNew
.
setPartTimeJob
(
getValue
(
character
.
getPartTimeJob
(),
originalCharacter
.
getPartTimeJob
()));
characterVoNew
.
setResearchField
(
getValue
(
character
.
getResearchField
(),
originalCharacter
.
getResearchField
()));
characterVoNew
.
setEvaluate
(
getValue
(
character
.
getEvaluate
(),
originalCharacter
.
getEvaluate
()));
characterVoNew
.
setCreateTime
(
new
Date
());
//原单位、原部门、原职务,新人物中没值去原数据的现
characterVoNew
.
setCompanyOriginal
(
getValue
(
character
.
getCompanyOriginal
(),
originalCharacter
.
getCompany
()));
characterVoNew
.
setDepartmentOriginal
(
getValue
(
character
.
getDepartmentOriginal
(),
originalCharacter
.
getDepartment
()));
characterVoNew
.
setDutyOriginal
(
getValue
(
character
.
getDutyOriginal
(),
originalCharacter
.
getDuty
()));
//单位、部门、职务 取新人物中的
characterVoNew
.
setCompany
(
character
.
getCompany
());
characterVoNew
.
setDepartment
(
character
.
getDepartment
());
characterVoNew
.
setDuty
(
character
.
getDuty
());
characterVoNew
.
setTakeOfficeTime
(
character
.
getTakeOfficeTime
());
characterVoNew
.
setTakeOfficeStatus
(
character
.
getTakeOfficeStatus
());
characterVoNew
.
setChangeUrl
(
character
.
getChangeUrl
());
characterVoNew
.
setDutiesUpdateTime
(
character
.
getDutiesUpdateTime
());
characterVoNew
.
setDutiesUpdateReason
(
character
.
getDutiesUpdateReason
());
characterVoNew
.
setCheckStatus
(
1L
);
characterVoNew
.
setCheckResult
(
character
.
getCheckResult
());
characterVoNew
.
setArticleId
(
character
.
getArticleId
());
characterVoNew
.
setArticleIndex
(
character
.
getArticleIndex
());
characterVoNew
.
setUpdateDesc
(
character
.
getUpdateDesc
());
characterVoNew
.
setOriginalId
(
originalCharacter
.
getId
());
characterVoNew
.
setNewId
(
character
.
getId
());
characterVoNew
.
setMergeStatus
(
1L
);
return
characterVoNew
;
}
/**
* 若value1不为空则返回value1,否则返回value2
* @param value1
* @param value2
* @return
*/
private
String
getValue
(
String
value1
,
String
value2
){
if
(
value1
==
null
||
value1
.
length
()
==
0
)
return
value2
;
return
value1
;
}
private
Date
getValue
(
Date
value1
,
Date
value2
){
if
(
value1
==
null
)
return
value2
;
return
value1
;
}
private
boolean
isNotEmpty
(
String
value
){
return
value
!=
null
&&
value
.
length
()
>
0
;
}
private
boolean
isNotEmpty
(
Date
value
){
return
value
!=
null
;
}
/**
* 合并两个字段,用 ;分隔
* @param value1
* @param value2
* @return
*/
private
String
mergeValue
(
String
value1
,
String
value2
){
StringBuffer
sb
=
new
StringBuffer
();
if
(
value1
==
null
||
value1
.
length
()
==
0
){
sb
.
append
(
value2
);
}
else
{
sb
.
append
(
value1
).
append
(
";"
).
append
(
value2
);
}
return
sb
.
toString
();
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论