sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

物模型属性导入excel code大小写修改

Browse Source
This commit is contained in:
huguanghan 2024-10-29 12:40:36 +08:00
parent 2d44f90e41
commit 2904c4346f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
View File

@ -81,7 +81,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
addModelCache(sysIotModel); addModelCache(sysIotModel);
SysIotModelVo sysIotModelVo = new SysIotModelVo(); SysIotModelVo sysIotModelVo = new SysIotModelVo();
BeanCopyUtils.copy(sysIotModel, sysIotModelVo); BeanCopyUtils.copy(sysIotModel, sysIotModelVo);
sysIotModelVo.setIotModelCode(sysIotModelDto.getIotModelCode().toLowerCase()); sysIotModelVo.setIotModelCode(sysIotModelDto.getIotModelCode());
return sysIotModelVo; return sysIotModelVo;
} }
@ -102,7 +102,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
} }
sysIotModel.setUpdatedTime(new Date()); sysIotModel.setUpdatedTime(new Date());
sysIotModel.setUpdatedBy(sysUserVo.getAccount()); sysIotModel.setUpdatedBy(sysUserVo.getAccount());
sysIotModel.setIotModelCode(sysIotModelDto.getIotModelCode().toLowerCase()); sysIotModel.setIotModelCode(sysIotModelDto.getIotModelCode());
sysIotModelMapper.updateById(sysIotModel); sysIotModelMapper.updateById(sysIotModel);
SysIotModelVo sysIotModelVo = new SysIotModelVo(); SysIotModelVo sysIotModelVo = new SysIotModelVo();
BeanCopyUtils.copy(sysIotModel, sysIotModelVo); BeanCopyUtils.copy(sysIotModel, sysIotModelVo);
@ -183,7 +183,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
addModelFieldCache(sysIotModelField); addModelFieldCache(sysIotModelField);
SysIotModelFieldVo sysIotModelFieldVo = new SysIotModelFieldVo(); SysIotModelFieldVo sysIotModelFieldVo = new SysIotModelFieldVo();
BeanCopyUtils.copy(sysIotModelField, sysIotModelFieldVo); BeanCopyUtils.copy(sysIotModelField, sysIotModelFieldVo);
sysIotModelFieldVo.setAttributeCode(sysIotModelFieldDto.getAttributeCode().toLowerCase()); sysIotModelFieldVo.setAttributeCode(sysIotModelFieldDto.getAttributeCode());
return sysIotModelFieldVo; return sysIotModelFieldVo;
} }
@ -194,7 +194,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY); SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY);
sysIotModelField.setUpdatedTime(new Date()); sysIotModelField.setUpdatedTime(new Date());
sysIotModelField.setUpdatedBy(sysUserVo.getAccount()); sysIotModelField.setUpdatedBy(sysUserVo.getAccount());
sysIotModelField.setAttributeCode(sysIotModelFieldDto.getAttributeCode().toLowerCase()); sysIotModelField.setAttributeCode(sysIotModelFieldDto.getAttributeCode());
if (sysIotModelFieldDto.getAttributeType() == 140) { if (sysIotModelFieldDto.getAttributeType() == 140) {
sysIotModelField.setDataType("tinyint"); sysIotModelField.setDataType("tinyint");
} }
@ -257,7 +257,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
sysIotModelServiceMapper.insert(sysIotModelServices); sysIotModelServiceMapper.insert(sysIotModelServices);
SysIotModelServiceVo sysIotModelServiceVo = new SysIotModelServiceVo(); SysIotModelServiceVo sysIotModelServiceVo = new SysIotModelServiceVo();
BeanCopyUtils.copy(sysIotModelServices, sysIotModelServiceVo); BeanCopyUtils.copy(sysIotModelServices, sysIotModelServiceVo);
sysIotModelServiceVo.setServiceCode(sysIotModelServiceDto.getServiceCode().toLowerCase()); sysIotModelServiceVo.setServiceCode(sysIotModelServiceDto.getServiceCode());
return sysIotModelServiceVo; return sysIotModelServiceVo;
} }
@ -268,7 +268,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY); SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY);
sysIotModelServices.setUpdatedTime(new Date()); sysIotModelServices.setUpdatedTime(new Date());
sysIotModelServices.setUpdatedBy(sysUserVo.getAccount()); sysIotModelServices.setUpdatedBy(sysUserVo.getAccount());
sysIotModelServices.setServiceCode(sysIotModelServiceDto.getServiceCode().toLowerCase()); sysIotModelServices.setServiceCode(sysIotModelServiceDto.getServiceCode());
SysIotModelServiceVo sysIotModelServiceQuery = sysIotModelServiceMapper.selectByServiceCode(sysIotModelServiceDto.getIotModelId(), sysIotModelServiceDto.getServiceCode()); SysIotModelServiceVo sysIotModelServiceQuery = sysIotModelServiceMapper.selectByServiceCode(sysIotModelServiceDto.getIotModelId(), sysIotModelServiceDto.getServiceCode());
if (!(sysIotModelServiceQuery == null)) { if (!(sysIotModelServiceQuery == null)) {
@ -362,7 +362,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
for (List<Object> row : list) { for (List<Object> row : list) {
// 遍历sheet页中记录，构造需要导入的对象 // 遍历sheet页中记录，构造需要导入的对象
SysIotModelServices services = new SysIotModelServices(); SysIotModelServices services = new SysIotModelServices();
services.setServiceCode(row.get(3).toString().toLowerCase()); services.setServiceCode(row.get(3).toString());
services.setServiceName(row.get(4).toString()); services.setServiceName(row.get(4).toString());
services.setServiceType(Integer.valueOf(row.get(5).toString())); services.setServiceType(Integer.valueOf(row.get(5).toString()));
services.setPorder(Integer.valueOf(row.get(6).toString())); services.setPorder(Integer.valueOf(row.get(6).toString()));
@ -504,7 +504,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
if (!allNotEmpty) { if (!allNotEmpty) {
throw new ServiceException("字段不可为空，请检查excel文件{}" + row); throw new ServiceException("字段不可为空，请检查excel文件{}" + row);
} }
field.setAttributeCode(row.get(3).toString().toLowerCase()); field.setAttributeCode(row.get(3).toString());
field.setAttributeName(row.get(4).toString()); field.setAttributeName(row.get(4).toString());
field.setAttributeType(Integer.valueOf(row.get(5).toString())); field.setAttributeType(Integer.valueOf(row.get(5).toString()));
//row6,8,10 转换前校验 //row6,8,10 转换前校验

4
das/src/main/java/com/das/modules/node/service/TDEngineService.java
View File

@ -462,7 +462,7 @@ public class TDEngineService {
List<Long> timeList = new ArrayList<>(); List<Long> timeList = new ArrayList<>();
timeList.add(rs.getTimestamp(1).getTime()); timeList.add(rs.getTimestamp(1).getTime());
List<Object> valueList = new ArrayList<>(); List<Object> valueList = new ArrayList<>();
valueList.add(rs.getObject(fieldList.get(i))); valueList.add(rs.getObject(fieldList.get(i).toLowerCase()));
map.put("times",timeList); map.put("times",timeList);
map.put("values",valueList); map.put("values",valueList);
valueMap.put(fieldList.get(i),map); valueMap.put(fieldList.get(i),map);
@ -471,7 +471,7 @@ public class TDEngineService {
List<Long> times = (List<Long>) map.get("times"); List<Long> times = (List<Long>) map.get("times");
List<Object> values = (List<Object>) map.get("values"); List<Object> values = (List<Object>) map.get("values");
times.add(rs.getTimestamp(1).getTime()); times.add(rs.getTimestamp(1).getTime());
values.add(rs.getObject(fieldList.get(i))); values.add(rs.getObject(fieldList.get(i).toLowerCase()));
} }
} }
} }