zcy
/
iotkit-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:pr修改

V0.5.x
xiwa 2023-07-06 23:53:12 +08:00
parent d1345b03c1
commit e6104c6e8b
7 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenant.java
View File

@ -1,7 +1,6 @@
package cc.iotkit.data.model; package cc.iotkit.data.model;
import cc.iotkit.common.constant.UserConstants; import cc.iotkit.common.constant.UserConstants;
import cc.iotkit.data.model.BaseEntity;
import cc.iotkit.model.system.SysTenant; import cc.iotkit.model.system.SysTenant;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

1
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenantPackage.java
View File

@ -1,7 +1,6 @@
package cc.iotkit.data.model; package cc.iotkit.data.model;
import cc.iotkit.common.constant.UserConstants; import cc.iotkit.common.constant.UserConstants;
import cc.iotkit.data.model.BaseEntity;
import cc.iotkit.model.system.SysTenantPackage; import cc.iotkit.model.system.SysTenantPackage;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

1
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUser.java
View File

@ -8,7 +8,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.GenericGenerator;
import org.springframework.boot.context.properties.bind.DefaultValue;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;

1
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDeviceMapping.java
View File

@ -9,7 +9,6 @@
*/ */
package cc.iotkit.data.model; package cc.iotkit.data.model;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;

6
iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/impl/ScreenServiceImpl.java
View File

@ -149,16 +149,16 @@ public class ScreenServiceImpl implements IScreenService {
@Override @Override
public void publishStatusChange(PublishChangeBo data) { public void publishStatusChange(PublishChangeBo data) {
Screen screen = getAndCheckBigScreen(data.getId()); Screen screen = getAndCheckBigScreen(data.getId());
if (screen.STATE_RUNNING.equals(data.getState())) {//发布状态 if (Screen.STATE_RUNNING.equals(data.getState())) {//发布状态
List<ScreenApi> screenApis=screenApiData.findByScreenId(screen.getId()); List<ScreenApi> screenApis=screenApiData.findByScreenId(screen.getId());
if(screenApis==null||screenApis.size()==0){ if(screenApis==null||screenApis.size()==0){
throw new BizException(ErrCode.API_LIST_BLANK); throw new BizException(ErrCode.API_LIST_BLANK);
} }
screen.setState(screen.STATE_RUNNING); screen.setState(Screen.STATE_RUNNING);
screenManager.register(screen); screenManager.register(screen);
screenManager.publish(screen); screenManager.publish(screen);
} else {//取消发布 } else {//取消发布
screen.setState(screen.STATE_STOPPED); screen.setState(Screen.STATE_STOPPED);
screenManager.unPublish(screen); screenManager.unPublish(screen);
} }
screenData.save(screen); screenData.save(screen);

2
iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserBo.java
View File

@ -67,7 +67,7 @@ public class SysUserBo extends BaseDto {
/** /**
* 手机号码 * 手机号码
*/ */
private String phoneNumber; private String phonenumber;
/** /**
* 用户性别（0男 1女 2未知） * 用户性别（0男 1女 2未知）

2
iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserProfileBo.java
View File

@ -39,7 +39,7 @@ public class SysUserProfileBo extends BaseDto {
/** /**
* 手机号码 * 手机号码
*/ */
private String phoneNumber; private String phonenumber;
/** /**
* 用户性别（0男 1女 2未知） * 用户性别（0男 1女 2未知）