root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:烘箱监控页面优化

Browse Source
This commit is contained in:
yanps
2024-06-21 09:48:28 +08:00
parent 0be3799d6d
commit be809d4132
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
View File

@@ -230,6 +230,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("device_type")), Device::getDevice_type, whereJson.get("device_type")); wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("device_type")), Device::getDevice_type, whereJson.get("device_type"));
wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("region")), Device::getRegion, whereJson.get("region")); wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("region")), Device::getRegion, whereJson.get("region"));
wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("is_config")), Device::getIs_config, whereJson.get("is_config"));
wrapper.nested(StringUtils.isNotBlank((String) whereJson.get("blurry")), i -> i.like(Device::getDevice_code, whereJson.get("blurry")).or().like(Device::getDevice_name, whereJson.get("blurry"))); wrapper.nested(StringUtils.isNotBlank((String) whereJson.get("blurry")), i -> i.like(Device::getDevice_code, whereJson.get("blurry")).or().like(Device::getDevice_name, whereJson.get("blurry")));
wrapper.orderByAsc(Device::getIs_config).orderByDesc(Device::getSeq_num).orderByDesc(Device::getUpdate_time); wrapper.orderByAsc(Device::getIs_config).orderByDesc(Device::getSeq_num).orderByDesc(Device::getUpdate_time);
wrapper.orderByDesc(Device::getCreate_time); wrapper.orderByDesc(Device::getCreate_time);
@@ -926,6 +927,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
String vehicle_code = form.getString("vehicle_code"); String vehicle_code = form.getString("vehicle_code");
String islock = form.getString("islock"); String islock = form.getString("islock");
String requireSucess = form.getString("requireSucess"); String requireSucess = form.getString("requireSucess");
String requireActionSucess = form.getString("requireActionSucess");
String fullrequireSucess = form.getString("fullrequireSucess"); String fullrequireSucess = form.getString("fullrequireSucess");
if (device_code.indexOf(".") != -1) { if (device_code.indexOf(".") != -1) {
device_code = device_code.substring(0, device_code.indexOf(".")); device_code = device_code.substring(0, device_code.indexOf("."));