Skip to content

A
amos-boot-biz
Commit 1d2d5773 authored by tianbo's avatar tianbo
Browse files
Options

feat(jg):优化设备认领与注册信息处理逻辑

- 优化时间字段处理逻辑，支持CREATE_DATE和REC_DATE字段的空值判断 - 补充使用单位地址查询方法，根据使用单位编码获取地址信息 - 调整设备认领和注册服务中的创建时间设置逻辑 - 增加对已有记录的判断，避免重复设置创建时间 - 添加Lazy注解解决循环依赖问题 - 修复使用登记管理中使用单位地址设置逻辑错误 - 完善历史数据处理中的日期转换逻辑
parent 47beccd6
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 10 deletions
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/DataDockServiceImpl.java
View file @ 1d2d5773
......@@ -139,6 +139,7 @@ public class DataDockServiceImpl {
private final CommonMapper commonMapper;
private final JgResumeInfoServiceImpl jgResumeInfoService;
private final IdxBizJgMaintenanceRecordInfoServiceImpl idxBizJgMaintenanceRecordInfoService;
private final TzBaseEnterpriseInfoMapper enterpriseInfoMapper;
private final Map<String, Object> resultError = new HashMap<>();
private final String inUseError = "设备已经做过除历史登记外的其他业务或被用户编辑过！";
List<String> useInnerCodeList = new ArrayList<>();// 单位内部编号集合
......@@ -800,9 +801,20 @@ public class DataDockServiceImpl {
Map<String, Object> map = categoryOtherInfoMapper.selectDataById(record);
ESEquipmentCategoryDto equipmentCategoryDto = JSON.parseObject(toJSONString(map), ESEquipmentCategoryDto.class);
if (!ObjectUtils.isEmpty(equipmentCategoryDto)) {
long time = Timestamp.valueOf(map.get("REC_DATE").toString().substring(0, 19)).getTime();
equipmentCategoryDto.setCREATE_DATE(time);
equipmentCategoryDto.setREC_DATE(time);
long recTime;
long createTime;
if (ValidationUtil.isEmpty(map.get("CREATE_DATE"))) {
createTime = System.currentTimeMillis();
} else {
createTime = Timestamp.valueOf(map.get("CREATE_DATE").toString().substring(0, 19)).getTime();
}
if (ValidationUtil.isEmpty(map.get("REC_DATE"))) {
recTime = System.currentTimeMillis();
} else {
recTime = Timestamp.valueOf(map.get("REC_DATE").toString().substring(0, 19)).getTime();
}
equipmentCategoryDto.setREC_DATE(recTime);
equipmentCategoryDto.setCREATE_DATE(createTime);
equipmentCategoryDto.setSTATUS("已认领");
equipmentCategoryDto.setIS_DO_BUSINESS(Boolean.TRUE);
equipmentCategoryDto.setIS_COMPLETE_XA(Objects.equals("0", isCompleteXa));
......@@ -2839,6 +2851,8 @@ public class DataDockServiceImpl {
jgUseRegistrationManagement.setSuperviseOrgName(equ.get("orgBranchCode").toString().split("_", 2)[1]);
jgUseRegistrationManagement.setIsDoBusiness("1");
jgUseRegistrationManagement.setUseRegistrationCode(equ.get("useOrgCode").toString());
jgUseRegistrationManagement.setUseUnitAddress(this.queryUseUnitAddress(equ));
jgUseRegistrationManagement.setRegDate(DateUtil.parse((String) equ.get("oRegDate"), DatePattern.NORM_DATE_PATTERN));
jgUseRegistrationManageService.saveOrUpdate(jgUseRegistrationManagement);
// 更新证表记录信息
......@@ -2858,6 +2872,17 @@ public class DataDockServiceImpl {
}
}
private String queryUseUnitAddress(Map<String, Object> equ) {
if (!ValidationUtil.isEmpty(equ.get("useUnitCode"))) {
TzBaseEnterpriseInfo enterpriseInfo = enterpriseInfoMapper.selectByUseUnitCode(equ.get("useUnitCode").toString());
if (!ValidationUtil.isEmpty(enterpriseInfo)) {
return enterpriseInfo.getAddress();
}
}
return null;
}
private void handleSupervisionOffice(Map<String, Object> equ) {
Optional.ofNullable(equ.get("orgBranchName")).ifPresent(orgBranchName -> {
String companyOrgCode = CommonCustomConverter.CompanyCodeConverter.getCompanyOrgCodeByName(orgBranchName.toString());
......@@ -3206,7 +3231,8 @@ public class DataDockServiceImpl {
manage.setCreateUserId(jgUseRegistration.getCreateUserId());
manage.setCreateDate(jgUseRegistration.getRecDate());
manage.setEquUseAddress(jgUseRegistration.getUseAddress());
manage.setUseUnitAddress(jgUseRegistration.getUseAddress());
// 查询企业地址
manage.setUseUnitAddress(this.queryUseUnitAddress(map));
manage.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());
manage.setUseUnitCreditCode(jgUseRegistration.getUseUnitCreditCode());
manage.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyCode());
......
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/EquipClaimServiceImpl.java
View file @ 1d2d5773
......@@ -1322,7 +1322,9 @@ public class EquipClaimServiceImpl {
useInfo.setRecord(record);
useInfo.setSequenceNbr(null);
useInfo.setRecDate(nowDate);
useInfo.setCreateDate(nowDate);
if (!hasRecord) {
useInfo.setCreateDate(nowDate);
}
useInfo.setDataSource(JG_HIS_XA_CLAIM);
useInfo.setIsIntoManagement(isIntoManagement);
useInfo.setUseUnitCreditCode(company.getCompanyCode());
......@@ -1436,7 +1438,16 @@ public class EquipClaimServiceImpl {
esEquipmentDto.setNEXT_INSPECT_DATE(inspectionDetectionInfo.getNextInspectDate().getTime());
}
esEquipmentDto.setREC_DATE(System.currentTimeMillis());
esEquipmentDto.setCREATE_DATE(System.currentTimeMillis());
if (!hasRecord) {
esEquipmentDto.setCREATE_DATE(System.currentTimeMillis());
} else {
IdxBizJgUseInfo existUseInfo = idxBizJgUseInfoService.lambdaQuery().eq(IdxBizJgUseInfo::getRecord, record).one();
if (ValidationUtil.isEmpty(existUseInfo)) {
esEquipmentDto.setCREATE_DATE(System.currentTimeMillis());
} else {
esEquipmentDto.setCREATE_DATE(existUseInfo.getCreateDate().getTime());
}
}
esEquipmentDto.setSEQUENCE_NBR(record);
esEquipmentDto.setIS_INTO_MANAGEMENT(false);
esEquipmentDto.setEQU_CATEGORY_CODE(registerInfo.getEquCategory());
......
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/IdxBizJgRegisterInfoServiceImpl.java
View file @ 1d2d5773
......@@ -3993,14 +3993,19 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
esEquipmentCategory.deleteById(id);
}
if (!ObjectUtils.isEmpty(dto)) {
long time = Timestamp.valueOf(map.get("REC_DATE").toString().substring(0, 19)).getTime();
long recTime;
long createTime;
if (map.get("CREATE_DATE") == null) {
createTime = time;
if (ValidationUtil.isEmpty(map.get("CREATE_DATE"))) {
createTime = System.currentTimeMillis();
} else {
createTime = Timestamp.valueOf(map.get("CREATE_DATE").toString().substring(0, 19)).getTime();
}
dto.setREC_DATE(time);
if (ValidationUtil.isEmpty(map.get("REC_DATE"))) {
recTime = System.currentTimeMillis();
} else {
recTime = Timestamp.valueOf(map.get("REC_DATE").toString().substring(0, 19)).getTime();
}
dto.setREC_DATE(recTime);
dto.setCREATE_DATE(createTime);
// 需要安装的设备 安装告知审批通过 清除设备的USC_UNIT_CREDIT_CODE安装单位信息
// 使用单位编辑 防止更新设备时将安改维单位信息更新到es中
......
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/JgChangeRegistrationReformServiceImpl.java
View file @ 1d2d5773
......@@ -63,6 +63,7 @@ import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
......@@ -200,6 +201,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
@Autowired
JgResumeInfoServiceImpl jgResumeInfoService;
@Lazy
@Autowired
private PieLineDataChangeServiceImpl pieLineDataChangeService;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment