diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/controller/SyncLogController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/controller/SyncLogController.java similarity index 96% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/controller/SyncLogController.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/controller/SyncLogController.java index 5b06c25..45ae0c5 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/controller/SyncLogController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/controller/SyncLogController.java @@ -1,12 +1,12 @@ -package com.nu.modules.tq.syncLog.controller; +package com.nu.modules.syncLog.controller; import java.util.Arrays; 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 com.nu.modules.tq.syncLog.entity.SyncLog; -import com.nu.modules.tq.syncLog.service.ISyncLogService; +import com.nu.modules.syncLog.entity.SyncLog; +import com.nu.modules.syncLog.service.ISyncLogService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -31,7 +31,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; @Api(tags="同步日志") @RestController //@RequestMapping("/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog") -@RequestMapping("/iot/tq/syncLog") +@RequestMapping("/iot/syncLog") @Slf4j public class SyncLogController extends JeecgController { @Autowired diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/SyncLog.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/entity/SyncLog.java similarity index 94% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/SyncLog.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/entity/SyncLog.java index 9abc026..8189b64 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/SyncLog.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/entity/SyncLog.java @@ -1,4 +1,4 @@ -package com.nu.modules.tq.syncLog.entity; +package com.nu.modules.syncLog.entity; import java.io.Serializable; import java.util.Date; @@ -22,10 +22,10 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("nu_iot_tq_electricity_sync_log") +@TableName("nu_iot_sync_log") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_iot_tq_electricity_sync_log对象", description="同步日志") +@ApiModel(value="nu_iot_sync_log对象", description="同步日志") public class SyncLog implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/SyncLogMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/mapper/SyncLogMapper.java similarity index 71% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/SyncLogMapper.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/mapper/SyncLogMapper.java index 1535ec1..6b8f0af 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/SyncLogMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/mapper/SyncLogMapper.java @@ -1,6 +1,6 @@ -package com.nu.modules.tq.syncLog.mapper; +package com.nu.modules.syncLog.mapper; -import com.nu.modules.tq.syncLog.entity.SyncLog; +import com.nu.modules.syncLog.entity.SyncLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/xml/SyncLogMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/mapper/xml/SyncLogMapper.xml similarity index 69% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/xml/SyncLogMapper.xml rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/mapper/xml/SyncLogMapper.xml index 9d9ad29..bf83712 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/xml/SyncLogMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/mapper/xml/SyncLogMapper.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/tq/syncLog/service/ISyncLogService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/service/ISyncLogService.java similarity index 71% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/ISyncLogService.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/service/ISyncLogService.java index 8b2bb4f..949d66d 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/ISyncLogService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/service/ISyncLogService.java @@ -1,6 +1,6 @@ -package com.nu.modules.tq.syncLog.service; +package com.nu.modules.syncLog.service; -import com.nu.modules.tq.syncLog.entity.SyncLog; +import com.nu.modules.syncLog.entity.SyncLog; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/SyncLogServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/service/impl/SyncLogServiceImpl.java similarity index 61% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/SyncLogServiceImpl.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/service/impl/SyncLogServiceImpl.java index a8218ae..5942b33 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/SyncLogServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/service/impl/SyncLogServiceImpl.java @@ -1,8 +1,8 @@ -package com.nu.modules.tq.syncLog.service.impl; +package com.nu.modules.syncLog.service.impl; -import com.nu.modules.tq.syncLog.entity.SyncLog; -import com.nu.modules.tq.syncLog.mapper.SyncLogMapper; -import com.nu.modules.tq.syncLog.service.ISyncLogService; +import com.nu.modules.syncLog.entity.SyncLog; +import com.nu.modules.syncLog.mapper.SyncLogMapper; +import com.nu.modules.syncLog.service.ISyncLogService; 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 06061d9..9443003 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,8 +8,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.tq.syncLog.entity.SyncLog; -import com.nu.modules.tq.syncLog.service.ISyncLogService; +import com.nu.modules.syncLog.entity.SyncLog; +import com.nu.modules.syncLog.service.ISyncLogService; import com.nu.modules.tq.common.entity.TqApiLog; import com.nu.modules.tq.common.service.ITqApiLogService; import com.nu.modules.tq.utils.HttpTool; 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 335b49d..ec27088 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,8 +8,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.tq.syncLog.entity.SyncLog; -import com.nu.modules.tq.syncLog.service.ISyncLogService; +import com.nu.modules.syncLog.entity.SyncLog; +import com.nu.modules.syncLog.service.ISyncLogService; import com.nu.modules.tq.common.entity.TqApiLog; import com.nu.modules.tq.common.service.ITqApiLogService; import com.nu.modules.tq.utils.HttpTool; 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 34aa7bb..6785a7e 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 @@ -8,8 +8,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.tq.syncLog.entity.SyncLog; -import com.nu.modules.tq.syncLog.service.ISyncLogService; +import com.nu.modules.syncLog.entity.SyncLog; +import com.nu.modules.syncLog.service.ISyncLogService; import com.nu.modules.yiweilian.humid.entity.HumidDevice; import com.nu.modules.yiweilian.humid.mapper.HumidDeviceMapper; import com.nu.modules.yiweilian.humid.service.IHumidDeviceService;