Commit 7ac3d977 authored by suhuiguang's avatar suhuiguang

fix(jg):3库数据同步

1.技术参数类型不兼容时,忽略报错字段
parent 48324f78
package com.yeejoin.amos.boot.module.jg.biz.refresh; package com.yeejoin.amos.boot.module.jg.biz.refresh;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.yeejoin.amos.boot.module.common.api.dto.ITechParamDefine; import com.yeejoin.amos.boot.module.common.api.dto.ITechParamDefine;
import com.yeejoin.amos.boot.module.common.api.dto.TechParamItem; import com.yeejoin.amos.boot.module.common.api.dto.TechParamItem;
import com.yeejoin.amos.boot.module.common.api.entity.ESEquipmentInfo; import com.yeejoin.amos.boot.module.common.api.entity.ESEquipmentInfo;
import com.yeejoin.amos.boot.module.common.biz.utils.RefreshDataUtils;
import com.yeejoin.amos.boot.module.common.biz.utils.TechParamUtil; import com.yeejoin.amos.boot.module.common.biz.utils.TechParamUtil;
import com.yeejoin.amos.boot.module.jg.biz.edit.backup.TechParamsBackupService; import com.yeejoin.amos.boot.module.jg.biz.edit.backup.TechParamsBackupService;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo; import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
...@@ -28,6 +27,11 @@ public class StatisticsDataUpdateService { ...@@ -28,6 +27,11 @@ public class StatisticsDataUpdateService {
public static final String USE_DATE_KEY = "USE_DATE"; public static final String USE_DATE_KEY = "USE_DATE";
/**
* 配置忽略错误字段类型
*/
public static final CopyOptions options = CopyOptions.create().setIgnoreError(true);
public List<ESEquipmentInfo.TechParam> getTechParams(String equList, String record) { public List<ESEquipmentInfo.TechParam> getTechParams(String equList, String record) {
List<ESEquipmentInfo.TechParam> techParams = new ArrayList<>(); List<ESEquipmentInfo.TechParam> techParams = new ArrayList<>();
...@@ -36,8 +40,7 @@ public class StatisticsDataUpdateService { ...@@ -36,8 +40,7 @@ public class StatisticsDataUpdateService {
// 类型转换,否则类型处理错误 // 类型转换,否则类型处理错误
Class<? extends ITechParamDefine> clazz = TechParamUtil.getParamClazz(equList); Class<? extends ITechParamDefine> clazz = TechParamUtil.getParamClazz(equList);
ITechParamDefine paramInstance = clazz.newInstance(); ITechParamDefine paramInstance = clazz.newInstance();
BeanUtil.copyProperties(params, paramInstance); BeanUtil.copyProperties(params, paramInstance, options);
Map<String, Object> paramsMap = BeanUtil.beanToMap(paramInstance); Map<String, Object> paramsMap = BeanUtil.beanToMap(paramInstance);
List<TechParamItem> techParamItems = TechParamUtil.getParamMetaList(equList); List<TechParamItem> techParamItems = TechParamUtil.getParamMetaList(equList);
techParamItems.forEach(techParamItem -> { techParamItems.forEach(techParamItem -> {
......
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