diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenant.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenant.java index e585f9f2..a839ee77 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenant.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenant.java @@ -1,7 +1,6 @@ package cc.iotkit.data.model; import cc.iotkit.common.constant.UserConstants; -import cc.iotkit.data.model.BaseEntity; import cc.iotkit.model.system.SysTenant; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModelProperty; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenantPackage.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenantPackage.java index fa4072b0..2e67fc97 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenantPackage.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenantPackage.java @@ -1,7 +1,6 @@ package cc.iotkit.data.model; import cc.iotkit.common.constant.UserConstants; -import cc.iotkit.data.model.BaseEntity; import cc.iotkit.model.system.SysTenantPackage; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModelProperty; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUser.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUser.java index b3a77f75..b2d79dc2 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUser.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUser.java @@ -8,7 +8,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.hibernate.annotations.GenericGenerator; -import org.springframework.boot.context.properties.bind.DefaultValue; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDeviceMapping.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDeviceMapping.java index fecd7c2f..323ec22f 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDeviceMapping.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDeviceMapping.java @@ -9,7 +9,6 @@ */ package cc.iotkit.data.model; -import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/impl/ScreenServiceImpl.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/impl/ScreenServiceImpl.java index 546430a8..812d761b 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/impl/ScreenServiceImpl.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/impl/ScreenServiceImpl.java @@ -149,16 +149,16 @@ public class ScreenServiceImpl implements IScreenService { @Override public void publishStatusChange(PublishChangeBo data) { Screen screen = getAndCheckBigScreen(data.getId()); - if (screen.STATE_RUNNING.equals(data.getState())) {//发布状态 + if (Screen.STATE_RUNNING.equals(data.getState())) {//发布状态 List screenApis=screenApiData.findByScreenId(screen.getId()); if(screenApis==null||screenApis.size()==0){ throw new BizException(ErrCode.API_LIST_BLANK); } - screen.setState(screen.STATE_RUNNING); + screen.setState(Screen.STATE_RUNNING); screenManager.register(screen); screenManager.publish(screen); } else {//取消发布 - screen.setState(screen.STATE_STOPPED); + screen.setState(Screen.STATE_STOPPED); screenManager.unPublish(screen); } screenData.save(screen); diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserBo.java index 1f438117..e2043dcd 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserBo.java @@ -67,7 +67,7 @@ public class SysUserBo extends BaseDto { /** * 手机号码 */ - private String phoneNumber; + private String phonenumber; /** * 用户性别(0男 1女 2未知) diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserProfileBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserProfileBo.java index f673d354..2fa270dd 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserProfileBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserProfileBo.java @@ -39,7 +39,7 @@ public class SysUserProfileBo extends BaseDto { /** * 手机号码 */ - private String phoneNumber; + private String phonenumber; /** * 用户性别(0男 1女 2未知)