#update
This commit is contained in:
@@ -2,8 +2,8 @@ package com.maibu;
|
||||
|
||||
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
|
||||
import com.dtflys.forest.springboot.annotation.ForestScan;
|
||||
import com.fastbee.netty.NettyServer;
|
||||
import com.fastbee.websocket.WebsocketHandler;
|
||||
import com.maibu.netty.NettyServer;
|
||||
import com.maibu.websocket.WebsocketHandler;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.context.ConfigurableApplicationContext;
|
||||
|
||||
@@ -1,18 +1,16 @@
|
||||
package com.fastbee;
|
||||
package com.maibu;
|
||||
|
||||
import org.springframework.boot.builder.SpringApplicationBuilder;
|
||||
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
|
||||
|
||||
/**
|
||||
* web容器中进行部署
|
||||
*
|
||||
*
|
||||
* @author ruoyi
|
||||
*/
|
||||
public class FastBeeServletInitializer extends SpringBootServletInitializer
|
||||
{
|
||||
public class MiddlePlatformServletInitializer extends SpringBootServletInitializer {
|
||||
@Override
|
||||
protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
|
||||
{
|
||||
return application.sources(FastBeeApplication.class);
|
||||
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
|
||||
return application.sources(MiddlePlatformApplication.class);
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.fastbee.web.controller.common;
|
||||
package com.maibu.web.controller.common;
|
||||
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.io.IOException;
|
||||
@@ -7,6 +7,14 @@ import javax.annotation.Resource;
|
||||
import javax.imageio.ImageIO;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.maibu.config.RuoYiConfig;
|
||||
import com.maibu.constant.CacheConstants;
|
||||
import com.maibu.constant.Constants;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.redis.RedisCache;
|
||||
import com.maibu.service.ISysConfigService;
|
||||
import com.maibu.utils.sign.Base64;
|
||||
import com.maibu.utils.uuid.IdUtils;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -14,14 +22,6 @@ import org.springframework.util.FastByteArrayOutputStream;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.google.code.kaptcha.Producer;
|
||||
import com.fastbee.common.config.RuoYiConfig;
|
||||
import com.fastbee.common.constant.CacheConstants;
|
||||
import com.fastbee.common.constant.Constants;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.core.redis.RedisCache;
|
||||
import com.fastbee.common.utils.sign.Base64;
|
||||
import com.fastbee.common.utils.uuid.IdUtils;
|
||||
import com.fastbee.system.service.ISysConfigService;
|
||||
|
||||
/**
|
||||
* 验证码操作处理
|
||||
@@ -48,7 +48,7 @@ public class CaptchaController
|
||||
*/
|
||||
@ApiOperation("获取验证码")
|
||||
@GetMapping("/captchaImage")
|
||||
public AjaxResult getCode(HttpServletResponse response,Boolean showCode) throws IOException
|
||||
public AjaxResult getCode(HttpServletResponse response, Boolean showCode) throws IOException
|
||||
{
|
||||
AjaxResult ajax = AjaxResult.success();
|
||||
boolean captchaEnabled = configService.selectCaptchaEnabled();
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.fastbee.web.controller.common;
|
||||
package com.maibu.web.controller.common;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
@@ -7,10 +7,17 @@ import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.fastbee.common.utils.MessageUtils;
|
||||
import com.fastbee.common.utils.file.QRCodeUtils;
|
||||
import com.google.zxing.client.j2se.MatrixToImageWriter;
|
||||
import com.google.zxing.common.BitMatrix;
|
||||
import com.maibu.config.RuoYiConfig;
|
||||
import com.maibu.config.ServerConfig;
|
||||
import com.maibu.constant.Constants;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.utils.MessageUtils;
|
||||
import com.maibu.utils.StringUtils;
|
||||
import com.maibu.utils.file.FileUploadUtils;
|
||||
import com.maibu.utils.file.FileUtils;
|
||||
import com.maibu.utils.file.QRCodeUtils;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.slf4j.Logger;
|
||||
@@ -22,13 +29,6 @@ import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import com.fastbee.common.config.RuoYiConfig;
|
||||
import com.fastbee.common.constant.Constants;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.utils.StringUtils;
|
||||
import com.fastbee.common.utils.file.FileUploadUtils;
|
||||
import com.fastbee.common.utils.file.FileUtils;
|
||||
import com.fastbee.framework.config.ServerConfig;
|
||||
|
||||
/**
|
||||
* 通用请求处理
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.fastbee.web.controller.monitor;
|
||||
package com.maibu.web.controller.monitor;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
@@ -8,6 +8,10 @@ import java.util.Map;
|
||||
import java.util.Properties;
|
||||
import java.util.Set;
|
||||
|
||||
import com.maibu.constant.CacheConstants;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.domain.SysCache;
|
||||
import com.maibu.utils.StringUtils;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -19,10 +23,6 @@ import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.fastbee.common.constant.CacheConstants;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.utils.StringUtils;
|
||||
import com.fastbee.system.domain.SysCache;
|
||||
|
||||
/**
|
||||
* 缓存监控
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
package com.fastbee.web.controller.monitor;
|
||||
package com.maibu.web.controller.monitor;
|
||||
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.web.domain.Server;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.framework.web.domain.Server;
|
||||
|
||||
/**
|
||||
* 服务器监控
|
||||
|
||||
@@ -1,9 +1,17 @@
|
||||
package com.fastbee.web.controller.monitor;
|
||||
package com.maibu.web.controller.monitor;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.maibu.annotation.Log;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.page.TableDataInfo;
|
||||
import com.maibu.domain.SysLogininfor;
|
||||
import com.maibu.enums.BusinessType;
|
||||
import com.maibu.service.ISysLogininforService;
|
||||
import com.maibu.utils.poi.ExcelUtil;
|
||||
import com.maibu.web.service.SysPasswordService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -14,15 +22,6 @@ import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.fastbee.common.annotation.Log;
|
||||
import com.fastbee.common.core.controller.BaseController;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.core.page.TableDataInfo;
|
||||
import com.fastbee.common.enums.BusinessType;
|
||||
import com.fastbee.common.utils.poi.ExcelUtil;
|
||||
import com.fastbee.framework.web.service.SysPasswordService;
|
||||
import com.fastbee.system.domain.SysLogininfor;
|
||||
import com.fastbee.system.service.ISysLogininforService;
|
||||
|
||||
/**
|
||||
* 系统访问记录
|
||||
|
||||
@@ -1,8 +1,16 @@
|
||||
package com.fastbee.web.controller.monitor;
|
||||
package com.maibu.web.controller.monitor;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.maibu.annotation.Log;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.page.TableDataInfo;
|
||||
import com.maibu.domain.SysOperLog;
|
||||
import com.maibu.enums.BusinessType;
|
||||
import com.maibu.service.ISysOperLogService;
|
||||
import com.maibu.utils.poi.ExcelUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -13,14 +21,6 @@ import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.fastbee.common.annotation.Log;
|
||||
import com.fastbee.common.core.controller.BaseController;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.core.page.TableDataInfo;
|
||||
import com.fastbee.common.enums.BusinessType;
|
||||
import com.fastbee.common.utils.poi.ExcelUtil;
|
||||
import com.fastbee.system.domain.SysOperLog;
|
||||
import com.fastbee.system.service.ISysOperLogService;
|
||||
|
||||
/**
|
||||
* 操作日志记录
|
||||
|
||||
@@ -1,10 +1,21 @@
|
||||
package com.fastbee.web.controller.monitor;
|
||||
package com.maibu.web.controller.monitor;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import com.maibu.annotation.Log;
|
||||
import com.maibu.constant.CacheConstants;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.domain.model.LoginUser;
|
||||
import com.maibu.core.page.TableDataInfo;
|
||||
import com.maibu.core.redis.RedisCache;
|
||||
import com.maibu.domain.SysUserOnline;
|
||||
import com.maibu.enums.BusinessType;
|
||||
import com.maibu.service.ISysUserOnlineService;
|
||||
import com.maibu.utils.StringUtils;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -14,17 +25,6 @@ import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.fastbee.common.annotation.Log;
|
||||
import com.fastbee.common.constant.CacheConstants;
|
||||
import com.fastbee.common.core.controller.BaseController;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.core.domain.model.LoginUser;
|
||||
import com.fastbee.common.core.page.TableDataInfo;
|
||||
import com.fastbee.common.core.redis.RedisCache;
|
||||
import com.fastbee.common.enums.BusinessType;
|
||||
import com.fastbee.common.utils.StringUtils;
|
||||
import com.fastbee.system.domain.SysUserOnline;
|
||||
import com.fastbee.system.service.ISysUserOnlineService;
|
||||
|
||||
/**
|
||||
* 在线用户监控
|
||||
|
||||
@@ -1,10 +1,16 @@
|
||||
package com.fastbee.web.controller.system;
|
||||
package com.maibu.web.controller.system;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.fastbee.common.core.domain.entity.SysUser;
|
||||
import com.fastbee.framework.web.service.TokenService;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.domain.entity.SysUser;
|
||||
import com.maibu.core.page.TableDataInfo;
|
||||
import com.maibu.domain.SysClient;
|
||||
import com.maibu.service.ISysClientService;
|
||||
import com.maibu.utils.poi.ExcelUtil;
|
||||
import com.maibu.web.service.TokenService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
@@ -17,14 +23,7 @@ import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.fastbee.common.core.controller.BaseController;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.system.domain.SysClient;
|
||||
import com.fastbee.system.service.ISysClientService;
|
||||
import com.fastbee.common.utils.poi.ExcelUtil;
|
||||
import com.fastbee.common.core.page.TableDataInfo;
|
||||
|
||||
import static com.fastbee.common.utils.SecurityUtils.getLoginUser;
|
||||
import static com.maibu.utils.SecurityUtils.getLoginUser;
|
||||
|
||||
/**
|
||||
* 系统授权Controller
|
||||
|
||||
@@ -1,8 +1,17 @@
|
||||
package com.fastbee.web.controller.system;
|
||||
package com.maibu.web.controller.system;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.maibu.annotation.Log;
|
||||
import com.maibu.constant.UserConstants;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.page.TableDataInfo;
|
||||
import com.maibu.domain.SysConfig;
|
||||
import com.maibu.enums.BusinessType;
|
||||
import com.maibu.service.ISysConfigService;
|
||||
import com.maibu.utils.poi.ExcelUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -16,15 +25,6 @@ import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.fastbee.common.annotation.Log;
|
||||
import com.fastbee.common.constant.UserConstants;
|
||||
import com.fastbee.common.core.controller.BaseController;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.core.page.TableDataInfo;
|
||||
import com.fastbee.common.enums.BusinessType;
|
||||
import com.fastbee.common.utils.poi.ExcelUtil;
|
||||
import com.fastbee.system.domain.SysConfig;
|
||||
import com.fastbee.system.service.ISysConfigService;
|
||||
|
||||
/**
|
||||
* 参数配置 信息操作处理
|
||||
|
||||
@@ -1,28 +1,21 @@
|
||||
package com.fastbee.web.controller.system;
|
||||
package com.maibu.web.controller.system;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.fastbee.common.annotation.Log;
|
||||
import com.fastbee.common.constant.UserConstants;
|
||||
import com.fastbee.common.core.controller.BaseController;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.core.domain.entity.*;
|
||||
import com.fastbee.common.enums.BusinessType;
|
||||
import com.fastbee.common.exception.ServiceException;
|
||||
import com.fastbee.common.utils.StringUtils;
|
||||
import com.fastbee.iot.mapper.DeviceMapper;
|
||||
import com.fastbee.iot.model.RegisterUserInput;
|
||||
import com.fastbee.iot.model.RegisterUserOutput;
|
||||
import com.fastbee.iot.service.IToolService;
|
||||
import com.fastbee.system.domain.SysRoleDept;
|
||||
import com.fastbee.system.domain.SysRoleMenu;
|
||||
import com.fastbee.system.domain.SysUserRole;
|
||||
import com.fastbee.system.domain.vo.SysDeptTypeVO;
|
||||
import com.fastbee.system.mapper.SysRoleDeptMapper;
|
||||
import com.fastbee.system.mapper.SysRoleMenuMapper;
|
||||
import com.fastbee.system.mapper.SysUserRoleMapper;
|
||||
import com.fastbee.common.utils.MessageUtils;
|
||||
|
||||
import com.fastbee.system.service.*;
|
||||
import com.maibu.annotation.Log;
|
||||
import com.maibu.constant.UserConstants;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.domain.entity.*;
|
||||
import com.maibu.domain.vo.SysDeptTypeVO;
|
||||
import com.maibu.enums.BusinessType;
|
||||
import com.maibu.exception.ServiceException;
|
||||
import com.maibu.mapper.DeviceMapper;
|
||||
import com.maibu.mapper.SysRoleDeptMapper;
|
||||
import com.maibu.model.RegisterUserInput;
|
||||
import com.maibu.model.RegisterUserOutput;
|
||||
import com.maibu.service.*;
|
||||
import com.maibu.utils.MessageUtils;
|
||||
import com.maibu.utils.StringUtils;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
@@ -34,14 +27,11 @@ import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import static com.fastbee.common.constant.Constants.LANGUAGE;
|
||||
|
||||
/**
|
||||
* 机构信息
|
||||
|
||||
@@ -1,8 +1,19 @@
|
||||
package com.fastbee.web.controller.system;
|
||||
package com.maibu.web.controller.system;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.maibu.annotation.Log;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.domain.entity.SysDictData;
|
||||
import com.maibu.core.page.TableDataInfo;
|
||||
import com.maibu.enums.BusinessType;
|
||||
import com.maibu.service.ISysDictDataService;
|
||||
import com.maibu.service.ISysDictTypeService;
|
||||
import com.maibu.utils.StringUtils;
|
||||
import com.maibu.utils.poi.ExcelUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
@@ -14,16 +25,6 @@ import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.fastbee.common.annotation.Log;
|
||||
import com.fastbee.common.core.controller.BaseController;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.core.domain.entity.SysDictData;
|
||||
import com.fastbee.common.core.page.TableDataInfo;
|
||||
import com.fastbee.common.enums.BusinessType;
|
||||
import com.fastbee.common.utils.StringUtils;
|
||||
import com.fastbee.common.utils.poi.ExcelUtil;
|
||||
import com.fastbee.system.service.ISysDictDataService;
|
||||
import com.fastbee.system.service.ISysDictTypeService;
|
||||
|
||||
/**
|
||||
* 数据字典信息
|
||||
|
||||
@@ -1,10 +1,19 @@
|
||||
package com.fastbee.web.controller.system;
|
||||
package com.maibu.web.controller.system;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.fastbee.common.utils.MessageUtils;
|
||||
import com.fastbee.common.utils.StringUtils;
|
||||
import com.maibu.annotation.Log;
|
||||
import com.maibu.constant.UserConstants;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.domain.entity.SysDictType;
|
||||
import com.maibu.core.page.TableDataInfo;
|
||||
import com.maibu.enums.BusinessType;
|
||||
import com.maibu.service.ISysDictTypeService;
|
||||
import com.maibu.utils.MessageUtils;
|
||||
import com.maibu.utils.StringUtils;
|
||||
import com.maibu.utils.poi.ExcelUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -18,15 +27,7 @@ import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.fastbee.common.annotation.Log;
|
||||
import com.fastbee.common.constant.UserConstants;
|
||||
import com.fastbee.common.core.controller.BaseController;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.core.domain.entity.SysDictType;
|
||||
import com.fastbee.common.core.page.TableDataInfo;
|
||||
import com.fastbee.common.enums.BusinessType;
|
||||
import com.fastbee.common.utils.poi.ExcelUtil;
|
||||
import com.fastbee.system.service.ISysDictTypeService;
|
||||
|
||||
|
||||
/**
|
||||
* 数据字典信息
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.fastbee.web.controller.system;
|
||||
package com.maibu.web.controller.system;
|
||||
|
||||
import com.fastbee.common.utils.MessageUtils;
|
||||
import com.maibu.config.RuoYiConfig;
|
||||
import com.maibu.utils.MessageUtils;
|
||||
import com.maibu.utils.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.fastbee.common.config.RuoYiConfig;
|
||||
import com.fastbee.common.utils.StringUtils;
|
||||
|
||||
/**
|
||||
* 首页
|
||||
|
||||
@@ -1,26 +1,26 @@
|
||||
package com.fastbee.web.controller.system;
|
||||
package com.maibu.web.controller.system;
|
||||
|
||||
import com.fastbee.common.annotation.Log;
|
||||
import com.fastbee.common.constant.Constants;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.core.domain.entity.SysMenu;
|
||||
import com.fastbee.common.core.domain.entity.SysUser;
|
||||
import com.fastbee.common.core.domain.model.LoginBody;
|
||||
import com.fastbee.common.enums.BusinessType;
|
||||
import com.fastbee.common.enums.SourceType;
|
||||
import com.fastbee.common.utils.SecurityUtils;
|
||||
import com.fastbee.dto.NettyDevice;
|
||||
import com.fastbee.enums.ConnectorStatus;
|
||||
import com.fastbee.framework.web.domain.dto.LoginResultDto;
|
||||
import com.fastbee.framework.web.service.SysLoginService;
|
||||
import com.fastbee.framework.web.service.SysPermissionService;
|
||||
import com.fastbee.manager.DeviceSessionManager;
|
||||
import com.fastbee.system.domain.AppPreferences;
|
||||
import com.fastbee.system.mapper.SysLoginConfigMapper;
|
||||
import com.fastbee.system.service.IAppPreferencesService;
|
||||
import com.fastbee.system.service.ISysMenuService;
|
||||
import com.fastbee.system.service.ISysUserClientService;
|
||||
import com.fastbee.system.service.ISysUserService;
|
||||
import com.maibu.annotation.Log;
|
||||
import com.maibu.constant.Constants;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.domain.entity.SysMenu;
|
||||
import com.maibu.core.domain.entity.SysUser;
|
||||
import com.maibu.core.domain.model.LoginBody;
|
||||
import com.maibu.domain.AppPreferences;
|
||||
import com.maibu.dto.NettyDevice;
|
||||
import com.maibu.enums.BusinessType;
|
||||
import com.maibu.enums.ConnectorStatus;
|
||||
import com.maibu.enums.SourceType;
|
||||
import com.maibu.manager.DeviceSessionManager;
|
||||
import com.maibu.mapper.SysLoginConfigMapper;
|
||||
import com.maibu.service.IAppPreferencesService;
|
||||
import com.maibu.service.ISysMenuService;
|
||||
import com.maibu.service.ISysUserClientService;
|
||||
import com.maibu.service.ISysUserService;
|
||||
import com.maibu.utils.SecurityUtils;
|
||||
import com.maibu.web.domain.dto.LoginResultDto;
|
||||
import com.maibu.web.service.SysLoginService;
|
||||
import com.maibu.web.service.SysPermissionService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
@@ -36,7 +36,8 @@ import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import static com.fastbee.common.constant.Constants.LANGUAGE;
|
||||
import static com.maibu.constant.Constants.LANGUAGE;
|
||||
|
||||
|
||||
/**
|
||||
* 登录验证
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
package com.fastbee.web.controller.system;
|
||||
package com.maibu.web.controller.system;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.fastbee.common.utils.MessageUtils;
|
||||
import com.maibu.annotation.Log;
|
||||
import com.maibu.constant.UserConstants;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.domain.entity.SysMenu;
|
||||
import com.maibu.enums.BusinessType;
|
||||
import com.maibu.service.ISysMenuService;
|
||||
import com.maibu.utils.MessageUtils;
|
||||
import com.maibu.utils.StringUtils;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import com.fastbee.common.annotation.Log;
|
||||
import com.fastbee.common.constant.UserConstants;
|
||||
import com.fastbee.common.core.controller.BaseController;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.core.domain.entity.SysMenu;
|
||||
import com.fastbee.common.enums.BusinessType;
|
||||
import com.fastbee.common.utils.StringUtils;
|
||||
import com.fastbee.system.service.ISysMenuService;
|
||||
|
||||
/**
|
||||
* 菜单信息
|
||||
|
||||
@@ -1,7 +1,14 @@
|
||||
package com.fastbee.web.controller.system;
|
||||
package com.maibu.web.controller.system;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.maibu.annotation.Log;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.page.TableDataInfo;
|
||||
import com.maibu.domain.SysNotice;
|
||||
import com.maibu.enums.BusinessType;
|
||||
import com.maibu.service.ISysNoticeService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -15,13 +22,6 @@ import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.fastbee.common.annotation.Log;
|
||||
import com.fastbee.common.core.controller.BaseController;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.core.page.TableDataInfo;
|
||||
import com.fastbee.common.enums.BusinessType;
|
||||
import com.fastbee.system.domain.SysNotice;
|
||||
import com.fastbee.system.service.ISysNoticeService;
|
||||
|
||||
/**
|
||||
* 公告 信息操作处理
|
||||
|
||||
@@ -1,10 +1,19 @@
|
||||
package com.fastbee.web.controller.system;
|
||||
package com.maibu.web.controller.system;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.fastbee.common.utils.MessageUtils;
|
||||
import com.fastbee.common.utils.StringUtils;
|
||||
import com.maibu.annotation.Log;
|
||||
import com.maibu.constant.UserConstants;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.page.TableDataInfo;
|
||||
import com.maibu.domain.SysPost;
|
||||
import com.maibu.enums.BusinessType;
|
||||
import com.maibu.service.ISysPostService;
|
||||
import com.maibu.utils.MessageUtils;
|
||||
import com.maibu.utils.StringUtils;
|
||||
import com.maibu.utils.poi.ExcelUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -18,15 +27,6 @@ import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.fastbee.common.annotation.Log;
|
||||
import com.fastbee.common.constant.UserConstants;
|
||||
import com.fastbee.common.core.controller.BaseController;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.core.page.TableDataInfo;
|
||||
import com.fastbee.common.enums.BusinessType;
|
||||
import com.fastbee.common.utils.poi.ExcelUtil;
|
||||
import com.fastbee.system.domain.SysPost;
|
||||
import com.fastbee.system.service.ISysPostService;
|
||||
|
||||
/**
|
||||
* 岗位信息操作处理
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
package com.fastbee.web.controller.system;
|
||||
package com.maibu.web.controller.system;
|
||||
|
||||
import com.fastbee.common.annotation.Log;
|
||||
import com.fastbee.common.config.RuoYiConfig;
|
||||
import com.fastbee.common.constant.UserConstants;
|
||||
import com.fastbee.common.core.controller.BaseController;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.core.domain.entity.SysUser;
|
||||
import com.fastbee.common.core.domain.model.LoginUser;
|
||||
import com.fastbee.common.enums.BusinessType;
|
||||
import com.fastbee.common.enums.SocialPlatformType;
|
||||
import com.fastbee.common.utils.MessageUtils;
|
||||
import com.fastbee.common.utils.SecurityUtils;
|
||||
import com.fastbee.common.utils.StringUtils;
|
||||
import com.fastbee.common.utils.file.FileUploadUtils;
|
||||
import com.fastbee.common.utils.file.MimeTypeUtils;
|
||||
import com.fastbee.framework.web.service.TokenService;
|
||||
import com.fastbee.iot.domain.UserSocialProfile;
|
||||
import com.fastbee.iot.service.IUserSocialProfileService;
|
||||
import com.fastbee.system.service.ISysUserService;
|
||||
import com.maibu.annotation.Log;
|
||||
import com.maibu.config.RuoYiConfig;
|
||||
import com.maibu.constant.UserConstants;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.domain.entity.SysUser;
|
||||
import com.maibu.core.domain.model.LoginUser;
|
||||
import com.maibu.enums.BusinessType;
|
||||
import com.maibu.enums.SocialPlatformType;
|
||||
import com.maibu.model.UserSocialProfile;
|
||||
import com.maibu.service.ISysUserService;
|
||||
import com.maibu.service.IUserSocialProfileService;
|
||||
import com.maibu.utils.MessageUtils;
|
||||
import com.maibu.utils.SecurityUtils;
|
||||
import com.maibu.utils.StringUtils;
|
||||
import com.maibu.utils.file.FileUploadUtils;
|
||||
import com.maibu.utils.file.MimeTypeUtils;
|
||||
import com.maibu.web.service.TokenService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
package com.fastbee.web.controller.system;
|
||||
package com.maibu.web.controller.system;
|
||||
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.domain.model.RegisterBody;
|
||||
import com.maibu.service.ISysConfigService;
|
||||
import com.maibu.utils.StringUtils;
|
||||
import com.maibu.web.service.SysRegisterService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.fastbee.common.core.controller.BaseController;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.core.domain.model.RegisterBody;
|
||||
import com.fastbee.common.utils.StringUtils;
|
||||
import com.fastbee.framework.web.service.SysRegisterService;
|
||||
import com.fastbee.system.service.ISysConfigService;
|
||||
|
||||
/**
|
||||
* 注册验证
|
||||
|
||||
@@ -1,12 +1,29 @@
|
||||
package com.fastbee.web.controller.system;
|
||||
package com.maibu.web.controller.system;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.fastbee.common.constant.HttpStatus;
|
||||
import com.fastbee.common.utils.MessageUtils;
|
||||
import com.fastbee.common.utils.collection.CollectionUtils;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.maibu.annotation.Log;
|
||||
import com.maibu.constant.HttpStatus;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.domain.entity.SysDept;
|
||||
import com.maibu.core.domain.entity.SysRole;
|
||||
import com.maibu.core.domain.entity.SysUser;
|
||||
import com.maibu.core.domain.model.LoginUser;
|
||||
import com.maibu.core.page.TableDataInfo;
|
||||
import com.maibu.domain.SysUserRole;
|
||||
import com.maibu.enums.BusinessType;
|
||||
import com.maibu.service.ISysDeptService;
|
||||
import com.maibu.service.ISysRoleService;
|
||||
import com.maibu.service.ISysUserService;
|
||||
import com.maibu.utils.MessageUtils;
|
||||
import com.maibu.utils.StringUtils;
|
||||
import com.maibu.utils.collection.CollectionUtils;
|
||||
import com.maibu.utils.poi.ExcelUtil;
|
||||
import com.maibu.web.service.SysPermissionService;
|
||||
import com.maibu.web.service.TokenService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -20,24 +37,6 @@ import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.fastbee.common.annotation.Log;
|
||||
import com.fastbee.common.constant.UserConstants;
|
||||
import com.fastbee.common.core.controller.BaseController;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.core.domain.entity.SysDept;
|
||||
import com.fastbee.common.core.domain.entity.SysRole;
|
||||
import com.fastbee.common.core.domain.entity.SysUser;
|
||||
import com.fastbee.common.core.domain.model.LoginUser;
|
||||
import com.fastbee.common.core.page.TableDataInfo;
|
||||
import com.fastbee.common.enums.BusinessType;
|
||||
import com.fastbee.common.utils.StringUtils;
|
||||
import com.fastbee.common.utils.poi.ExcelUtil;
|
||||
import com.fastbee.framework.web.service.SysPermissionService;
|
||||
import com.fastbee.framework.web.service.TokenService;
|
||||
import com.fastbee.system.domain.SysUserRole;
|
||||
import com.fastbee.system.service.ISysDeptService;
|
||||
import com.fastbee.system.service.ISysRoleService;
|
||||
import com.fastbee.system.service.ISysUserService;
|
||||
|
||||
/**
|
||||
* 角色信息
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.fastbee.web.controller.system;
|
||||
package com.maibu.web.controller.system;
|
||||
|
||||
import com.fastbee.common.core.controller.BaseController;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.core.domain.entity.SysTranslate;
|
||||
import com.fastbee.common.utils.MessageUtils;
|
||||
import com.fastbee.common.utils.StringUtils;
|
||||
import com.fastbee.common.utils.poi.ExcelUtil;
|
||||
import com.fastbee.system.service.ISysTranslateService;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.domain.entity.SysTranslate;
|
||||
import com.maibu.service.ISysTranslateService;
|
||||
import com.maibu.utils.MessageUtils;
|
||||
import com.maibu.utils.StringUtils;
|
||||
import com.maibu.utils.poi.ExcelUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
|
||||
@@ -1,10 +1,26 @@
|
||||
package com.fastbee.web.controller.system;
|
||||
package com.maibu.web.controller.system;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.fastbee.common.utils.MessageUtils;
|
||||
import com.maibu.annotation.Log;
|
||||
import com.maibu.constant.UserConstants;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.domain.entity.SysDept;
|
||||
import com.maibu.core.domain.entity.SysRole;
|
||||
import com.maibu.core.domain.entity.SysUser;
|
||||
import com.maibu.core.page.TableDataInfo;
|
||||
import com.maibu.enums.BusinessType;
|
||||
import com.maibu.service.ISysDeptService;
|
||||
import com.maibu.service.ISysPostService;
|
||||
import com.maibu.service.ISysRoleService;
|
||||
import com.maibu.service.ISysUserService;
|
||||
import com.maibu.utils.MessageUtils;
|
||||
import com.maibu.utils.SecurityUtils;
|
||||
import com.maibu.utils.StringUtils;
|
||||
import com.maibu.utils.poi.ExcelUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.apache.commons.lang3.ArrayUtils;
|
||||
@@ -20,22 +36,6 @@ import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import com.fastbee.common.annotation.Log;
|
||||
import com.fastbee.common.constant.UserConstants;
|
||||
import com.fastbee.common.core.controller.BaseController;
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.core.domain.entity.SysDept;
|
||||
import com.fastbee.common.core.domain.entity.SysRole;
|
||||
import com.fastbee.common.core.domain.entity.SysUser;
|
||||
import com.fastbee.common.core.page.TableDataInfo;
|
||||
import com.fastbee.common.enums.BusinessType;
|
||||
import com.fastbee.common.utils.SecurityUtils;
|
||||
import com.fastbee.common.utils.StringUtils;
|
||||
import com.fastbee.common.utils.poi.ExcelUtil;
|
||||
import com.fastbee.system.service.ISysDeptService;
|
||||
import com.fastbee.system.service.ISysPostService;
|
||||
import com.fastbee.system.service.ISysRoleService;
|
||||
import com.fastbee.system.service.ISysUserService;
|
||||
|
||||
/**
|
||||
* 用户信息
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.fastbee.web.controller.tool;
|
||||
package com.maibu.web.controller.tool;
|
||||
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import com.fastbee.common.core.controller.BaseController;
|
||||
|
||||
/**
|
||||
* swagger 接口
|
||||
|
||||
@@ -1,185 +0,0 @@
|
||||
package com.fastbee.web.controller.tool;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.fastbee.common.core.controller.BaseController;
|
||||
import com.fastbee.common.core.domain.R;
|
||||
import com.fastbee.common.utils.StringUtils;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiImplicitParams;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* swagger 用户测试方法
|
||||
*
|
||||
* @author ruoyi
|
||||
*/
|
||||
@Api("swagger 用户测试方法")
|
||||
@RestController
|
||||
@RequestMapping("/test/user")
|
||||
public class TestController extends BaseController
|
||||
{
|
||||
private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>();
|
||||
{
|
||||
users.put(1, new UserEntity(1, "admin", "admin123", "15888888888"));
|
||||
users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
|
||||
}
|
||||
|
||||
@ApiOperation("获取用户列表")
|
||||
@GetMapping("/list")
|
||||
public R<List<UserEntity>> userList()
|
||||
{
|
||||
List<UserEntity> userList = new ArrayList<UserEntity>(users.values());
|
||||
return R.ok(userList);
|
||||
}
|
||||
|
||||
@ApiOperation("获取用户详细")
|
||||
@ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
|
||||
@GetMapping("/{userId}")
|
||||
public R<UserEntity> getUser(@PathVariable Integer userId)
|
||||
{
|
||||
if (!users.isEmpty() && users.containsKey(userId))
|
||||
{
|
||||
return R.ok(users.get(userId));
|
||||
}
|
||||
else
|
||||
{
|
||||
return R.fail("用户不存在");
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation("新增用户")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", dataTypeClass = Integer.class),
|
||||
@ApiImplicitParam(name = "username", value = "用户名称", dataType = "String", dataTypeClass = String.class),
|
||||
@ApiImplicitParam(name = "password", value = "用户密码", dataType = "String", dataTypeClass = String.class),
|
||||
@ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String", dataTypeClass = String.class)
|
||||
})
|
||||
@PostMapping("/save")
|
||||
public R<String> save(UserEntity user)
|
||||
{
|
||||
if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
|
||||
{
|
||||
return R.fail("用户ID不能为空");
|
||||
}
|
||||
users.put(user.getUserId(), user);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@ApiOperation("更新用户")
|
||||
@PutMapping("/update")
|
||||
public R<String> update(@RequestBody UserEntity user)
|
||||
{
|
||||
if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
|
||||
{
|
||||
return R.fail("用户ID不能为空");
|
||||
}
|
||||
if (users.isEmpty() || !users.containsKey(user.getUserId()))
|
||||
{
|
||||
return R.fail("用户不存在");
|
||||
}
|
||||
users.remove(user.getUserId());
|
||||
users.put(user.getUserId(), user);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@ApiOperation("删除用户信息")
|
||||
@ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
|
||||
@DeleteMapping("/{userId}")
|
||||
public R<String> delete(@PathVariable Integer userId)
|
||||
{
|
||||
if (!users.isEmpty() && users.containsKey(userId))
|
||||
{
|
||||
users.remove(userId);
|
||||
return R.ok();
|
||||
}
|
||||
else
|
||||
{
|
||||
return R.fail("用户不存在");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ApiModel(value = "UserEntity", description = "用户实体")
|
||||
class UserEntity
|
||||
{
|
||||
@ApiModelProperty("用户ID")
|
||||
private Integer userId;
|
||||
|
||||
@ApiModelProperty("用户名称")
|
||||
private String username;
|
||||
|
||||
@ApiModelProperty("用户密码")
|
||||
private String password;
|
||||
|
||||
@ApiModelProperty("用户手机")
|
||||
private String mobile;
|
||||
|
||||
public UserEntity()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public UserEntity(Integer userId, String username, String password, String mobile)
|
||||
{
|
||||
this.userId = userId;
|
||||
this.username = username;
|
||||
this.password = password;
|
||||
this.mobile = mobile;
|
||||
}
|
||||
|
||||
public Integer getUserId()
|
||||
{
|
||||
return userId;
|
||||
}
|
||||
|
||||
public void setUserId(Integer userId)
|
||||
{
|
||||
this.userId = userId;
|
||||
}
|
||||
|
||||
public String getUsername()
|
||||
{
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUsername(String username)
|
||||
{
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public String getPassword()
|
||||
{
|
||||
return password;
|
||||
}
|
||||
|
||||
public void setPassword(String password)
|
||||
{
|
||||
this.password = password;
|
||||
}
|
||||
|
||||
public String getMobile()
|
||||
{
|
||||
return mobile;
|
||||
}
|
||||
|
||||
public void setMobile(String mobile)
|
||||
{
|
||||
this.mobile = mobile;
|
||||
}
|
||||
}
|
||||
@@ -1,218 +0,0 @@
|
||||
package com.fastbee.web.controller.tool;
|
||||
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import com.fastbee.iot.domain.DeviceJob;
|
||||
import com.fastbee.iot.domain.DeviceLog;
|
||||
import com.fastbee.iot.mapper.DeviceJobMapper;
|
||||
import com.fastbee.iot.mapper.DeviceLogMapper;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import javax.annotation.Resource;
|
||||
import java.util.*;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
import com.fastbee.common.annotation.Anonymous;
|
||||
import com.fastbee.common.core.domain.ImportExcelVO;
|
||||
import com.fastbee.common.core.domain.OutputExcelVO;
|
||||
import com.fastbee.common.utils.StringUtils;
|
||||
import com.fastbee.common.utils.poi.ExcelUtil;
|
||||
import com.fastbee.iot.domain.AlertLog;
|
||||
import com.fastbee.iot.mapper.AlertLogMapper;
|
||||
import com.fastbee.iot.mapper.DeviceMapper;
|
||||
import com.fastbee.iot.model.DeviceRelateAlertLogVO;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
|
||||
/**
|
||||
* 测试类
|
||||
* @author fastb
|
||||
* @date 2023-09-13 11:42
|
||||
*/
|
||||
@Anonymous
|
||||
@RestController
|
||||
@RequestMapping("/test2")
|
||||
public class TestController2 {
|
||||
|
||||
@Resource
|
||||
private AlertLogMapper alertLogMapper;
|
||||
@Resource
|
||||
private DeviceMapper deviceMapper;
|
||||
|
||||
@Resource
|
||||
private DeviceJobMapper deviceJobMapper;
|
||||
@Resource
|
||||
private DeviceLogMapper deviceLogMapper;
|
||||
|
||||
@GetMapping("/add")
|
||||
public void add()
|
||||
{
|
||||
Set<String> deviceNumbers = new HashSet<>();
|
||||
deviceNumbers.add("D1PGLPG58K88");
|
||||
deviceNumbers.add("D1F0L7P84D8Z");
|
||||
deviceNumbers.add("D1F0L7P84D8Z_2");
|
||||
List<DeviceRelateAlertLogVO> deviceRelateAlertLogVOList = deviceMapper.selectDeviceBySerialNumbers(deviceNumbers);
|
||||
Map<String, DeviceRelateAlertLogVO> deviceRelateAlertLogVOMap = deviceRelateAlertLogVOList.stream().collect(Collectors.toMap(DeviceRelateAlertLogVO::getSerialNumber, Function.identity()));
|
||||
|
||||
ArrayList<AlertLog> alertLogList = new ArrayList<>();
|
||||
for (String deviceNumber : deviceNumbers) {
|
||||
AlertLog alertLog = new AlertLog();
|
||||
alertLog.setSerialNumber(deviceNumber);
|
||||
alertLog.setAlertName("温度告警测试");
|
||||
alertLog.setAlertLevel(1L);
|
||||
alertLog.setStatus(1);
|
||||
alertLog.setProductId(1L);
|
||||
alertLog.setDetail("111");
|
||||
alertLog.setCreateTime(new Date());
|
||||
// 添加设备关联信息
|
||||
if (deviceRelateAlertLogVOMap.containsKey(deviceNumber)) {
|
||||
DeviceRelateAlertLogVO deviceRelateAlertLogVO = deviceRelateAlertLogVOMap.get(deviceNumber);
|
||||
alertLog.setDeviceName(deviceRelateAlertLogVO.getDeviceName());
|
||||
alertLog.setUserId(deviceRelateAlertLogVO.getUserId());
|
||||
}
|
||||
alertLogList.add(alertLog);
|
||||
}
|
||||
|
||||
// 批量插入告警日志
|
||||
alertLogMapper.insertAlertLogBatch(alertLogList);
|
||||
}
|
||||
|
||||
@PostMapping("/handleExcel")
|
||||
public String handleExcel(@RequestParam("file") MultipartFile file) throws Exception
|
||||
{
|
||||
if (null == file) {
|
||||
return "导入失败,请先上传文件!";
|
||||
}
|
||||
ExcelUtil<ImportExcelVO> util = new ExcelUtil<>(ImportExcelVO.class);
|
||||
List<ImportExcelVO> importExcelVOList = util.importExcel(file.getInputStream());
|
||||
if (CollectionUtils.isEmpty(importExcelVOList)) {
|
||||
return "导入失败,模板数据不能为空!";
|
||||
}
|
||||
System.out.println(importExcelVOList.size());
|
||||
List<String> oneCityName = new ArrayList<>();
|
||||
List<String> twoCityName = new ArrayList<>();
|
||||
List<String> threeCityName = new ArrayList<>();
|
||||
|
||||
List<OutputExcelVO> oneCityList = new ArrayList<>();
|
||||
Map<String, List<OutputExcelVO>> twoCityMap = new HashMap<>(2);
|
||||
Map<String, List<OutputExcelVO>> threeCityMap = new HashMap<>(2);
|
||||
|
||||
for (ImportExcelVO vo : importExcelVOList) {
|
||||
String city = vo.getCity();
|
||||
List<String> cityNameList = StringUtils.str2List(city, "/", true, true);
|
||||
int size = cityNameList.size();
|
||||
if (1 == size) {
|
||||
String name = cityNameList.get(0);
|
||||
if (!oneCityName.contains(name)) {
|
||||
oneCityName.add(name);
|
||||
OutputExcelVO outputExcelVO = new OutputExcelVO();
|
||||
outputExcelVO.setName(name);
|
||||
outputExcelVO.setCode(vo.getCode());
|
||||
outputExcelVO.setLat(vo.getLat());
|
||||
outputExcelVO.setLon(vo.getLon());
|
||||
oneCityList.add(outputExcelVO);
|
||||
twoCityMap.put(name, new ArrayList<>());
|
||||
}
|
||||
} else if (2 == size) {
|
||||
String oneName = cityNameList.get(0);
|
||||
if (!oneCityName.contains(oneName)) {
|
||||
oneCityName.add(oneName);
|
||||
OutputExcelVO outputExcelVO = new OutputExcelVO();
|
||||
outputExcelVO.setName(oneName);
|
||||
oneCityList.add(outputExcelVO);
|
||||
twoCityMap.put(oneName, new ArrayList<>());
|
||||
}
|
||||
String twoName = cityNameList.get(1);
|
||||
OutputExcelVO outputExcelVO = new OutputExcelVO();
|
||||
outputExcelVO.setName(twoName);
|
||||
outputExcelVO.setCode(vo.getCode());
|
||||
outputExcelVO.setLat(vo.getLat());
|
||||
outputExcelVO.setLon(vo.getLon());
|
||||
if (!twoCityName.contains(twoName)) {
|
||||
twoCityName.add(twoName);
|
||||
List<OutputExcelVO> twoList = twoCityMap.get(oneName);
|
||||
twoList.add(outputExcelVO);
|
||||
twoCityMap.put(oneName, twoList);
|
||||
threeCityMap.put(twoName, new ArrayList<>());
|
||||
}
|
||||
} else if (3 == size) {
|
||||
String oneName = cityNameList.get(0);
|
||||
if (!oneCityName.contains(oneName)) {
|
||||
oneCityName.add(oneName);
|
||||
OutputExcelVO outputExcelVO = new OutputExcelVO();
|
||||
outputExcelVO.setName(oneName);
|
||||
oneCityList.add(outputExcelVO);
|
||||
twoCityMap.put(oneName, new ArrayList<>());
|
||||
}
|
||||
String twoName = cityNameList.get(1);
|
||||
if (!twoCityName.contains(twoName)) {
|
||||
twoCityName.add(twoName);
|
||||
OutputExcelVO outputExcelVO = new OutputExcelVO();
|
||||
outputExcelVO.setName(twoName);
|
||||
List<OutputExcelVO> twoList = twoCityMap.get(oneName);
|
||||
twoList.add(outputExcelVO);
|
||||
twoCityMap.put(oneName, twoList);
|
||||
threeCityMap.put(twoName, new ArrayList<>());
|
||||
}
|
||||
String threeName = cityNameList.get(2);
|
||||
if (!threeCityName.contains(threeName)) {
|
||||
threeCityName.add(threeName);
|
||||
OutputExcelVO outputExcelVO = new OutputExcelVO();
|
||||
outputExcelVO.setName(threeName);
|
||||
outputExcelVO.setCode(vo.getCode());
|
||||
outputExcelVO.setLat(vo.getLat());
|
||||
outputExcelVO.setLon(vo.getLon());
|
||||
List<OutputExcelVO> twoList = threeCityMap.get(twoName);
|
||||
twoList.add(outputExcelVO);
|
||||
threeCityMap.put(twoName, twoList);
|
||||
}
|
||||
}
|
||||
}
|
||||
int total = 0;
|
||||
total = total + oneCityList.size();
|
||||
for (OutputExcelVO outputExcelVO : oneCityList) {
|
||||
List<OutputExcelVO> voList = twoCityMap.get(outputExcelVO.getName());
|
||||
if (CollectionUtils.isNotEmpty(voList)) {
|
||||
total = total + voList.size();
|
||||
outputExcelVO.setChildren(voList);
|
||||
for (OutputExcelVO excelVO : voList) {
|
||||
List<OutputExcelVO> voList1 = threeCityMap.get(excelVO.getName());
|
||||
if (CollectionUtils.isNotEmpty(voList1)) {
|
||||
total = total + voList1.size();
|
||||
excelVO.setChildren(voList1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
System.out.println(total);
|
||||
return JSON.toJSONString(oneCityList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算场景运算型变量的值
|
||||
* @param id
|
||||
* @return java.lang.String
|
||||
*/
|
||||
@GetMapping("/getJobList")
|
||||
public String getJobList() {
|
||||
Long[] ids = {1L, 2L};
|
||||
List<DeviceJob> deviceJobList = deviceJobMapper.selectListByJobTypeAndDatasourceIds(ids, 3);
|
||||
return JSON.toJSONString(deviceJobList);
|
||||
}
|
||||
|
||||
@GetMapping("/getStatsValue")
|
||||
public String getStatsValue() {
|
||||
DeviceLog deviceLog = new DeviceLog();
|
||||
deviceLog.setLogType(1);
|
||||
deviceLog.setIdentity("k1");
|
||||
deviceLog.setSerialNumber("D10I741UL2P3_1");
|
||||
deviceLog.setBeginTime("2024-05-17 00:00:00");
|
||||
deviceLog.setEndTime("2024-05-17 23:59:59");
|
||||
// deviceLog.setOperation(5);
|
||||
List<String> list = deviceLogMapper.selectStatsValue(deviceLog);
|
||||
return JSON.toJSONString(list);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,12 +1,13 @@
|
||||
package com.fastbee.web.core.config;
|
||||
package com.maibu.web.core.config;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.maibu.config.RuoYiConfig;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import com.fastbee.common.config.RuoYiConfig;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.models.auth.In;
|
||||
import springfox.documentation.builders.ApiInfoBuilder;
|
||||
|
||||
@@ -8,7 +8,7 @@ spring:
|
||||
master:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
url: jdbc:mysql://1.95.137.212:3306/fastbee?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
url: jdbc:mysql://localhost:3306/fastbee?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: fastbee
|
||||
password: maibu520
|
||||
# slave:
|
||||
|
||||
Reference in New Issue
Block a user