解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/DemoController.java

@@ -270,8 +270,8 @@ public class DemoController extends BaseController {
                        //更新显示名称
                        equipmentsJxiopDocMysql.setDisplayName(pointImportDto.getDisplayName());
                        esEquipments.setDisplayName(pointImportDto.getDisplayName());
-                       //更新单位
-                       if(!ObjectUtils.isEmpty(pointImportDto.getUnit())){
+                       //更新单位 如果单位为空或者单位超过周期性数据存储长度则丢弃单位更新操作
+                       if(!ObjectUtils.isEmpty(pointImportDto.getUnit())&&(pointImportDto.getUnit().toCharArray().length<24)){
                            equipmentsJxiopDocMysql.setUnit(pointImportDto.getUnit());
                            esEquipments.setUnit(pointImportDto.getUnit());
                        }