作者 钟来

初始提交

正在显示 49 个修改的文件 包含 194 行增加17 行删除
... ... @@ -44,7 +44,10 @@ public class IotTerminalController extends BaseController
public TableDataInfo list(IotTerminal iotTerminal)
{
startPage();
List<IotTerminal> list = iotTerminalService.selectIotTerminalList(iotTerminal);
UserTerminalGroupRelation userTerminalGroupRelation = new UserTerminalGroupRelation();
userTerminalGroupRelation.setUser_info_id(getUserId().intValue());
iotTerminal.setUserTerminalGroupRelation(userTerminalGroupRelation);
List<IotTerminal> list = iotTerminalService.selectIotTerminalListByUserId(iotTerminal);
return getDataTable(list);
}
... ...
package com.ruoyi.system.domain;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import io.swagger.annotations.ApiModel;
... ... @@ -16,6 +17,7 @@ import java.io.Serializable;
@ApiModel("主机/网关")
public class IotDevice implements Serializable
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 激活时间 */
... ...
package com.ruoyi.system.domain;
import com.ruoyi.system.domain.tool.BaseEntity;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import io.swagger.annotations.ApiModel;
... ... @@ -17,6 +18,7 @@ import java.io.Serializable;
@ApiModel("topic权限控制")
public class IotPermission implements Serializable
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 动作(PUBLISH,SUBSCRIBE,ALL) */
... ...
package com.ruoyi.system.domain;
import com.ruoyi.system.domain.tool.BaseEntity;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import io.swagger.annotations.ApiModel;
... ... @@ -17,6 +18,7 @@ import java.io.Serializable;
@ApiModel("产品")
public class IotProduct implements Serializable
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 创建时间 */
... ...
package com.ruoyi.system.domain;
import com.ruoyi.system.domain.tool.BaseEntity;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
... ... @@ -15,6 +16,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
@ApiModel("产品指标翻译")
public class IotProductTranslate extends BaseEntity
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 创建时间 */
... ...
package com.ruoyi.system.domain;
import com.ruoyi.system.domain.tool.BaseEntity;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import io.swagger.annotations.ApiModel;
... ... @@ -17,6 +18,7 @@ import java.io.Serializable;
@ApiModel("公司")
public class IotRole implements Serializable
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 创建时间 */
... ...
package com.ruoyi.system.domain;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import io.swagger.annotations.ApiModel;
... ... @@ -16,6 +17,7 @@ import java.io.Serializable;
@ApiModel("终端")
public class IotTerminal implements Serializable
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 网关id */
... ... @@ -49,6 +51,26 @@ public class IotTerminal implements Serializable
@ApiModelProperty("数据更新时间")
private Integer data_update_time;
private UserTerminalGroupRelation userTerminalGroupRelation;
private IotDevice iotDevice;
public IotDevice getIotDevice() {
return iotDevice;
}
public void setIotDevice(IotDevice iotDevice) {
this.iotDevice = iotDevice;
}
public UserTerminalGroupRelation getUserTerminalGroupRelation() {
return userTerminalGroupRelation;
}
public void setUserTerminalGroupRelation(UserTerminalGroupRelation userTerminalGroupRelation) {
this.userTerminalGroupRelation = userTerminalGroupRelation;
}
public Integer getData_update_time() {
return data_update_time;
}
... ...
package com.ruoyi.system.domain;
import com.ruoyi.system.domain.tool.BaseEntity;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import io.swagger.annotations.ApiModel;
... ... @@ -17,6 +18,7 @@ import java.io.Serializable;
@ApiModel("物模型模板")
public class IotThingsModel implements Serializable
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 创建者 */
... ...
package com.ruoyi.system.domain;
import com.ruoyi.system.domain.tool.BaseEntity;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
... ... @@ -15,6 +16,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
@ApiModel("物模型模板")
public class IotThingsModelTemplate extends BaseEntity
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 归属(0主键,1终端) */
... ...
... ... @@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
import com.ruoyi.system.domain.tool.BaseEntity;
import com.ruoyi.system.domain.tool.Excel;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
... ... @@ -18,6 +19,7 @@ import javax.validation.constraints.Size;
@ApiModel(value = "SysConfig", description = "参数配置表")
public class SysConfig extends BaseEntity
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 参数主键 */
... ...
... ... @@ -3,6 +3,7 @@ package com.ruoyi.system.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.system.domain.tool.BaseEntity;
import com.ruoyi.system.domain.tool.Excel;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import java.util.Date;
... ... @@ -13,6 +14,7 @@ import java.util.Date;
*/
public class SysLogininfor extends BaseEntity
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** ID */
... ...
package com.ruoyi.system.domain;
import com.ruoyi.system.domain.tool.BaseEntity;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import com.ruoyi.system.domain.tool.Xss;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
... ... @@ -18,6 +19,7 @@ import javax.validation.constraints.Size;
@ApiModel(value = "SysNotice", description = "通知公告表")
public class SysNotice extends BaseEntity
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 公告ID */
... ...
... ... @@ -3,6 +3,7 @@ package com.ruoyi.system.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.system.domain.tool.BaseEntity;
import com.ruoyi.system.domain.tool.Excel;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
... ... @@ -16,6 +17,7 @@ import java.util.Date;
@ApiModel(value = "SysOperLog", description = "操作日志记录表")
public class SysOperLog extends BaseEntity
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 日志主键 */
... ...
... ... @@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
import com.ruoyi.system.domain.tool.BaseEntity;
import com.ruoyi.system.domain.tool.Excel;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
... ... @@ -18,6 +19,7 @@ import javax.validation.constraints.Size;
@ApiModel(value = "SysPost", description = "岗位表")
public class SysPost extends BaseEntity
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 岗位序号 */
... ... @@ -113,7 +115,7 @@ public class SysPost extends BaseEntity
{
this.flag = flag;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
... ...
package com.ruoyi.system.domain;
import com.ruoyi.system.domain.tool.BaseEntity;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
... ... @@ -15,6 +16,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
@ApiModel("终端分组")
public class UserTerminalGroup extends BaseEntity
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 创建时间 */
... ...
package com.ruoyi.system.domain;
import com.ruoyi.system.domain.tool.BaseEntity;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
... ... @@ -15,6 +16,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
@ApiModel("终端分组关系")
public class UserTerminalGroupRelation extends BaseEntity
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 创建时间 */
... ...
package com.ruoyi.system.domain.entity;
import com.ruoyi.system.domain.tool.BaseEntity;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
... ... @@ -17,6 +18,7 @@ import java.util.List;
*/
public class SysDept extends BaseEntity
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 部门ID */
... ...
package com.ruoyi.system.domain.entity;
import com.ruoyi.system.domain.tool.BaseEntity;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
... ... @@ -17,6 +18,7 @@ import java.util.List;
*/
public class SysMenu extends BaseEntity
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 菜单ID */
... ...
... ... @@ -15,6 +15,7 @@ import java.util.Map;
*/
public class BaseEntity implements Serializable
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 搜索值 */
... ...
package com.ruoyi.system.dto;
package com.ruoyi.system.domain.tool;
import java.lang.annotation.ElementType;
... ...
package com.ruoyi.common.core.page;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import java.io.Serializable;
import java.util.List;
... ... @@ -10,6 +12,7 @@ import java.util.List;
*/
public class TableDataInfo implements Serializable
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 总记录数 */
... ...
package com.ruoyi.common.exception;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
/**
* 演示模式异常
*
... ... @@ -7,6 +9,7 @@ package com.ruoyi.common.exception;
*/
public class DemoModeException extends RuntimeException
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
public DemoModeException()
... ...
package com.ruoyi.common.exception;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
/**
* 全局异常
*
... ... @@ -7,7 +9,7 @@ package com.ruoyi.common.exception;
*/
public class GlobalException extends RuntimeException
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/**
... ...
package com.ruoyi.common.exception;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
/**
* 业务异常
*
... ... @@ -7,6 +9,7 @@ package com.ruoyi.common.exception;
*/
public final class ServiceException extends RuntimeException
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/**
... ...
... ... @@ -2,6 +2,7 @@ package com.ruoyi.common.exception.base;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
/**
* 基础异常
... ... @@ -10,6 +11,7 @@ import com.ruoyi.common.utils.StringUtils;
*/
public class BaseException extends RuntimeException
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/**
... ...
package com.ruoyi.common.exception.file;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
/**
* 文件信息异常类
... ... @@ -9,6 +10,7 @@ import com.ruoyi.common.exception.base.BaseException;
*/
public class FileException extends BaseException
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
public FileException(String code, Object[] args)
... ...
package com.ruoyi.common.exception.file;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
/**
* 文件名称超长限制异常类
*
... ... @@ -7,6 +9,7 @@ package com.ruoyi.common.exception.file;
*/
public class FileNameLengthLimitExceededException extends FileException
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
public FileNameLengthLimitExceededException(int defaultFileNameLength)
... ...
package com.ruoyi.common.exception.file;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
/**
* 文件名大小限制异常类
*
... ... @@ -7,6 +9,7 @@ package com.ruoyi.common.exception.file;
*/
public class FileSizeLimitExceededException extends FileException
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
public FileSizeLimitExceededException(long defaultMaxSize)
... ...
package com.ruoyi.common.exception.file; import org.apache.commons.fileupload.FileUploadException; import java.util.Arrays; /** * 文件上传 误异常类 * * @author ruoyi */public class InvalidExtensionException extends FileUploadException{ private static final long serialVersionUID = 1L; private String[] allowedExtension; private String extension; private String filename; public InvalidExtensionException(String[] allowedExtension, String extension, String filename) { super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]"); this.allowedExtension = allowedExtension; this.extension = extension; this.filename = filename; } public String[] getAllowedExtension() { return allowedExtension; } public String getExtension() { return extension; } public String getFilename() { return filename; } public static class InvalidImageExtensionException extends InvalidExtensionException { private static final long serialVersionUID = 1L; public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); } } public static class InvalidFlashExtensionException extends InvalidExtensionException { private static final long serialVersionUID = 1L; public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); } } public static class InvalidMediaExtensionException extends InvalidExtensionException { private static final long serialVersionUID = 1L; public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); } } public static class InvalidVideoExtensionException extends InvalidExtensionException { private static final long serialVersionUID = 1L; public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); } }}
\ No newline at end of file
package com.ruoyi.common.exception.file; import com.ruoyi.system.domain.tool.PublicSQLConfig;import org.apache.commons.fileupload.FileUploadException; import java.util.Arrays; /** * 文件上传 误异常类 * * @author ruoyi */public class InvalidExtensionException extends FileUploadException{ @PublicSQLConfig(isSelect=false) private static final long serialVersionUID = 1L; private String[] allowedExtension; private String extension; private String filename; public InvalidExtensionException(String[] allowedExtension, String extension, String filename) { super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]"); this.allowedExtension = allowedExtension; this.extension = extension; this.filename = filename; } public String[] getAllowedExtension() { return allowedExtension; } public String getExtension() { return extension; } public String getFilename() { return filename; } public static class InvalidImageExtensionException extends InvalidExtensionException { @PublicSQLConfig(isSelect=false) private static final long serialVersionUID = 1L; public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); } } public static class InvalidFlashExtensionException extends InvalidExtensionException { @PublicSQLConfig(isSelect=false) private static final long serialVersionUID = 1L; public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); } } public static class InvalidMediaExtensionException extends InvalidExtensionException { @PublicSQLConfig(isSelect=false) private static final long serialVersionUID = 1L; public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); } } public static class InvalidVideoExtensionException extends InvalidExtensionException { @PublicSQLConfig(isSelect=false) private static final long serialVersionUID = 1L; public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); } }}
\ No newline at end of file
... ...
package com.ruoyi.common.exception.user;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
/**
* 验证码错误异常类
*
... ... @@ -7,6 +9,7 @@ package com.ruoyi.common.exception.user;
*/
public class CaptchaException extends UserException
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
public CaptchaException()
... ...
package com.ruoyi.common.exception.user;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
/**
* 验证码失效异常类
*
... ... @@ -7,6 +9,7 @@ package com.ruoyi.common.exception.user;
*/
public class CaptchaExpireException extends UserException
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
public CaptchaExpireException()
... ...
package com.ruoyi.common.exception.user;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
/**
* 用户信息异常类
... ... @@ -9,6 +10,7 @@ import com.ruoyi.common.exception.base.BaseException;
*/
public class UserException extends BaseException
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
public UserException(String code, Object[] args)
... ...
package com.ruoyi.common.exception.user;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
/**
* 用户密码不正确或不符合规范异常类
*
... ... @@ -7,6 +9,7 @@ package com.ruoyi.common.exception.user;
*/
public class UserPasswordNotMatchException extends UserException
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
public UserPasswordNotMatchException()
... ...
... ... @@ -26,11 +26,6 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
private Class<T> clazz;
static
{
ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
}
public FastJson2JsonRedisSerializer(Class<T> clazz)
{
super();
... ...
package com.ruoyi.framework.config;
import com.alibaba.fastjson.parser.ParserConfig;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.PropertyAccessor;
... ... @@ -30,6 +31,8 @@ public class RedisConfig extends CachingConfigurerSupport
RedisTemplate<Object, Object> template = new RedisTemplate<>();
template.setConnectionFactory(connectionFactory);
//配置
ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class);
ObjectMapper mapper = new ObjectMapper();
... ...
... ... @@ -3,6 +3,8 @@ package com.ruoyi.generator.domain;
import java.util.List;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import org.apache.commons.lang3.ArrayUtils;
import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.system.domain.tool.BaseEntity;
... ... @@ -15,6 +17,7 @@ import com.ruoyi.common.utils.StringUtils;
*/
public class GenTable extends BaseEntity
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 编号 */
... ...
... ... @@ -3,6 +3,7 @@ package com.ruoyi.generator.domain;
import javax.validation.constraints.NotBlank;
import com.ruoyi.system.domain.tool.BaseEntity;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
/**
* 代码生成业务字段表 gen_table_column
... ... @@ -11,6 +12,7 @@ import com.ruoyi.common.utils.StringUtils;
*/
public class GenTableColumn extends BaseEntity
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/** 编号 */
... ...
... ... @@ -9,6 +9,7 @@ import com.ruoyi.common.annotation.Excel;
#end
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
/**
* ${functionName}对象 ${tableName}
... ... @@ -24,6 +25,7 @@ import io.swagger.annotations.ApiModelProperty;
#end
public class ${ClassName} extends ${Entity}
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
#foreach ($column in $columns)
... ...
... ... @@ -4,6 +4,7 @@ package ${packageName}.domain;
import ${import};
#end
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
/**
* ${subTable.functionName}对象 ${subTableName}
... ... @@ -13,6 +14,7 @@ import com.ruoyi.common.annotation.Excel;
*/
public class ${subClassName} extends BaseEntity
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
#foreach ($column in $subTable.columns)
... ...
package com.ruoyi.system.dto;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import org.apache.commons.lang3.StringUtils;
import java.lang.reflect.Field;
... ... @@ -12,7 +13,7 @@ import java.util.Map;
public class PublicSQL {
private String changTableNameFromObject(Object object)
{
return com.ruoyi.common.utils.StringUtils.toUnderScoreCase(object.getClass().getName());
return com.ruoyi.common.utils.StringUtils.toUnderScoreCase(object.getClass().getSimpleName());
}
... ... @@ -751,9 +752,9 @@ public class PublicSQL {
return para.get("sql")+"";
}
public String updateBySql(Map<String, Object> para)
public String updateBySql(String sql)
{
return para.get("sql")+"";
return sql;
}
public static String escapeSql(String str) {
... ...
... ... @@ -13,6 +13,11 @@ public class ApiLoginUser extends BaseLoginUser {
private Yu2leUserInfo yu2leUserInfo;
private Yu2leUserLogin yu2leUserLogin;
public ApiLoginUser()
{
}
public ApiLoginUser(Yu2leUserInfo yu2leUserInfo,Yu2leUserLogin yu2leUserLogin) {
this.yu2leUserLogin = yu2leUserLogin;
this.yu2leUserInfo = yu2leUserInfo;
... ...
... ... @@ -3,6 +3,7 @@ package com.ruoyi.system.login.dto;
import com.alibaba.fastjson.annotation.JSONField;
import com.ruoyi.common.core.domain.BaseLoginUser;
import com.ruoyi.system.domain.entity.SysUser;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import com.ruoyi.system.domain.tool.SysLogininforType;
import org.springframework.security.core.GrantedAuthority;
... ... @@ -16,6 +17,7 @@ import java.util.Set;
*/
public class SysLoginUser extends BaseLoginUser
{
@PublicSQLConfig(isSelect=false)
private static final long serialVersionUID = 1L;
/**
... ...
package com.ruoyi.system.login.dto;
import com.ruoyi.system.dto.PublicSQLConfig;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import java.io.Serializable;
... ...
package com.ruoyi.system.login.dto;
import com.ruoyi.system.dto.PublicSQLConfig;
import com.ruoyi.system.domain.tool.PublicSQLConfig;
import java.io.Serializable;
... ...
... ... @@ -75,6 +75,7 @@ public class TokenService
}
catch (Exception e)
{
System.err.println(e);
}
}
return null;
... ...
... ... @@ -28,7 +28,7 @@ public interface IotTerminalMapper
* @return null集合
*/
public List<IotTerminal> selectIotTerminalList(IotTerminal iotTerminal);
List<IotTerminal>selectIotTerminalListByUserId(IotTerminal iotTerminal);
/**
* 新增null
*
... ...
... ... @@ -30,6 +30,7 @@ public interface IIotTerminalService
*/
public List<IotTerminal> selectIotTerminalList(IotTerminal iotTerminal);
List<IotTerminal> selectIotTerminalListByUserId(IotTerminal iotTerminal);
/**
* 新增null
*
... ...
... ... @@ -55,6 +55,11 @@ public class IotTerminalServiceImpl implements IIotTerminalService
return iotTerminalMapper.selectIotTerminalList(iotTerminal);
}
@Override
public List<IotTerminal> selectIotTerminalListByUserId(IotTerminal iotTerminal) {
return iotTerminalMapper.selectIotTerminalListByUserId(iotTerminal);
}
/**
* 新增null
*
... ...
... ... @@ -14,6 +14,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="product_id" column="product_id" />
<result property="mqtt_username" column="mqtt_username" />
<result property="data_update_time" column="data_update_time" />
<association property="userTerminalGroupRelation" column="id" javaType="UserTerminalGroupRelation" resultMap="userTerminalGroupRelationResult" />
<association property="iotDevice" column="device_id" javaType="IotDevice" resultMap="iotDeviceResult" />
</resultMap>
<resultMap type="UserTerminalGroupRelation" id="userTerminalGroupRelationResult">
<result property="create_time" column="create_time" />
<result property="iot_terminal_group_id" column="iot_terminal_group_id" />
<result property="iot_terminal_group_name" column="iot_terminal_group_name" />
<result property="iot_terminal_id" column="iot_terminal_id" />
<result property="user_info_id" column="user_info_id" />
</resultMap>
<resultMap type="IotDevice" id="iotDeviceResult">
<result property="active_time" column="active_time" />
<result property="client_id" column="client_id" />
<result property="completion_auth" column="completion_auth" />
<result property="create_by" column="create_by" />
<result property="create_time" column="create_time" />
<result property="del_flag" column="del_flag" />
<result property="firmware_version" column="firmware_version" />
<result property="img_url" column="img_url" />
<result property="is_shadow" column="is_shadow" />
<result property="latitude" column="latitude" />
<result property="location_way" column="location_way" />
<result property="longitude" column="longitude" />
<result property="name" column="name" />
<result property="network_address" column="network_address" />
<result property="network_ip" column="network_ip" />
<result property="remark" column="remark" />
<result property="rssi" column="rssi" />
<result property="status" column="status" />
<result property="summary" column="summary" />
<result property="things_model_value" column="things_model_value" />
<result property="update_by" column="update_by" />
<result property="update_time" column="update_time" />
<result property="product_id" column="product_id" />
<result property="mqtt_username" column="mqtt_username" />
<result property="payload_type" column="payload_type" />
<result property="things_model_config" column="things_model_config" />
<result property="listen_service_ip" column="listen_service_ip" />
<result property="device_life" column="device_life" />
<result property="data_update_time" column="data_update_time" />
</resultMap>
<sql id="selectIotTerminalVo">
... ... @@ -37,6 +80,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
</where>
</select>
<select id="selectIotTerminalListByUserId" parameterType="IotTerminal" resultMap="IotTerminalResult">
SELECT a.*,b.*,c.* FROM `iot_terminal` a LEFT JOIN `user_terminal_group_relation` b ON a.`id`=b.`iot_terminal_id` LEFT JOIN `iot_device` c ON c.client_id=a.`device_id`
<where>
<if test="device_id !=null and device_id != ''">
and a.device_id = #{device_id}
</if>
<if test="name != null and name != ''">
AND (a.`name` like concat('%', #{name}, '%') or a.`id` like concat('%', #{name}, '%') or a.device_id like concat('%', #{name}, '%'))
</if>
<if test="id != null and id != ''">
AND a.`id` like concat('%', #{id}, '%')
</if>
<if test="product_id !=null and product_id != ''">
and a.product_id = #{product_id}
</if>
<if test="mqtt_username != null and mqtt_username != ''">
AND a.`mqtt_username` = #{mqtt_username}
</if>
and b.user_info_id = #{userTerminalGroupRelation.user_info_id}
</where>
</select>
<select id="selectIotTerminalById" parameterType="String" resultMap="IotTerminalResult">
<include refid="selectIotTerminalVo"/>
... ... @@ -99,7 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<select id="selectNotUserIotTerminalListByImei" parameterType="String" resultMap="IotTerminalResult">
SELECT a.* FROM `iot_terminal` a LEFT JOIN `user_terminal_group_relation` b ON a.`id`=b.`iot_terminal_id` WHERE b.user_info_id is not null AND a.`device_id`= #{device_id}
SELECT a.* FROM `iot_terminal` a LEFT JOIN `user_terminal_group_relation` b ON a.`id`=b.`iot_terminal_id` WHERE b.user_info_id is null AND a.`device_id`= #{device_id}
</select>
</mapper>
\ No newline at end of file
... ...