diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/controller/NuIotTqApiRequestLogController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java similarity index 89% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/controller/NuIotTqApiRequestLogController.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java index 1d05302..3042018 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/controller/NuIotTqApiRequestLogController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java @@ -1,12 +1,8 @@ -package com.nu.modules.nuIotTqApiRequestLog.controller; +package com.nu.modules.tq.apiRequestLog.controller; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -14,27 +10,18 @@ import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; -import org.jeecg.common.util.oConvertUtils; -import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog; -import com.nu.modules.nuIotTqApiRequestLog.service.INuIotTqApiRequestLogService; +import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; +import com.nu.modules.tq.apiRequestLog.service.INuIotTqApiRequestLogService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/entity/NuIotTqApiRequestLog.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/NuIotTqApiRequestLog.java similarity index 92% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/entity/NuIotTqApiRequestLog.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/NuIotTqApiRequestLog.java index 228685a..2d94c75 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/entity/NuIotTqApiRequestLog.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/NuIotTqApiRequestLog.java @@ -1,15 +1,11 @@ -package com.nu.modules.nuIotTqApiRequestLog.entity; +package com.nu.modules.tq.apiRequestLog.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/NuIotTqApiRequestLogMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/NuIotTqApiRequestLogMapper.java similarity index 56% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/NuIotTqApiRequestLogMapper.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/NuIotTqApiRequestLogMapper.java index 16181e3..1f12182 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/NuIotTqApiRequestLogMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/NuIotTqApiRequestLogMapper.java @@ -1,9 +1,6 @@ -package com.nu.modules.nuIotTqApiRequestLog.mapper; +package com.nu.modules.tq.apiRequestLog.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog; +import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml similarity index 63% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml index 31f35b8..4706e40 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/INuIotTqApiRequestLogService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/INuIotTqApiRequestLogService.java similarity index 67% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/INuIotTqApiRequestLogService.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/INuIotTqApiRequestLogService.java index 6b2ce12..506afcd 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/INuIotTqApiRequestLogService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/INuIotTqApiRequestLogService.java @@ -1,6 +1,6 @@ -package com.nu.modules.nuIotTqApiRequestLog.service; +package com.nu.modules.tq.apiRequestLog.service; -import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog; +import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java similarity index 57% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java index ab4638b..1437058 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java @@ -1,8 +1,8 @@ -package com.nu.modules.nuIotTqApiRequestLog.service.impl; +package com.nu.modules.tq.apiRequestLog.service.impl; -import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog; -import com.nu.modules.nuIotTqApiRequestLog.mapper.NuIotTqApiRequestLogMapper; -import com.nu.modules.nuIotTqApiRequestLog.service.INuIotTqApiRequestLogService; +import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; +import com.nu.modules.tq.apiRequestLog.mapper.NuIotTqApiRequestLogMapper; +import com.nu.modules.tq.apiRequestLog.service.INuIotTqApiRequestLogService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java index 948ad9b..9e42706 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java @@ -8,14 +8,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.nuIotTqElectricitySyncLog.service.INuIotTqElectricitySyncLogService; +import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.tq.common.entity.TqApiLog; import com.nu.modules.tq.common.service.ITqApiLogService; import com.nu.modules.tq.utils.HttpTool; import com.nu.modules.tq.utils.SignTool; import com.nu.modules.tq.utils.TqApi; -import com.nu.modules.tq.water.entity.WaterMeter; import lombok.extern.slf4j.Slf4j; import com.nu.modules.tq.electricity.entity.ElectricityMeter; import com.nu.modules.tq.electricity.mapper.ElectricityMeterMapper; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/controller/NuIotTqElectricitySyncLogController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/controller/NuIotTqElectricitySyncLogController.java similarity index 85% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/controller/NuIotTqElectricitySyncLogController.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/controller/NuIotTqElectricitySyncLogController.java index 70b68f4..5898ae0 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/controller/NuIotTqElectricitySyncLogController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/controller/NuIotTqElectricitySyncLogController.java @@ -1,39 +1,22 @@ -package com.nu.modules.nuIotTqElectricitySyncLog.controller; +package com.nu.modules.tq.syncLog.controller; import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.system.query.QueryRuleEnum; -import org.jeecg.common.util.oConvertUtils; -import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.nuIotTqElectricitySyncLog.service.INuIotTqElectricitySyncLogService; +import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/entity/NuIotTqElectricitySyncLog.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/NuIotTqElectricitySyncLog.java similarity index 90% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/entity/NuIotTqElectricitySyncLog.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/NuIotTqElectricitySyncLog.java index 82cb6e7..c2d93c8 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/entity/NuIotTqElectricitySyncLog.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/NuIotTqElectricitySyncLog.java @@ -1,20 +1,15 @@ -package com.nu.modules.nuIotTqElectricitySyncLog.entity; +package com.nu.modules.tq.syncLog.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/mapper/NuIotTqElectricitySyncLogMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/NuIotTqElectricitySyncLogMapper.java similarity index 55% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/mapper/NuIotTqElectricitySyncLogMapper.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/NuIotTqElectricitySyncLogMapper.java index fecebbe..459ca0b 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/mapper/NuIotTqElectricitySyncLogMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/NuIotTqElectricitySyncLogMapper.java @@ -1,9 +1,6 @@ -package com.nu.modules.nuIotTqElectricitySyncLog.mapper; +package com.nu.modules.tq.syncLog.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml similarity index 60% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml index b4f9a34..b441196 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/INuIotTqElectricitySyncLogService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/INuIotTqElectricitySyncLogService.java similarity index 65% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/INuIotTqElectricitySyncLogService.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/INuIotTqElectricitySyncLogService.java index bd60a30..c68c1e8 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/INuIotTqElectricitySyncLogService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/INuIotTqElectricitySyncLogService.java @@ -1,6 +1,6 @@ -package com.nu.modules.nuIotTqElectricitySyncLog.service; +package com.nu.modules.tq.syncLog.service; -import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java similarity index 55% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java index 2954565..b62ed93 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java @@ -1,8 +1,8 @@ -package com.nu.modules.nuIotTqElectricitySyncLog.service.impl; +package com.nu.modules.tq.syncLog.service.impl; -import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.nuIotTqElectricitySyncLog.mapper.NuIotTqElectricitySyncLogMapper; -import com.nu.modules.nuIotTqElectricitySyncLog.service.INuIotTqElectricitySyncLogService; +import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.mapper.NuIotTqElectricitySyncLogMapper; +import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java index c28c7c9..bcc9171 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java @@ -8,12 +8,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.nuIotTqElectricitySyncLog.service.INuIotTqElectricitySyncLogService; +import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.tq.common.entity.TqApiLog; import com.nu.modules.tq.common.service.ITqApiLogService; -import com.nu.modules.tq.electricity.entity.ElectricityMeter; -import com.nu.modules.tq.electricity.service.impl.ElectricityMeterServiceImpl; import com.nu.modules.tq.utils.HttpTool; import com.nu.modules.tq.utils.SignTool; import com.nu.modules.tq.utils.TqApi; 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 99eae71..f7883bc 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 @@ -7,11 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.nuIotTqElectricitySyncLog.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.tq.syncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.yiweilian.humid.entity.HumidDevice; import com.nu.modules.yiweilian.humid.mapper.HumidDeviceMapper; import com.nu.modules.yiweilian.humid.service.IHumidDeviceService; @@ -27,7 +24,6 @@ import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.Map; -import java.util.UUID; @Slf4j @Service