|
|
@@ -484,7 +484,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
|
|
|
queryWrapper.eq("farm_id", farmId);
|
|
|
List<EnvDevice> envDevices = envDeviceMapper.selectList(queryWrapper);
|
|
|
for (EnvDevice envDevice : envDevices) {
|
|
|
- if (StringUtils.isNotBlank(envDevice.getRemark())) {
|
|
|
+ if (StringUtils.isNotBlank(envDevice.getRemark()) && "26".equals(farmId)) {
|
|
|
QueryWrapper<EnvNh3n> queryWrapper1 = new QueryWrapper<>();
|
|
|
queryWrapper1.eq("device_code", envDevice.getRemark()).orderByDesc("create_date").last(" limit 1");
|
|
|
EnvNh3n envNh3n = nh3nMapper.selectOne(queryWrapper1);
|
|
|
@@ -496,9 +496,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
|
|
|
jsonObject.put("hum", "");
|
|
|
jsonObject.put("temp", "");
|
|
|
jsonArray.add(jsonObject);
|
|
|
- }
|
|
|
-
|
|
|
- if (envDevice.getDeviceCode().length() > 3) {
|
|
|
+ } else if (envDevice.getDeviceCode().length() > 3 && "26".equals(farmId)) {
|
|
|
QueryWrapper<EnvData> queryWrapper1 = new QueryWrapper<>();
|
|
|
queryWrapper1.eq("device_id", envDevice.getDeviceName()).orderByDesc("create_time").last(" limit 1");
|
|
|
EnvData envData = dataMapper.selectOne(queryWrapper1);
|
|
|
@@ -512,6 +510,15 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
|
|
|
jsonObject.put("status", envDevice.getDeviceStatus());
|
|
|
jsonArray.add(jsonObject);
|
|
|
}
|
|
|
+ } else {
|
|
|
+ JSONObject jsonObject = new JSONObject();
|
|
|
+ jsonObject.put("deviceCode", envDevice.getDeviceCode());
|
|
|
+ jsonObject.put("buildName", envDevice.getUnitName());
|
|
|
+ jsonObject.put("aq", "");
|
|
|
+ jsonObject.put("hum","");
|
|
|
+ jsonObject.put("temp", "");
|
|
|
+ jsonObject.put("status", envDevice.getDeviceStatus());
|
|
|
+ jsonArray.add(jsonObject);
|
|
|
}
|
|
|
}
|
|
|
return new Result(ResultCode.SUCCESS, jsonArray);
|
