|
@@ -7,11 +7,8 @@ import com.alibaba.fastjson2.JSONObject;
|
|
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
|
import com.iohao.mmo.equip.entity.EquipEntryProperty;
|
|
|
import com.iohao.mmo.equip.entity.EquipEntryTemplate;
|
|
|
-import com.iohao.mmo.excel.dto.DemoExcelDTO;
|
|
|
import com.iohao.mmo.excel.dto.EquipEntryTemplateExcelDTO;
|
|
|
-import com.iohao.mmo.excel.entity.DemoExcel;
|
|
|
-import com.iohao.mmo.excel.kit.ConvertKit;
|
|
|
-import com.iohao.mmo.excel.service.DemoExcelService;
|
|
|
+import com.iohao.mmo.common.kit.ConvertKit;
|
|
|
import com.iohao.mmo.excel.service.EquipEntryTemplateExcelService;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
@@ -63,7 +60,7 @@ public class EquipEntryTemplateExcelListener<E, T> extends AnalysisEventListener
|
|
|
public void invoke(T data, AnalysisContext context) {
|
|
|
LOGGER.info("解析到一条数据:{}", JSONObject.toJSONString(data));
|
|
|
EquipEntryTemplateExcelDTO excel = ConvertKit.sourceToTarget(data, EquipEntryTemplateExcelDTO.class);
|
|
|
- // 这里对数据做自定义设置,如果一级类字段不为空,则一级类取本条数据新导入的,反之取缓存里面的
|
|
|
+ // (关键部分)这里对数据做自定义设置,如果一级类字段不为空,则一级类取本条数据新导入的,反之取缓存里面的
|
|
|
if(StringUtils.isNotBlank(excel.getCode())){
|
|
|
//拷贝一级类属性
|
|
|
nowEquipEntryTemplate = ConvertKit.sourceToTarget(excel, EquipEntryTemplate.class);
|