diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java index 8e8a26e2..cf7615c3 100644 --- a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java +++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java @@ -81,7 +81,7 @@ public class SysIotModelServiceImpl implements SysIotModelService { addModelCache(sysIotModel); SysIotModelVo sysIotModelVo = new SysIotModelVo(); BeanCopyUtils.copy(sysIotModel, sysIotModelVo); - sysIotModelVo.setIotModelCode(sysIotModelDto.getIotModelCode().toLowerCase()); + sysIotModelVo.setIotModelCode(sysIotModelDto.getIotModelCode()); return sysIotModelVo; } @@ -102,7 +102,7 @@ public class SysIotModelServiceImpl implements SysIotModelService { } sysIotModel.setUpdatedTime(new Date()); sysIotModel.setUpdatedBy(sysUserVo.getAccount()); - sysIotModel.setIotModelCode(sysIotModelDto.getIotModelCode().toLowerCase()); + sysIotModel.setIotModelCode(sysIotModelDto.getIotModelCode()); sysIotModelMapper.updateById(sysIotModel); SysIotModelVo sysIotModelVo = new SysIotModelVo(); BeanCopyUtils.copy(sysIotModel, sysIotModelVo); @@ -183,7 +183,7 @@ public class SysIotModelServiceImpl implements SysIotModelService { addModelFieldCache(sysIotModelField); SysIotModelFieldVo sysIotModelFieldVo = new SysIotModelFieldVo(); BeanCopyUtils.copy(sysIotModelField, sysIotModelFieldVo); - sysIotModelFieldVo.setAttributeCode(sysIotModelFieldDto.getAttributeCode().toLowerCase()); + sysIotModelFieldVo.setAttributeCode(sysIotModelFieldDto.getAttributeCode()); return sysIotModelFieldVo; } @@ -194,7 +194,7 @@ public class SysIotModelServiceImpl implements SysIotModelService { SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY); sysIotModelField.setUpdatedTime(new Date()); sysIotModelField.setUpdatedBy(sysUserVo.getAccount()); - sysIotModelField.setAttributeCode(sysIotModelFieldDto.getAttributeCode().toLowerCase()); + sysIotModelField.setAttributeCode(sysIotModelFieldDto.getAttributeCode()); if (sysIotModelFieldDto.getAttributeType() == 140) { sysIotModelField.setDataType("tinyint"); } @@ -257,7 +257,7 @@ public class SysIotModelServiceImpl implements SysIotModelService { sysIotModelServiceMapper.insert(sysIotModelServices); SysIotModelServiceVo sysIotModelServiceVo = new SysIotModelServiceVo(); BeanCopyUtils.copy(sysIotModelServices, sysIotModelServiceVo); - sysIotModelServiceVo.setServiceCode(sysIotModelServiceDto.getServiceCode().toLowerCase()); + sysIotModelServiceVo.setServiceCode(sysIotModelServiceDto.getServiceCode()); return sysIotModelServiceVo; } @@ -268,7 +268,7 @@ public class SysIotModelServiceImpl implements SysIotModelService { SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY); sysIotModelServices.setUpdatedTime(new Date()); sysIotModelServices.setUpdatedBy(sysUserVo.getAccount()); - sysIotModelServices.setServiceCode(sysIotModelServiceDto.getServiceCode().toLowerCase()); + sysIotModelServices.setServiceCode(sysIotModelServiceDto.getServiceCode()); SysIotModelServiceVo sysIotModelServiceQuery = sysIotModelServiceMapper.selectByServiceCode(sysIotModelServiceDto.getIotModelId(), sysIotModelServiceDto.getServiceCode()); if (!(sysIotModelServiceQuery == null)) { @@ -362,7 +362,7 @@ public class SysIotModelServiceImpl implements SysIotModelService { for (List row : list) { // 遍历sheet页中记录,构造需要导入的对象 SysIotModelServices services = new SysIotModelServices(); - services.setServiceCode(row.get(3).toString().toLowerCase()); + services.setServiceCode(row.get(3).toString()); services.setServiceName(row.get(4).toString()); services.setServiceType(Integer.valueOf(row.get(5).toString())); services.setPorder(Integer.valueOf(row.get(6).toString())); @@ -504,7 +504,7 @@ public class SysIotModelServiceImpl implements SysIotModelService { if (!allNotEmpty) { 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.setAttributeType(Integer.valueOf(row.get(5).toString())); //row6,8,10 转换前校验 diff --git a/das/src/main/java/com/das/modules/node/service/TDEngineService.java b/das/src/main/java/com/das/modules/node/service/TDEngineService.java index d61ae709..0e656c62 100644 --- a/das/src/main/java/com/das/modules/node/service/TDEngineService.java +++ b/das/src/main/java/com/das/modules/node/service/TDEngineService.java @@ -462,7 +462,7 @@ public class TDEngineService { List timeList = new ArrayList<>(); timeList.add(rs.getTimestamp(1).getTime()); List valueList = new ArrayList<>(); - valueList.add(rs.getObject(fieldList.get(i))); + valueList.add(rs.getObject(fieldList.get(i).toLowerCase())); map.put("times",timeList); map.put("values",valueList); valueMap.put(fieldList.get(i),map); @@ -471,7 +471,7 @@ public class TDEngineService { List times = (List) map.get("times"); List values = (List) map.get("values"); times.add(rs.getTimestamp(1).getTime()); - values.add(rs.getObject(fieldList.get(i))); + values.add(rs.getObject(fieldList.get(i).toLowerCase())); } } }