物模型属性导入excel 参数校验修改

This commit is contained in:
huguanghan 2024-10-29 11:54:00 +08:00
parent 242ae64da9
commit 2d44f90e41

View File

@ -1,7 +1,7 @@
package com.das.modules.equipment.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.poi.excel.ExcelReader;
import cn.hutool.poi.excel.ExcelUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -499,17 +499,20 @@ public class SysIotModelServiceImpl implements SysIotModelService {
}
private static void buildFieldInfo(String iotModelId, List<Object> row, SysIotModelField field) {
if (row.get(3).equals("") || row.get(4).equals("") || row.get(5).equals("") || row.get(7).equals("") || row.get(9).equals("") || row.get(11).equals("")) {
//参数校验
boolean allNotEmpty = ObjectUtil.isAllNotEmpty(row.get(3), row.get(4), row.get(5), row.get(7), row.get(9), row.get(11));
if (!allNotEmpty) {
throw new ServiceException("字段不可为空请检查excel文件{}" + row);
}
field.setAttributeCode(row.get(3).toString().toLowerCase());
field.setAttributeName(row.get(4).toString());
field.setAttributeType(Integer.valueOf(row.get(5).toString()));
field.setUnit(row.get(6).equals("") ? null : row.get(6).toString());
//row6,8,10 转换前校验
field.setUnit(ObjectUtil.isEmpty(row.get(6)) ? null : row.get(6).toString());
field.setPorder(Integer.valueOf(row.get(7).toString()));
field.setSubSystem(row.get(8).equals("") ? null : row.get(8).toString());
field.setSubSystem(ObjectUtil.isEmpty(row.get(8)) ? null : row.get(8).toString());
field.setDataType(row.get(9).toString());
field.setVisible(row.get(10).equals("") ? null : Integer.valueOf(row.get(10).toString()));
field.setVisible(ObjectUtil.isEmpty(row.get(10)) ? null : Integer.valueOf(row.get(10).toString()));
field.setHighSpeed(Integer.valueOf(row.get(11).toString()));
field.setIotModelId(Long.valueOf(iotModelId));
}