Skip to content

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

fix(jg):管道导入bug修改

parent 8a8ef537
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 67 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataDockServiceImpl.java
View file @ ffbf9643
......@@ -16,6 +16,7 @@ import com.alibaba.fastjson.JSONObject;
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.google.common.collect.Sets;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
......@@ -189,15 +190,15 @@ public class DataDockServiceImpl {
@GlobalTransactional(rollbackFor = Exception.class)
public String saveEquipmentDataInTransaction(Map<String, Object> equ, String dataSource, String remark) {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
CompanyBo company = reginParams.getCompany();
String record = UUID.randomUUID().toString();
try {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
CompanyBo company = reginParams.getCompany();
// transactionTemplate.execute(status -> {
String equList = String.valueOf(equ.get("equList"));
String isCompleteXa = String.valueOf(equ.get("isCompleteXa"));
// 压力管道保存 工程装置表信息 必须在saveUseInfo之前进行，需要提前生成工程装置id
saveProjectContraption(equ, equList, company, dataSource);
//saveProjectContraption(equ, equList, company, dataSource);
// 保存到设备表
saveUseInfo(equ, record, dataSource, remark, company);
saveDesignInfo(equ, record);
......@@ -231,8 +232,8 @@ public class DataDockServiceImpl {
* @param record
*/
private void saveConstructionInfo(Map<String, Object> equ, String record,CompanyBo company) {
log.error("数据===>{}", JSONObject.toJSONString(equ));
IdxBizJgConstructionInfo constructionInfo = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgConstructionInfo.class);
log.error("数据===>{}", toJSONString(equ));
IdxBizJgConstructionInfo constructionInfo = JSON.parseObject(toJSONString(equ), IdxBizJgConstructionInfo.class);
if (!ValidationUtil.isEmpty(constructionInfo)) {
constructionInfo.setRecord(record);
constructionInfo.setRecDate(new Date());
......@@ -272,9 +273,10 @@ public class DataDockServiceImpl {
/**
* 保存工程装置表信息
*/
private void saveProjectContraption(Map<String, Object> equ, String equList,CompanyBo company,String dataSource) {
private Long saveProjectContraption(Map<String, Object> equ, String equList,CompanyBo company,String dataSource) {
Long sequenceNbr = null;
if (EquipmentClassifityEnum.YLGD.getCode().equals(equList)) {
IdxBizJgProjectContraption projectContraption = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgProjectContraption.class);
IdxBizJgProjectContraption projectContraption = JSON.parseObject(toJSONString(equ), IdxBizJgProjectContraption.class);
if (!ValidationUtil.isEmpty(projectContraption)) {
String useUnitCode = Objects.toString(equ.get("useUnitCode"),company.getCompanyCode());// 使用单位Code
String useUnit = Objects.toString(equ.get("useUnit"), company.getCompanyName());// 使用单位名称
......@@ -297,7 +299,7 @@ public class DataDockServiceImpl {
projectContraption.setRecDate(new Date());
projectContraption.setDataQualityScore("1");
if (ObjectUtils.isEmpty(oldContraption) ) { // save
Long sequenceNbr = sequence.nextId();
sequenceNbr = sequence.nextId();
projectContraption.setSequenceNbr(sequenceNbr);
if ("使用单位".equals(company.getCompanyType())) {
projectContraption.setUseUnitCreditCode(useUnitCode);
......@@ -320,17 +322,17 @@ public class DataDockServiceImpl {
projectContraption.setIsIntoManagement(Boolean.FALSE);
projectContraption.setDataSource(dataSource);
idxBizJgProjectContraptionService.save(projectContraption);
equ.put("projectContraptionId", sequenceNbr);
} else { // update
equ.put("projectContraptionId", oldContraption.getSequenceNbr());
projectContraption.setSequenceNbr(oldContraption.getSequenceNbr());
sequenceNbr = oldContraption.getSequenceNbr();
Double oldPipelineLength = oldContraption.getPipelineLength();
projectContraption.setPipelineLength(Double.sum(oldPipelineLength, Double.parseDouble((String) equ.get("pipeLength"))));
idxBizJgProjectContraptionService.updateById(projectContraption);
UpdateWrapper<IdxBizJgProjectContraption> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("sequence_nbr", oldContraption.getSequenceNbr()) // 根据主键更新
.set("pipeline_length", Double.sum(oldPipelineLength, Double.parseDouble((String) equ.get("pipeLength"))));
idxBizJgProjectContraptionService.update(updateWrapper);
}
}
}
return sequenceNbr;
}
/**
......@@ -340,8 +342,8 @@ public class DataDockServiceImpl {
* @param record
*/
private void saveUseInfo(Map<String, Object> equ, String record, String dataSource, String remark,CompanyBo company) {
log.error("数据===>{}", JSONObject.toJSONString(equ));
IdxBizJgUseInfo useInfo = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgUseInfo.class);
log.error("数据===>{}", toJSONString(equ));
IdxBizJgUseInfo useInfo = JSON.parseObject(toJSONString(equ), IdxBizJgUseInfo.class);
if (!ValidationUtil.isEmpty(useInfo)) {
String provinceName = Objects.toString(equ.get("provinceName"),"");
String provinceCode = "610000";
......@@ -420,8 +422,8 @@ public class DataDockServiceImpl {
* @param record
*/
private void saveDesignInfo(Map<String, Object> equ, String record) {
log.error("数据===>{}", JSONObject.toJSONString(equ));
IdxBizJgDesignInfo designInfo = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgDesignInfo.class);
log.error("数据===>{}", toJSONString(equ));
IdxBizJgDesignInfo designInfo = JSON.parseObject(toJSONString(equ), IdxBizJgDesignInfo.class);
if (!ValidationUtil.isEmpty(designInfo)) {
designInfo.setRecord(record);
designInfo.setRecDate(new Date());
......@@ -437,8 +439,8 @@ public class DataDockServiceImpl {
* @param record
*/
private void saveFactoryInfo(Map<String, Object> equ, String record) {
log.error("数据===>{}", JSONObject.toJSONString(equ));
IdxBizJgFactoryInfo factoryInfo = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgFactoryInfo.class);
log.error("数据===>{}", toJSONString(equ));
IdxBizJgFactoryInfo factoryInfo = JSON.parseObject(toJSONString(equ), IdxBizJgFactoryInfo.class);
if (!ValidationUtil.isEmpty(factoryInfo)) {
factoryInfo.setRecord(record);
factoryInfo.setRecDate(new Date());
......@@ -454,8 +456,8 @@ public class DataDockServiceImpl {
* @param record
*/
private void saveRegisterInfo(Map<String, Object> equ, String record, String equList) {
log.error("数据===>{}", JSONObject.toJSONString(equ));
IdxBizJgRegisterInfo registerInfo = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgRegisterInfo.class);
log.error("数据===>{}", toJSONString(equ));
IdxBizJgRegisterInfo registerInfo = JSON.parseObject(toJSONString(equ), IdxBizJgRegisterInfo.class);
if (!ValidationUtil.isEmpty(registerInfo)) {
registerInfo.setRecord(record);
registerInfo.setRecDate(new Date());
......@@ -473,9 +475,9 @@ public class DataDockServiceImpl {
* @param record
*/
private void saveSupervisionInfo(Map<String, Object> equ, String record) {
log.error("数据===>{}", JSONObject.toJSONString(equ));
IdxBizJgSupervisionInfo supervisionInfo = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgSupervisionInfo.class);
log.error("数据===hou>{}", JSONObject.toJSONString(supervisionInfo));
log.error("数据===>{}", toJSONString(equ));
IdxBizJgSupervisionInfo supervisionInfo = JSON.parseObject(toJSONString(equ), IdxBizJgSupervisionInfo.class);
log.error("数据===hou>{}", toJSONString(supervisionInfo));
// if (ObjectUtils.isEmpty(supervisionInfo)) return;
supervisionInfo.setRecord(record);
supervisionInfo.setRecDate(new Date());
......@@ -527,7 +529,7 @@ public class DataDockServiceImpl {
String superOrgCode = orgCode.substring(0, orgCode.lastIndexOf("*"));
supervisionInfo.setOrgBranchCode(superOrgCode);
Optional.ofNullable(Privilege.companyClient.queryByOrgcode(superOrgCode).getResult())
.map(result -> JSON.parseObject(JSON.toJSONString(result)).getString("compnay"))
.map(result -> JSON.parseObject(toJSONString(result)).getString("compnay"))
.map(json -> JSON.parseObject(json, CompanyModel.class))
.map(CompanyModel::getCompanyName)
.ifPresent(supervisionInfo::setOrgBranchName);
......@@ -549,8 +551,8 @@ public class DataDockServiceImpl {
* @param record
*/
private void saveOtherInfo(Map<String, Object> equ, String record, String equList) {
log.error("数据===>{}", JSONObject.toJSONString(equ));
IdxBizJgOtherInfo otherInfo = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgOtherInfo.class);
log.error("数据===>{}", toJSONString(equ));
IdxBizJgOtherInfo otherInfo = JSON.parseObject(toJSONString(equ), IdxBizJgOtherInfo.class);
if (!ValidationUtil.isEmpty(otherInfo)) {
otherInfo.setRecord(record);
otherInfo.setClaimStatus("已认领");
......@@ -596,8 +598,8 @@ public class DataDockServiceImpl {
* @param record
*/
private void saveLiftingParams(Map<String, Object> equ, String record) {
log.error("数据===>{}", JSONObject.toJSONString(equ));
IdxBizJgTechParamsLifting equipTechParamLifting = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgTechParamsLifting.class);
log.error("数据===>{}", toJSONString(equ));
IdxBizJgTechParamsLifting equipTechParamLifting = JSON.parseObject(toJSONString(equ), IdxBizJgTechParamsLifting.class);
if (!ValidationUtil.isEmpty(equipTechParamLifting)) {
equipTechParamLifting.setRecord(record);
equipTechParamLifting.setRecDate(new Date());
......@@ -612,12 +614,12 @@ public class DataDockServiceImpl {
* @param record
*/
private void saveVehicleParams(Map<String, Object> equ, String record) {
log.info("数据===>{}", JSONObject.toJSONString(equ));
log.info("数据===>{}", toJSONString(equ));
Stream.of("seatNumber", "carsNumber", "tractorSeatNumber")
.forEach(key -> {
});
IdxBizJgTechParamsVehicle equipTechParamVehicle = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgTechParamsVehicle.class);
IdxBizJgTechParamsVehicle equipTechParamVehicle = JSON.parseObject(toJSONString(equ), IdxBizJgTechParamsVehicle.class);
if (!ValidationUtil.isEmpty(equipTechParamVehicle)) {
equipTechParamVehicle.setRecord(record);
equipTechParamVehicle.setRecDate(new Date());
......@@ -632,8 +634,8 @@ public class DataDockServiceImpl {
* @param record
*/
private void saveBoilerParams(Map<String, Object> equ, String record) {
log.error("数据===>{}", JSONObject.toJSONString(equ));
IdxBizJgTechParamsBoiler equipTechParamBoiler = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgTechParamsBoiler.class);
log.error("数据===>{}", toJSONString(equ));
IdxBizJgTechParamsBoiler equipTechParamBoiler = JSON.parseObject(toJSONString(equ), IdxBizJgTechParamsBoiler.class);
if (!ValidationUtil.isEmpty(equipTechParamBoiler)) {
equipTechParamBoiler.setRecord(record);
equipTechParamBoiler.setRecDate(new Date());
......@@ -648,8 +650,8 @@ public class DataDockServiceImpl {
* @param record
*/
private void saveVesselParams(Map<String, Object> equ, String record) {
log.error("数据===>{}", JSONObject.toJSONString(equ));
IdxBizJgTechParamsVessel equipTechParamVessel = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgTechParamsVessel.class);
log.error("数据===>{}", toJSONString(equ));
IdxBizJgTechParamsVessel equipTechParamVessel = JSON.parseObject(toJSONString(equ), IdxBizJgTechParamsVessel.class);
if (!ValidationUtil.isEmpty(equipTechParamVessel)) {
equipTechParamVessel.setRecord(record);
equipTechParamVessel.setRecDate(new Date());
......@@ -664,8 +666,8 @@ public class DataDockServiceImpl {
* @param record
*/
private void savePipelineParams(Map<String, Object> equ, String record) {
log.error("数据===>{}", JSONObject.toJSONString(equ));
IdxBizJgTechParamsPipeline equipTechParamPipeline = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgTechParamsPipeline.class);
log.error("数据===>{}", toJSONString(equ));
IdxBizJgTechParamsPipeline equipTechParamPipeline = JSON.parseObject(toJSONString(equ), IdxBizJgTechParamsPipeline.class);
if (!ValidationUtil.isEmpty(equipTechParamPipeline)) {
equipTechParamPipeline.setWallThickness(String.valueOf(equ.get("wallThickness_YLGD")));
equipTechParamPipeline.setMedium(String.valueOf(equ.get("medium_YLGD")));
......@@ -685,8 +687,8 @@ public class DataDockServiceImpl {
* @param record
*/
private void saveRidesParams(Map<String, Object> equ, String record) {
log.error("数据===>{}", JSONObject.toJSONString(equ));
IdxBizJgTechParamsRides equipTechParamRides = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgTechParamsRides.class);
log.error("数据===>{}", toJSONString(equ));
IdxBizJgTechParamsRides equipTechParamRides = JSON.parseObject(toJSONString(equ), IdxBizJgTechParamsRides.class);
if (!ValidationUtil.isEmpty(equipTechParamRides)) {
equipTechParamRides.setRecord(record);
equipTechParamRides.setRecDate(new Date());
......@@ -704,8 +706,8 @@ public class DataDockServiceImpl {
* @param record
*/
private void saveRopewayParams(Map<String, Object> equ, String record) {
log.error("数据===>{}", JSONObject.toJSONString(equ));
IdxBizJgTechParamsRopeway equipTechParamRopeway = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgTechParamsRopeway.class);
log.error("数据===>{}", toJSONString(equ));
IdxBizJgTechParamsRopeway equipTechParamRopeway = JSON.parseObject(toJSONString(equ), IdxBizJgTechParamsRopeway.class);
if (!ValidationUtil.isEmpty(equipTechParamRopeway)) {
equipTechParamRopeway.setRecord(record);
equipTechParamRopeway.setRecDate(new Date());
......@@ -720,8 +722,8 @@ public class DataDockServiceImpl {
* @param record
*/
private void saveElevatorParams(Map<String, Object> equ, String record) {
log.error("数据===>{}", JSONObject.toJSONString(equ));
IdxBizJgTechParamsElevator equipTechParamElevator = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgTechParamsElevator.class);
log.error("数据===>{}", toJSONString(equ));
IdxBizJgTechParamsElevator equipTechParamElevator = JSON.parseObject(toJSONString(equ), IdxBizJgTechParamsElevator.class);
if (!ValidationUtil.isEmpty(equipTechParamElevator)) {
equipTechParamElevator.setRecord(record);
equipTechParamElevator.setRecDate(new Date());
......@@ -851,7 +853,7 @@ public class DataDockServiceImpl {
// 检查 resultError中的每一项，若存在内容，则有错误信息，直接抛异常
if (!ValidationUtil.isEmpty(resultError)) {
throw new BadRequest(JSON.toJSONString(resultError));
throw new BadRequest(toJSONString(resultError));
}
return dataList;
......@@ -890,7 +892,7 @@ public class DataDockServiceImpl {
boolean isDT = !ValidationUtil.isEmpty(data.getEquList()) && EquipmentClassifityEnum.DT.getCode().equals(data.getEquList());
try {
log.info("解析第{}行数据：{}", rowIndex, JSON.toJSONString(data));
log.info("解析第{}行数据：{}", rowIndex, toJSONString(data));
// 通用字段检查 每一个sheet页都有的基本信息，设计信息，制造信息和使用信息
this.commonFieldCheck(data, rowError, remark);
......@@ -934,7 +936,7 @@ public class DataDockServiceImpl {
}
} catch (Exception e) {
log.error(String.format("sheet页：[%s] -> 对应行索引数: [%s] -> 失败的 Excel 数据: [%s]", sheetName, rowIndex, JSON.toJSONString(data)), e);
log.error(String.format("sheet页：[%s] -> 对应行索引数: [%s] -> 失败的 Excel 数据: [%s]", sheetName, rowIndex, toJSONString(data)), e);
throw e;
}
}
......@@ -1522,6 +1524,8 @@ public class DataDockServiceImpl {
@Transactional(rollbackFor = Exception.class)
public void batchSaveHisEquipmentData(String remark, List<EquipInfoExcelDto> equipInfoExcelDtos, LinkedHashMap equipmentInfoForm) {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
CompanyBo company = reginParams.getCompany();
String[] keys = {
"PRODUCT_PHOTO", "OTHER_ACCESSORIES_REG", "DESIGN_DOC", "DESIGN_STANDARD",
"OTHER_ACCESSORIES_DES", "PRODUCT_QUALITY_YIELD_PROVE", "FACTORY_STANDARD",
......@@ -1553,10 +1557,11 @@ public class DataDockServiceImpl {
}
}
Set<String> recordSet = new HashSet<>();
Set<String> projectContraptionSet = new HashSet<>();
Map<String, Long> projectContraptionMap = new HashMap<>(); // 循环外声明
for (EquipInfoExcelDto equ : equipInfoExcelDtos) {
List<Map<String, Object>> fileDataList = (List<Map<String, Object>>) equ.getFileData();
Map<String, Object> equMap = (Map<String, Object>) JSON.parseObject(JSON.toJSONString(equ), Map.class);
Map<String, Object> equMap = (Map<String, Object>) JSON.parseObject(toJSONString(equ), Map.class);
for (String key : keys) {
String camelKey = toCamelCase(key.toLowerCase());
equMap.put(camelKey, getUrlByKey(fileDataList, key));
......@@ -1565,10 +1570,19 @@ public class DataDockServiceImpl {
equMap.put("orgBranchCode", orgBranchCode);
equMap.put("EQU_STATE", equipmentInfoForm.get("EQU_STATE"));
String record = this.saveEquipmentDataInTransaction(equMap, dataSource, remark);
String projectContraptionNo = Objects.toString(equMap.get("projectContraptionNo"), "").trim();
Long projectContraptionId;
if (!projectContraptionSet.contains(projectContraptionNo)) {
projectContraptionId = saveProjectContraption(equMap, equList, company, dataSource);
projectContraptionSet.add(projectContraptionNo);
projectContraptionMap.put(projectContraptionNo, projectContraptionId);
} else {
projectContraptionId = projectContraptionMap.get(projectContraptionNo);
}
equMap.put("projectContraptionId", projectContraptionId);
String record = saveEquipmentDataInTransaction(equMap, dataSource, remark);
recordSet.add(record);
}
eventPublisher.publish(new EquipCreateOrEditEvent(
this,
BusinessTypeEnum.JG_NEW_EQUIP.name(),
......@@ -1591,7 +1605,7 @@ public class DataDockServiceImpl {
};
Arrays.stream(equipInfoExcelDtos.toArray(new EquipInfoExcelDto[0])).forEach(equ -> {
List<Map<String, Object>> fileDataList = (List<Map<String, Object>>) equ.getFileData();
Map<String, Object> equMap = (Map<String, Object>) JSON.parseObject(JSON.toJSONString(equ), Map.class);
Map<String, Object> equMap = (Map<String, Object>) JSON.parseObject(toJSONString(equ), Map.class);
for (String key : keys) {
String camelKey = toCamelCase(key.toLowerCase());
equMap.put(camelKey, getUrlByKey(fileDataList, key));
......@@ -1606,7 +1620,7 @@ public class DataDockServiceImpl {
}
for (Map<String, Object> item : dataList) {
if (key.equals(item.get("key"))) {
return JSON.toJSONString(item.get("value"));
return toJSONString(item.get("value"));
}
}
return null;
......@@ -1664,7 +1678,7 @@ public class DataDockServiceImpl {
ReadRowHolder readRowHolder = context.readRowHolder();
int rowIndex = readRowHolder.getRowIndex() + 1;
try {
log.info("解析第{}行数据：{}", rowIndex, JSON.toJSONString(data));
log.info("解析第{}行数据：{}", rowIndex, toJSONString(data));
checkNotBlank(data.getPipeName(), "管道名称不能为空；", rowError);
//checkNotBlank(data.getDesignUnitCreditCode(), "设计单位统一社会信用代码不能为空；", rowError);
//checkNotBlank(data.getDesignUnitName(), "设计单位名称不能为空；", rowError);
......@@ -1713,7 +1727,7 @@ public class DataDockServiceImpl {
}
} catch (Exception e) {
log.error("行索引数: [{}] -> 失败的 Excel 数据: [{}]", rowIndex, JSON.toJSONString(data), e);
log.error("行索引数: [{}] -> 失败的 Excel 数据: [{}]", rowIndex, toJSONString(data), e);
throw e;
}
return rowError;
......@@ -1740,7 +1754,7 @@ public class DataDockServiceImpl {
}
LinkedHashMap equipmentInfoForm = (LinkedHashMap) checkAndCast(paramMap.get(EQUIP_INFO_FORM_ID));
LinkedHashMap attachmentUpload = (LinkedHashMap) checkAndCast(paramMap.get(ATTACHMENT_UPLOAD));
List<EquipInfoExcelDto> equipInfoExcelDtos = JSON.parseArray(JSON.toJSONString(attachmentUpload.get(EQU_LISTS)), EquipInfoExcelDto.class);
List<EquipInfoExcelDto> equipInfoExcelDtos = JSON.parseArray(toJSONString(attachmentUpload.get(EQU_LISTS)), EquipInfoExcelDto.class);
// 2, 保存设备数据
this.batchSaveHisEquipmentData("", equipInfoExcelDtos,equipmentInfoForm);
......@@ -2126,7 +2140,7 @@ public class DataDockServiceImpl {
supervisionInfo.setOrgBranchName(paramsDto.getOrgBranchName());
HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(paramsDto.getOrgBranchCode()).getResult();
// 目前平台返回key为compnay(存在拼写错误)
CompanyModel parentModel = JSON.parseObject(JSON.toJSONString(parentMessage.get("compnay")), CompanyModel.class);
CompanyModel parentModel = JSON.parseObject(toJSONString(parentMessage.get("compnay")), CompanyModel.class);
supervisionInfo.setCompanyOrgBranchCode(parentModel.getCompanyCode());
supervisionInfo.setRecDate(new Date());
supervisionInfo.setSequenceNbr(null);
......@@ -2276,7 +2290,7 @@ public class DataDockServiceImpl {
JSONObject changeData = getJgUseRegistrationChangeData(paramsDto, records, applyNo);
JgRegistrationHistory registrationHistory = JgRegistrationHistory.builder()
.registrationClass("使用登记")
.changeData(JSON.toJSONString(changeData))
.changeData(toJSONString(changeData))
.status("history")
.currentDocumentId(String.valueOf(useRegseq))
.build();
......@@ -2473,14 +2487,14 @@ public class DataDockServiceImpl {
JSONObject jsonObject = (JSONObject) obj;
for (String field : jsonFields) {
if (jsonObject.get(field) != null && jsonObject.get(field) instanceof String) {
jsonObject.put(field, JSON.parse(JSONObject.toJSONString(jsonObject.get(field))));
jsonObject.put(field, JSON.parse(toJSONString(jsonObject.get(field))));
}
}
} else if (obj instanceof Map) {
Map<String, Object> map = (Map<String, Object>) obj;
for (String field : jsonFields) {
if (map.containsKey(field) && map.get(field) instanceof String) {
map.put(field, JSON.parse(JSONObject.toJSONString(map.get(field))));
map.put(field, JSON.parse(toJSONString(map.get(field))));
}
}
} else {
......@@ -2563,7 +2577,7 @@ public class DataDockServiceImpl {
ExcelImportErrorLogDto errorLogDto = JSON.parseObject(toJSONString(equ), ExcelImportErrorLogDto.class);
errorLogDto.setErrorInfo(e.getMessage());
excelImportErrorLogDao.save(errorLogDto);
log.error("{}数据：保存时出现异常，对应数据：{}", dataSource, JSONObject.toJSONString(equ), e);
log.error("{}数据：保存时出现异常，对应数据：{}", dataSource, toJSONString(equ), e);
log.error("==========================西安电梯数据：保存时出现异常，对应数据：{}==========================",record);
throw new RuntimeException("保存电梯数据失败", e);
}
......@@ -2618,7 +2632,7 @@ public class DataDockServiceImpl {
}
private void saveResumeInfo(Map<String, Object> equ) {
JgResumeInfoDto resumeInfoDto = JSON.parseObject(JSON.toJSONString(equ), JgResumeInfoDto.class);
JgResumeInfoDto resumeInfoDto = JSON.parseObject(toJSONString(equ), JgResumeInfoDto.class);
resumeInfoDto.setEquId(Objects.toString(equ.get("resumeSeq"), ""));
resumeInfoDto.setStatus("正常");
resumeInfoDto.setDataSource("1");
......@@ -2630,7 +2644,7 @@ public class DataDockServiceImpl {
* 历史设备登记-》更新维保信息
*/
private void historyEquUpdateMaintenanceInfo(Map<String, Object> map) {
IdxBizJgMaintenanceRecordInfo info = JSON.parseObject(JSON.toJSONString(map), IdxBizJgMaintenanceRecordInfo.class);
IdxBizJgMaintenanceRecordInfo info = JSON.parseObject(toJSONString(map), IdxBizJgMaintenanceRecordInfo.class);
info.setRecDate(new Date());
info.setRecUserId(RequestContext.getExeUserId());
try {
......@@ -2640,7 +2654,7 @@ public class DataDockServiceImpl {
exception.printStackTrace();
log.info("date转化失败");
}
info.setRepairInform(ValidationUtil.isEmpty(map.get("maintenanceContract")) ? null : JSONObject.toJSONString(map.get("maintenanceContract")));
info.setRepairInform(ValidationUtil.isEmpty(map.get("maintenanceContract")) ? null : toJSONString(map.get("maintenanceContract")));
idxBizJgMaintenanceRecordInfoService.save(info);
}
......@@ -2921,10 +2935,10 @@ public class DataDockServiceImpl {
lambda.eq(JgRegistrationHistory::getIsDelete, false);
Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
if (integer > 0) {
jgRegistrationHistory.setChangeData(JSON.toJSONString(map));
jgRegistrationHistory.setChangeData(toJSONString(map));
jgRegistrationHistoryService.update(jgRegistrationHistory, lambda);
} else {
jgRegistrationHistory.setChangeData(JSON.toJSONString(map));
jgRegistrationHistory.setChangeData(toJSONString(map));
jgRegistrationHistory.setStatus("new");
jgRegistrationHistory.setRegistrationClass("使用登记");
jgRegistrationHistory.setSupervisoryCode(supervisoryCode);
......@@ -2935,7 +2949,7 @@ public class DataDockServiceImpl {
}
private void saveInstallInfo(Map<String, Object> equ) {
IdxBizJgConstructionInfo constructionInfo = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgConstructionInfo.class);
IdxBizJgConstructionInfo constructionInfo = JSON.parseObject(toJSONString(equ), IdxBizJgConstructionInfo.class);
constructionInfo.setUscUnitName(ValidationUtil.isEmpty(equ.get("installUnitName")) ? null : String.valueOf(equ.get("installUnitName")));
constructionInfo.setUscUnitCreditCode(ValidationUtil.isEmpty(equ.get("installUnitCreditCode")) ? null : String.valueOf(equ.get("installUnitCreditCode")));
constructionInfo.setConstructionLeaderName(ValidationUtil.isEmpty(equ.get("installLeaderName")) ? null : String.valueOf(equ.get("installLeaderName")));
......
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