Skip to content

A
amos-boot-biz
Commit 9a04427c authored by suhuiguang's avatar suhuiguang
Browse files
Options

feat(重要提醒)：业务新增提醒开发联调

1.使用登记、车用气瓶作废
parent 72fcb711
Show whitespace changes
Inline Side-by-side
Showing with 314 additions and 174 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/backup/EquipBackupHandler.java
View file @ 9a04427c
......@@ -140,12 +140,12 @@ public class EquipBackupHandler {
useInfoService.saveOrUpdate(useInfo);
// 检验流水
List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfos = JSONObject.parseArray(eq.getString(BACKUP_JSON_KEY_INSPECTION_DETECTION_INFO), IdxBizJgInspectionDetectionInfo.class);
if (!inspectionDetectionInfos.isEmpty()) {
if (inspectionDetectionInfos != null && !inspectionDetectionInfos.isEmpty()) {
inspectionDetectionInfoService.saveOrUpdateBatch(inspectionDetectionInfos);
}
// 施工流水
List<IdxBizJgConstructionInfo> constructionInfoList = JSONObject.parseArray(eq.getString(BACKUP_JSON_KEY_CONSTRUCTION_INFO), IdxBizJgConstructionInfo.class);
if (!constructionInfoList.isEmpty()) {
if (constructionInfoList != null && !constructionInfoList.isEmpty()) {
constructionInfoService.saveOrUpdateBatch(constructionInfoList);
}
// 技术参数
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/event/CancellationAndGradeEvent.java 0 → 100644
View file @ 9a04427c
package com.yeejoin.amos.boot.module.jg.biz.event;
import lombok.Getter;
import org.springframework.context.ApplicationEvent;
import java.util.List;
import java.util.Set;
/**
* @author Administrator
*/
@Getter
public class CancellationAndGradeEvent extends ApplicationEvent {
private final Set<String> projectContraptionIds;
private final List<String> records;
public CancellationAndGradeEvent(Object source, List<String> records, Set<String> projectContraptionIds) {
super(source);
this.projectContraptionIds = projectContraptionIds;
this.records = records;
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/event/CancellationEvent.java
View file @ 9a04427c
......@@ -12,9 +12,7 @@ import java.util.Set;
@Getter
public class CancellationEvent extends ApplicationEvent {
private List<String> records;
private Set<String> projectContraptionIds;
private final List<String> records;
/**
* Create a new {@code ApplicationEvent}.
*
......@@ -25,10 +23,4 @@ public class CancellationEvent extends ApplicationEvent {
super(source);
this.records = records;
}
public CancellationEvent(Object source, List<String> records, Set<String> projectContraptionIds) {
super(source);
this.records = records;
this.projectContraptionIds = projectContraptionIds;
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/event/dto/CancelEquipItem.java 0 → 100644
View file @ 9a04427c
package com.yeejoin.amos.boot.module.jg.biz.event.dto;
import lombok.Data;
import java.util.List;
import java.util.Set;
@Data
public class CancelEquipItem {
private Set<String> projectContraptionIds;
private List<String> records;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/event/listener/CancelAndGradeEventListener.java 0 → 100644
View file @ 9a04427c
package com.yeejoin.amos.boot.module.jg.biz.event.listener;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.module.jg.biz.event.CancellationAndGradeEvent;
import com.yeejoin.amos.boot.module.jg.biz.event.dto.CancelEquipItem;
import com.yeejoin.amos.boot.module.jg.biz.event.listener.service.ManageStatusDataUpdateService;
import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
/**
* @author Administrator
*/
@Component
@Slf4j
@RequiredArgsConstructor
public class CancelAndGradeEventListener {
@Value("${cancellation.deal.thread.number:1}")
private int threadNumber;
private final BlockingQueue<CancelEquipItem> queue = new LinkedBlockingQueue<>();
private final ManageStatusDataUpdateService updateService;
@EventListener(value = CancellationAndGradeEvent.class)
public void handleTransactionalEvent(CancellationAndGradeEvent event) {
log.info("收到作废且更新评分消息:{}", JSONObject.toJSONString(event));
List<String> records = event.getRecords();
CancelEquipItem cancelEquipItem = new CancelEquipItem();
cancelEquipItem.setRecords(records);
cancelEquipItem.setProjectContraptionIds(event.getProjectContraptionIds());
queue.add(cancelEquipItem);
}
@PostConstruct
public void init() {
ExecutorService executorService = Executors.newFixedThreadPool(threadNumber, r -> {
Thread t = new Thread(r);
t.setName("CancelAndGradeEventWorker-" + t.getId());
return t;
});
for (int i = 0; i < threadNumber; i++) {
executorService.execute(() -> {
while (true) {
try {
CancelEquipItem cancelEquipItem = queue.take();
log.info("线程 {} 开始处理 cancelEquipItem: {}", Thread.currentThread().getName(), cancelEquipItem);
updateService.dealData(cancelEquipItem);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
});
}
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/event/listener/CancellationEventListener.java
View file @ 9a04427c
package com.yeejoin.amos.boot.module.jg.biz.event.listener;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent;
import com.yeejoin.amos.boot.module.jg.biz.event.listener.service.ManageStatusDataUpdateService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
......@@ -31,22 +29,14 @@ public class CancellationEventListener {
private final BlockingQueue<String> queue = new LinkedBlockingQueue<>();
private final EventPublisher publisher;
private final ManageStatusDataUpdateService updateService;
@EventListener(value = CancellationEvent.class)
public void handleTransactionalEvent(CancellationEvent event) {
log.info("收到作废消息:{}", JSONObject.toJSONString(event));
List<String> records = event.getRecords();
log.info("收到作废消息:{}", JSONObject.toJSONString(records));
queue.addAll(records);
castEvent2EquipEditEvent(event);
}
private void castEvent2EquipEditEvent(CancellationEvent event) {
if (event.getProjectContraptionIds() != null && !event.getProjectContraptionIds().isEmpty()) {
publisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_NEW_PROJECT.name(), event.getProjectContraptionIds(), EquipCreateOrEditEvent.EquipType.project));
}
}
@PostConstruct
......@@ -62,7 +52,7 @@ public class CancellationEventListener {
try {
String record = queue.take();
log.info("线程 {} 开始处理 record: {}", Thread.currentThread().getName(), record);
updateService.dealData(record);
updateService.dealData(record, false);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/event/listener/ManageStatusDataUpdateService.java → amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/event/listener/service/ManageStatusDataUpdateService.java
View file @ 9a04427c
package com.yeejoin.amos.boot.module.jg.biz.event.listener;
package com.yeejoin.amos.boot.module.jg.biz.event.listener.service;
import com.google.common.collect.Sets;
import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.biz.event.dto.CancelEquipItem;
import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent;
import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
......@@ -17,6 +18,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Optional;
import java.util.Set;
@Service
@Slf4j
......@@ -34,7 +36,23 @@ public class ManageStatusDataUpdateService {
private final IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoService;
@Transactional(rollbackFor = Exception.class)
public void dealData(String record) {
public void dealData(CancelEquipItem cancelEquipItem) {
// 设备、气瓶、管道纳管状态处理
cancelEquipItem.getRecords().forEach(record -> {
dealData(record, true);
});
// 装置评分处理
castEvent2EquipEditEvent(cancelEquipItem.getProjectContraptionIds());
}
/**
* 处理单个设备纳管状态
*
* @param record 设备唯一标识
* @param isForward 是否进行转发
*/
@Transactional(rollbackFor = Exception.class)
public void dealData(String record, Boolean isForward) {
log.info("开始检查设备的引用:{}", record);
// 所有业务单据（除去作废、删除状态单据），有在引用设备的则不修改设备纳管状态
Boolean inUsed = commonService.checkEquipIsUsed(record);
......@@ -64,14 +82,23 @@ public class ManageStatusDataUpdateService {
}
esEquipmentCategoryDao.save(esEquipmentCategoryDto);
});
castEvent2EquipEditEvent(record);
} catch (Exception e) {
log.error("设备作废异常:{}", e.getMessage());
}
}
if (isForward) {
castEvent2EquipEditEvent(record);
}
}
private void castEvent2EquipEditEvent(String record) {
publisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_NEW_EQUIP.name(), Sets.newHashSet(record), EquipCreateOrEditEvent.EquipType.equip));
}
private void castEvent2EquipEditEvent(Set<String> projectContraptionIds) {
if (projectContraptionIds != null && !projectContraptionIds.isEmpty()) {
publisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_NEW_PROJECT.name(), projectContraptionIds, EquipCreateOrEditEvent.EquipType.project));
}
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/core/event/service/impl/EquipQualityScoreUpdateService.java
View file @ 9a04427c
......@@ -5,16 +5,17 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.factory.GradeStrategyFactory;
import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent;
import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.service.IQualityScoreUpdate;
import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.factory.GradeStrategyFactory;
import com.yeejoin.amos.boot.module.jg.biz.reminder.dto.MatchItemDto;
import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
import com.yeejoin.amos.boot.module.jg.biz.reminder.service.CommonReminderService;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgRegisterInfoServiceImpl;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgUseInfoServiceImpl;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
......@@ -22,6 +23,7 @@ import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import java.util.Collections;
import java.util.Date;
import java.util.Optional;
import java.util.Set;
......@@ -52,6 +54,10 @@ public class EquipQualityScoreUpdateService implements IQualityScoreUpdate {
public void update(String bizType, Set<String> records) {
records.parallelStream().forEach(record -> {
Optional<ESEquipmentCategoryDto> op = equipmentCategoryDao.findById(record);
// 压力管道不进行管道登记的计算
if (op.isPresent() && op.get().getEQU_LIST_CODE().equals(EquipmentClassifityEnum.YLGD.getCode())) {
return;
}
Integer level = this.getReminderLevel(bizType, record);
op.ifPresent(equipmentCategory -> {
equipmentCategory.setDataQualityScore(level);
......@@ -60,6 +66,7 @@ public class EquipQualityScoreUpdateService implements IQualityScoreUpdate {
LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(IdxBizJgUseInfo::getRecord, record);
updateWrapper.set(IdxBizJgUseInfo::getDataQualityScore, level);
updateWrapper.set(TzsBaseEntity::getRecDate, new Date());
idxBizJgUseInfoService.update(updateWrapper);
});
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/core/event/service/impl/ProjectQualityScoreUpdateService.java
View file @ 9a04427c
......@@ -2,11 +2,12 @@ package com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.factory.GradeStrategyFactory;
import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent;
import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.service.IQualityScoreUpdate;
import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.factory.GradeStrategyFactory;
import com.yeejoin.amos.boot.module.jg.biz.reminder.dto.MatchItemDto;
import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
import com.yeejoin.amos.boot.module.jg.biz.reminder.service.CommonReminderService;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgProjectContraptionServiceImpl;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
......@@ -17,6 +18,7 @@ import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import java.util.Collections;
import java.util.Date;
import java.util.Set;
@Component
......@@ -44,6 +46,7 @@ public class ProjectQualityScoreUpdateService implements IQualityScoreUpdate {
LambdaUpdateWrapper<IdxBizJgProjectContraption> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(IdxBizJgProjectContraption::getSequenceNbr, projectContraptionId);
updateWrapper.set(IdxBizJgProjectContraption::getDataQualityScore, level);
updateWrapper.set(BaseEntity::getRecDate, new Date());
idxBizJgProjectContraptionService.update(updateWrapper);
});
}
......
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/JgUseRegistrationServiceImpl.java
View file @ 9a04427c
......@@ -46,6 +46,7 @@ import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.useRegister.UseRegisterBackupManager;
import com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler.PieLineLevelTypeHandler;
import com.yeejoin.amos.boot.module.jg.biz.event.CancellationAndGradeEvent;
import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
......@@ -283,16 +284,16 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
today = auditPassDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
}
exportParamsMap.put("giveOutYear", today.getYear());
exportParamsMap.put("giveOutMonth", String.format("%02d",today.getMonthValue()));
exportParamsMap.put("giveOutDay", String.format("%02d",today.getDayOfMonth()));
exportParamsMap.put("giveOutMonth", String.format("%02d", today.getMonthValue()));
exportParamsMap.put("giveOutDay", String.format("%02d", today.getDayOfMonth()));
}
static void getReissueDate(Date reissueDate, Map<String, Object> exportParamsMap) {
if (!ValidationUtil.isEmpty(reissueDate)) {
LocalDate date = reissueDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
exportParamsMap.put("reissueDateYear", date.getYear());
exportParamsMap.put("reissueDateMonth", String.format("%02d",date.getMonthValue()));
exportParamsMap.put("reissueDateDay", String.format("%02d",date.getDayOfMonth()));
exportParamsMap.put("reissueDateMonth", String.format("%02d", date.getMonthValue()));
exportParamsMap.put("reissueDateDay", String.format("%02d", date.getDayOfMonth()));
}
}
......@@ -449,8 +450,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
private void updateOrCreateInspectionDetection(Map<String, Object> equipment, JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo registerInfo) {
InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();
BeanUtil.copyProperties(equipment, inspectionDetectionInfo);
if("unit".equals(jgUseRegistration.getManageType())){
if (registerInfo.getEquList().equals(EquipmentClassifityEnum.YLGD.getCode())){
if ("unit".equals(jgUseRegistration.getManageType())) {
if (registerInfo.getEquList().equals(EquipmentClassifityEnum.YLGD.getCode())) {
// 压力管道逻辑，根据设备record + 检验报告编号判定唯一一条检验流水，有进行更新，无则进行插入
String record = (String) equipment.get("record");
inspectionDetectionInfo.setInspectConclusion((String) equipment.get("inspectConclusionCode"));
......@@ -606,7 +607,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
jgUseRegistration.setSupervisionOrgCode(splitOrgBranchCode[0]);
}
// 安全管理员
if (map.containsKey("safetyManager")&& map.get("safetyManager") != null) {
if (map.containsKey("safetyManager") && map.get("safetyManager") != null) {
String[] data = String.valueOf(map.getString("safetyManager")).split("_");
map.put("safetyManagerId", data[0]);
map.put("safetyManagerName", data[1]);
......@@ -808,7 +809,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
List<String> records = eqList.stream().map(JgUseRegistrationEq::getEquId).collect(toList());
//合并的管道只需要子工程装置管道集合
if (Objects.nonNull(data.getOriginProjectContraptionIds()) &&
!data.getOriginProjectContraptionIds().contains(data.getProjectContraptionId())){
!data.getOriginProjectContraptionIds().contains(data.getProjectContraptionId())) {
List<IdxBizJgUseInfo> useInfoRecords = idxBizJgUseInfoService.lambdaQuery()
.select(IdxBizJgUseInfo::getRecord)
.in(IdxBizJgUseInfo::getProjectContraptionId, Arrays.asList(data.getOriginProjectContraptionIds().split(",")))
......@@ -841,7 +842,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
CompanyBo company = reginParams.getCompany();
String equListCode = String.valueOf(map.get("EQU_LIST_CODE"));
List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
if (!ObjectUtils.isEmpty(map.get("submit")) &&CollectionUtils.isEmpty(equipmentLists)) {
if (!ObjectUtils.isEmpty(map.get("submit")) && CollectionUtils.isEmpty(equipmentLists)) {
throw new BadRequest("请选择设备信息!");
}
......@@ -1217,7 +1218,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
List<String> records = new ArrayList<>();
if (!CollectionUtils.isEmpty(equipmentLists)) {
// 装置更新管道的技术参数、设计信息、安装信息
if(jgProjectContraption != null){
if (jgProjectContraption != null) {
updatePieLineTechAndInspection(equipmentLists);
}
for (int i = 0; i < equipmentLists.size(); i++) {
......@@ -1289,11 +1290,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
/**
* 计算登记
*
* @param jgUseRegistration 使用登记
* @param records 管道或者普通气瓶
*/
private void publish2CalGrade(JgUseRegistration jgUseRegistration, List<String> records) {
if(!StringUtils.isEmpty(jgUseRegistration.getProjectContraptionId())){ // 装置
if (!StringUtils.isEmpty(jgUseRegistration.getProjectContraptionId())) { // 装置
eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_USAGE_REGISTRATION.name(), Sets.newHashSet(jgUseRegistration.getProjectContraptionId()), EquipCreateOrEditEvent.EquipType.project));
} else { // 气瓶
eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_USAGE_REGISTRATION.name(), Sets.newHashSet(records), EquipCreateOrEditEvent.EquipType.equip));
......@@ -1302,6 +1304,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
/**
* 管道的技术参数及检验信息更新
*
* @return 更新的管道信息
*/
private void updatePieLineTechAndInspection(List<Map<String, Object>> piePines) {
......@@ -1342,9 +1345,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
private void updateRegAndProjectContraption(JgUseRegistration jgUseRegistration, JSONObject mapData, IdxBizJgProjectContraption jgProjectContraption) {
//总工程装置
if(!StringUtils.isEmpty(jgProjectContraption)){
if (!StringUtils.isEmpty(jgProjectContraption)) {
jgUseRegistration.setProjectContraption(jgProjectContraption.getProjectContraption());
jgProjectContraption.setUseDate(Objects.toString(mapData.get("useDate"),""));
jgProjectContraption.setUseDate(Objects.toString(mapData.get("useDate"), ""));
jgProjectContraption.setCity(String.valueOf(mapData.get("city")));
jgProjectContraption.setCounty(String.valueOf(mapData.get("county")));
jgProjectContraption.setStreet(String.valueOf(mapData.get("factoryUseSiteStreet")));
......@@ -1399,6 +1402,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
/**
* 根据code获取市区县名字
*
* @param key key
* @param codeKey codeKey
* @param mapData 表单信息
......@@ -1415,10 +1419,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
private String getInspectConclusionName(JSONObject mapData) {
if( !ObjectUtils.isEmpty(mapData.get("inspectConclusion"))) {
if (!ObjectUtils.isEmpty(mapData.get("inspectConclusion"))) {
String code = mapData.get("inspectConclusion").toString();
DataDictionary conclusionDict = dataDictionaryServiceImpl.getByCode( code,"JYJL");
if(conclusionDict != null) {
DataDictionary conclusionDict = dataDictionaryServiceImpl.getByCode(code, "JYJL");
if (conclusionDict != null) {
return conclusionDict.getName();
}
}
......@@ -1452,11 +1456,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
changeRecord.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());//使用登记编号
changeRecord.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyOrgCode());//接收机构公司代码
// 流水表不需要再次生成唯一编号，使用证管理表对应值
if (!ObjectUtils.isEmpty(jgUseRegistration.getUseRegistrationCode())){
if (!ObjectUtils.isEmpty(jgUseRegistration.getUseRegistrationCode())) {
JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery()
.eq(JgUseRegistrationManage::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode())
.eq(JgUseRegistrationManage::getIsDelete, 0)
.eq(JgUseRegistrationManage::getCertificateStatus,CertificateStatusEnum.YIDENGJI.getName()).one();
.eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName()).one();
changeRecord.setCertificateNo(manage.getCertificateNo());//登记证书唯一码
}
changeRecord.setUseUnitCreditCode(jgUseRegistration.getUseUnitCreditCode());//使用单位统一信用代码
......@@ -1648,7 +1652,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
} else {
//如果是特殊的历史设备需要更新安装信息
String dataSource = jsonObject.getString("DATA_SOURCE");
if("jg_his_black".equals(dataSource)){
if ("jg_his_black".equals(dataSource)) {
this.historyEquUpdateInstallInfo(jsonObject);
}
// 流程结束
......@@ -1760,10 +1764,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(lambda);
String usePlace = useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName() + "/" + useInfo.getStreetName();
useInfo.setIsIntoManagement(Boolean.TRUE);
useInfo.setUseDate(Objects.toString(mapData.get("useDate"),""));
useInfo.setUseDate(Objects.toString(mapData.get("useDate"), ""));
useInfoMapper.updateById(useInfo);
// 更新es
updateEsData(usePlace, mapData, otherInfo,useInfo, jgUseRegistration, jsonObject);
updateEsData(usePlace, mapData, otherInfo, useInfo, jgUseRegistration, jsonObject);
jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
.applyNo(jgUseRegistration.getApplyNo())
.businessType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName())
......@@ -1818,7 +1822,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
//张三办理了【单位变更】 ，单号【DWBG202407050001】，办理日期2024-07-05
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
return obj.getUseUnitName()+"的"+agencyUserModelFeignClientResult.getResult().getRealName() + "办理了【" + businessName + (flag ? "设备增补" : "") + "】，" +
return obj.getUseUnitName() + "的" + agencyUserModelFeignClientResult.getResult().getRealName() + "办理了【" + businessName + (flag ? "设备增补" : "") + "】，" +
"单号【" + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getRecDate());
}
......@@ -1863,7 +1867,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
return codeUtil.generateEquipmentCode(codeGenerateDto);
}
public void updateEsData(String usePlace, JSONObject dataMap, IdxBizJgOtherInfo otherInfo,IdxBizJgUseInfo useInfo,
public void updateEsData(String usePlace, JSONObject dataMap, IdxBizJgOtherInfo otherInfo, IdxBizJgUseInfo useInfo,
JgUseRegistration jgUseRegistration, JSONObject jsonObject) {
// 更新es
HashMap<String, Map<String, Object>> objMap = new HashMap<>();
......@@ -1896,9 +1900,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
}
public void updateEsData2(String usePlace, JSONObject dataMap, IdxBizJgOtherInfo otherInfo,IdxBizJgUseInfo useInfo,
public void updateEsData2(String usePlace, JSONObject dataMap, IdxBizJgOtherInfo otherInfo, IdxBizJgUseInfo useInfo,
JgUseRegistration jgUseRegistration, JSONObject jsonObject) {
if (otherInfo != null){
if (otherInfo != null) {
// 更新es
HashMap<String, Map<String, Object>> objMap = new HashMap<>();
HashMap<String, Object> param = new HashMap<>();
......@@ -1935,7 +1939,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
private Long castDate2TimeStr(String nextInspectDate) {
if(nextInspectDate != null){
if (nextInspectDate != null) {
return DateUtil.parse(nextInspectDate).getTime();
}
return null;
......@@ -1992,8 +1996,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
public String getEquipListCode(String record) {
IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoService.getOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().eq(IdxBizJgRegisterInfo::getRecord, record).select(TzsBaseEntity::getSequenceNbr,IdxBizJgRegisterInfo::getEquList));
if(registerInfo != null){
IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoService.getOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().eq(IdxBizJgRegisterInfo::getRecord, record).select(TzsBaseEntity::getSequenceNbr, IdxBizJgRegisterInfo::getEquList));
if (registerInfo != null) {
return registerInfo.getEquList();
}
return null;
......@@ -2042,34 +2046,35 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
String orgCode = "";
if (jsonObject.containsKey("orgBranchCode") && !ObjectUtils.isEmpty(jsonObject.get("orgBranchCode"))) {
orgCode = String.valueOf(jsonObject.get("orgBranchCode")).split("_")[0];;
orgCode = String.valueOf(jsonObject.get("orgBranchCode")).split("_")[0];
;
}
//驳回
if ("1".equals(operate)){
if ("1".equals(operate)) {
//一级驳回
if(WorkFlowStatusEnum.USE_RECEIVE.getPass().equals(jgUseRegistration.getStatus())){
if (WorkFlowStatusEnum.USE_RECEIVE.getPass().equals(jgUseRegistration.getStatus())) {
// 一级驳回到使用单位
dto.setNextExecuteUserCompanyCode(jgUseRegistration.getUseUnitCreditCode());
dto.setNextExecuteUserOrgCode(jgUseRegistration.getUseUnitCreditCode());
}
//特殊登记，安全监察驳回到一级
if("2".equals(jgUseRegistration.getRegType())) {
if ("2".equals(jgUseRegistration.getRegType())) {
// 二级驳回到监察单位
if(WorkFlowStatusEnum.USE_PRELIMINARY.getPass().equals(jgUseRegistration.getStatus()) || WorkFlowStatusEnum.USE_PRELIMINARY.getReject().equals(jgUseRegistration.getStatus())){
if (WorkFlowStatusEnum.USE_PRELIMINARY.getPass().equals(jgUseRegistration.getStatus()) || WorkFlowStatusEnum.USE_PRELIMINARY.getReject().equals(jgUseRegistration.getStatus())) {
map.put("nextExecuteUserOrgCode", orgCode);
dto.setResultCode("approvalStatus");
map.put("approvalStatus", "10");
operate = "2";
}else if(WorkFlowStatusEnum.USE_SAFETY_CHECK.getPass().equals(jgUseRegistration.getStatus())
} else if (WorkFlowStatusEnum.USE_SAFETY_CHECK.getPass().equals(jgUseRegistration.getStatus())
|| WorkFlowStatusEnum.USE_SAFETY_CHECK.getReject().equals(jgUseRegistration.getStatus())
|| WorkFlowStatusEnum.USE_SAFETY_CHECK.getRollBack().equals(jgUseRegistration.getStatus())){
|| WorkFlowStatusEnum.USE_SAFETY_CHECK.getRollBack().equals(jgUseRegistration.getStatus())) {
//安全监察驳回到一级
dto.setNextExecuteUserCompanyCode(jgUseRegistration.getReceiveCompanyCode());
map.put("nextExecuteUserOrgCode", "");
dto.setResultCode("approvalStatus");
map.put("approvalStatus", operate);
operate = "2";
}else{
} else {
dto.setNextExecuteUserCompanyCode(jgUseRegistration.getReceiveCompanyCode());
dto.setResultCode("approvalStatus");
map.put("nextExecuteUserOrgCode", "");
......@@ -2081,14 +2086,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
map.put("approvalStatus", operate);
dto.setResultCode("approvalStatus");
}
} else{
} else {
//通过
//一级通过，且是特殊登记,需要监察，approvalStatus=2
if ("2".equals(jgUseRegistration.getRegType()) && (WorkFlowStatusEnum.USE_RECEIVE.getPass().equals(jgUseRegistration.getStatus()) || WorkFlowStatusEnum.USE_RECEIVE.getReject().equals(jgUseRegistration.getStatus()))){
if ("2".equals(jgUseRegistration.getRegType()) && (WorkFlowStatusEnum.USE_RECEIVE.getPass().equals(jgUseRegistration.getStatus()) || WorkFlowStatusEnum.USE_RECEIVE.getReject().equals(jgUseRegistration.getStatus()))) {
dto.setResultCode("approvalStatus");
map.put("approvalStatus", "9");
map.put("nextExecuteUserOrgCode", orgCode);
}else{//新增登记
} else {//新增登记
map.put("approvalStatus", operate);
dto.setResultCode("approvalStatus");
map.put("nextExecuteUserOrgCode", "");
......@@ -2230,11 +2235,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
/**
* 历史数据填充 设备种类、设备类别、设备品种名称
*
* @param detail 返回数据
* @param jgUseRegistration 当前单据
*/
private void fillingEquCategoryNameForHisData(Map<String, Object> detail, JgUseRegistration jgUseRegistration) {
if(!StringUtils.isEmpty(jgUseRegistration.getProjectContraptionId())){
if (!StringUtils.isEmpty(jgUseRegistration.getProjectContraptionId())) {
LambdaQueryWrapper<IdxBizJgProjectContraption> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(BaseEntity::getSequenceNbr, jgUseRegistration.getProjectContraptionId());
queryWrapper.select(IdxBizJgProjectContraption::getEquListName,
......@@ -2245,7 +2251,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
IdxBizJgProjectContraption::getEquCategory,
IdxBizJgProjectContraption::getEquDefine);
IdxBizJgProjectContraption projectContraption = jgProjectContraptionService.getBaseMapper().selectOne(queryWrapper);
if(projectContraption != null){
if (projectContraption != null) {
detail.put("equListName", projectContraption.getEquListName());
detail.put("equCategoryName", projectContraption.getEquCategoryName());
detail.put("equDefineName", projectContraption.getEquDefineName());
......@@ -2691,6 +2697,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
/**
* 获取导出基本信息数据
*
* @param useRegistrationSeqs
* @param category
* @param whetherToFilterStatus 是否过滤设备状态 是：true（过滤设备状态为在用），否：false（所有的）
......@@ -2754,7 +2761,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
JgRegistrationHistory jgRegistrationHistory = registrationHistoryList.get(0);
jsonObjectFirst = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
}
if("安装告知".equals(type)){
if ("安装告知".equals(type)) {
//人员信息去registrationHistoryList的第一条信息的创建人
JgRegistrationHistory jgRegistrationHistory = registrationHistoryList.get(0);
if (!ValidationUtil.isEmpty(jgRegistrationHistory)) {
......@@ -2763,7 +2770,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
result = Privilege.agencyUserClient.queryByUserId(createUserId).getResult();
}
}
}else {
} else {
JgUseRegistration jgUseRegistration = jgUseRegistrationMapper.selectOne(new QueryWrapper<JgUseRegistration>().lambda()
.eq(JgUseRegistration::getSequenceNbr, useRegistrationSeqs.get(0)).eq(JgUseRegistration::getIsDelete, false));
if (!ValidationUtil.isEmpty(jgUseRegistration.getCreateUserId())) {
......@@ -2778,7 +2785,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 总页数
int page = (int) Math.ceil(total / size);
// 异步获取数据
futureList = pressurePipeDataPreparation(page, jsonObjectFirst, size, total, allEquipment, wordPath, filePrefix, result,category);
futureList = pressurePipeDataPreparation(page, jsonObjectFirst, size, total, allEquipment, wordPath, filePrefix, result, category);
} else if ("2300".equals(category)) {// 气瓶基本信息汇总表
// 模板
String wordPath = "CylinderBasicInformationSummary.ftl";
......@@ -2795,6 +2802,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
/**
* 根据record判断设备状态是否为【在用】
*
* @param record
* @return
*/
......@@ -2823,7 +2831,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
String customFileName = filePrefix + jgUseRegistration.getApplyNo() + ".zip";
// byte[]压缩zip
toZipFile(response, futures, filePrefix, customFileName);
}else if ("2300".equals(category)) {
} else if ("2300".equals(category)) {
// 文件名前缀
String filePrefix = "气瓶基本信息汇总表_";
// 压力包名称
......@@ -2872,8 +2880,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
private Map<String, String> getInformationManageInfo(List<Object> equData) {
List<String> records = new ArrayList<>();
equData.forEach(e->{
JSONObject jsonObject = (JSONObject)e;
equData.forEach(e -> {
JSONObject jsonObject = (JSONObject) e;
String record = jsonObject.getString("record");
records.add(record);
});
......@@ -2896,7 +2904,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
*
* @return
*/
private List<CompletableFuture<byte[]>> pressurePipeDataPreparation(int page, JSONObject jsonObject, int size, double total, JSONArray equipmentLists, String wordPath, String filePrefix, AgencyUserModel result,String category) {
private List<CompletableFuture<byte[]>> pressurePipeDataPreparation(int page, JSONObject jsonObject, int size, double total, JSONArray equipmentLists, String wordPath, String filePrefix, AgencyUserModel result, String category) {
Map<String, Object> exportParamsMap = new HashMap<>();
exportParamsMap.put("page", page);
LocalDate currentDate = LocalDate.now();
......@@ -2921,9 +2929,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
exportParamsMap.put("nameOfProjectDevice", ValidationUtil.isEmpty(idxBizJgUseInfo) ? "" : idxBizJgUseInfo.getProjectContraption());
}
// 安全管理部门
exportParamsMap.put("orgBranchName", String.valueOf(jsonObject.get("orgBranchCode")).contains("_") ? String.valueOf(jsonObject.get("orgBranchCode")).split("_")[1] : jsonObject.getString("orgBranchName") == null ? "": jsonObject.getString("orgBranchName"));
exportParamsMap.put("orgBranchName", String.valueOf(jsonObject.get("orgBranchCode")).contains("_") ? String.valueOf(jsonObject.get("orgBranchCode")).split("_")[1] : jsonObject.getString("orgBranchName") == null ? "" : jsonObject.getString("orgBranchName"));
// 安全管理员
exportParamsMap.put("safetyManager", String.valueOf(jsonObject.get("safetyManager")).contains("_") ? String.valueOf(jsonObject.get("safetyManager")).split("_")[1] : jsonObject.getString("safetyManager") == null ? "": jsonObject.getString("safetyManager"));
exportParamsMap.put("safetyManager", String.valueOf(jsonObject.get("safetyManager")).contains("_") ? String.valueOf(jsonObject.get("safetyManager")).split("_")[1] : jsonObject.getString("safetyManager") == null ? "" : jsonObject.getString("safetyManager"));
// 联系电话
exportParamsMap.put("phone", ValidationUtil.isEmpty(result.getMobile()) ? "" : result.getMobile());
// 经办人
......@@ -2967,7 +2975,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
String[] fieldNames = {"equDefineName", "factoryNum", "chargingMedium",
"produceUnitName", "produceDate", "nominalWorkingPressure",
"singleBottleVolume", "inspectDate", "nextInspectDate", "useInnerCode","informationSituation"};
"singleBottleVolume", "inspectDate", "nextInspectDate", "useInnerCode", "informationSituation"};
// 填充有效数据
for (int curr = 0; curr < equData.size(); curr++) {
JSONObject obj = (JSONObject) equData.get(curr);
......@@ -3022,7 +3030,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
private Object setSpecialParamFields(String fieldName, JSONObject equip){
private Object setSpecialParamFields(String fieldName, JSONObject equip) {
switch (fieldName) {
case "pressure":
return trimIfEmpty(equip.get(fieldName)) + "/" + trimIfEmpty(equip.get("workPressure"));
......@@ -3056,7 +3064,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 基本信息 + 制造信息 + 设计信息
fillLastEquipBaseInfo(jsonObject, record);
// 安装信息
if(!jsonObject.containsKey("installationIsComplete")) {
if (!jsonObject.containsKey("installationIsComplete")) {
Map<String, Object> installDetail = this.baseMapper.getInstallDetail(record);
// 历史设备登记来的数据没有安装业务信息 从一码通数据拿
if (ValidationUtil.isEmpty(installDetail)) {
......@@ -3143,7 +3151,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
*/
public void createCode(JSONObject dataMap, JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo
registerInfo, IdxBizJgUseInfo useInfo, IdxBizJgOtherInfo otherInfo) {
if (otherInfo != null){
if (otherInfo != null) {
if (ObjectUtils.isEmpty(otherInfo.getSupervisoryCode())) {
// 生成监管码、96333码
Map<String, Object> map = new HashMap<>();
......@@ -3167,7 +3175,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
if (!ObjectUtils.isEmpty(result)) {
otherInfo.setSupervisoryCode(String.valueOf(result.get("superviseCode")));
// 历史登记时 96333如果自行输入则不再进行生成插入
if(StringUtils.isEmpty(otherInfo.getCode96333())){
if (StringUtils.isEmpty(otherInfo.getCode96333())) {
otherInfo.setCode96333(ObjectUtils.isEmpty(result.get("code96333")) ? null : String.valueOf(result.get("code96333")));
}
// 更新使用登记业务表
......@@ -3230,11 +3238,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
jgUseRegistration.setStatus(FlowStatusEnum.TO_BE_DISCARD.getName());
// 单位办理
if ("unit".equals(jgUseRegistration.getManageType())){
if ("unit".equals(jgUseRegistration.getManageType())) {
//单位办理-历史作废
if ("1".equals(jgUseRegistration.getRegType())){
if ("1".equals(jgUseRegistration.getRegType())) {
// 管道增减特殊作废逻辑,管道全量数据为装置下的所有管道（已完成时，编辑装置进行增减不会修改eq表，所以eq表不是全量管道）
if(!ValidationUtil.isEmpty(jgUseRegistration.getProjectContraptionId())){
if (!ValidationUtil.isEmpty(jgUseRegistration.getProjectContraptionId())) {
records = idxBizJgUseInfoService.list(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, jgUseRegistration.getProjectContraptionId()).select(IdxBizJgUseInfo::getRecord)).stream().map(IdxBizJgUseInfo::getRecord).collect(toList());
}
// 构建设备删除的 DTO 列表
......@@ -3253,9 +3261,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
this.lambdaUpdate().set(JgUseRegistration::getIsDelete, Boolean.TRUE).eq(JgUseRegistration::getSequenceNbr, sequenceNbr).update();
// 管道作废工程装置
if (!ValidationUtil.isEmpty(jgUseRegistration.getProjectContraptionId())) {
idxBizJgProjectContraptionMapper.delete(new LambdaQueryWrapper<IdxBizJgProjectContraption>().eq(IdxBizJgProjectContraption::getSequenceNbr,jgUseRegistration.getProjectContraptionId()));
idxBizJgProjectContraptionMapper.delete(new LambdaQueryWrapper<IdxBizJgProjectContraption>().eq(IdxBizJgProjectContraption::getSequenceNbr, jgUseRegistration.getProjectContraptionId()));
}
} else{
} else {
//判断是否管道
if (FlowStatusEnum.TO_BE_FINISHED.getName().equals(oldStatus) &&
jgUseRegistration.getUseRegistrationCode().startsWith("管")) {
......@@ -3271,14 +3279,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
throw new BadRequest("作废失败，该使用登记证下有合并工程装置，请先作废最新单据后再作废此单据！");
}
if (jgUseRegistration.getProjectContraptionId() == null) {
throw new BadRequest("该作废单据没有工程装置，请联系管理员处理此单据:"+ jgUseRegistration.getApplyNo());
throw new BadRequest("该作废单据没有工程装置，请联系管理员处理此单据:" + jgUseRegistration.getApplyNo());
}
}
if (jgUseRegistration.getProjectContraptionId() != null) {
//2.合并后作废
if (!jgUseRegistration.getOriginProjectContraptionIds().contains(jgUseRegistration.getProjectContraptionId())){
if (!jgUseRegistration.getOriginProjectContraptionIds().contains(jgUseRegistration.getProjectContraptionId())) {
Boolean isRollBack = useRegisterBackupManager.restore(jgUseRegistration.getSequenceNbr() + "");
if(isRollBack){ // 进行过编辑逻辑
if (isRollBack) { // 进行过编辑逻辑
// 1.还原子工程装置的下的管道信息（装置id）
eqList.stream()
.filter(v -> jgUseRegistration.getOriginProjectContraptionIds().contains(v.getOriginProjectContraptionId()))
......@@ -3296,8 +3304,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
//还原 原工程装置下equCode和监管码
LambdaUpdateWrapper<IdxBizJgRegisterInfo> updateWrapper = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda()
.eq(IdxBizJgRegisterInfo::getRecord, v.getEquId());
updateWrapper.set(IdxBizJgRegisterInfo::getEquCode,originProjectContraption.getEquCode());
updateWrapper.set(IdxBizJgRegisterInfo::getUseOrgCode,null);
updateWrapper.set(IdxBizJgRegisterInfo::getEquCode, originProjectContraption.getEquCode());
updateWrapper.set(IdxBizJgRegisterInfo::getUseOrgCode, null);
idxBizJgRegisterInfoMapper.update(null, updateWrapper);
LambdaUpdateWrapper<IdxBizJgOtherInfo> otherInfoLambdaUpdateWrapper = new UpdateWrapper<IdxBizJgOtherInfo>().lambda()
......@@ -3337,7 +3345,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
pIds.add(jgUseRegistration.getProjectContraptionId());
pIds.addAll(Arrays.asList(jgUseRegistration.getOriginProjectContraptionIds().split(",")));
registerAfterCommitTask(records, pIds);
}else{
} else {
// 查询原工程装置及 useInfo 记录
List<String> originProjectContraptionIds = Arrays.asList(jgUseRegistration.getOriginProjectContraptionIds().split(","));
records = idxBizJgUseInfoService.lambdaQuery()
......@@ -3411,7 +3419,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
pIds.add(jgUseRegistration.getProjectContraptionId());
pIds.addAll(Arrays.asList(jgUseRegistration.getOriginProjectContraptionIds().split(",")));
registerAfterCommitTask(records, pIds);
}else{
} else {
// 查询原工程装置及 useInfo 记录
List<String> originProjectContraptionIds = Arrays.asList(jgUseRegistration.getOriginProjectContraptionIds().split(","));
List<IdxBizJgProjectContraption> originProjectContraptionList = jgProjectContraptionService.lambdaQuery()
......@@ -3450,7 +3458,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
else {
// 编辑过则按照编辑的数据进行恢复管道信息
Boolean isRollBack = useRegisterBackupManager.restore(jgUseRegistration.getSequenceNbr() + "");
if(isRollBack){ // 进行过编辑逻辑
if (isRollBack) { // 进行过编辑逻辑
// 1.原装置、新装置重新计算管道长度
this.updateTotalPieLineLength(null, jgUseRegistration.getProjectContraptionId());
}
......@@ -3487,9 +3495,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
pIds.addAll(Arrays.asList(oPids));
}
pIds.add(projectContraptionId);
pIds.parallelStream().forEach(pid->{
pIds.parallelStream().forEach(pid -> {
List<String> records = idxBizJgUseInfoService.list(new LambdaQueryWrapper<IdxBizJgUseInfo>().in(IdxBizJgUseInfo::getProjectContraptionId, pid)).stream().map(IdxBizJgUseInfo::getRecord).collect(toList());
List<IdxBizJgTechParamsPipeline> paramsPipelines = idxBizJgTechParamsPipelineServiceImpl.list(new LambdaQueryWrapper<IdxBizJgTechParamsPipeline>().in(IdxBizJgTechParamsPipeline::getRecord, records).select(IdxBizJgTechParamsPipeline::getRecord,IdxBizJgTechParamsPipeline::getPipeLength));
List<IdxBizJgTechParamsPipeline> paramsPipelines = idxBizJgTechParamsPipelineServiceImpl.list(new LambdaQueryWrapper<IdxBizJgTechParamsPipeline>().in(IdxBizJgTechParamsPipeline::getRecord, records).select(IdxBizJgTechParamsPipeline::getRecord, IdxBizJgTechParamsPipeline::getPipeLength));
double totalLength = paramsPipelines.stream()
.map(IdxBizJgTechParamsPipeline::getPipeLength) // 先提取长度字符串
.filter(Objects::nonNull) // 过滤掉null值
......@@ -3523,7 +3531,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
@Override
public void afterCommit() {
// 发布作废事件
eventPublisher.publish(new CancellationEvent(this, records, projectContraptionIds));
eventPublisher.publish(new CancellationAndGradeEvent(this, records, projectContraptionIds));
}
});
}
......@@ -3531,7 +3539,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
private void clearUseInfoOfEquip(JgUseRegistration jgUseRegistration) {
List<JgUseRegistrationEq> eqList = getJgUseRegistrationEqs(jgUseRegistration);
//非管道
if(StringUtils.isEmpty(jgUseRegistration.getProjectContraptionId())){
if (StringUtils.isEmpty(jgUseRegistration.getProjectContraptionId())) {
eqList.forEach(e -> {
String record = e.getEquId();
Boolean flag = Boolean.FALSE;
......@@ -3552,7 +3560,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 3.回滚更新idx_biz_jg_supervision_info表
this.rollBackSupervisionInfo(record);
// 4.es的EQU_STATE, USE_ORG_CODE、ORG_BRANCH_CODE、ORG_BRANCH_NAME、STATUS
this.rollBackForEquipEsInfo(record, flag,jgUseRegistration);
this.rollBackForEquipEsInfo(record, flag, jgUseRegistration);
// 5.历史设备处理
this.dealHisRegEquipData(jgUseRegistration, record);
});
......@@ -3567,7 +3575,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
private void rollBackForPieLine(JgUseRegistration jgUseRegistration) {
if(!StringUtils.isEmpty(jgUseRegistration.getProjectContraptionId())){
if (!StringUtils.isEmpty(jgUseRegistration.getProjectContraptionId())) {
// 清除使用登记证编号
LambdaUpdateWrapper<IdxBizJgProjectContraption> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(BaseEntity::getSequenceNbr, jgUseRegistration.getProjectContraptionId());
......@@ -3580,7 +3588,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
private void dealHisRegEquipData(JgUseRegistration jgUseRegistration, String record) {
// 历史有证、历史无证作废时清除信息
if("1".equals(jgUseRegistration.getRegType()) || "2".equals(jgUseRegistration.getRegType())){
if ("1".equals(jgUseRegistration.getRegType()) || "2".equals(jgUseRegistration.getRegType())) {
// 删除安装信息
this.clearConstructionInfo(record);
// 删除维保信息
......@@ -3594,6 +3602,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
/**
* 释放96333码为未使用状态
*
* @param record 记录值
*/
private void release96333Code(String record) {
......@@ -3646,7 +3655,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
return jgRelationEquipMapper.selectList(eqLambdaQueryWrapper);
}
private void rollBackForEquipEsInfo(String record, Boolean flag,JgUseRegistration jgUseRegistration) {
private void rollBackForEquipEsInfo(String record, Boolean flag, JgUseRegistration jgUseRegistration) {
LambdaQueryWrapper<IdxBizJgConstructionInfo> wrapper = new LambdaQueryWrapper<>();
wrapper.select(IdxBizJgConstructionInfo::getUscUnitCreditCode,
IdxBizJgConstructionInfo::getUscUnitName,
......@@ -3664,7 +3673,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
if (optional.isPresent()) {
ESEquipmentCategoryDto esEquipmentCategoryDto = optional.get();
// 非历史有证设备,作废清除使用登记证编号
if(!"1".equals(jgUseRegistration.getRegType())){
if (!"1".equals(jgUseRegistration.getRegType())) {
esEquipmentCategoryDto.setUSE_ORG_CODE(null);
}
// 历史有证设备、历史无证设备，系统生成的96333清空
......@@ -3676,7 +3685,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
esEquipmentCategoryDto.setEQU_STATE(null);
esEquipmentCategoryDto.setORG_BRANCH_CODE(null);
esEquipmentCategoryDto.setORG_BRANCH_NAME(null);
if (jgConstructionInfo != null){
if (jgConstructionInfo != null) {
esEquipmentCategoryDto.setUSC_UNIT_NAME(jgConstructionInfo.getUscUnitName());
esEquipmentCategoryDto.setUSC_UNIT_CREDIT_CODE(jgConstructionInfo.getUscUnitCreditCode());
}
......@@ -3727,7 +3736,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
changeRecord.setCreateDate(new Date());
firstRecord.ifPresent(record -> changeRecord.setRoutePath(record.getRoutePath()));
certificateChangeRecordService.save(changeRecord);
jgResumeInfoService.deleteByBusinessId(jgUseRegistration.getSequenceNbr()+"");
jgResumeInfoService.deleteByBusinessId(jgUseRegistration.getSequenceNbr() + "");
}
private void rollBackSupervisionInfo(String record) {
......@@ -3745,7 +3754,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 未注册，来源cb_data_dictionary type = 'ZC'
updateWrapper.set(IdxBizJgRegisterInfo::getRegisterState, "6046");
// 非历史有证设备 作废时清除使用登记证编号（0-新增设备；1-历史有证设备；2-历史无证设备）
updateWrapper.set(!"1".equals(jgUseRegistration.getRegType()),IdxBizJgRegisterInfo::getUseOrgCode, null);
updateWrapper.set(!"1".equals(jgUseRegistration.getRegType()), IdxBizJgRegisterInfo::getUseOrgCode, null);
updateWrapper.set(IdxBizJgRegisterInfo::getCarNumber, null);
idxBizJgRegisterInfoService.update(updateWrapper);
}
......@@ -3821,7 +3830,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
List<JgUseRegistrationEq> jgUseRegistrationEqList = jgRelationEquipMapper.selectList(jgUseRegEqWrapper);
if (!jgUseRegistrationEqList.isEmpty()) {
String record = jgUseRegistrationEqList.get(0).getEquId();
return idxBizJgRegisterInfoService.getOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().eq(IdxBizJgRegisterInfo::getRecord, record).select(TzsBaseEntity::getSequenceNbr,IdxBizJgRegisterInfo::getEquList));
return idxBizJgRegisterInfoService.getOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().eq(IdxBizJgRegisterInfo::getRecord, record).select(TzsBaseEntity::getSequenceNbr, IdxBizJgRegisterInfo::getEquList));
}
return null;
}
......@@ -3992,7 +4001,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 使用登记信息
JgUseRegistration jgUseRegistration = new JgUseRegistration();
jgUseRegistration.setRegDate(ValidationUtil.isEmpty(map.get("oRegDate")) ? new Date() :
DateUtils.dateParse((String) map.get("oRegDate"),DateUtils.DATE_PATTERN));
DateUtils.dateParse((String) map.get("oRegDate"), DateUtils.DATE_PATTERN));
jgUseRegistration.setInputUnitNo(Objects.toString(map.get("oRegUnit")));
if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
jgUseRegistration.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
......@@ -4121,7 +4130,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
LambdaQueryWrapper<IdxBizJgSupervisionInfo> lambdaSup = new QueryWrapper<IdxBizJgSupervisionInfo>().lambda();
lambdaSup.eq(IdxBizJgSupervisionInfo::getRecord, jgRelationEquip.getEquId());
IdxBizJgSupervisionInfo supervisionInfo = idxBizJgSupervisionInfoMapper.selectOne(lambdaSup);
if (supervisionInfo!= null && !ObjectUtils.isEmpty(map.get("orgBranchCode"))){
if (supervisionInfo != null && !ObjectUtils.isEmpty(map.get("orgBranchCode"))) {
supervisionInfo.setOrgBranchCode(String.valueOf(map.get("orgBranchCode")).split("_")[0]);
supervisionInfo.setOrgBranchName(String.valueOf(map.get("orgBranchCode")).split("_")[1]);
idxBizJgSupervisionInfoMapper.updateById(supervisionInfo);
......@@ -4132,7 +4141,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, jgRelationEquip.getEquId());
IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
String equCode = "";
if (registerInfo != null){
if (registerInfo != null) {
registerInfo.setUseOrgCode(jgUseRegistration.getUseRegistrationCode());
registerInfo.setEquCodeType(String.valueOf(map.get("equCodeType")));
equCode = ObjectUtils.isEmpty(map.get("equCode")) ? this.getEquCode(registerInfo, jgUseRegistration.getReceiveCompanyCode()) : String.valueOf(map.get("equCode"));
......@@ -4151,10 +4160,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
LambdaQueryWrapper<IdxBizJgDesignInfo> lambdaDes = new QueryWrapper<IdxBizJgDesignInfo>().lambda();
lambdaDes.eq(IdxBizJgDesignInfo::getRecord, jgRelationEquip.getEquId());
IdxBizJgDesignInfo designInfo = idxBizJgDesignInfoService.getOne(lambdaDes);
if (designInfo != null){
designInfo.setDesignUnitCreditCode(MapUtil.getStr(map,"designUnitCreditCode"));
designInfo.setDesignUnitName(MapUtil.getStr(map,"designUnitName"));
designInfo.setDesignLicenseNum(MapUtil.getStr(map,"designLicenseNum"));
if (designInfo != null) {
designInfo.setDesignUnitCreditCode(MapUtil.getStr(map, "designUnitCreditCode"));
designInfo.setDesignUnitName(MapUtil.getStr(map, "designUnitName"));
designInfo.setDesignLicenseNum(MapUtil.getStr(map, "designLicenseNum"));
designInfo.setDesignUseDate(MapUtil.getStr(map, "designUseDate"));
designInfo.setDesignDate(!StringUtils.isEmpty(map.get("designDate")) ? DateUtil.parse(String.valueOf(map.get("designDate")), "yyyy-MM-dd") : null);
designInfo.setDrawingDo(ObjectUtils.isEmpty(map.get("drawingDo")) ? null : String.valueOf(map.get("drawingDo")));
......@@ -4170,7 +4179,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, jgRelationEquip.getEquId());
IdxBizJgFactoryInfo idxBizJgFactoryInfo = idxBizJgFactoryInfoService.getOne(factoryInfoWrapper);
if (idxBizJgFactoryInfo != null){
if (idxBizJgFactoryInfo != null) {
idxBizJgFactoryInfo.setProduceUnitCreditCode(MapUtil.getStr(map, "produceUnitCreditCode"));
idxBizJgFactoryInfo.setProduceUnitName(MapUtil.getStr(map, "produceUnitName"));
idxBizJgFactoryInfo.setFactoryNum(MapUtil.getStr(map, "factoryNum"));
......@@ -4192,7 +4201,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
lambda.eq(IdxBizJgUseInfo::getRecord, String.valueOf(map.get("equipId")));
IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(lambda);
String usePlace = "";
if (useInfo != null){
if (useInfo != null) {
useInfo.setIsIntoManagement(Boolean.TRUE);
useInfo.setUseUnitCreditCode(String.valueOf(map.get("useUnitCreditCode")));
useInfo.setUseUnitName(String.valueOf(map.get("useUnitName")));
......@@ -4252,7 +4261,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
inspectionDetectionInfo.setInspectOrgCode(MapUtil.getStr(map, "inspectOrgCode"));
inspectionDetectionInfo.setInspectOrgName(MapUtil.getStr(map, "inspectOrgName"));
inspectionDetectionInfo.setInspectConclusion(MapUtil.getStr(map,"inspectConclusion"));
inspectionDetectionInfo.setInspectConclusion(MapUtil.getStr(map, "inspectConclusion"));
inspectionDetectionInfo.setInspectType(MapUtil.getStr(map, "inspectType"));
inspectionDetectionInfo.setInspectDate(!StringUtils.isEmpty(map.get("inspectDate")) ? DateUtil.parse(String.valueOf(map.get("inspectDate")), "yyyy-MM-dd") : null);
inspectionDetectionInfo.setInspectStaff(MapUtil.getStr(map, "inspectStaff"));
......@@ -4272,12 +4281,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
this.historyEquUpdateInstallInfo(map);
// 设备维保信息更新,只有电梯
if ("3000".equals(map.get("equList")) || "3000".equals(map.get("equListCode"))){
if ("3000".equals(map.get("equList")) || "3000".equals(map.get("equListCode"))) {
this.historyEquUpdateMaintenanceInfo(map);
}
// 历史设备 生成证书管理表记录 & 生成安装 维保等操作记录
if (registerInfo != null){
if (registerInfo != null) {
this.historyEquGenManageRelated(map, jgUseRegistration, registerInfo, idxBizJgFactoryInfo);
}
String routePath = this.buildTaskModel(jgUseRegistration, map, reginParams);
......@@ -4400,9 +4409,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 类型为安装
constructionInfo.setConstructionType("6030");
try {
constructionInfo.setUscDate(ValidationUtil.isEmpty(map.get("installStartDate")) ? null : DateUtils.dateParse((String) map.get("installStartDate"),DateUtils.DATE_PATTERN));
constructionInfo.setUscDate(ValidationUtil.isEmpty(map.get("installStartDate")) ? null : DateUtils.dateParse((String) map.get("installStartDate"), DateUtils.DATE_PATTERN));
} catch (ParseException e) {
log.error(e.getMessage(),e);
log.error(e.getMessage(), e);
throw new BadRequest("安装日期时间转化错误");
}
idxBizJgConstructionInfoService.getBaseMapper().updateById(constructionInfo);
......@@ -4459,7 +4468,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
try {
FeignClientResult<AgencyUserModel> agencyUserModelFeignClientResult = Privilege.agencyUserClient.queryByUserId(jgUseRegistration.getCreateUserId());
changeContent = jgUseRegistration.getUseUnitName()+"的"+agencyUserModelFeignClientResult.getResult().getRealName() + "办理了【" + BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName() + "】，" +
changeContent = jgUseRegistration.getUseUnitName() + "的" + agencyUserModelFeignClientResult.getResult().getRealName() + "办理了【" + BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName() + "】，" +
"办理日期" + map.get("installStartDate");
jgCertificateChangeRecord.setAuditPassDate(simpleDateFormat.parse((String) map.get("installStartDate")));
jgCertificateChangeRecord.setRegDate(simpleDateFormat.parse((String) map.get("installStartDate")));
......@@ -4549,6 +4558,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
/**
* 历史登记设备编辑接口
*
* @param map 入参
* @return
*/
......@@ -4686,7 +4696,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
@Transactional
public Object updateCylinderCategoryByEquCodeBatch(String cylinderCategory, List<String> equCodeList) {
if (idxBizJgRegisterInfoMapper.updateCylinderCategoryByEquCodeBatch(cylinderCategory, equCodeList)){
if (idxBizJgRegisterInfoMapper.updateCylinderCategoryByEquCodeBatch(cylinderCategory, equCodeList)) {
return this.baseMapper.updateByEquCodeList(cylinderCategory, equCodeList);
}
return true;
......@@ -4709,7 +4719,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
public IPage<IdxBizJgProjectContraption> getJgProjectContraptionPage(String useUnitCreditCode, String dataSource, Page<IdxBizJgProjectContraption> page) {
// 兼容个人业务
if(useUnitCreditCode.contains("_")){
if (useUnitCreditCode.contains("_")) {
useUnitCreditCode = useUnitCreditCode.split("_")[1];
}
// 查询流程中的装置
......@@ -4719,7 +4729,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
proIds.remove("");
// 查询已纳管且使用登记证编号不为空且非流程中的装置
LambdaQueryWrapper<IdxBizJgProjectContraption> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(IdxBizJgProjectContraption::getUseUnitCreditCode,useUnitCreditCode);
wrapper.eq(IdxBizJgProjectContraption::getUseUnitCreditCode, useUnitCreditCode);
if (Optional.ofNullable(dataSource).map(ds -> ds.contains("black")).orElse(false)) {
wrapper.eq(IdxBizJgProjectContraption::getDataSource, dataSource);
} else {
......@@ -4739,7 +4749,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
public List<IdxBizJgProjectContraption> jgProjectContraptionListMaster(String useUnitCreditCode) {
// 兼容个人业务
if(useUnitCreditCode.contains("_")){
if (useUnitCreditCode.contains("_")) {
useUnitCreditCode = useUnitCreditCode.split("_")[1];
}
// 查询流程中的装置
......@@ -4770,7 +4780,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
List<Map<String, Object>> equList = this.getBaseMapper()
.selectPieLineListByOfCanReg(uniqueContraptionList);
// 检验报告数据格式化 转json
equList.stream().filter(e-> e.get("inspectReport") != null).forEach(item->{
equList.stream().filter(e -> e.get("inspectReport") != null).forEach(item -> {
item.put("inspectReport", JSON.parse(item.get("inspectReport").toString()));
});
// 根据设备判断工程装置安装位置是否西咸
......@@ -4834,9 +4844,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
queryWrapper.eq(IdxBizJgProjectConstruction::getProjectContraptionId, projectContraptionSeq)
.orderByDesc(IdxBizJgProjectConstruction::getUscDate).last("limit 1");
IdxBizJgProjectConstruction construction = idxBizJgProjectConstructionMapper.selectOne(queryWrapper);
if(construction != null){
if (construction != null) {
re.put("installLeaderName", construction.getConstructionLeaderName());
re.put("installLeaderPhone",construction.getConstructionLeaderPhone());
re.put("installLeaderPhone", construction.getConstructionLeaderPhone());
re.put("installStartDate", construction.getUscDate());
re.put("installPropertyUnitName", construction.getConstructionLeaderName());
re.put("installProxyStatementAttachment", JSON.parse(construction.getProxyStatementAttachment()));
......@@ -4858,7 +4868,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
queryWrapper.eq(IdxBizJgProjectInspection::getProjectContraptionId, projectContraptionSeq)
.orderByDesc(IdxBizJgProjectInspection::getInspectDate).last("limit 1");
IdxBizJgProjectInspection inspection = projectInspectionMapper.selectOne(queryWrapper);
if(inspection != null){
if (inspection != null) {
re.put("inspectOrgCode", inspection.getInspectOrgCode());
re.put("inspectOrgName", inspection.getInspectOrgCode());
re.put("inspectConclusion", inspection.getInspectConclusion());
......@@ -4867,9 +4877,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
re.put("inspectStaff", inspection.getInspectStaff());
re.put("nextInspectDate", inspection.getNextInspectDate());
re.put("inspectReport", JSON.parse(inspection.getInspectReport()));
re.put("inspectReportNo",inspection.getInspectReportNo());
re.put("inspectReportNo", inspection.getInspectReportNo());
// 返回代表是系统的数据，前端控制系统的检验信息不让编辑
re.put("jySeq",inspection.getSequenceNbr());
re.put("jySeq", inspection.getSequenceNbr());
}
}
......@@ -4881,27 +4891,27 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
.ne(JgUseRegistration::getStatus, "已作废")
.ne(JgUseRegistration::getRegType, "1");
List<JgUseRegistration> useRegistrations = this.list(queryWrapper);
if(CollUtil.isNotEmpty(useRegistrations)){
if (CollUtil.isNotEmpty(useRegistrations)) {
for (JgUseRegistration useRegistration : useRegistrations) {
try {
Map<String, Object> detail = this.getDetail(null, useRegistration.getSequenceNbr(), null);
String jsonString = JSONObject.toJSONString(detail);
JSONObject jsonObject = JSONObject.parseObject(jsonString);
FeignClientResult<AgencyUserModel> agencyUserModelFeignClientResult = Privilege.agencyUserClient.queryByUserId((String) detail.get("createUserId"));
jsonObject.put("userName",agencyUserModelFeignClientResult.getResult().getRealName());
jsonObject.put("userName", agencyUserModelFeignClientResult.getResult().getRealName());
String manageType = useRegistration.getManageType();
if(StringUtils.isEmpty(manageType)){
manageType="set";
if (StringUtils.isEmpty(manageType)) {
manageType = "set";
}
Map<String, Object> formUrlMap = commonService.getRegistrationFormUrl(manageType, jsonObject);
if(Objects.nonNull(formUrlMap)){
if (Objects.nonNull(formUrlMap)) {
LambdaUpdateWrapper<JgUseRegistration> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(JgUseRegistration::getUseRegistrationFormUrl,String.valueOf(formUrlMap.get("useRegistrationFormUrl")))
.eq(JgUseRegistration::getSequenceNbr,useRegistration.getSequenceNbr());
wrapper.set(JgUseRegistration::getUseRegistrationFormUrl, String.valueOf(formUrlMap.get("useRegistrationFormUrl")))
.eq(JgUseRegistration::getSequenceNbr, useRegistration.getSequenceNbr());
this.update(wrapper);
}
}catch (BadRequest request){
log.error(request.getMessage(),request);
} catch (BadRequest request) {
log.error(request.getMessage(), request);
}
}
}
......@@ -4912,11 +4922,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
public JSONObject getHisData(JgUseRegistration jgUseRegistration){
public JSONObject getHisData(JgUseRegistration jgUseRegistration) {
return commonService.queryHistoryData(jgUseRegistration.getSequenceNbr());
}
public IdxBizJgUseInfo getUseInfo(String record){
public IdxBizJgUseInfo getUseInfo(String record) {
LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
lambda.eq(IdxBizJgUseInfo::getRecord, record);
return useInfoMapper.selectOne(lambda);
......
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/JgVehicleInformationServiceImpl.java
View file @ 9a04427c
......@@ -37,7 +37,7 @@ import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
import com.yeejoin.amos.boot.module.jg.biz.event.CancellationAndGradeEvent;
import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
import com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService;
......@@ -212,10 +212,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
@GlobalTransactional(rollbackFor = Exception.class)
public List<JgVehicleInformation> save(String submit, JSONObject map) {
try {
if(SUBMIT_TYPE_FLOW.equals(submit)){
if (SUBMIT_TYPE_FLOW.equals(submit)) {
//校验登记表字段是否有值
JSONArray useRegistrationFormFile = map.getJSONArray("useRegistrationFormFile");
if(CollUtil.isEmpty(useRegistrationFormFile)){
if (CollUtil.isEmpty(useRegistrationFormFile)) {
throw new BadRequest("使用登记表（签章后）为空");
}
}
......@@ -227,9 +227,9 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
Optional.ofNullable(map.get("useRegistrationFormFile"))
.map(JSONObject::toJSONString)
.ifPresent(vehicleInfoDto::setUseRegistrationFormFile);
map.put("userName",reginParams.getUserModel().getRealName());
map.put("userName", reginParams.getUserModel().getRealName());
Map<String, Object> vehicle = commonService.getRegistrationFormUrl("vehicle", map);
if(Objects.nonNull(vehicle)){
if (Objects.nonNull(vehicle)) {
vehicleInfoDto.setUseRegistrationFormUrl(String.valueOf(vehicle.get("useRegistrationFormUrl")));
}
List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
......@@ -670,8 +670,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
List<String> records = vehicleInformationEqList.stream()
.map(JgVehicleInformationEq::getEquId)
.collect(Collectors.toList());
if(CollUtil.isNotEmpty(records)){
vo.setEquipmentLists(this.baseMapper.queryForUnitVesselEquipment(sequenceNbr,records).stream()
if (CollUtil.isNotEmpty(records)) {
vo.setEquipmentLists(this.baseMapper.queryForUnitVesselEquipment(sequenceNbr, records).stream()
.peek(v -> v.put("chargingMedium", getFillingMediumMap().get(v.getOrDefault("chargingMedium", "") + "")))
.collect(Collectors.toList()));
}
......@@ -683,9 +683,9 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
List<String> records = vehicleInformationEqList.stream()
.map(JgVehicleInformationEq::getEquId)
.collect(Collectors.toList());
if(CollUtil.isNotEmpty(records)){
if (CollUtil.isNotEmpty(records)) {
vo.setEquipmentLists(
this.baseMapper.queryForUnitVesselEquipment(sequenceNbr,records).stream()
this.baseMapper.queryForUnitVesselEquipment(sequenceNbr, records).stream()
.peek(v -> v.put("chargingMedium", getFillingMediumMap().get(v.getOrDefault("chargingMedium", "") + "")))
.collect(Collectors.toList())
);
......@@ -696,7 +696,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
}
}
if(Objects.isNull(vo.getEquipmentLists())){
if (Objects.isNull(vo.getEquipmentLists())) {
vo.setEquipmentLists(new ArrayList<>());
}
vo.setEquDefineCode(
......@@ -710,9 +710,9 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
if (firstEqu.isPresent()) {
LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
lambda.eq(IdxBizJgUseInfo::getRecord, firstEqu.get().get("record"));
lambda.select(TzsBaseEntity::getSequenceNbr, IdxBizJgUseInfo::getOldUseRegistrationCertificate,IdxBizJgUseInfo::getOldUseRegistrationTable,IdxBizJgUseInfo::getORegDate,IdxBizJgUseInfo::getORegUnit);
lambda.select(TzsBaseEntity::getSequenceNbr, IdxBizJgUseInfo::getOldUseRegistrationCertificate, IdxBizJgUseInfo::getOldUseRegistrationTable, IdxBizJgUseInfo::getORegDate, IdxBizJgUseInfo::getORegUnit);
IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(lambda);
if(Objects.nonNull(useInfo)){
if (Objects.nonNull(useInfo)) {
vo.setORegDate(useInfo.getORegDate());
vo.setORegUnit(useInfo.getORegUnit());
vo.setOldUseRegistrationTable(JSONArray.parseArray(useInfo.getOldUseRegistrationTable()));
......@@ -1452,7 +1452,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@Override
public void afterCommit() {
eventPublisher.publish(new CancellationEvent(this, getEquList(vehicleInformation)));
eventPublisher.publish(new CancellationAndGradeEvent(this, getEquList(vehicleInformation), null));
}
});
return vehicleInformation;
......@@ -1524,7 +1524,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
changeRecord.setCreateDate(new Date());
firstRecord.ifPresent(record -> changeRecord.setRoutePath(record.getRoutePath()));
certificateChangeRecordService.save(changeRecord);
jgResumeInfoService.deleteByBusinessId(jgVehicleInformation.getSequenceNbr()+"");
jgResumeInfoService.deleteByBusinessId(jgVehicleInformation.getSequenceNbr() + "");
}
/**
......@@ -1672,11 +1672,11 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
changeRecord.setReceiveCompanyCode(jgVehicleInformation.getReceiveCompanyCode());//接收机构公司代码
// changeRecord.setCertificateNo(commonService.generateCertificateNo(equType, new Date(), jgVehicleInformation.getReceiveCompanyCode()));//登记证书唯一码
// 流水表不需要再次生成唯一编号，使用证管理表对应值
if (!ObjectUtils.isEmpty(jgVehicleInformation.getUseRegistrationCode())){
if (!ObjectUtils.isEmpty(jgVehicleInformation.getUseRegistrationCode())) {
JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery()
.eq(JgUseRegistrationManage::getUseRegistrationCode, jgVehicleInformation.getUseRegistrationCode())
.eq(JgUseRegistrationManage::getIsDelete, 0)
.eq(JgUseRegistrationManage::getCertificateStatus,CertificateStatusEnum.YIDENGJI.getName()).one();
.eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName()).one();
changeRecord.setCertificateNo(manage.getCertificateNo());//登记证书唯一码
}
changeRecord.setUseUnitCreditCode(jgVehicleInformation.getUseUnitCreditCode());//使用单位统一信用代码
......@@ -1738,7 +1738,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
//张三办理了【单位变更】 ，单号【DWBG202407050001】，办理日期2024-07-05
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
return obj.getUseUnitName()+"的"+ agencyUserModelFeignClientResult.getResult().getRealName() + "办理了【" + BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName() + "】，" +
return obj.getUseUnitName() + "的" + agencyUserModelFeignClientResult.getResult().getRealName() + "办理了【" + BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName() + "】，" +
"单号【" + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getRecDate());
}
......@@ -2051,7 +2051,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
equip.setVehicleId(vehicleInformation.getSequenceNbr() + "");
equipList.add(equip);
//新增添加设备履历
if (StringUtils.isEmpty(vehicleInfoDto.getSequenceNbr())){
if (StringUtils.isEmpty(vehicleInfoDto.getSequenceNbr())) {
jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
.applyNo(vehicleInformation.getApplyNo())
.businessType(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName())
......@@ -2126,6 +2126,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
/**
* 检测是否三环系统中的车用气瓶数据 不让三环系统数据通过设备新增方式进来
*
* @param map 入参
*/
private void checkIsSanSystemHanData(JSONObject map) {
......@@ -2406,7 +2407,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
@Override
public boolean beforeCheck(JgVehicleInformationDto jgVehicleInformation) {
return jgVehicleInformation.getInstanceId() != null && !jgVehicleInformation.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName()) &&!jgVehicleInformation.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName());
return jgVehicleInformation.getInstanceId() != null && !jgVehicleInformation.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName()) && !jgVehicleInformation.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName());
}
@Override
......@@ -2422,22 +2423,22 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
.isNull(JgVehicleInformation::getUseRegistrationFormUrl)
.ne(JgVehicleInformation::getStatus, "已作废");
List<JgVehicleInformation> vehicleInformations = this.list(queryWrapper);
if(CollUtil.isNotEmpty(vehicleInformations)){
if (CollUtil.isNotEmpty(vehicleInformations)) {
for (JgVehicleInformation vehicleInformation : vehicleInformations) {
try {
JgVehicleInformationVo jgVehicleInformationVo = this.queryBySequenceNbr(vehicleInformation.getSequenceNbr());
String jsonString = JSONObject.toJSONString(jgVehicleInformationVo);
JSONObject jsonObject = JSONObject.parseObject(jsonString);
jsonObject.put("userName",jgVehicleInformationVo.getCreateUserName());
jsonObject.put("userName", jgVehicleInformationVo.getCreateUserName());
Map<String, Object> vehicle = commonService.getRegistrationFormUrl("vehicle", jsonObject);
if(Objects.nonNull(vehicle)){
if (Objects.nonNull(vehicle)) {
LambdaUpdateWrapper<JgVehicleInformation> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(JgVehicleInformation::getUseRegistrationFormUrl,String.valueOf(vehicle.get("useRegistrationFormUrl")))
.eq(JgVehicleInformation::getSequenceNbr,vehicleInformation.getSequenceNbr());
wrapper.set(JgVehicleInformation::getUseRegistrationFormUrl, String.valueOf(vehicle.get("useRegistrationFormUrl")))
.eq(JgVehicleInformation::getSequenceNbr, vehicleInformation.getSequenceNbr());
this.update(wrapper);
}
}catch (BadRequest request){
log.error(request.getMessage(),request);
} catch (BadRequest request) {
log.error(request.getMessage(), request);
}
}
}
......
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