Skip to content

A
amos-boot-biz
Commit efb3e7df authored by 刘林's avatar 刘林
Browse files
Options

fix(jg):气瓶履历信息处理

parent 78eba12e
Show whitespace changes
Inline Side-by-side
Showing with 297 additions and 287 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgResumeInfo.java
View file @ efb3e7df
......@@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.annotation.RecUserNameFilling;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.*;
import lombok.experimental.Accessors;
import java.util.Date;
......@@ -22,6 +21,9 @@ import java.util.Date;
@Accessors(chain = true)
@TableName("tzs_jg_resume_info")
@RecUserNameFilling
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class JgResumeInfo extends BaseEntity {
private static final long serialVersionUID = 1L;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgResumeInfoController.java
View file @ efb3e7df
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgResumeInfo;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgResumeInfoServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -50,8 +51,8 @@ public class JgResumeInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/saveBatchResume")
@ApiOperation(httpMethod = "POST", value = "批量新增", notes = "批量新增")
public void saveBatchResume(@RequestBody List<JgResumeInfoDto> jgResumeInfoDtoList) {
jgResumeInfoServiceImpl.saveBatchResume(jgResumeInfoDtoList);
public void saveBatchResume(@RequestBody List<JgResumeInfo> jgResumeInfoList) {
jgResumeInfoServiceImpl.saveBatchResume(jgResumeInfoList);
}
/**
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgResumeInfoEqController.java 0 → 100644
View file @ efb3e7df
package com.yeejoin.amos.boot.module.jg.biz.controller;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.jg.api.entity.JgResumeInfoEq;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgResumeInfoEqServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import java.util.List;
/**
* 监管履历信息关系表-气瓶用
* @author LiuLin
* @date 2026-01-29
*/
@RestController
@Api(tags = "监管履历信息关系表Api")
@RequestMapping(value = "/jg-resume-info-eq")
public class JgResumeInfoEqController extends BaseController {
@Autowired
JgResumeInfoEqServiceImpl jgResumeInfoEqServiceImpl;
/**
* 新增监管履历信息关系表
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/saveBatchResumeEq")
@ApiOperation(httpMethod = "POST", value = "批量新增", notes = "批量新增")
public void saveBatchResumeEq(@RequestBody List<JgResumeInfoEq> jgResumeInfoEqList) {
jgResumeInfoEqServiceImpl.saveBatchResumeEq(jgResumeInfoEqList);
}
}
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/CommonServiceImpl.java
View file @ efb3e7df
......@@ -45,7 +45,6 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
import com.yeejoin.amos.boot.module.jg.api.enums.*;
import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgResumeInfoEqMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationManageMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
......@@ -110,7 +109,6 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.annotation.PostConstruct;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
......@@ -133,9 +131,7 @@ import java.util.function.Function;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static com.yeejoin.amos.boot.module.jg.biz.service.impl.DataHandlerServiceImpl.IDX_BIZ_EQUIPMENT_INFO;
import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationNameServiceImpl.DB_BATCH_SIZE;
/**
* 装备分类服务实现类
......@@ -324,7 +320,7 @@ public class CommonServiceImpl implements ICommonService {
@Autowired
private CodeUtil codeUtil;
@Autowired
private JgResumeInfoEqMapper jgResumeInfoEqMapper;
private JgResumeInfoEqServiceImpl jgResumeInfoEqService;
public static final String DATA_QUALITY_SCORE = "DATA_QUALITY_SCORE";
......@@ -3504,17 +3500,11 @@ public class CommonServiceImpl implements ICommonService {
}
public void batchInsertResumeEq(Long resumeId, List<Map<String, Object>> equipmentLists) {
List<JgResumeInfoEq> list = equipmentLists.stream()
jgResumeInfoEqService.saveBatchResumeEq(equipmentLists.stream()
.map(e -> JgResumeInfoEq.builder()
.resumeId(resumeId)
.equId(String.valueOf(e.get("record")))
.build())
.collect(Collectors.toList());
for (int i = 0; i < list.size(); i += DB_BATCH_SIZE) {
jgResumeInfoEqMapper.insertBatchSomeColumn(
list.subList(i, Math.min(i + DB_BATCH_SIZE, list.size()))
);
}
.collect(Collectors.toList()));
}
}
\ No newline at end of file
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 @ efb3e7df
......@@ -141,7 +141,7 @@ public class DataDockServiceImpl {
private final CodeUtil codeUtil;
private final CommonMapper commonMapper;
private final JgResumeInfoServiceImpl jgResumeInfoService;
private final JgResumeInfoEqMapper jgResumeInfoEqMapper;
private final JgResumeInfoEqServiceImpl jgResumeInfoEqService;
private final IdxBizJgMaintenanceRecordInfoServiceImpl idxBizJgMaintenanceRecordInfoService;
private final TzBaseEnterpriseInfoMapper enterpriseInfoMapper;
private final Map<String, Object> resultError = new HashMap<>();
......@@ -1749,7 +1749,7 @@ public class DataDockServiceImpl {
}
private void createResumeCylinderBatch(Set<String> records, String dataSource, String equipRoutePath, CompanyBo company) {
JgResumeInfoDto dto = JgResumeInfoDto.builder()
JgResumeInfo info = JgResumeInfo.builder()
.businessType(BusinessTypeEnum.JG_NEW_EQUIP.getName())
.status("正常")
.approvalUnitCode(company.getCompanyCode())
......@@ -1757,18 +1757,13 @@ public class DataDockServiceImpl {
.changeContent(BusinessTypeEnum.JG_NEW_EQUIP.getName() + "业务办理")
.routePath(String.format(equipRoutePath, dataSource))
.build();
jgResumeInfoService.saveBatchResume(Collections.singletonList(dto));
List<JgResumeInfoEq> list = records.stream()
jgResumeInfoService.save(info);
jgResumeInfoEqService.saveBatchResumeEq(records.stream()
.map(record -> JgResumeInfoEq.builder()
.resumeId(dto.getSequenceNbr())
.resumeId(info.getSequenceNbr())
.equId(record)
.build())
.collect(Collectors.toList());
for (int i = 0; i < list.size(); i += DB_BATCH_SIZE) {
jgResumeInfoEqMapper.insertBatchSomeColumn(
list.subList(i, Math.min(i + DB_BATCH_SIZE, list.size()))
);
}
.collect(Collectors.toList()));
}
private void updatePipelineLength(Set<String> projectContraptionIdSet) {
......@@ -1776,7 +1771,7 @@ public class DataDockServiceImpl {
}
private void createResumeBatch(Set<String> records, String dataSource, String routePath, CompanyBo company) {
jgResumeInfoService.saveBatchResume(records.stream().map(record->JgResumeInfoDto.builder()
jgResumeInfoService.saveBatchResume(records.stream().map(record->JgResumeInfo.builder()
.businessType(BusinessTypeEnum.JG_NEW_EQUIP.getName())
.businessId(record)
.equId(record)
......@@ -1790,7 +1785,7 @@ public class DataDockServiceImpl {
}
private void createResumePipelineBatch(Set<String> projectContraptionIdSet, String routePath, CompanyBo company) {
jgResumeInfoService.saveBatchResume(projectContraptionIdSet.stream().map(projectContraptionId ->JgResumeInfoDto.builder()
jgResumeInfoService.saveBatchResume(projectContraptionIdSet.stream().map(projectContraptionId ->JgResumeInfo.builder()
.businessType(BusinessTypeEnum.JG_NEW_PROJECT.getName())
.businessId(projectContraptionId)
.equId(projectContraptionId)
......@@ -2082,7 +2077,7 @@ public class DataDockServiceImpl {
}
private void createResumePipeline(Long sequenceNbr, String routePath, CompanyBo company) {
jgResumeInfoService.saveBatchResume(Collections.singletonList(JgResumeInfoDto.builder()
jgResumeInfoService.saveBatchResume(Collections.singletonList(JgResumeInfo.builder()
.businessType(BusinessTypeEnum.JG_NEW_PROJECT.getName())
.businessId(sequenceNbr + "")
.equId(sequenceNbr + "")
......
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 @ efb3e7df
......@@ -739,7 +739,7 @@ public class EquipClaimServiceImpl {
*/
public void addEquipResume(JSONObject equipInfo, BusinessTypeEnum businessTypeEnum, JgUseRegistration useRegistration) {
String record = (String) equipInfo.get(RECORD);
JgResumeInfoDto resumeInfoDto = JgResumeInfoDto.builder()
JgResumeInfo resumeInfo = JgResumeInfo.builder()
.applyNo(null)
.businessType(businessTypeEnum.getName())
.businessId(record)
......@@ -750,10 +750,8 @@ public class EquipClaimServiceImpl {
.changeContent(businessTypeEnum.getName() + "业务")
.build();
if (!ObjectUtils.isEmpty(useRegistration.getSequenceNbr())) {
resumeInfoDto.setRoutePath(useRegistrationService.buildTaskModel(useRegistration, equipInfo, getSelectedOrgInfo()));
resumeInfo.setRoutePath(useRegistrationService.buildTaskModel(useRegistration, equipInfo, getSelectedOrgInfo()));
}
JgResumeInfo resumeInfo = new JgResumeInfo();
BeanUtils.copyProperties(resumeInfoDto, resumeInfo);
jgResumeInfoService.save(resumeInfo);
}
......
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 @ efb3e7df
......@@ -895,7 +895,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
}
private void createResumePipeline(Long sequenceNbr, String routePath, CompanyBo company) {
jgResumeInfoService.saveBatchResume(Collections.singletonList(JgResumeInfoDto.builder()
jgResumeInfoService.save(JgResumeInfo.builder()
.businessType(BusinessTypeEnum.JG_NEW_PROJECT.getName())
.businessId(sequenceNbr + "")
.equId(sequenceNbr + "")
......@@ -904,8 +904,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
.approvalUnit(company.getCompanyName())
.changeContent(BusinessTypeEnum.JG_NEW_PROJECT.getName() + "业务办理")
.routePath(routePath)
.build())
);
.build());
}
/**
......@@ -3904,7 +3903,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
}
private void createResume(String record, String routePath, CompanyBo company) {
jgResumeInfoService.saveBatchResume(Collections.singletonList(JgResumeInfoDto.builder()
jgResumeInfoService.save(JgResumeInfo.builder()
.businessType(BusinessTypeEnum.JG_NEW_EQUIP.getName())
.businessId(record)
.equId(record)
......@@ -3913,8 +3912,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
.approvalUnit(company.getCompanyName())
.changeContent(BusinessTypeEnum.JG_NEW_EQUIP.getName() + "业务办理")
.routePath(routePath)
.build())
);
.build());
}
public void createResumeForCylinder(String record, String routePath, CompanyBo company) {
......
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/JgCertificateReplenishServiceImpl.java
View file @ efb3e7df
......@@ -161,7 +161,7 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
private final IdxBizJgFactoryInfoServiceImpl idxBizJgFactoryInfoService;
private final JgCertificateReplenishMapper jgCertificateReplenishMapper;
private final JgResumeInfoServiceImpl jgResumeInfoService;
private final JgResumeInfoEqMapper jgResumeInfoEqMapper;
private final JgResumeInfoEqServiceImpl jgResumeInfoEqService;
private final IdxBizJgProjectContraptionServiceImplService jgProjectContraptionServiceImplService;
/**
......@@ -551,7 +551,7 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
List<JgCertificateReplenishEq> replenishEqs = certificateReplenishEqService.getBaseMapper().selectList(new LambdaQueryWrapper<JgCertificateReplenishEq>()
.eq(JgCertificateReplenishEq::getCertificateReplenishId, certificateReplenish.getSequenceNbr()));
if (CylinderTypeEnum.CYLINDER.getCode().equals(certificateReplenish.getEquCategoryCode())){
JgResumeInfoDto dto = JgResumeInfoDto.builder().applyNo(certificateReplenish.getApplyNo())
JgResumeInfo info = JgResumeInfo.builder().applyNo(certificateReplenish.getApplyNo())
.businessType(BusinessTypeEnum.JG_REPLACEMENT_REGISTRATION.getName())
.businessId(String.valueOf(certificateReplenish.getSequenceNbr()))
.approvalUnit(certificateReplenish.getReceiveOrgName())
......@@ -560,20 +560,15 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
.changeContent(BusinessTypeEnum.JG_REPLACEMENT_REGISTRATION.getName() + "业务办理")
.routePath(routePath)
.build();
jgResumeInfoService.saveBatchResume(Collections.singletonList(dto));
List<JgResumeInfoEq> list = replenishEqs.stream()
jgResumeInfoService.save(info);
jgResumeInfoEqService.saveBatchResumeEq(replenishEqs.stream()
.map(eq -> JgResumeInfoEq.builder()
.resumeId(dto.getSequenceNbr())
.resumeId(info.getSequenceNbr())
.equId(eq.getEquId())
.build())
.collect(Collectors.toList());
for (int i = 0; i < list.size(); i += DB_BATCH_SIZE) {
jgResumeInfoEqMapper.insertBatchSomeColumn(
list.subList(i, Math.min(i + DB_BATCH_SIZE, list.size()))
);
}
.collect(Collectors.toList()));
}else{
jgResumeInfoService.saveBatchResume(replenishEqs.stream().map(eq-> JgResumeInfoDto.builder().applyNo(certificateReplenish.getApplyNo())
jgResumeInfoService.saveBatchResume(replenishEqs.stream().map(eq-> JgResumeInfo.builder().applyNo(certificateReplenish.getApplyNo())
.businessType(BusinessTypeEnum.JG_REPLACEMENT_REGISTRATION.getName())
.businessId(String.valueOf(certificateReplenish.getSequenceNbr()))
.equId(eq.getEquId())
......
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/JgChangeRegistrationNameServiceImpl.java
View file @ efb3e7df
......@@ -11,17 +11,17 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.annotation.EnableEsRollback;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
import com.yeejoin.amos.boot.module.common.api.dao.EsBaseEnterpriseInfoDao;
import com.yeejoin.amos.boot.module.common.api.dao.EsEquipmentDao;
import com.yeejoin.amos.boot.module.common.api.dao.EsUserInfoDao;
import com.yeejoin.amos.boot.module.common.api.entity.ESEquipmentInfo;
import com.yeejoin.amos.boot.module.common.api.entity.EsBaseEnterpriseInfo;
import com.yeejoin.amos.boot.module.common.api.entity.EsUserInfo;
import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
import com.yeejoin.amos.boot.module.common.api.enums.CylinderTypeEnum;
import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
import com.yeejoin.amos.boot.module.jg.api.dto.*;
......@@ -127,13 +127,15 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
private JgResumeInfoServiceImpl jgResumeInfoService;
@Autowired
private JgResumeInfoEqMapper jgResumeInfoEqMapper;
private JgResumeInfoEqServiceImpl jgResumeInfoEqService;
@Autowired
private EsBaseEnterpriseInfoDao enterpriseInfoDao;
@Autowired
private EsEquipmentDao esEquipmentDao;
@Autowired
private EsUserInfoDao esUserInfoDao;
@Autowired
private ESEquipmentCategory esEquipmentCategory;
public final static String CHANGE_NAME = "更名变更";
public final static String CHANGE_NAME_KEY = "changeName";
......@@ -226,19 +228,19 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
public void updateEsData(List<String> ids, JgChangeRegistrationName jgChangeRegistrationName) {
// 更新es
HashMap<String, Map<String, Object>> objMap = new HashMap<>();
ids.forEach(item -> {
HashMap<String, Object> param = new HashMap<>();
param.put("USE_UNIT_NAME", jgChangeRegistrationName.getNewUseUnitName());
objMap.put(item, param);
});
tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
Iterable<ESEquipmentInfo> newEsDtos = esEquipmentDao.findAllById(ids);
newEsDtos.forEach(dto -> {
dto.setUSE_UNIT_NAME(jgChangeRegistrationName.getNewUseUnitName());
dto.setREC_DATE(new Date().getTime());
Iterable<ESEquipmentCategoryDto> equips = esEquipmentCategory.findAllById(ids);
Date date = new Date();
equips.forEach(item -> {
item.setUSE_UNIT_NAME(jgChangeRegistrationName.getNewUseUnitName());
item.setREC_DATE(date.getTime());
});
esEquipmentDao.saveAll(newEsDtos);
esEquipmentCategory.saveAllWithFallback(equips);
// Iterable<ESEquipmentInfo> newEsDtos = esEquipmentDao.findAllById(ids);
// newEsDtos.forEach(dto -> {
// dto.setUSE_UNIT_NAME(jgChangeRegistrationName.getNewUseUnitName());
// dto.setREC_DATE(date.getTime());
// });
// esEquipmentDao.saveAll(newEsDtos);
}
@Transactional(rollbackFor = Exception.class)
......@@ -731,6 +733,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
}
@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 6000000)
@EnableEsRollback
public void flowExecute(Long id, String instanceId, String operate, String comment, String nextTaskId) {
String lockKey = CommonServiceImpl.buildJgExecuteLockKey(instanceId);
RLock lock = redissonClient.getLock(lockKey);
......@@ -839,14 +842,16 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
Lists.partition(recordList, ES_BATCH_SIZE)
.forEach(batch -> updateEsData(batch, jgChangeRegistrationName));
this.updateEnterpriseInfo(jgChangeRegistrationName);
this.sendDataRefreshMsg(jgChangeRegistrationName, recordList);
}
// 保存redis最新流程数据
commonService.saveExecuteFlowData2Redis(jgChangeRegistrationName.getInstanceId(), this.buildInstanceRuntimeData(jgChangeRegistrationName));
this.getBaseMapper().updateById(jgChangeRegistrationName);
}
private void sendDataRefreshMsg(JgChangeRegistrationName jgChangeRegistrationName) {
private void sendDataRefreshMsg(JgChangeRegistrationName jgChangeRegistrationName, List<String> records) {
eventPublisher.publish(new DataRefreshEvent(this, Collections.singletonList(jgChangeRegistrationName.getUseUnitCreditCode()), DataRefreshEvent.DataType.enterprise.name(), DataRefreshEvent.Operation.UPDATE));
eventPublisher.publish(new DataRefreshEvent(this, records, DataRefreshEvent.DataType.equipment.name(), DataRefreshEvent.Operation.UPDATE));
}
public InstanceRuntimeData buildInstanceRuntimeData(JgChangeRegistrationName jgChangeRegistrationName) {
......@@ -1034,22 +1039,22 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
enterprise.setUseUnit(newName);
tzBaseEnterpriseInfoMapper.updateById(enterprise);
EsBaseEnterpriseInfo esBaseEnterpriseInfo = new EsBaseEnterpriseInfo();
BeanUtil.copyProperties(enterprise, esBaseEnterpriseInfo);
enterpriseInfoDao.save(esBaseEnterpriseInfo);
// EsBaseEnterpriseInfo esBaseEnterpriseInfo = new EsBaseEnterpriseInfo();
// BeanUtil.copyProperties(enterprise, esBaseEnterpriseInfo);
// enterpriseInfoDao.save(esBaseEnterpriseInfo);
String platformName = CompanyTypeEnum.INDIVIDUAL.getName().equals(enterprise.getUnitType())
? jgChangeRegistrationName.getUseUnitCreditCode() + "_" + newName
: newName;
// 人员更新冗余的单位信息
List<TzsUserInfo> userOfOneUnit = useInfoMapper.selectList(new LambdaQueryWrapper<TzsUserInfo>().eq(TzsUserInfo::getUnitCode, enterprise.getUseCode()).eq(BaseEntity::getIsDelete, false).select(BaseEntity::getSequenceNbr));
Iterable<EsUserInfo> userInfosEs = esUserInfoDao.findAllById(userOfOneUnit.stream().map(u -> String.valueOf(u.getSequenceNbr())).collect(Collectors.toList()));
userInfosEs.forEach(esUserInfo -> {
esUserInfo.setUnitType(esBaseEnterpriseInfo.getUnitType());
esUserInfo.setSuperviseOrgName(esBaseEnterpriseInfo.getSuperviseOrgName());
esUserInfo.setSuperviseOrgCode(esBaseEnterpriseInfo.getSuperviseOrgCode());
esUserInfo.setOfficeRegion(esBaseEnterpriseInfo.getOfficeRegion());
esUserInfo.setUnitName(platformName);
});
// Iterable<EsUserInfo> userInfosEs = esUserInfoDao.findAllById(userOfOneUnit.stream().map(u -> String.valueOf(u.getSequenceNbr())).collect(Collectors.toList()));
// userInfosEs.forEach(esUserInfo -> {
// esUserInfo.setUnitType(esBaseEnterpriseInfo.getUnitType());
// esUserInfo.setSuperviseOrgName(esBaseEnterpriseInfo.getSuperviseOrgName());
// esUserInfo.setSuperviseOrgCode(esBaseEnterpriseInfo.getSuperviseOrgCode());
// esUserInfo.setOfficeRegion(esBaseEnterpriseInfo.getOfficeRegion());
// esUserInfo.setUnitName(platformName);
// });
if (CompanyTypeEnum.INDIVIDUAL.getName().equals(enterprise.getUnitType())){
useInfoMapper.updateBatchUnitName(userOfOneUnit, platformName);
......@@ -1066,10 +1071,9 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
Privilege.agencyUserClient.update(userModel, userModel.getUserId());
}
}
if (userInfosEs.iterator().hasNext()) {
esUserInfoDao.saveAll(userInfosEs);
}
// if (userInfosEs.iterator().hasNext()) {
// esUserInfoDao.saveAll(userInfosEs);
// }
try {
Privilege.companyClient.updateCompanyName(enterprise.getUseCode(), platformName);
} catch (InnerInvokException e) {
......@@ -1091,7 +1095,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
}
});
if (!cylinderEquipIds.isEmpty()) {
JgResumeInfoDto resumeInfo = JgResumeInfoDto.builder()
JgResumeInfo resumeInfo = JgResumeInfo.builder()
.businessType(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName())
.applyNo(jgChangeRegistrationName.getApplyNo())
.businessId(String.valueOf(jgChangeRegistrationName.getSequenceNbr()))
......@@ -1101,23 +1105,15 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
.changeContent(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName() + "业务办理")
.routePath(routePath)
.build();
JgResumeInfo info = new JgResumeInfo();
BeanUtils.copyProperties(resumeInfo, info);
jgResumeInfoService.save(info);
List<JgResumeInfoEq> list = cylinderEquipIds.stream()
jgResumeInfoService.save(resumeInfo);
jgResumeInfoEqService.saveBatchResumeEq(cylinderEquipIds.stream()
.map(e -> JgResumeInfoEq.builder()
.resumeId(info.getSequenceNbr())
.resumeId(resumeInfo.getSequenceNbr())
.equId(e)
.build())
.collect(Collectors.toList());
for (int i = 0; i < list.size(); i += DB_BATCH_SIZE) {
jgResumeInfoEqMapper.insertBatchSomeColumn(
list.subList(i, Math.min(i + DB_BATCH_SIZE, list.size()))
);
}
.collect(Collectors.toList()));
}
List<JgResumeInfoDto> resumeInfoDtos = Stream.concat(projectContraptionIds.stream(), notPipelineRecords.stream()).map(e-> JgResumeInfoDto.builder()
List<JgResumeInfo> resumeInfos = Stream.concat(projectContraptionIds.stream(), notPipelineRecords.stream()).map(e-> JgResumeInfo.builder()
.businessType(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName())
.applyNo(jgChangeRegistrationName.getApplyNo())
.businessId(jgChangeRegistrationName.getSequenceNbr() + "")
......@@ -1128,7 +1124,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
.changeContent(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName() + "业务办理")
.routePath(routePath)
.build()).collect(Collectors.toList());
jgResumeInfoService.saveBatchResume(resumeInfoDtos);
jgResumeInfoService.saveBatchResume(resumeInfos);
}
public Map<String, Object> getTableData(JgUseRegistrationManageDto dto) {
......
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 @ efb3e7df
......@@ -702,8 +702,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
* @param routePath 详情
*/
private void createResume(JgChangeRegistrationReform jgChangeRegistrationReform, String routePath) {
jgResumeInfoService.saveBatchResume(Collections.singletonList(
JgResumeInfoDto.builder()
jgResumeInfoService.save(JgResumeInfo.builder()
.applyNo(jgChangeRegistrationReform.getApplyNo())
.businessType(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName())
.businessId(String.valueOf(jgChangeRegistrationReform.getSequenceNbr()))
......@@ -713,9 +712,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
.status("正常")
.changeContent(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName() + "业务办理")
.routePath(routePath)
.build()
)
);
.build());
}
/**
......@@ -724,8 +721,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
* @param routePath 详情
*/
private void createResume(JgChangeRegistrationReformEq jgChangeRegistrationReformEq, JgChangeRegistrationReform jgChangeRegistrationReform, String routePath) {
jgResumeInfoService.saveBatchResume(Collections.singletonList(
JgResumeInfoDto.builder()
jgResumeInfoService.save(JgResumeInfo.builder()
.applyNo(jgChangeRegistrationReform.getApplyNo())
.businessType(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName())
.businessId(String.valueOf(jgChangeRegistrationReform.getSequenceNbr()))
......@@ -735,9 +731,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
.status("正常")
.changeContent(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName() + "业务办理")
.routePath(routePath)
.build()
)
);
.build());
}
private void sendDataRefreshMsg(JgChangeRegistrationReform jgChangeRegistrationReform) {
......
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/JgChangeRegistrationTransferServiceImpl.java
View file @ efb3e7df
......@@ -899,7 +899,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
LambdaQueryWrapper<JgChangeRegistrationTransferEq> lambda = new QueryWrapper<JgChangeRegistrationTransferEq>().lambda();
lambda.eq(JgChangeRegistrationTransferEq::getEquipTransferId, jgChangeRegistrationTransfer.getSequenceNbr());
List<JgChangeRegistrationTransferEq> changeRegistrationTransferEqs = jgChangeRegistrationTransferEqService.getBaseMapper().selectList(lambda);
jgResumeInfoService.saveBatchResume(changeRegistrationTransferEqs.stream().map(eq-> JgResumeInfoDto.builder().applyNo(jgChangeRegistrationTransfer.getApplyNo())
jgResumeInfoService.saveBatchResume(changeRegistrationTransferEqs.stream().map(eq-> JgResumeInfo.builder().applyNo(jgChangeRegistrationTransfer.getApplyNo())
.businessType(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getName())
.businessId(String.valueOf(jgChangeRegistrationTransfer.getSequenceNbr()))
.equId(eq.getEquId())
......
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/JgChangeRegistrationUnitServiceImpl.java
View file @ efb3e7df
......@@ -10,11 +10,11 @@ import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import com.olym.shaded.org.apache.commons.collections4.MapUtils;
import com.yeejoin.amos.boot.biz.common.annotation.EnableEsRollback;
import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
......@@ -81,10 +81,10 @@ import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationNameServiceImpl.DB_BATCH_SIZE;
import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationNameServiceImpl.ES_BATCH_SIZE;
import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate;
/**
......@@ -227,7 +227,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
@Autowired
private JgUseRegistrationServiceImpl jgUseRegistrationService;
@Autowired
private JgResumeInfoEqMapper jgResumeInfoEqMapper;
private JgResumeInfoEqServiceImpl jgResumeInfoEqService;
/**
* 根据sequenceNbr查询：1、查询单位变更信息，2、查询使用登记证列表
......@@ -1814,6 +1814,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
* @date 2024/7/18 11:00
**/
@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 6000000)
@EnableEsRollback
public void accept(JgChangeRegistrationUnitDto dto, String op) {
String lockKey = CommonServiceImpl.buildJgExecuteLockKey(dto.getInstanceId());
RLock lock = redissonClient.getLock(lockKey);
......@@ -1894,9 +1895,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
LambdaQueryWrapper<JgChangeRegistrationUnitEq> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, dto.getSequenceNbr());
List<JgChangeRegistrationUnitEq> jgChangeRegistrationUnitEqs = JgChangeRegistrationUnitEqMapper.selectList(queryWrapper);
//修改ES中使用单位信息和使用单位代码
Map<String, Map<String, Object>> resultMap = new HashMap<>();
//更新产权信息
dto.getRegistrationList().forEach(v -> {
String useCode = String.valueOf(v.get("useRegistrationCode"));
......@@ -1927,6 +1925,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
});
Map<String, String> seqToEquId = new HashMap<>();
List<ESEquipmentCategoryDto> esEquipmentCategoryDtos = new ArrayList<>();
for (JgChangeRegistrationUnitEq jgChangeRegistrationUnitEq : jgChangeRegistrationUnitEqs) {
String equipId = jgChangeRegistrationUnitEq.getEquId();
LambdaQueryWrapper<IdxBizJgUseInfo> useInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
......@@ -1949,36 +1948,38 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
LambdaQueryWrapper<IdxBizJgRegisterInfo> registerInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
registerInfoLambdaQueryWrapper.eq(IdxBizJgRegisterInfo::getRecord, equipId);
IdxBizJgRegisterInfo registerInfo = registerInfoMapper.selectOne(registerInfoLambdaQueryWrapper);
Map<String, Object> esUpdateParams = new HashMap<>();
Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(equipId);
String[] companyCode = registration.getNewUseUnitCreditCode().split("_");
esUpdateParams.put("USE_UNIT_CREDIT_CODE", companyCode.length > 1 ? companyCode[1] : registration.getNewUseUnitCreditCode());
esUpdateParams.put("USE_UNIT_NAME", registration.getNewUseUnitName());
esUpdateParams.put("REC_DATE", new Date());// 更新时间，设备筛选时排在前面 bug-21476
esUpdateParams.put("EQU_STATE", "1");
if (optional.isPresent()) {
ESEquipmentCategoryDto esEquipmentCategoryDto = optional.get();
esEquipmentCategoryDto.setUSE_UNIT_CREDIT_CODE(companyCode.length > 1 ? companyCode[1] : registration.getNewUseUnitCreditCode());
esEquipmentCategoryDto.setUSE_UNIT_NAME(registration.getNewUseUnitName());
esEquipmentCategoryDto.setEQU_STATE(EquipmentEnum.ZAIYONG.getCode());
esEquipmentCategoryDto.setREC_DATE(new Date().getTime());
if (EQU_CODE_CC.equals(registration.getEquListCode())) {
esUpdateParams.put("USE_PLACE", joinWithSeparator("/", useInfo.getProvinceName(), useInfo.getCityName(), useInfo.getCountyName(), useInfo.getStreetName()));
esUpdateParams.put("USE_PLACE_CODE", joinWithSeparator("#", useInfo.getProvince(), useInfo.getCity(), useInfo.getCounty(), useInfo.getFactoryUseSiteStreet()));
esUpdateParams.put("ORG_BRANCH_CODE", registration.getOrgBranchCode());
esUpdateParams.put("ORG_BRANCH_NAME", registration.getOrgBranchName());
esEquipmentCategoryDto.setUSE_PLACE(joinWithSeparator("/", useInfo.getProvinceName(), useInfo.getCityName(), useInfo.getCountyName(), useInfo.getStreetName()));
esEquipmentCategoryDto.setUSE_PLACE_CODE(joinWithSeparator("#", useInfo.getProvince(), useInfo.getCity(), useInfo.getCounty(), useInfo.getFactoryUseSiteStreet()));
esEquipmentCategoryDto.setOrgBranchCode(registration.getOrgBranchCode());
esEquipmentCategoryDto.setORG_BRANCH_NAME(registration.getOrgBranchName());
}
// 如果是变更类型=1，还需要更新证号到 ES
if ("1".equals(registration.getChangeType()) && EQU_CODE_CC.equals(dto.getEquListCode())) {
// 新证号生成逻辑
String newCode = commonServiceImpl.generateRegistrationCode(equipId, registration.getReceiveCompanyCode(), false);
esUpdateParams.put("USE_ORG_CODE", newCode);
esEquipmentCategoryDto.setUSE_ORG_CODE(newCode);
seqToEquId.put(registerInfo.getUseOrgCode(), newCode);
registerInfo.setUseOrgCode(newCode);
registerInfoMapper.updateById(registerInfo);
}
if (ObjectUtils.isNotEmpty(registerInfo) && ObjectUtils.isNotEmpty(registerInfo.getCarNumber())) {
esUpdateParams.put("CAR_NUMBER", registerInfo.getCarNumber());
}
resultMap.put(equipId, esUpdateParams);
// if (ObjectUtils.isNotEmpty(registerInfo) && ObjectUtils.isNotEmpty(registerInfo.getCarNumber())) {
// esUpdateParams.put("CAR_NUMBER", registerInfo.getCarNumber());
// }
//修改各类告知列表，置为废弃
this.updataInvalidStatusByHistory(equipId, registration.getApplyNo());
tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
esEquipmentCategoryDtos.add(esEquipmentCategoryDto);
}
esEquipmentCategory.saveAllWithFallback(esEquipmentCategoryDtos);
}
registration.setNextTaskId(nextTaskId);
TaskV2Model taskV2Model = updateTaskModel(registration, op);
......@@ -2190,51 +2191,47 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
String useRegistrationCode = findOrGenerateUseRegistrationCode(dto, registration, deviceList, existedRegistrationFlag);
List<String> records = new ArrayList<>(deviceList.size());
Map<String, Map<String, Object>> esUpdateMap = new HashMap<>(deviceList.size());
this.extractDeviceBaseInfo(deviceList, registration);
IdxBizJgUseInfo useInfo = this.buildUseInfo(dto, registration);
Map<String, Object> esParams = this.buildEsUpdateParams(useInfo, registration, useRegistrationCode);
deviceList.stream()
.map(device -> MapUtils.getString(device, RECORD))
deviceList.stream().map(device -> MapUtils.getString(device, RECORD))
.filter(ObjectUtils::isNotEmpty)
.forEach(record -> {
records.add(record);
esUpdateMap.put(record, esParams);
});
.forEach(records::add);
Lists.partition(records, DB_BATCH_SIZE).forEach(batch -> {
useInfoMapper.batchUpdateUseInfoByRecords(useInfo, batch);
registerInfoMapper.batchUpdateUseOrgCodeByRecord(useRegistrationCode, batch);
idxBizJgSupervisionInfoMapper.batchUpdateSupervisionInfo(
registration.getOrgBranchCode(),
registration.getOrgBranchName(),
batch
);
// ===== ES 分批 =====
Map<String, Map<String, Object>> esBatchMap = batch.stream()
.filter(esUpdateMap::containsKey)
.collect(Collectors.toMap(
Function.identity(),
esUpdateMap::get,
(a, b) -> a
));
if (!esBatchMap.isEmpty()) {
tzsServiceFeignClient.commonUpdateEsDataByIds(esBatchMap);
}
idxBizJgSupervisionInfoMapper.batchUpdateSupervisionInfo(registration.getOrgBranchCode(), registration.getOrgBranchName(), batch);
});
// 7. 新增或更新使用登记证管理表
this.upsertUseRegistrationManage(registration, useRegistrationCode, existedRegistrationFlag.get());
this.createResumeForCylinder(records, registration, taskV2Model.getRoutePath());
Lists.partition(records, ES_BATCH_SIZE).forEach(batch -> {
Iterable<ESEquipmentCategoryDto> iterable = esEquipmentCategory.findAllById(batch);
List<ESEquipmentCategoryDto> updateList = new ArrayList<>(batch.size());
for (ESEquipmentCategoryDto categoryDto : iterable) {
categoryDto.setUSE_UNIT_CREDIT_CODE(registration.getNewUseUnitCreditCode());
categoryDto.setUSE_UNIT_NAME(registration.getNewUseUnitName());
categoryDto.setREC_DATE(System.currentTimeMillis());
categoryDto.setUSE_PLACE(joinWithSeparator("/", useInfo.getProvinceName(), useInfo.getCityName(), useInfo.getCountyName(), useInfo.getStreetName()));
categoryDto.setUSE_PLACE_CODE(joinWithSeparator("#", useInfo.getProvince(), useInfo.getCity(), useInfo.getCounty(), useInfo.getFactoryUseSiteStreet()));
categoryDto.setOrgBranchCode(registration.getOrgBranchCode());
categoryDto.setORG_BRANCH_NAME(registration.getOrgBranchName());
categoryDto.setUSE_ORG_CODE(useRegistrationCode);
updateList.add(categoryDto);
}
if (!updateList.isEmpty()) {
esEquipmentCategory.saveAllWithFallback(updateList);
}
});
}
private void createResumeForCylinder(List<String> records, JgChangeRegistrationUnit registration, String routePath) {
if (!records.isEmpty()) {
JgResumeInfoDto resumeInfo = JgResumeInfoDto.builder()
JgResumeInfo resumeInfo = JgResumeInfo.builder()
.businessType(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName())
.applyNo(registration.getApplyNo())
.businessId(String.valueOf(registration.getSequenceNbr()))
......@@ -2244,21 +2241,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
.changeContent(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName() + "业务办理")
.routePath(routePath)
.build();
JgResumeInfo info = new JgResumeInfo();
BeanUtils.copyProperties(resumeInfo, info);
jgResumeInfoService.save(info);
List<JgResumeInfoEq> list = records.stream()
jgResumeInfoService.save(resumeInfo);
jgResumeInfoEqService.saveBatchResumeEq(records.stream()
.map(e -> JgResumeInfoEq.builder()
.resumeId(info.getSequenceNbr())
.resumeId(resumeInfo.getSequenceNbr())
.equId(e)
.build())
.collect(Collectors.toList());
for (int i = 0; i < list.size(); i += DB_BATCH_SIZE) {
jgResumeInfoEqMapper.insertBatchSomeColumn(
list.subList(i, Math.min(i + DB_BATCH_SIZE, list.size()))
);
}
.collect(Collectors.toList()));
}
}
......@@ -2323,28 +2312,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
.setUseDate(dto.getUseDate());
}
private void updateRegisterInfo(String record, String useRegistrationCode) {
LambdaUpdateWrapper<IdxBizJgRegisterInfo> update = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda()
.eq(IdxBizJgRegisterInfo::getRecord, record)
.set(true, IdxBizJgRegisterInfo::getUseOrgCode, useRegistrationCode);
idxBizJgRegisterInfoService.update(update);
}
private Map<String, Object> buildEsUpdateParams(IdxBizJgUseInfo useInfo, JgChangeRegistrationUnit registration, String useRegistrationCode) {
Map<String, Object> params = new HashMap<>();
params.put("USE_UNIT_CREDIT_CODE", registration.getNewUseUnitCreditCode());
params.put("USE_UNIT_NAME", registration.getNewUseUnitName());
params.put("REC_DATE", new Date());
if (useInfo != null) {
params.put("USE_PLACE", joinWithSeparator("/", useInfo.getProvinceName(), useInfo.getCityName(), useInfo.getCountyName(), useInfo.getStreetName()));
params.put("USE_PLACE_CODE", joinWithSeparator("#", useInfo.getProvince(), useInfo.getCity(), useInfo.getCounty(), useInfo.getFactoryUseSiteStreet()));
}
params.put("ORG_BRANCH_CODE", registration.getOrgBranchCode());
params.put("ORG_BRANCH_NAME", registration.getOrgBranchName());
params.put("USE_ORG_CODE", useRegistrationCode);
return params;
}
private void upsertUseRegistrationManage(JgChangeRegistrationUnit registration, String useRegistrationCode, boolean existed) {
Map<String, String> equType = new HashMap<>();
equType.put("equListCode", registration.getEquListCode());
......@@ -2426,7 +2393,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
private void createResume(JgChangeRegistrationUnit registration, List<JgChangeRegistrationUnitEq> jgChangeRegistrationUnitEqs, String routePath) {
jgResumeInfoService.saveBatchResume(jgChangeRegistrationUnitEqs.stream().map(eq-> JgResumeInfoDto.builder().applyNo(registration.getApplyNo())
jgResumeInfoService.saveBatchResume(jgChangeRegistrationUnitEqs.stream().map(eq-> JgResumeInfo.builder().applyNo(registration.getApplyNo())
.businessType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName())
.businessId(String.valueOf(registration.getSequenceNbr()))
.equId(eq.getEquId())
......@@ -2754,7 +2721,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
Iterable<ESEquipmentCategoryDto> jgAllEsDtos = esEquipmentCategory.findAllById(batch);
jgAllEsDtos.forEach(dto -> dto.setUSE_ORG_CODE(null));
esEquipmentCategory.saveAll(jgAllEsDtos);
Iterable<ESEquipmentInfo> newEsDtos = esEquipmentDao.findAllById(batch);
newEsDtos.forEach(dto -> dto.setUSE_ORG_CODE(null));
esEquipmentDao.saveAll(newEsDtos);
......@@ -2824,7 +2790,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
private void createResume(List<String> projectContraptionIds, JgChangeRegistrationUnit registration, String routePath) {
jgResumeInfoService.saveBatchResume(projectContraptionIds.stream().map(projectContraptionId-> JgResumeInfoDto.builder().applyNo(registration.getApplyNo())
jgResumeInfoService.saveBatchResume(projectContraptionIds.stream().map(projectContraptionId-> JgResumeInfo.builder().applyNo(registration.getApplyNo())
.businessType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName())
.businessId(String.valueOf(registration.getSequenceNbr()))
.equId(projectContraptionId)
......@@ -2867,8 +2833,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
dto.setEQU_STATE(EquipmentEnum.ZAIYONG.getCode());
});
esEquipmentCategory.saveAll(jgAllEsDtos);
esEquipmentCategory.saveAllWithFallback(jgAllEsDtos);
Iterable<ESEquipmentInfo> newEsDtos = esEquipmentDao.findAllById(batch);
newEsDtos.forEach(dto -> {
dto.setUSE_UNIT_CREDIT_CODE(newCompanyCode);
......
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/JgChangeVehicleRegistrationUnitServiceImpl.java
View file @ efb3e7df
......@@ -139,6 +139,9 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
private JgResumeInfoServiceImpl jgResumeInfoService;
@Autowired
private JgResumeInfoEqServiceImpl jgResumeInfoEqService;
@Autowired
private CodeUtil codeUtil;
public void changeData(JgChangeVehicleRegistrationUnit dto, CompanyBo company) {
......@@ -479,17 +482,22 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
private void createResume(JgChangeVehicleRegistrationUnit changeVehicleRegistrationUnit , String routePath) {
List<JgChangeVehicleRegistrationUnitEq> registrationUnitEqs = getJgChangeVehicleRegistrationUnitEqs(changeVehicleRegistrationUnit);
jgResumeInfoService.saveBatchResume(registrationUnitEqs.stream().map(eq-> JgResumeInfoDto.builder().applyNo(changeVehicleRegistrationUnit.getApplyNo())
JgResumeInfo info = JgResumeInfo.builder().applyNo(changeVehicleRegistrationUnit.getApplyNo())
.businessType(BusinessTypeEnum.JG_VEHICLE_GAS_CYLINDER_CHANGE.getName())
.businessId(String.valueOf(changeVehicleRegistrationUnit.getSequenceNbr()))
.equId(eq.getEquId())
.approvalUnit(changeVehicleRegistrationUnit.getReceiveOrgName())
.approvalUnitCode(changeVehicleRegistrationUnit.getReceiveOrgCode())
.status("正常")
.changeContent(BusinessTypeEnum.JG_VEHICLE_GAS_CYLINDER_CHANGE.getName() + "业务办理")
.routePath(routePath)
.build()).collect(Collectors.toList())
);
.build();
jgResumeInfoService.save(info);
jgResumeInfoEqService.saveBatchResumeEq(registrationUnitEqs.stream()
.map(eq -> JgResumeInfoEq.builder()
.resumeId(info.getSequenceNbr())
.equId(eq.getEquId())
.build())
.collect(Collectors.toList()));
}
private List<JgChangeVehicleRegistrationUnitEq> getJgChangeVehicleRegistrationUnitEqs(JgChangeVehicleRegistrationUnit changeVehicleRegistrationUnit) {
......
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/JgEnableDisableServiceImpl.java
View file @ efb3e7df
......@@ -96,7 +96,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
@Autowired
JgResumeInfoServiceImpl jgResumeInfoService;
@Autowired
private JgResumeInfoEqMapper jgResumeInfoEqMapper;
private JgResumeInfoEqServiceImpl jgResumeInfoEqService;
@Autowired
private CommonServiceImpl commonService;
......@@ -705,35 +705,34 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
String equListCode = jgEnableDisable.getEquListCode();
// 1️⃣ 压力管道：按装置记录履历
if (EquipmentClassifityEnum.YLGD.getCode().equals(equListCode)) {
JgResumeInfoDto resume = buildBaseResume(jgEnableDisable, routePath);
JgResumeInfo resume = buildBaseResume(jgEnableDisable, routePath);
resume.setEquId(jgEnableDisable.getProjectContraptionId());
jgResumeInfoService.saveBatchResume(Collections.singletonList(resume));
jgResumeInfoService.save(resume);
return;
}
// 2️⃣ 气瓶：一条履历 + 多设备关系
if (CylinderTypeEnum.CYLINDER.getCode().equals(equListCode)) {
JgResumeInfoDto resume = buildBaseResume(jgEnableDisable, routePath);
JgResumeInfo resume = buildBaseResume(jgEnableDisable, routePath);
jgResumeInfoService.saveBatchResume(Collections.singletonList(resume));
batchInsertResumeEq(resume.getSequenceNbr(), enableDisableEqs);
this.batchInsertResumeEq(resume.getSequenceNbr(), enableDisableEqs);
return;
}
// 3️⃣ 其他设备：按设备直接记履历
List<JgResumeInfoDto> resumeList = enableDisableEqs.stream()
List<JgResumeInfo> resumeList = enableDisableEqs.stream()
.map(eq -> {
JgResumeInfoDto dto = buildBaseResume(jgEnableDisable, routePath);
JgResumeInfo dto = buildBaseResume(jgEnableDisable, routePath);
dto.setEquId(eq.getEquId());
return dto;
})
.collect(Collectors.toList());
jgResumeInfoService.saveBatchResume(resumeList);
}
private JgResumeInfoDto buildBaseResume(JgEnableDisable jgEnableDisable, String routePath) {
return JgResumeInfoDto.builder()
private JgResumeInfo buildBaseResume(JgEnableDisable jgEnableDisable, String routePath) {
return JgResumeInfo.builder()
.applyNo(jgEnableDisable.getApplyNo())
.businessType(getRegistrationClass(jgEnableDisable))
.businessId(String.valueOf(jgEnableDisable.getSequenceNbr()))
......@@ -751,18 +750,11 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
if (CollectionUtils.isEmpty(eqs)) {
return;
}
List<JgResumeInfoEq> list = eqs.stream()
jgResumeInfoEqService.saveBatchResumeEq(eqs.stream()
.map(eq -> JgResumeInfoEq.builder()
.resumeId(resumeId)
.equId(eq.getEquId())
.build())
.collect(Collectors.toList());
for (int i = 0; i < list.size(); i += DB_BATCH_SIZE) {
jgResumeInfoEqMapper.insertBatchSomeColumn(
list.subList(i, Math.min(i + DB_BATCH_SIZE, list.size()))
);
}
.build()).collect(Collectors.toList()));
}
private void sendDataRefreshMsg(JgEnableDisable jgEnableDisable) {
......
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/JgEquipTransferServiceImpl.java
View file @ efb3e7df
......@@ -24,6 +24,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.*;
import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransferEq;
import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
import com.yeejoin.amos.boot.module.jg.api.entity.JgResumeInfo;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferEqMapper;
......@@ -649,7 +650,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
private void createResume(List<JgEquipTransferEq> equipTransferEqList, JgEquipTransfer equipTransfer, String routePath) {
if(StringUtils.hasText(equipTransfer.getProjectContraptionSeq())){
jgResumeInfoService.saveBatchResume(Collections.singletonList(
JgResumeInfoDto.builder()
JgResumeInfo.builder()
.applyNo(equipTransfer.getApplyNo())
.businessType(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getName())
.businessId(String.valueOf(equipTransfer.getSequenceNbr()))
......@@ -663,7 +664,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
)
);
} else {
jgResumeInfoService.saveBatchResume(equipTransferEqList.stream().map(eq-> JgResumeInfoDto.builder().applyNo(equipTransfer.getApplyNo())
jgResumeInfoService.saveBatchResume(equipTransferEqList.stream().map(eq-> JgResumeInfo.builder().applyNo(equipTransfer.getApplyNo())
.businessType(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getName())
.businessId(String.valueOf(equipTransfer.getSequenceNbr()))
.equId(eq.getEquId())
......
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/JgInstallationNoticeServiceImpl.java
View file @ efb3e7df
......@@ -1381,7 +1381,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
// 处理工业管道审批后业务数据保存
this.savePipelineData(jgInstallationNotice, jgRelationEquips, finalYm, dto, taskV2Model1, esEquipmentDtos);
jgResumeInfoService.saveBatchResume(
Lists.newArrayList(JgResumeInfoDto.builder()
Lists.newArrayList(JgResumeInfo.builder()
.applyNo(jgInstallationNotice.getApplyNo())
.businessType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName())
.businessId(String.valueOf(jgInstallationNotice.getSequenceNbr()))
......@@ -1469,7 +1469,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
});
jgResumeInfoService.saveBatchResume(
jgRelationEquips.stream()
.map(v -> JgResumeInfoDto.builder()
.map(v -> JgResumeInfo.builder()
.applyNo(jgInstallationNotice.getApplyNo())
.businessType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName())
.businessId(String.valueOf(jgInstallationNotice.getSequenceNbr()))
......@@ -2480,7 +2480,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
// 处理工业管道审批后业务数据保存
this.savePipelineData(jgInstallationNotice, jgRelationEquips, finalYm, dto, taskV2Model1, esEquipmentDtos);
jgResumeInfoService.saveBatchResume(
Lists.newArrayList(JgResumeInfoDto.builder()
Lists.newArrayList(JgResumeInfo.builder()
.applyNo(jgInstallationNotice.getApplyNo())
.businessType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName())
.businessId(String.valueOf(jgInstallationNotice.getSequenceNbr()))
......@@ -2568,7 +2568,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
});
jgResumeInfoService.saveBatchResume(
jgRelationEquips.stream()
.map(v -> JgResumeInfoDto.builder()
.map(v -> JgResumeInfo.builder()
.applyNo(jgInstallationNotice.getApplyNo())
.businessType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName())
.businessId(String.valueOf(jgInstallationNotice.getSequenceNbr()))
......
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/JgMaintainNoticeServiceImpl.java
View file @ efb3e7df
......@@ -1127,7 +1127,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
private void createResume(List<JgMaintainNoticeEq> jgRelationEquips, JgMaintainNotice notice, String routePath) {
if (StringUtils.hasText(notice.getProjectContraptionId())) {
jgResumeInfoService.saveBatchResume(Collections.singletonList(
JgResumeInfoDto.builder()
JgResumeInfo.builder()
.applyNo(notice.getApplyNo())
.businessType(BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName())
.businessId(String.valueOf(notice.getSequenceNbr()))
......@@ -1141,7 +1141,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
)
);
} else {
jgResumeInfoService.saveBatchResume(jgRelationEquips.stream().map(eq -> JgResumeInfoDto.builder().applyNo(notice.getApplyNo())
jgResumeInfoService.saveBatchResume(jgRelationEquips.stream().map(eq -> JgResumeInfo.builder().applyNo(notice.getApplyNo())
.businessType(BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName())
.businessId(String.valueOf(notice.getSequenceNbr()))
.equId(eq.getEquId())
......
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/JgMaintenanceContractServiceImpl.java
View file @ efb3e7df
......@@ -16,6 +16,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.*;
import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
import com.yeejoin.amos.boot.module.jg.api.entity.JgResumeInfo;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemTypeEnum;
......@@ -740,7 +741,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
private void createResume(JgMaintenanceContract maintenanceContract, String routePath) {
List<JgMaintenanceContractEq> maintenanceContractEqs = getJgMaintenanceContractEqs(maintenanceContract.getSequenceNbr());
jgResumeInfoService.saveBatchResume(maintenanceContractEqs.stream().map(eq-> JgResumeInfoDto.builder().applyNo(maintenanceContract.getApplyNo())
jgResumeInfoService.saveBatchResume(maintenanceContractEqs.stream().map(eq-> JgResumeInfo.builder().applyNo(maintenanceContract.getApplyNo())
.businessType(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName())
.businessId(String.valueOf(maintenanceContract.getSequenceNbr()))
.equId(eq.getEquId())
......@@ -760,7 +761,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
/**
* 流程结束后添加设备维保信息
*
* @param id
* @param jgMaintenanceContract 维保信息
*/
@SneakyThrows
private void updateEquipMessage(JgMaintenanceContract jgMaintenanceContract) {
......
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/JgOverDesignServiceLifeServiceImpl.java
View file @ efb3e7df
......@@ -114,7 +114,7 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
private final JgUseRegistrationManageServiceImpl useRegistrationManageService;
private final IIdxBizJgInspectionDetectionInfoService iIdxBizJgInspectionDetectionInfoService;
private final JgResumeInfoServiceImpl jgResumeInfoService;
private final JgResumeInfoEqMapper jgResumeInfoEqMapper;
private final JgResumeInfoEqServiceImpl jgResumeInfoEqService;
private final InspectionDetectionInfoMapper inspectionDetectionInfoMapper;
private final SnowflakeIdUtil sequence;
private final EventPublisher eventPublisher;
......@@ -732,7 +732,7 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
private void saveResumeInfo(TaskV2Model taskV2Model, JgOverDesignServiceLife jgOverDesignServiceLife, List<IdxBizJgDesignInfo> designInfoList) {
if (CylinderTypeEnum.CYLINDER.getCode().equals(jgOverDesignServiceLife.getEquCategory())){
JgResumeInfoDto dto = JgResumeInfoDto.builder().applyNo(jgOverDesignServiceLife.getApplyNo())
JgResumeInfo info = JgResumeInfo.builder().applyNo(jgOverDesignServiceLife.getApplyNo())
.businessType(BusinessTypeEnum.JG_OVER_DESIGN_SERVICE_LIFE.getName())
.businessId(String.valueOf(jgOverDesignServiceLife.getSequenceNbr()))
.approvalUnit(jgOverDesignServiceLife.getReceiveOrgName())
......@@ -741,20 +741,15 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
.changeContent(BusinessTypeEnum.JG_OVER_DESIGN_SERVICE_LIFE.getName() + "业务办理")
.routePath(taskV2Model.getRoutePath())
.build();
jgResumeInfoService.saveBatchResume(Collections.singletonList(dto));
List<JgResumeInfoEq> list = designInfoList.stream()
jgResumeInfoService.save(info);
jgResumeInfoEqService.saveBatchResumeEq(designInfoList.stream()
.map(eq -> JgResumeInfoEq.builder()
.resumeId(dto.getSequenceNbr())
.resumeId(info.getSequenceNbr())
.equId(eq.getRecord())
.build())
.collect(Collectors.toList());
for (int i = 0; i < list.size(); i += DB_BATCH_SIZE) {
jgResumeInfoEqMapper.insertBatchSomeColumn(
list.subList(i, Math.min(i + DB_BATCH_SIZE, list.size()))
);
}
.collect(Collectors.toList()));
}else{
jgResumeInfoService.saveBatchResume(designInfoList.stream().map(eq-> JgResumeInfoDto.builder().applyNo(jgOverDesignServiceLife.getApplyNo())
jgResumeInfoService.saveBatchResume(designInfoList.stream().map(eq-> JgResumeInfo.builder().applyNo(jgOverDesignServiceLife.getApplyNo())
.businessType(BusinessTypeEnum.JG_OVER_DESIGN_SERVICE_LIFE.getName())
.businessId(String.valueOf(jgOverDesignServiceLife.getSequenceNbr()))
.equId(eq.getRecord())
......
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/JgReformNoticeServiceImpl.java
View file @ efb3e7df
......@@ -31,6 +31,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.*;
import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNoticeEq;
import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
import com.yeejoin.amos.boot.module.jg.api.entity.JgResumeInfo;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgReformNoticeEqMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgReformNoticeMapper;
......@@ -1063,8 +1064,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
private void createResume(List<JgReformNoticeEq> jgRelationEquips, JgReformNotice notice, String routePath) {
if(StringUtils.hasText(notice.getProjectContraptionId())){
jgResumeInfoService.saveBatchResume(Collections.singletonList(
JgResumeInfoDto.builder()
jgResumeInfoService.save(JgResumeInfo.builder()
.applyNo(notice.getApplyNo())
.businessType(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName())
.businessId(String.valueOf(notice.getSequenceNbr()))
......@@ -1074,11 +1074,9 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
.status("正常")
.changeContent(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName() + "业务办理")
.routePath(routePath)
.build()
)
);
.build());
} else {
jgResumeInfoService.saveBatchResume(jgRelationEquips.stream().map(eq-> JgResumeInfoDto.builder().applyNo(notice.getApplyNo())
jgResumeInfoService.saveBatchResume(jgRelationEquips.stream().map(eq-> JgResumeInfo.builder().applyNo(notice.getApplyNo())
.businessType(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName())
.businessId(String.valueOf(notice.getSequenceNbr()))
.equId(eq.getEquId())
......
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/JgResumeInfoEqServiceImpl.java
View file @ efb3e7df
......@@ -29,4 +29,8 @@ public class JgResumeInfoEqServiceImpl extends BaseService<JgResumeInfoEq,JgResu
public List<JgResumeInfoEq> queryForJgResumeInfoEqList() {
return this.queryForList("" , false);
}
public void saveBatchResumeEq(List<JgResumeInfoEq> jgResumeInfoEqList) {
this.baseMapper.insertBatchSomeColumn(jgResumeInfoEqList,500);
}
}
\ No newline at end of file
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/JgResumeInfoServiceImpl.java
View file @ efb3e7df
......@@ -39,15 +39,8 @@ public class JgResumeInfoServiceImpl extends BaseService<JgResumeInfoDto, JgResu
return this.queryForList("", false, isDelete);
}
public void saveBatchResume(List<JgResumeInfoDto> jgResumeInfoDtoList) {
List<JgResumeInfo> jgResumeInfoCollection = jgResumeInfoDtoList.stream()
.map(dto -> {
JgResumeInfo info = new JgResumeInfo();
BeanUtils.copyProperties(dto, info);
return info;
})
.collect(Collectors.toList());
this.baseMapper.insertBatchSomeColumn(jgResumeInfoCollection,200);
public void saveBatchResume(List<JgResumeInfo> jgResumeInfoList) {
this.baseMapper.insertBatchSomeColumn(jgResumeInfoList,200);
}
/**
......
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/JgScrapCancelServiceImpl.java
View file @ efb3e7df
......@@ -1142,7 +1142,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
lambdaEq.eq(JgScrapCancelEq::getEquipTransferId, jgScrapCancel.getSequenceNbr());
lambdaEq.select(JgScrapCancelEq::getEquId, BaseEntity::getSequenceNbr);
List<JgScrapCancelEq> scrapCancelEqs = jgScrapCancelEqService.list(lambdaEq);
jgResumeInfoService.saveBatchResume(scrapCancelEqs.stream().map(eq-> JgResumeInfoDto.builder().applyNo(jgScrapCancel.getApplyNo())
jgResumeInfoService.saveBatchResume(scrapCancelEqs.stream().map(eq-> JgResumeInfo.builder().applyNo(jgScrapCancel.getApplyNo())
.businessType(getRegistrationClass(jgScrapCancel.getCancelType()))
.businessId(String.valueOf(jgScrapCancel.getSequenceNbr()))
.equId(eq.getEquId())
......
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/JgTransferNoticeServiceImpl.java
View file @ efb3e7df
......@@ -1040,7 +1040,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
}
private void createResume(List<JgTransferNoticeEq> jgRelationEquips, JgTransferNotice notice, String routePath) {
jgResumeInfoService.saveBatchResume(jgRelationEquips.stream().map(eq-> JgResumeInfoDto.builder().applyNo(notice.getApplyNo())
jgResumeInfoService.saveBatchResume(jgRelationEquips.stream().map(eq-> JgResumeInfo.builder().applyNo(notice.getApplyNo())
.businessType(BusinessTypeEnum.JG_ADVICE_REMOVAL.getName())
.businessId(String.valueOf(notice.getSequenceNbr()))
.equId(eq.getEquId())
......
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 @ efb3e7df
......@@ -1337,13 +1337,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
}
List<String> records = new ArrayList<>();
List<JgResumeInfoDto> resumeList = new ArrayList<>();
List<JgResumeInfo> resumeList = new ArrayList<>();
List<ESEquipmentCategoryDto> esEquipmentCategoryDtos = new ArrayList<>();
if (!CollectionUtils.isEmpty(equipmentLists)) {
// 装置更新管道的技术参数、设计信息、安装信息
if (jgProjectContraption != null) {
updatePieLineTechAndInspection(equipmentLists);
resumeList.add(JgResumeInfoDto.builder()
resumeList.add(JgResumeInfo.builder()
.applyNo(jgUseRegistration.getApplyNo())
.businessType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName())
.businessId(String.valueOf(jgUseRegistration.getSequenceNbr()))
......@@ -1355,7 +1355,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
.routePath(taskV2Model.getRoutePath())
.build());
}else{
JgResumeInfoDto dto = JgResumeInfoDto.builder()
JgResumeInfo info = JgResumeInfo.builder()
.applyNo(jgUseRegistration.getApplyNo())
.businessType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName())
.businessId(jgUseRegistration.getSequenceNbr() + "")
......@@ -1365,8 +1365,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
.status("正常")
.routePath(taskV2Model.getRoutePath())
.build();
jgResumeInfoService.saveBatchResume(Collections.singletonList(dto));
commonServiceImpl.batchInsertResumeEq(dto.getSequenceNbr(),equipmentLists);
jgResumeInfoService.save(info);
commonServiceImpl.batchInsertResumeEq(info.getSequenceNbr(),equipmentLists);
}
// 批量收集的结果
List<JgCertificateChangeRecordEq> jgCertificateChangeRecordEqBatchList = new ArrayList<>();
......
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 @ efb3e7df
......@@ -171,7 +171,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
@Autowired
private JgResumeInfoServiceImpl jgResumeInfoService;
@Autowired
private JgResumeInfoEqMapper jgResumeInfoEqMapper;
private JgResumeInfoEqServiceImpl jgResumeInfoEqService;
@Autowired
private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
@Autowired
......@@ -1053,7 +1053,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
// 生成一条tzs_jg_certificate_change_record记录
generateCertificateChangeRecord(jgVehicleInformation, registerInfo, changeRecordId, taskV2Model);
JgResumeInfoDto dto = JgResumeInfoDto.builder()
JgResumeInfo info = JgResumeInfo.builder()
.applyNo(jgVehicleInformation.getApplyNo())
.businessType(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName())
.businessId(String.valueOf(jgVehicleInformation.getSequenceNbr()))
......@@ -1063,19 +1063,13 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
.changeContent(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName() + "业务办理")
.routePath(taskV2Model.getRoutePath())
.build();
jgResumeInfoService.saveBatchResume(Collections.singletonList(dto));
List<JgResumeInfoEq> list = equipIdList.stream()
jgResumeInfoService.save(info);
jgResumeInfoEqService.saveBatchResumeEq(equipIdList.stream()
.map(equipId -> JgResumeInfoEq.builder()
.resumeId(dto.getSequenceNbr())
.resumeId(info.getSequenceNbr())
.equId(equipId)
.build())
.collect(Collectors.toList());
for (int i = 0; i < list.size(); i += DB_BATCH_SIZE) {
jgResumeInfoEqMapper.insertBatchSomeColumn(
list.subList(i, Math.min(i + DB_BATCH_SIZE, list.size()))
);
}
.collect(Collectors.toList()));
// 车用气瓶评分
eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.name(), Sets.newHashSet(equipIdList), EquipCreateOrEditEvent.EquipType.equip));
}
......@@ -2198,7 +2192,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
equipList.add(equip);
//新增添加设备履历
if (StringUtils.isEmpty(vehicleInfoDto.getSequenceNbr())) {
jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
jgResumeInfoService.save(JgResumeInfo.builder()
.applyNo(vehicleInformation.getApplyNo())
.businessType(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName())
.businessId(vehicleInformation.getSequenceNbr() + "")
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/feign/JgFeignClient.java
View file @ efb3e7df
......@@ -3,7 +3,8 @@ package com.yeejoin.amos.boot.module.jyjc.biz.feign;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
import com.yeejoin.amos.boot.module.jyjc.api.model.JgResumeInfoDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgResumeInfo;
import com.yeejoin.amos.boot.module.jg.api.entity.JgResumeInfoEq;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.systemctl.model.RegionModel;
import org.springframework.cloud.openfeign.FeignClient;
......@@ -25,7 +26,7 @@ public interface JgFeignClient {
* 设备注册信息分页查询
* */
@RequestMapping(value = "/jg-resume-info/saveBatchResume", method = RequestMethod.POST)
FeignClientResult saveBatchResume(@RequestBody List<JgResumeInfoDto> jgResumeInfoDtoList);
FeignClientResult saveBatchResume(@RequestBody List<JgResumeInfo> jgResumeInfoList);
/***
......@@ -34,5 +35,11 @@ public interface JgFeignClient {
@RequestMapping(value = "/common/getRegion", method = RequestMethod.GET)
FeignClientResult<List<RegionModel>> getRegion(@RequestParam(value = "level", required = false) String level,
@RequestParam(value = "parentId", required = false) String parentId);
/***
* 批量插入履历信息关系表
* */
@RequestMapping(value = "/jg-resume-info-eq/saveBatchResumeEq", method = RequestMethod.POST)
FeignClientResult saveBatchResumeEq(@RequestBody List<JgResumeInfoEq> jgResumeInfoEqList);
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java
View file @ efb3e7df
......@@ -23,8 +23,11 @@ import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import com.yeejoin.amos.boot.module.common.api.dto.ContraptionQueryParams;
import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
import com.yeejoin.amos.boot.module.common.api.enums.CylinderTypeEnum;
import com.yeejoin.amos.boot.module.common.api.enums.JYJCBusinessTypeEnum;
import com.yeejoin.amos.boot.module.common.api.service.ICompensateFlowDataOfRedis;
import com.yeejoin.amos.boot.module.jg.api.entity.JgResumeInfo;
import com.yeejoin.amos.boot.module.jg.api.entity.JgResumeInfoEq;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jyjc.api.common.BizCommonConstant;
import com.yeejoin.amos.boot.module.jyjc.api.entity.*;
......@@ -816,7 +819,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
TaskV2Model taskV2Model = updateTaskModel(model);
List<JyjcInspectionApplicationEquipModel> applicationEquipModels = applicationEquipService.listApplicationEquipByApplicationSeq(sequenceNbr);
List<JyjcInspectionResult> resultModels = new ArrayList<>();
List<JgResumeInfoDto> jgResumeInfoDtoList = new ArrayList<>();
List<JgResumeInfo> jgResumeInfoList = new ArrayList<>();
List<JgResumeInfoEq> jgResumeInfoEqList = new ArrayList<>();
Date now = DateUtil.date();
if (model.getEquipClassify().equals(EquipmentClassifityEnum.YLGD.getCode())) {
List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SE.getCode(), 1).getResult();
......@@ -858,7 +862,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
resultParam.setParamType("IdxBizJgTechParamsPipeline");
resultParam.setRecDate(new Date());
jyjcInspectionResultParamServiceImpl.save(resultParam);
jgResumeInfoDtoList.add(JgResumeInfoDto.builder().applyNo(jyjcInspectionApplication.getApplicationNo())
jgResumeInfoList.add(JgResumeInfo.builder().applyNo(jyjcInspectionApplication.getApplicationNo())
.businessType(resultModel.getInspectionTypeName())
.businessId(String.valueOf(jyjcInspectionApplication.getSequenceNbr()))
.changeContent(resultModel.getInspectionTypeName() + "业务办理")
......@@ -869,6 +873,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
.routePath(taskV2Model.getRoutePath()).build());
} else {
List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SE.getCode(), applicationEquipModels.size()).getResult();
JgResumeInfo cylinderMainResumeInfo = null;
for (int i = 0; i < applicationEquipModels.size(); i++) {
JyjcInspectionResult resultModel = new JyjcInspectionResult();
resultModel.setInspectionUnitCode(model.getInspectionUnitCode());
......@@ -896,8 +901,28 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
resultModel.setSequenceNbr(resultSeq);
resultModels.add(resultModel);
// TODO 暂存json,在结果录入后，将数据更新技术参数-检验详情使用 考虑兼容老数据
if (model.getEquCategory().equals(CylinderTypeEnum.CYLINDER.getCode())){
jgResumeInfoEqList.add(JgResumeInfoEq.builder()
.resumeId(resultSeq)
.equId(applicationEquipModels.get(i).getEquipUnicode())
.build());
// 主表只创建一次
if (cylinderMainResumeInfo == null) {
cylinderMainResumeInfo = JgResumeInfo.builder()
.applyNo(jyjcInspectionApplication.getApplicationNo())
.businessType(resultModel.getInspectionTypeName())
.businessId(String.valueOf(jyjcInspectionApplication.getSequenceNbr()))
.changeContent(resultModel.getInspectionTypeName() + "业务办理")
.approvalUnit(model.getInspectionUnitName())
.approvalUnitCode(model.getInspectionUnitCode())
.status("正常")
.routePath(taskV2Model.getRoutePath())
.build();
cylinderMainResumeInfo.setSequenceNbr(resultSeq);
}
} else {
// 新增设备履历信息
jgResumeInfoDtoList.add(JgResumeInfoDto.builder().applyNo(jyjcInspectionApplication.getApplicationNo())
jgResumeInfoList.add(JgResumeInfo.builder().applyNo(jyjcInspectionApplication.getApplicationNo())
.businessType(resultModel.getInspectionTypeName())
.businessId(String.valueOf(jyjcInspectionApplication.getSequenceNbr()))
.changeContent(resultModel.getInspectionTypeName() + "业务办理")
......@@ -908,12 +933,22 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
.routePath(taskV2Model.getRoutePath()).build());
}
}
// 气瓶主表单独保存
if (cylinderMainResumeInfo != null) {
this.saveBatchResume(Collections.singletonList(cylinderMainResumeInfo));
}
}
inspectionResultService.saveOrUpdateBatch(resultModels);
// 报检信息推送
this.pushInspectionApplication(model);
this.createHisAfterReceive(model);
// 设备检验履历
this.saveBatchResume(jgResumeInfoDtoList);
if (!jgResumeInfoList.isEmpty()) {
this.saveBatchResume(jgResumeInfoList);
}
if (!jgResumeInfoEqList.isEmpty()) {
this.saveBatchResumeEq(jgResumeInfoEqList);
}
// 更新流程中的流程数据
commonService.saveExecuteFlowData2Redis(model.getProcessInstanceId(), this.buildInstanceRuntimeData(jyjcInspectionApplication));
// 事务提交后，生成报检申请表
......@@ -986,9 +1021,17 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
}
private void saveBatchResume(List<JgResumeInfoDto> jgResumeInfoDtoList) {
private void saveBatchResume(List<JgResumeInfo> jgResumeInfoList) {
try {
jgFeignClient.saveBatchResume(jgResumeInfoList);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
private void saveBatchResumeEq(List<JgResumeInfoEq> jgResumeInfoEqList) {
try {
jgFeignClient.saveBatchResume(jgResumeInfoDtoList);
jgFeignClient.saveBatchResumeEq(jgResumeInfoEqList);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
......
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