|
@@ -59,6 +59,8 @@ public class EnergyEnvDeviceServiceImpl extends ServiceImpl<EnergyEnvDeviceMappe
|
|
|
@Override
|
|
|
public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
|
|
|
String type = paramsMap.get("type");
|
|
|
+ String status = paramsMap.get("status");
|
|
|
+ String deviceCode = paramsMap.get("deviceCode");
|
|
|
String farmId = paramsMap.get("farmId");
|
|
|
String pageSize = paramsMap.get("pageSize");
|
|
|
String pageNo = paramsMap.get("pageNum");
|
|
@@ -69,6 +71,8 @@ public class EnergyEnvDeviceServiceImpl extends ServiceImpl<EnergyEnvDeviceMappe
|
|
|
pageNo = "1";
|
|
|
}
|
|
|
QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.like(StringUtils.isNotBlank(deviceCode),"device_code",deviceCode);
|
|
|
+ queryWrapper.eq(StringUtils.isNotBlank(status),"device_status",status);
|
|
|
queryWrapper.eq("farm_id", farmId);
|
|
|
if ("1".equals(type)) {
|
|
|
queryWrapper.in("device_type", 1, 2);
|