From 14f8dcb5ddcb7638f0bd6395a37608baf3439e4e Mon Sep 17 00:00:00 2001 From: "zhczyx@163.com" Date: Mon, 29 Dec 2025 20:43:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E8=AE=BE=E5=A4=87=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DeviceConfigInfoImpl.java | 64 ++++++++++--------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceConfigInfoImpl.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceConfigInfoImpl.java index 444d687..f4cf363 100644 --- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceConfigInfoImpl.java +++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceConfigInfoImpl.java @@ -166,37 +166,36 @@ public class DeviceConfigInfoImpl implements IDeviceTypeService { public SimpleDataResponse addDeviceInfos(DeviceConfigParams deviceAddParams, Long userId, Long companyId, Integer languageType) { String deviceDataSrc=deviceAddParams.getDeviceDataSrc(); - if (StringUtils.isBlank(deviceDataSrc)) { - return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "dataSrcNotExist")); - } - if (StringUtils.isBlank(deviceAddParams.getDeviceType())) { - return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "deviceTypeNotExist")); - } - - if(MapUtils.isEmpty(deviceAddParams.getExpressionMap())){ - return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "expressionMapNotExist")); - } - - if(MapUtils.isEmpty(deviceAddParams.getExpressionMap())){ - return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "expressionVariableMapNotExist")); - } +// if (StringUtils.isBlank(deviceDataSrc)) { +// return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "dataSrcNotExist")); +// } +// if (StringUtils.isBlank(deviceAddParams.getDeviceType())) { +// return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "deviceTypeNotExist")); +// } +// +// if(MapUtils.isEmpty(deviceAddParams.getExpressionMap())){ +// return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "expressionMapNotExist")); +// } +// +// if(MapUtils.isEmpty(deviceAddParams.getExpressionMap())){ +// return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "expressionVariableMapNotExist")); +// } if (MapUtils.isEmpty(deviceAddParams.getExpressionVariableMap())) { return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "deviceNameNotExist")); } // if (!deviceAddParams.getExpressionMap().containsKey("$.deviceId")) { // return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "deviceIdNotExist")); // } - DataSourceConfigExample dataSourceConfigExample=new DataSourceConfigExample(); - dataSourceConfigExample.createCriteria().andCompanyIdEqualTo(companyId).andCodeEqualTo(deviceDataSrc).andFlagEqualTo(0); - long cnt = this.dataSourceConfigMapperExt.countByExample(dataSourceConfigExample); - if (cnt==0){ - return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "dataSrcNotExist")); - } +// DataSourceConfigExample dataSourceConfigExample=new DataSourceConfigExample(); +// dataSourceConfigExample.createCriteria().andCompanyIdEqualTo(companyId).andNameEqualTo(deviceAddParams.getName()).andFlagEqualTo(0); +// long cnt = this.dataSourceConfigMapperExt.countByExample(dataSourceConfigExample); +// if (cnt==0){ +// return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "dataSrcNotExist")); +// } DeviceConfigInfoExample deviceConfigInfoExample=new DeviceConfigInfoExample(); - deviceConfigInfoExample.createCriteria().andCompanyIdEqualTo(companyId).andFlagEqualTo(0).andDeviceDataSrcEqualTo(deviceDataSrc).andDeviceTypeEqualTo(deviceAddParams.getDeviceType()); + deviceConfigInfoExample.createCriteria().andCompanyIdEqualTo(companyId).andFlagEqualTo(0).andNameEqualTo(deviceAddParams.getName()); long result=this.deviceConfigInfoExtMapper.countByExample(deviceConfigInfoExample); - if (result>0){ return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "deviceConfigInfoExist")); } @@ -207,15 +206,18 @@ public class DeviceConfigInfoImpl implements IDeviceTypeService { deviceConfigInfo.setCreatedTimestamp(new Date()); deviceConfigInfo.setUpdatedTimestamp(new Date()); deviceConfigInfo.setCreatedBy(userId); - if (languageType==0){ - deviceConfigInfo.setNameZh(deviceAddParams.getName()); - } - if (languageType==1){ - deviceConfigInfo.setNameEn(deviceAddParams.getName()); - } - if (languageType==2){ - deviceConfigInfo.setName(deviceAddParams.getName()); - } + deviceConfigInfo.setNameZh(deviceAddParams.getName()); + deviceConfigInfo.setNameEn(deviceAddParams.getName()); + deviceConfigInfo.setName(deviceAddParams.getName()); +// if (languageType==0){ +// deviceConfigInfo.setNameZh(deviceAddParams.getName()); +// } +// if (languageType==1){ +// deviceConfigInfo.setNameEn(deviceAddParams.getName()); +// } +// if (languageType==2){ +// deviceConfigInfo.setName(deviceAddParams.getName()); +// } deviceConfigInfo.setUpdatedBy(userId); deviceConfigInfo.setExpressionMap(JSON.toJSONString(deviceAddParams.getExpressionMap())); deviceConfigInfo.setExpressionVariableMap(JSON.toJSONString(deviceAddParams.getExpressionVariableMap()));