Skip to content

L
leader-base
提交 2881a8b1 作者: ZhangJingKun
操作

删除无用代码

上级 9dc27b94
正在显示 包含 0 行增加 和 254 行删除
src/main/java/com/zzsn/leaderbase/config/QiyegaoguanExcutor.java
......@@ -5,7 +5,6 @@ import com.zzsn.leaderbase.entity.CharacterCorrelationEnterprise;
import com.zzsn.leaderbase.service.CharacterBasicInfoService;
import com.zzsn.leaderbase.service.CharacterCorrelationEnterpriseService;
import com.zzsn.leaderbase.service.IGeneratorIdService;
import com.zzsn.leaderbase.util.CharacterMergeStatus;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -34,8 +33,6 @@ public class QiyegaoguanExcutor implements CommandLineRunner {
//生成id
@Autowired
IGeneratorIdService generatorIdService;
@Autowired
CharacterMergeStatus characterMergeStatus;
@Autowired
CharacterBasicInfoService characterBasicInfoService;
......
src/main/java/com/zzsn/leaderbase/controller/CharacterInfoController.java
......@@ -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追加历任职务
* @param characterMergeVo
......
src/main/java/com/zzsn/leaderbase/service/CharacterInfoService.java
......@@ -46,11 +46,6 @@ public interface CharacterInfoService {
Result<?> getListByName(String id, String Name, String articleId);
Result<?> checkUpdate(CharacterCheckVo characterCheckVo);
Result<?> checkCancelUpdate(String id);
Result<?> merge(CharacterMergeVo characterMergeVo);
Result<?> mergeCancel(String id);
......
src/main/java/com/zzsn/leaderbase/service/impl/CharacterInfoServiceImpl.java
......@@ -8,7 +8,6 @@ import com.zzsn.leaderbase.entity.CharacterBasicInfoHistory;
import com.zzsn.leaderbase.entity.CharacterChangeInfo;
import com.zzsn.leaderbase.entity.CharacterTagMap;
import com.zzsn.leaderbase.service.*;
import com.zzsn.leaderbase.util.CharacterMergeStatus;
import com.zzsn.leaderbase.vo.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
......@@ -39,8 +38,6 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
//生成id
@Autowired
IGeneratorIdService generatorIdService;
@Autowired
CharacterMergeStatus characterMergeStatus;
//人物标签
@Autowired
......@@ -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
public Result<?> merge(CharacterMergeVo characterMergeVo) {
......
src/main/java/com/zzsn/leaderbase/util/CharacterMergeStatus.java deleted 100644 → 0
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 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论