diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java index 79c536a..0f4564d 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java @@ -13,12 +13,14 @@ import com.zsc.edu.gateway.modules.iot.device.vo.DeviceVo; import java.util.List; +/** + * @author zhuang + */ public interface DeviceService extends IService<Device> { Device create(DeviceDto dto); List<Device> batchCreate(BatchDeviceDto dto); - Device update(DeviceDto dto, Long id); IPage<DeviceVo> query(Page<DeviceVo> page, DeviceQuery query); diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/product/dto/ProductDto.java b/src/main/java/com/zsc/edu/gateway/modules/iot/product/dto/ProductDto.java index 4886319..8a16f50 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/product/dto/ProductDto.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/product/dto/ProductDto.java @@ -10,7 +10,6 @@ import lombok.NoArgsConstructor; import jakarta.validation.constraints.NotBlank; import java.util.List; -import java.util.Set; /** * @author Yao @@ -29,7 +28,7 @@ public class ProductDto { /** * 产品分类 */ - public String type; + public String productType; /** * 产品类型 diff --git a/src/main/resources/db/gateway/public/iot_device.sql b/src/main/resources/db/gateway/public/iot_device.sql index a84be39..5338122 100644 --- a/src/main/resources/db/gateway/public/iot_device.sql +++ b/src/main/resources/db/gateway/public/iot_device.sql @@ -1,6 +1,6 @@ create table iot_device ( - id bigserial not null + id serial not null constraint 表_name_pk primary key, name varchar, @@ -17,7 +17,8 @@ create table iot_device create_time timestamp, update_by varchar, update_time timestamp, - remark varchar + remark varchar, + dept_id bigint ); comment on column iot_device.id is '主键'; @@ -54,7 +55,8 @@ comment on column iot_device.update_time is '更新时间'; comment on column iot_device.remark is '备注'; +comment on column iot_device.dept_id is '部门权限id'; + alter table iot_device owner to gitea; -