diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java index db2be6d..044ae88 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java @@ -1,5 +1,6 @@ package com.nu.modules.yiweilian.humid.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; @@ -9,9 +10,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; -import com.nu.modules.tq.utils.HttpTool; -import com.nu.modules.tq.water.entity.WaterMeter; -import com.nu.modules.tq.water.service.impl.WaterMeterServiceImpl; import com.nu.modules.yiweilian.humid.entity.HumidDevice; import com.nu.modules.yiweilian.humid.mapper.HumidDeviceMapper; import com.nu.modules.yiweilian.humid.service.IHumidDeviceService; @@ -25,9 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import java.util.Calendar; +import java.util.Date; import java.util.HashMap; import java.util.Map; -import java.util.UUID; @Slf4j @Service @@ -231,29 +230,53 @@ public class HumidDeviceServiceImpl extends ServiceImpl0){ + for(int i=0;i params = getParmas(page+1,limit,humidDevice); @@ -344,7 +367,8 @@ public class HumidDeviceServiceImpl extends ServiceImpl0){ + for(int i=0;i