drone-common/pom.xml
@@ -16,10 +16,6 @@ <dependencies> <dependency> <groupId>org.springblade</groupId> <artifactId>blade-core-boot</artifactId> </dependency> <dependency> <groupId>org.springblade</groupId> <artifactId>blade-core-launch</artifactId> </dependency> <dependency> drone-gateway/pom.xml
@@ -37,14 +37,6 @@ <groupId>org.springblade</groupId> <artifactId>blade-core-launch</artifactId> </exclusion> <exclusion> <groupId>org.springblade</groupId> <artifactId>blade-core-boot</artifactId> </exclusion> <exclusion> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> </exclusion> </exclusions> </dependency> <dependency> drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
@@ -33,8 +33,8 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.*; import org.sxkj.common.model.GenericConverter; import org.sxkj.common.param.DetailParam; import org.sxkj.fw.device.param.GenericConverter; import org.sxkj.fw.device.param.DetailParam; import org.sxkj.fw.device.dto.FwDeviceDTO; import org.sxkj.fw.device.entity.FwDeviceEntity; import org.sxkj.fw.device.excel.FwDeviceExcel; drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceTrackController.java
@@ -33,8 +33,8 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.*; import org.sxkj.common.model.GenericConverter; import org.sxkj.common.param.DetailParam; import org.sxkj.fw.device.param.GenericConverter; import org.sxkj.fw.device.param.DetailParam; import org.sxkj.fw.device.dto.FwDeviceTrackDTO; import org.sxkj.fw.device.entity.FwDeviceTrackEntity; import org.sxkj.fw.device.excel.FwDeviceTrackExcel; drone-service/drone-fw/src/main/java/org/sxkj/fw/device/param/DetailParam.java
File was renamed from drone-common/src/main/java/org/sxkj/common/param/DetailParam.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ package org.sxkj.common.param; package org.sxkj.fw.device.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; drone-service/drone-fw/src/main/java/org/sxkj/fw/device/param/GenericConverter.java
File was renamed from drone-common/src/main/java/org/sxkj/common/model/GenericConverter.java @@ -1,4 +1,4 @@ package org.sxkj.common.model; package org.sxkj.fw.device.param; import org.springblade.core.tool.utils.BeanUtil;