jwy
/
aeon_business_back
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

精简设备类别相关字段

zhc
zhczyx@163.com 2 weeks ago
parent
d63db1cdff
commit
14f8dcb5dd
1 changed files with 33 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 64
      data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceConfigInfoImpl.java

64
data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceConfigInfoImpl.java
View File

@ -166,37 +166,36 @@ public class DeviceConfigInfoImpl implements IDeviceTypeService {
public SimpleDataResponse addDeviceInfos(DeviceConfigParams deviceAddParams, Long userId, Long companyId, Integer languageType) { public SimpleDataResponse addDeviceInfos(DeviceConfigParams deviceAddParams, Long userId, Long companyId, Integer languageType) {
String deviceDataSrc=deviceAddParams.getDeviceDataSrc(); String deviceDataSrc=deviceAddParams.getDeviceDataSrc();
if (StringUtils.isBlank(deviceDataSrc)) { // if (StringUtils.isBlank(deviceDataSrc)) {
return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "dataSrcNotExist")); // return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "dataSrcNotExist"));
} // }
if (StringUtils.isBlank(deviceAddParams.getDeviceType())) { // if (StringUtils.isBlank(deviceAddParams.getDeviceType())) {
return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "deviceTypeNotExist")); // return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "deviceTypeNotExist"));
} // }
//
if(MapUtils.isEmpty(deviceAddParams.getExpressionMap())){ // if(MapUtils.isEmpty(deviceAddParams.getExpressionMap())){
return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "expressionMapNotExist")); // return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "expressionMapNotExist"));
} // }
//
if(MapUtils.isEmpty(deviceAddParams.getExpressionMap())){ // if(MapUtils.isEmpty(deviceAddParams.getExpressionMap())){
return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "expressionVariableMapNotExist")); // return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "expressionVariableMapNotExist"));
} // }
if (MapUtils.isEmpty(deviceAddParams.getExpressionVariableMap())) { if (MapUtils.isEmpty(deviceAddParams.getExpressionVariableMap())) {
return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "deviceNameNotExist")); return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "deviceNameNotExist"));
} }
// if (!deviceAddParams.getExpressionMap().containsKey("$.deviceId")) { // if (!deviceAddParams.getExpressionMap().containsKey("$.deviceId")) {
// return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "deviceIdNotExist")); // return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "deviceIdNotExist"));
// } // }
DataSourceConfigExample dataSourceConfigExample=new DataSourceConfigExample(); // DataSourceConfigExample dataSourceConfigExample=new DataSourceConfigExample();
dataSourceConfigExample.createCriteria().andCompanyIdEqualTo(companyId).andCodeEqualTo(deviceDataSrc).andFlagEqualTo(0); // dataSourceConfigExample.createCriteria().andCompanyIdEqualTo(companyId).andNameEqualTo(deviceAddParams.getName()).andFlagEqualTo(0);
long cnt = this.dataSourceConfigMapperExt.countByExample(dataSourceConfigExample); // long cnt = this.dataSourceConfigMapperExt.countByExample(dataSourceConfigExample);
if (cnt==0){ // if (cnt==0){
return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "dataSrcNotExist")); // return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "dataSrcNotExist"));
} // }
DeviceConfigInfoExample deviceConfigInfoExample=new DeviceConfigInfoExample(); 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); long result=this.deviceConfigInfoExtMapper.countByExample(deviceConfigInfoExample);
if (result>0){ if (result>0){
return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "deviceConfigInfoExist")); return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "deviceConfigInfoExist"));
} }
@ -207,15 +206,18 @@ public class DeviceConfigInfoImpl implements IDeviceTypeService {
deviceConfigInfo.setCreatedTimestamp(new Date()); deviceConfigInfo.setCreatedTimestamp(new Date());
deviceConfigInfo.setUpdatedTimestamp(new Date()); deviceConfigInfo.setUpdatedTimestamp(new Date());
deviceConfigInfo.setCreatedBy(userId); deviceConfigInfo.setCreatedBy(userId);
if (languageType==0){ deviceConfigInfo.setNameZh(deviceAddParams.getName());
deviceConfigInfo.setNameZh(deviceAddParams.getName()); deviceConfigInfo.setNameEn(deviceAddParams.getName());
} deviceConfigInfo.setName(deviceAddParams.getName());
if (languageType==1){ // if (languageType==0){
deviceConfigInfo.setNameEn(deviceAddParams.getName()); // deviceConfigInfo.setNameZh(deviceAddParams.getName());
} // }
if (languageType==2){ // if (languageType==1){
deviceConfigInfo.setName(deviceAddParams.getName()); // deviceConfigInfo.setNameEn(deviceAddParams.getName());
} // }
// if (languageType==2){
// deviceConfigInfo.setName(deviceAddParams.getName());
// }
deviceConfigInfo.setUpdatedBy(userId); deviceConfigInfo.setUpdatedBy(userId);
deviceConfigInfo.setExpressionMap(JSON.toJSONString(deviceAddParams.getExpressionMap())); deviceConfigInfo.setExpressionMap(JSON.toJSONString(deviceAddParams.getExpressionMap()));
deviceConfigInfo.setExpressionVariableMap(JSON.toJSONString(deviceAddParams.getExpressionVariableMap())); deviceConfigInfo.setExpressionVariableMap(JSON.toJSONString(deviceAddParams.getExpressionVariableMap()));

Write Preview
Loading…
Cancel
Save