IOT/MiddlePlatform
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#update

Browse Source
This commit is contained in:
rqian
2026-04-17 17:12:41 +08:00
parent 99d9406936
commit a4b8203687
638 changed files with 4235 additions and 45595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1428
.idea/workspace.xml generated
View File

File diff suppressed because it is too large Load Diff

4
maibu-admin/src/main/java/com/maibu/MiddlePlatformApplication.java
View File

@@ -2,8 +2,8 @@ package com.maibu;
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
import com.dtflys.forest.springboot.annotation.ForestScan; import com.dtflys.forest.springboot.annotation.ForestScan;
import com.fastbee.netty.NettyServer; import com.maibu.netty.NettyServer;
import com.fastbee.websocket.WebsocketHandler; import com.maibu.websocket.WebsocketHandler;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;

12
maibu-admin/src/main/java/com/maibu/FastBeeServletInitializer.java → maibu-admin/src/main/java/com/maibu/MiddlePlatformServletInitializer.java
View File

@@ -1,18 +1,16 @@
package com.fastbee; package com.maibu;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
/** /**
* web容器中进行部署 * web容器中进行部署
* *
* @author ruoyi * @author ruoyi
*/ */
public class FastBeeServletInitializer extends SpringBootServletInitializer public class MiddlePlatformServletInitializer extends SpringBootServletInitializer {
{
@Override @Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
{ return application.sources(MiddlePlatformApplication.class);
return application.sources(FastBeeApplication.class);
} }
} }

20
maibu-admin/src/main/java/com/maibu/web/controller/common/CaptchaController.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.web.controller.common; package com.maibu.web.controller.common;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException; import java.io.IOException;
@@ -7,6 +7,14 @@ import javax.annotation.Resource;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.google.code.kaptcha.Producer; 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("获取验证码") @ApiOperation("获取验证码")
@GetMapping("/captchaImage") @GetMapping("/captchaImage")
public AjaxResult getCode(HttpServletResponse response,Boolean showCode) throws IOException public AjaxResult getCode(HttpServletResponse response, Boolean showCode) throws IOException
{ {
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
boolean captchaEnabled = configService.selectCaptchaEnabled(); boolean captchaEnabled = configService.selectCaptchaEnabled();

20
maibu-admin/src/main/java/com/maibu/web/controller/common/CommonController.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.web.controller.common; package com.maibu.web.controller.common;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
@@ -7,10 +7,17 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; 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.client.j2se.MatrixToImageWriter;
import com.google.zxing.common.BitMatrix; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; 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.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; 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;
/** /**
* 通用请求处理 * 通用请求处理

10
maibu-admin/src/main/java/com/maibu/web/controller/monitor/CacheController.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.web.controller.monitor; package com.maibu.web.controller.monitor;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@@ -8,6 +8,10 @@ import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.Set; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; 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;
/** /**
* 缓存监控 * 缓存监控

6
maibu-admin/src/main/java/com/maibu/web/controller/monitor/ServerController.java
View File

@@ -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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.framework.web.domain.Server;
/** /**
* 服务器监控 * 服务器监控

21
maibu-admin/src/main/java/com/maibu/web/controller/monitor/SysLogininforController.java
View File

@@ -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 java.util.List;
import javax.servlet.http.HttpServletResponse; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; 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;
/** /**
* 系统访问记录 * 系统访问记录

18
maibu-admin/src/main/java/com/maibu/web/controller/monitor/SysOperlogController.java
View File

@@ -1,8 +1,16 @@
package com.fastbee.web.controller.monitor; package com.maibu.web.controller.monitor;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; 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;
/** /**
* 操作日志记录 * 操作日志记录

24
maibu-admin/src/main/java/com/maibu/web/controller/monitor/SysUserOnlineController.java
View File

@@ -1,10 +1,21 @@
package com.fastbee.web.controller.monitor; package com.maibu.web.controller.monitor;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; 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;
/** /**
* 在线用户监控 * 在线用户监控

21
maibu-admin/src/main/java/com/maibu/web/controller/system/SysClientController.java
View File

@@ -1,10 +1,16 @@
package com.fastbee.web.controller.system; package com.maibu.web.controller.system;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.fastbee.common.core.domain.entity.SysUser; import com.maibu.core.controller.BaseController;
import com.fastbee.framework.web.service.TokenService; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize; 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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.fastbee.common.core.controller.BaseController; import static com.maibu.utils.SecurityUtils.getLoginUser;
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;
/** /**
* 系统授权Controller * 系统授权Controller

20
maibu-admin/src/main/java/com/maibu/web/controller/system/SysConfigController.java
View File

@@ -1,8 +1,17 @@
package com.fastbee.web.controller.system; package com.maibu.web.controller.system;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; 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;
/** /**
* 参数配置 信息操作处理 * 参数配置 信息操作处理

44
maibu-admin/src/main/java/com/maibu/web/controller/system/SysDeptController.java
View File

@@ -1,28 +1,21 @@
package com.fastbee.web.controller.system; package com.maibu.web.controller.system;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.fastbee.common.annotation.Log; import com.maibu.annotation.Log;
import com.fastbee.common.constant.UserConstants; import com.maibu.constant.UserConstants;
import com.fastbee.common.core.controller.BaseController; import com.maibu.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult; import com.maibu.core.domain.AjaxResult;
import com.fastbee.common.core.domain.entity.*; import com.maibu.core.domain.entity.*;
import com.fastbee.common.enums.BusinessType; import com.maibu.domain.vo.SysDeptTypeVO;
import com.fastbee.common.exception.ServiceException; import com.maibu.enums.BusinessType;
import com.fastbee.common.utils.StringUtils; import com.maibu.exception.ServiceException;
import com.fastbee.iot.mapper.DeviceMapper; import com.maibu.mapper.DeviceMapper;
import com.fastbee.iot.model.RegisterUserInput; import com.maibu.mapper.SysRoleDeptMapper;
import com.fastbee.iot.model.RegisterUserOutput; import com.maibu.model.RegisterUserInput;
import com.fastbee.iot.service.IToolService; import com.maibu.model.RegisterUserOutput;
import com.fastbee.system.domain.SysRoleDept; import com.maibu.service.*;
import com.fastbee.system.domain.SysRoleMenu; import com.maibu.utils.MessageUtils;
import com.fastbee.system.domain.SysUserRole; import com.maibu.utils.StringUtils;
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 io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
@@ -34,14 +27,11 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import static com.fastbee.common.constant.Constants.LANGUAGE;
/** /**
* 机构信息 * 机构信息

23
maibu-admin/src/main/java/com/maibu/web/controller/system/SysDictDataController.java
View File

@@ -1,8 +1,19 @@
package com.fastbee.web.controller.system; package com.maibu.web.controller.system;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; 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.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; 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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; 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;
/** /**
* 数据字典信息 * 数据字典信息

25
maibu-admin/src/main/java/com/maibu/web/controller/system/SysDictTypeController.java
View File

@@ -1,10 +1,19 @@
package com.fastbee.web.controller.system; package com.maibu.web.controller.system;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.fastbee.common.utils.MessageUtils; import com.maibu.annotation.Log;
import com.fastbee.common.utils.StringUtils; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; 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;
/** /**
* 数据字典信息 * 数据字典信息

8
maibu-admin/src/main/java/com/maibu/web/controller/system/SysIndexController.java
View File

@@ -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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.fastbee.common.config.RuoYiConfig;
import com.fastbee.common.utils.StringUtils;
/** /**
* 首页 * 首页

47
maibu-admin/src/main/java/com/maibu/web/controller/system/SysLoginController.java
View File

@@ -1,26 +1,26 @@
package com.fastbee.web.controller.system; package com.maibu.web.controller.system;
import com.fastbee.common.annotation.Log; import com.maibu.annotation.Log;
import com.fastbee.common.constant.Constants; import com.maibu.constant.Constants;
import com.fastbee.common.core.domain.AjaxResult; import com.maibu.core.domain.AjaxResult;
import com.fastbee.common.core.domain.entity.SysMenu; import com.maibu.core.domain.entity.SysMenu;
import com.fastbee.common.core.domain.entity.SysUser; import com.maibu.core.domain.entity.SysUser;
import com.fastbee.common.core.domain.model.LoginBody; import com.maibu.core.domain.model.LoginBody;
import com.fastbee.common.enums.BusinessType; import com.maibu.domain.AppPreferences;
import com.fastbee.common.enums.SourceType; import com.maibu.dto.NettyDevice;
import com.fastbee.common.utils.SecurityUtils; import com.maibu.enums.BusinessType;
import com.fastbee.dto.NettyDevice; import com.maibu.enums.ConnectorStatus;
import com.fastbee.enums.ConnectorStatus; import com.maibu.enums.SourceType;
import com.fastbee.framework.web.domain.dto.LoginResultDto; import com.maibu.manager.DeviceSessionManager;
import com.fastbee.framework.web.service.SysLoginService; import com.maibu.mapper.SysLoginConfigMapper;
import com.fastbee.framework.web.service.SysPermissionService; import com.maibu.service.IAppPreferencesService;
import com.fastbee.manager.DeviceSessionManager; import com.maibu.service.ISysMenuService;
import com.fastbee.system.domain.AppPreferences; import com.maibu.service.ISysUserClientService;
import com.fastbee.system.mapper.SysLoginConfigMapper; import com.maibu.service.ISysUserService;
import com.fastbee.system.service.IAppPreferencesService; import com.maibu.utils.SecurityUtils;
import com.fastbee.system.service.ISysMenuService; import com.maibu.web.domain.dto.LoginResultDto;
import com.fastbee.system.service.ISysUserClientService; import com.maibu.web.service.SysLoginService;
import com.fastbee.system.service.ISysUserService; import com.maibu.web.service.SysPermissionService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -36,7 +36,8 @@ import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import static com.fastbee.common.constant.Constants.LANGUAGE; import static com.maibu.constant.Constants.LANGUAGE;
/** /**
* 登录验证 * 登录验证

20
maibu-admin/src/main/java/com/maibu/web/controller/system/SysMenuController.java
View File

@@ -1,22 +1,22 @@
package com.fastbee.web.controller.system; package com.maibu.web.controller.system;
import java.util.List; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; 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;
/** /**
* 菜单信息 * 菜单信息

16
maibu-admin/src/main/java/com/maibu/web/controller/system/SysNoticeController.java
View File

@@ -1,7 +1,14 @@
package com.fastbee.web.controller.system; package com.maibu.web.controller.system;
import java.util.List; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; 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;
/** /**
* 公告 信息操作处理 * 公告 信息操作处理

24
maibu-admin/src/main/java/com/maibu/web/controller/system/SysPostController.java
View File

@@ -1,10 +1,19 @@
package com.fastbee.web.controller.system; package com.maibu.web.controller.system;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.fastbee.common.utils.MessageUtils; import com.maibu.annotation.Log;
import com.fastbee.common.utils.StringUtils; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; 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;
/** /**
* 岗位信息操作处理 * 岗位信息操作处理

38
maibu-admin/src/main/java/com/maibu/web/controller/system/SysProfileController.java
View File

@@ -1,23 +1,23 @@
package com.fastbee.web.controller.system; package com.maibu.web.controller.system;
import com.fastbee.common.annotation.Log; import com.maibu.annotation.Log;
import com.fastbee.common.config.RuoYiConfig; import com.maibu.config.RuoYiConfig;
import com.fastbee.common.constant.UserConstants; import com.maibu.constant.UserConstants;
import com.fastbee.common.core.controller.BaseController; import com.maibu.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult; import com.maibu.core.domain.AjaxResult;
import com.fastbee.common.core.domain.entity.SysUser; import com.maibu.core.domain.entity.SysUser;
import com.fastbee.common.core.domain.model.LoginUser; import com.maibu.core.domain.model.LoginUser;
import com.fastbee.common.enums.BusinessType; import com.maibu.enums.BusinessType;
import com.fastbee.common.enums.SocialPlatformType; import com.maibu.enums.SocialPlatformType;
import com.fastbee.common.utils.MessageUtils; import com.maibu.model.UserSocialProfile;
import com.fastbee.common.utils.SecurityUtils; import com.maibu.service.ISysUserService;
import com.fastbee.common.utils.StringUtils; import com.maibu.service.IUserSocialProfileService;
import com.fastbee.common.utils.file.FileUploadUtils; import com.maibu.utils.MessageUtils;
import com.fastbee.common.utils.file.MimeTypeUtils; import com.maibu.utils.SecurityUtils;
import com.fastbee.framework.web.service.TokenService; import com.maibu.utils.StringUtils;
import com.fastbee.iot.domain.UserSocialProfile; import com.maibu.utils.file.FileUploadUtils;
import com.fastbee.iot.service.IUserSocialProfileService; import com.maibu.utils.file.MimeTypeUtils;
import com.fastbee.system.service.ISysUserService; import com.maibu.web.service.TokenService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

14
maibu-admin/src/main/java/com/maibu/web/controller/system/SysRegisterController.java
View File

@@ -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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; 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;
/** /**
* 注册验证 * 注册验证

43
maibu-admin/src/main/java/com/maibu/web/controller/system/SysRoleController.java
View File

@@ -1,12 +1,29 @@
package com.fastbee.web.controller.system; package com.maibu.web.controller.system;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; 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.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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; 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;
/** /**
* 角色信息 * 角色信息

16
maibu-admin/src/main/java/com/maibu/web/controller/system/SysTranslateController.java
View File

@@ -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.maibu.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult; import com.maibu.core.domain.AjaxResult;
import com.fastbee.common.core.domain.entity.SysTranslate; import com.maibu.core.domain.entity.SysTranslate;
import com.fastbee.common.utils.MessageUtils; import com.maibu.service.ISysTranslateService;
import com.fastbee.common.utils.StringUtils; import com.maibu.utils.MessageUtils;
import com.fastbee.common.utils.poi.ExcelUtil; import com.maibu.utils.StringUtils;
import com.fastbee.system.service.ISysTranslateService; import com.maibu.utils.poi.ExcelUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;

36
maibu-admin/src/main/java/com/maibu/web/controller/system/SysUserController.java
View File

@@ -1,10 +1,26 @@
package com.fastbee.web.controller.system; package com.maibu.web.controller.system;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ArrayUtils; 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.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; 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;
/** /**
* 用户信息 * 用户信息

4
maibu-admin/src/main/java/com/maibu/web/controller/tool/SwaggerController.java
View File

@@ -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.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import com.fastbee.common.core.controller.BaseController;
/** /**
* swagger 接口 * swagger 接口

185
maibu-admin/src/main/java/com/maibu/web/controller/tool/TestController.java
View File

@@ -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;
}
}

218
maibu-admin/src/main/java/com/maibu/web/controller/tool/TestController2.java
View File

@@ -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);
}
}

5
maibu-admin/src/main/java/com/maibu/web/core/config/SwaggerConfig.java
View File

@@ -1,12 +1,13 @@
package com.fastbee.web.core.config; package com.maibu.web.core.config;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.maibu.config.RuoYiConfig;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import com.fastbee.common.config.RuoYiConfig;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In; import io.swagger.models.auth.In;
import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.ApiInfoBuilder;

2
maibu-admin/src/main/resources/application-dev.yml
View File

@@ -8,7 +8,7 @@ spring:
master: master:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver 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 username: fastbee
password: maibu520 password: maibu520
# slave: # slave:

1736
maibu-common/src/main/java/com/maibu/utils/poi/ExcelUtil.java Normal file
View File

File diff suppressed because it is too large Load Diff

12
maibu-external/src/main/java/com/maibu/own/controller/CommonDeviceController.java
View File

@@ -1,12 +1,10 @@
package com.maibu.own.controller; package com.maibu.own.controller;
import com.fastbee.common.core.controller.BaseController; import com.maibu.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult; import com.maibu.core.domain.AjaxResult;
import com.fastbee.common.core.page.TableDataInfo; import com.maibu.core.page.TableDataInfo;
import com.fastbee.iot.domain.IoTCommonDevice; import com.maibu.domain.IoTCommonDevice;
import com.fastbee.own.entity.WorkOrder; import com.maibu.own.service.CommonDeviceService;
import com.fastbee.own.service.CommonDeviceService;
import com.fastbee.own.service.WorkOrderService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

12
maibu-external/src/main/java/com/maibu/own/controller/PathPlanController.java
View File

@@ -1,12 +1,10 @@
package com.maibu.own.controller; package com.maibu.own.controller;
import com.fastbee.common.core.controller.BaseController; import com.maibu.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult; import com.maibu.core.domain.AjaxResult;
import com.fastbee.common.core.page.TableDataInfo; import com.maibu.core.page.TableDataInfo;
import com.fastbee.own.entity.PathPlan; import com.maibu.own.entity.PathPlan;
import com.fastbee.own.entity.WorkOrder; import com.maibu.own.service.PathPlanService;
import com.fastbee.own.service.PathPlanService;
import com.fastbee.own.service.WorkOrderService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

10
maibu-external/src/main/java/com/maibu/own/controller/WorkOrderController.java
View File

@@ -1,10 +1,10 @@
package com.maibu.own.controller; package com.maibu.own.controller;
import com.fastbee.common.core.controller.BaseController; import com.maibu.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult; import com.maibu.core.domain.AjaxResult;
import com.fastbee.common.core.page.TableDataInfo; import com.maibu.core.page.TableDataInfo;
import com.fastbee.own.entity.WorkOrder; import com.maibu.own.entity.WorkOrder;
import com.fastbee.own.service.WorkOrderService; import com.maibu.own.service.WorkOrderService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

6
maibu-external/src/main/java/com/maibu/own/entity/PathPlan.java
View File

@@ -5,14 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.fastbee.common.core.domain.BaseDO; import com.maibu.core.domain.BaseDO;
import com.fastbee.iot.domain.DeviceTaskPlanRule;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.springframework.data.annotation.Id;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@Data @Data

4
maibu-external/src/main/java/com/maibu/own/mapper/PathPlanMapper.java
View File

@@ -1,7 +1,7 @@
package com.maibu.own.mapper; package com.maibu.own.mapper;
import com.fastbee.framework.mybatis.mapper.BaseMapperX; import com.maibu.mybatis.mapper.BaseMapperX;
import com.fastbee.own.entity.PathPlan; import com.maibu.own.entity.PathPlan;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;

4
maibu-external/src/main/java/com/maibu/own/mapper/WorkOrderMapper.java
View File

@@ -1,7 +1,7 @@
package com.maibu.own.mapper; package com.maibu.own.mapper;
import com.fastbee.framework.mybatis.mapper.BaseMapperX; import com.maibu.mybatis.mapper.BaseMapperX;
import com.fastbee.own.entity.WorkOrder; import com.maibu.own.entity.WorkOrder;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;

9
maibu-external/src/main/java/com/maibu/own/service/CommonDeviceService.java
View File

@@ -1,11 +1,8 @@
package com.maibu.own.service; package com.maibu.own.service;
import com.fastbee.framework.mybatis.LambdaQueryWrapperX; import com.maibu.domain.IoTCommonDevice;
import com.fastbee.iot.domain.IoTCommonDevice; import com.maibu.mapper.IoTCommonDevicesMapper;
import com.fastbee.iot.mapper.IoTCommonDevicesMapper; import com.maibu.memory.CommonMemory;
import com.fastbee.iot.memory.CommonMemory;
import com.fastbee.own.entity.WorkOrder;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

6
maibu-external/src/main/java/com/maibu/own/service/PathPlanService.java
View File

@@ -1,8 +1,8 @@
package com.maibu.own.service; package com.maibu.own.service;
import com.fastbee.framework.mybatis.LambdaQueryWrapperX; import com.maibu.mybatis.LambdaQueryWrapperX;
import com.fastbee.own.entity.PathPlan; import com.maibu.own.entity.PathPlan;
import com.fastbee.own.mapper.PathPlanMapper; import com.maibu.own.mapper.PathPlanMapper;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

6
maibu-external/src/main/java/com/maibu/own/service/WorkOrderService.java
View File

@@ -1,8 +1,8 @@
package com.maibu.own.service; package com.maibu.own.service;
import com.fastbee.framework.mybatis.LambdaQueryWrapperX; import com.maibu.mybatis.LambdaQueryWrapperX;
import com.fastbee.own.entity.WorkOrder; import com.maibu.own.entity.WorkOrder;
import com.fastbee.own.mapper.WorkOrderMapper; import com.maibu.own.mapper.WorkOrderMapper;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

12
maibu-external/src/main/java/com/maibu/thermal/controller/ThermalController.java
View File

@@ -1,15 +1,12 @@
package com.maibu.thermal.controller; package com.maibu.thermal.controller;
import com.fastbee.common.core.domain.AjaxResult; import com.maibu.core.domain.AjaxResult;
import com.fastbee.thermal.model.AnalyzeRequest; import com.maibu.thermal.model.AnalyzeRequest;
import com.fastbee.thermal.model.ProbeRequest; import com.maibu.thermal.model.ProbeRequest;
import com.fastbee.thermal.model.ReportRequest; import com.maibu.thermal.service.ThermalService;
import com.fastbee.thermal.service.ThermalService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -22,7 +19,6 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.Base64; import java.util.Base64;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
@RestController @RestController

2
maibu-external/src/main/java/com/maibu/thermal/service/AnalysisStore.java
View File

@@ -1,6 +1,6 @@
package com.maibu.thermal.service; package com.maibu.thermal.service;
import com.fastbee.thermal.model.StoredAnalysis; import com.maibu.thermal.model.StoredAnalysis;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Map; import java.util.Map;

6
maibu-external/src/main/java/com/maibu/thermal/service/ThermalService.java
View File

@@ -1,8 +1,8 @@
package com.maibu.thermal.service; package com.maibu.thermal.service;
import com.fastbee.thermal.model.*; import com.maibu.thermal.model.*;
import com.fastbee.thermal.util.FileUtil; import com.maibu.thermal.util.FileUtil;
import com.fastbee.thermal.util.HtmlTemplateUtil; import com.maibu.thermal.util.HtmlTemplateUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

12
maibu-external/src/main/java/com/maibu/uav/controller/UAVController.java
View File

@@ -1,9 +1,12 @@
package com.maibu.uav.controller; package com.maibu.uav.controller;
import com.fastbee.common.core.controller.BaseController; import com.maibu.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult; import com.maibu.core.domain.AjaxResult;
import com.fastbee.uav.dto.*; import com.maibu.uav.dto.CameraLiveParamDTO;
import com.fastbee.uav.service.UAVService; import com.maibu.uav.dto.FlightTaskCommandDTO;
import com.maibu.uav.dto.FlightTaskCreateDTO;
import com.maibu.uav.dto.UavDeviceStateResponseDTO;
import com.maibu.uav.service.UAVService;
import io.minio.errors.*; import io.minio.errors.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -12,7 +15,6 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.IOException; import java.io.IOException;
import java.security.InvalidKeyException; import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.List;
@RestController @RestController
@RequestMapping("/iot/UAV") @RequestMapping("/iot/UAV")

2
maibu-external/src/main/java/com/maibu/uav/dto/CameraLiveParamDTO.java
View File

@@ -1,6 +1,6 @@
package com.maibu.uav.dto; package com.maibu.uav.dto;
import com.fastbee.uav.entity.CameraInfo; import com.maibu.uav.entity.CameraInfo;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;

4
maibu-external/src/main/java/com/maibu/uav/dto/UavDeviceStateDTO.java
View File

@@ -1,7 +1,7 @@
package com.maibu.uav.dto; package com.maibu.uav.dto;
import com.fastbee.uav.entity.DeviceModel; import com.maibu.uav.entity.DeviceModel;
import com.fastbee.uav.entity.UavDeviceState; import com.maibu.uav.entity.UavDeviceState;
import lombok.Data; import lombok.Data;
@Data @Data

2
maibu-external/src/main/java/com/maibu/uav/dto/UavDeviceStateResponseDTO.java
View File

@@ -1,7 +1,5 @@
package com.maibu.uav.dto; package com.maibu.uav.dto;
import com.fastbee.uav.entity.DeviceModel;
import com.fastbee.uav.entity.UavDeviceState;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;

2
maibu-external/src/main/java/com/maibu/uav/dto/UavDeviceStateResponseDetailDTO.java
View File

@@ -1,6 +1,6 @@
package com.maibu.uav.dto; package com.maibu.uav.dto;
import com.fastbee.uav.entity.CameraInfo; import com.maibu.uav.entity.CameraInfo;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;

2
maibu-external/src/main/java/com/maibu/uav/dto/UavProjectDeviceDTO.java
View File

@@ -1,6 +1,6 @@
package com.maibu.uav.dto; package com.maibu.uav.dto;
import com.fastbee.uav.entity.UavDevice; import com.maibu.uav.entity.UavDevice;
import lombok.Data; import lombok.Data;
@Data @Data

1
maibu-external/src/main/java/com/maibu/uav/entity/CameraInfo.java
View File

@@ -1,6 +1,5 @@
package com.maibu.uav.entity; package com.maibu.uav.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;

2
maibu-external/src/main/java/com/maibu/uav/entity/DeviceModel.java
View File

@@ -3,8 +3,6 @@ package com.maibu.uav.entity;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.util.Map;
@Data @Data
public class DeviceModel { public class DeviceModel {
private String key; private String key;

1
maibu-external/src/main/java/com/maibu/uav/entity/UavDevice.java
View File

@@ -3,7 +3,6 @@ package com.maibu.uav.entity;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
import java.util.Map;
@Data @Data
public class UavDevice { public class UavDevice {

16
maibu-external/src/main/java/com/maibu/uav/entity/UavProject.java
View File

@@ -1,16 +0,0 @@
package com.maibu.uav.entity;
import lombok.Data;
import java.util.Map;
@Data
public class UavProject {
private String name;
private String introduction;
private String uuid;
private String org_uuid;
private Map<String,Double> project_work_center_point;
private Long created_at;
private Long updated_at;
}

20
maibu-external/src/main/java/com/maibu/uav/service/UAVService.java
View File

@@ -1,14 +1,13 @@
package com.maibu.uav.service; package com.maibu.uav.service;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.common.utils.json.JsonUtils;
import com.fastbee.iot.domain.DevicePlanTask;
import com.fastbee.uav.dto.*;
import com.fastbee.uav.entity.UavDevice;
import com.fastbee.uav.entity.UavDeviceState;
import com.fastbee.uav.utils.UavHttpUtils;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.maibu.uav.dto.*;
import com.maibu.uav.entity.UavDevice;
import com.maibu.uav.entity.UavDeviceState;
import com.maibu.uav.utils.UavHttpUtils;
import com.maibu.utils.StringUtils;
import com.maibu.utils.json.JsonUtils;
import io.minio.MinioClient; import io.minio.MinioClient;
import io.minio.PutObjectArgs; import io.minio.PutObjectArgs;
import io.minio.credentials.StaticProvider; import io.minio.credentials.StaticProvider;
@@ -18,16 +17,17 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.security.InvalidKeyException; import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.*; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;

5
maibu-framework/src/main/java/com/maibu/ali/AliSmsController.java
View File

@@ -1,7 +1,10 @@
package com.maibu.ali; package com.maibu.ali;
import com.aliyun.dysmsapi20170525.models.SendSmsRequest; import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
import com.fastbee.framework.web.service.TokenService; import com.maibu.annotation.Log;
import com.maibu.core.domain.AjaxResult;
import com.maibu.enums.BusinessType;
import com.maibu.web.service.TokenService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;

2
maibu-framework/src/main/java/com/maibu/ali/AliSmsService.java
View File

@@ -1,7 +1,7 @@
package com.maibu.ali; package com.maibu.ali;
import com.aliyun.dysmsapi20170525.models.SendSmsResponse; import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
import com.fastbee.common.core.redis.RedisCache; import com.maibu.core.redis.RedisCache;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

2
maibu-framework/src/main/java/com/maibu/ali/AliSmsUtil.java
View File

@@ -4,7 +4,7 @@ import com.aliyun.dysmsapi20170525.Client;
import com.aliyun.dysmsapi20170525.models.SendSmsRequest; import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
import com.aliyun.dysmsapi20170525.models.SendSmsResponse; import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
import com.aliyun.teaopenapi.models.Config; import com.aliyun.teaopenapi.models.Config;
import com.fastbee.common.utils.json.JsonUtils; import com.maibu.utils.json.JsonUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

19
maibu-framework/src/main/java/com/maibu/aspectj/DataScopeAspect.java
View File

@@ -2,19 +2,20 @@ package com.maibu.aspectj;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.maibu.annotation.DataScope;
import com.maibu.core.domain.BaseEntity;
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.text.Convert;
import com.maibu.security.context.PermissionContextHolder;
import com.maibu.utils.SecurityUtils;
import com.maibu.utils.StringUtils;
import org.aspectj.lang.JoinPoint; import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Before;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.fastbee.common.annotation.DataScope;
import com.fastbee.common.core.domain.BaseEntity;
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.text.Convert;
import com.fastbee.common.utils.SecurityUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.framework.security.context.PermissionContextHolder;
/** /**
* 数据过滤处理 * 数据过滤处理

11
maibu-framework/src/main/java/com/maibu/aspectj/DataSourceAspect.java
View File

@@ -2,6 +2,10 @@ package com.maibu.aspectj;
import java.util.Objects; import java.util.Objects;
import com.maibu.annotation.DataSource;
import com.maibu.datasource.DynamicDataSourceContextHolder;
import com.maibu.utils.StringUtils;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
@@ -12,9 +16,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.fastbee.common.annotation.DataSource;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.framework.datasource.DynamicDataSourceContextHolder;
/** /**
* 多数据源处理 * 多数据源处理
@@ -28,8 +29,8 @@ public class DataSourceAspect
{ {
protected Logger logger = LoggerFactory.getLogger(getClass()); protected Logger logger = LoggerFactory.getLogger(getClass());
@Pointcut("@annotation(com.fastbee.common.annotation.DataSource)" @Pointcut("@annotation(com.maibu.annotation.DataSource)"
+ "|| @within(com.fastbee.common.annotation.DataSource)") + "|| @within(com.maibu.annotation.DataSource)")
public void dsPointCut() public void dsPointCut()
{ {

25
maibu-framework/src/main/java/com/maibu/aspectj/LogAspect.java
View File

@@ -5,6 +5,19 @@ import java.util.Collection;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.maibu.annotation.Log;
import com.maibu.core.domain.model.LoginUser;
import com.maibu.domain.SysOperLog;
import com.maibu.enums.BusinessStatus;
import com.maibu.enums.HttpMethod;
import com.maibu.filter.PropertyPreExcludeFilter;
import com.maibu.manager.AsyncManager;
import com.maibu.manager.factory.AsyncFactory;
import com.maibu.utils.SecurityUtils;
import com.maibu.utils.ServletUtils;
import com.maibu.utils.StringUtils;
import com.maibu.utils.ip.IpUtils;
import org.aspectj.lang.JoinPoint; import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.AfterThrowing;
@@ -15,18 +28,6 @@ import org.springframework.stereotype.Component;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.fastbee.common.annotation.Log;
import com.fastbee.common.core.domain.model.LoginUser;
import com.fastbee.common.enums.BusinessStatus;
import com.fastbee.common.enums.HttpMethod;
import com.fastbee.common.filter.PropertyPreExcludeFilter;
import com.fastbee.common.utils.SecurityUtils;
import com.fastbee.common.utils.ServletUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.common.utils.ip.IpUtils;
import com.fastbee.framework.manager.AsyncManager;
import com.fastbee.framework.manager.factory.AsyncFactory;
import com.fastbee.system.domain.SysOperLog;
/** /**
* 操作日志记录处理 * 操作日志记录处理

13
maibu-framework/src/main/java/com/maibu/aspectj/RateLimiterAspect.java
View File

@@ -4,6 +4,13 @@ package com.maibu.aspectj;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import com.maibu.annotation.RateLimiter;
import com.maibu.enums.LimitType;
import com.maibu.exception.ServiceException;
import com.maibu.utils.ServletUtils;
import com.maibu.utils.StringUtils;
import com.maibu.utils.ip.IpUtils;
import org.aspectj.lang.JoinPoint; import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Before;
@@ -14,12 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.script.RedisScript; import org.springframework.data.redis.core.script.RedisScript;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.fastbee.common.annotation.RateLimiter;
import com.fastbee.common.enums.LimitType;
import com.fastbee.common.exception.ServiceException;
import com.fastbee.common.utils.ServletUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.common.utils.ip.IpUtils;
/** /**
* 限流处理 * 限流处理

2
maibu-framework/src/main/java/com/maibu/config/CacheConfig.java
View File

@@ -1,8 +1,8 @@
package com.maibu.config; package com.maibu.config;
import com.fastbee.framework.manager.SpringCacheManager;
import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.Caffeine;
import com.maibu.manager.SpringCacheManager;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cache.CacheManager; import org.springframework.cache.CacheManager;

2
maibu-framework/src/main/java/com/maibu/config/DataSourceConfig.java
View File

@@ -2,7 +2,7 @@ package com.maibu.config;
import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSource;
import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration;
import com.fastbee.framework.datasource.DynamicDataSource; import com.maibu.datasource.DynamicDataSource;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.AutoConfigureBefore;

7
maibu-framework/src/main/java/com/maibu/config/FilterConfig.java
View File

@@ -3,14 +3,15 @@ package com.maibu.config;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.servlet.DispatcherType; import javax.servlet.DispatcherType;
import com.maibu.filter.RepeatableFilter;
import com.maibu.filter.XssFilter;
import com.maibu.utils.StringUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import com.fastbee.common.filter.RepeatableFilter;
import com.fastbee.common.filter.XssFilter;
import com.fastbee.common.utils.StringUtils;
/** /**
* Filter配置 * Filter配置

4
maibu-framework/src/main/java/com/maibu/config/MyBatisConfig.java
View File

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import com.fastbee.common.utils.StringUtils; import com.maibu.datasource.DynamicDataSource;
import com.fastbee.framework.datasource.DynamicDataSource; import com.maibu.utils.StringUtils;
import org.apache.ibatis.io.VFS; import org.apache.ibatis.io.VFS;
import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionTemplate; import org.mybatis.spring.SqlSessionTemplate;

4
maibu-framework/src/main/java/com/maibu/config/MybatisPlusMetaObjectHandler.java
View File

@@ -2,8 +2,8 @@ package com.maibu.config;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.fastbee.common.core.domain.model.LoginUser; import com.maibu.core.domain.model.LoginUser;
import com.fastbee.common.utils.SecurityUtils; import com.maibu.utils.SecurityUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject; import org.apache.ibatis.reflection.MetaObject;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;

2
maibu-framework/src/main/java/com/maibu/config/OtaThreadPoolConfig.java
View File

@@ -1,6 +1,6 @@
package com.maibu.config; package com.maibu.config;
import com.fastbee.common.constant.FastBeeConstant; import com.maibu.constant.FastBeeConstant;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;

4
maibu-framework/src/main/java/com/maibu/config/RedissonConfig.java
View File

@@ -8,8 +8,9 @@ import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import com.maibu.config.properties.RedissonProperties;
import com.maibu.handler.KeyPrefixHandler;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import com.fastbee.framework.config.properties.RedissonProperties;
import org.redisson.client.codec.StringCodec; import org.redisson.client.codec.StringCodec;
import org.redisson.codec.CompositeCodec; import org.redisson.codec.CompositeCodec;
import org.redisson.codec.TypedJsonJacksonCodec; import org.redisson.codec.TypedJsonJacksonCodec;
@@ -18,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import com.fastbee.framework.handler.KeyPrefixHandler;
import java.time.LocalDateTime; import java.time.LocalDateTime;

7
maibu-framework/src/main/java/com/maibu/config/ResourcesConfig.java
View File

@@ -2,7 +2,9 @@ package com.maibu.config;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import com.fastbee.framework.interceptor.LanguageInterceptor; import com.maibu.constant.Constants;
import com.maibu.interceptor.LanguageInterceptor;
import com.maibu.interceptor.RepeatSubmitInterceptor;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@@ -13,9 +15,6 @@ import org.springframework.web.filter.CorsFilter;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import com.fastbee.common.config.RuoYiConfig;
import com.fastbee.common.constant.Constants;
import com.fastbee.framework.interceptor.RepeatSubmitInterceptor;
import javax.annotation.Resource; import javax.annotation.Resource;

8
maibu-framework/src/main/java/com/maibu/config/SecurityConfig.java
View File

@@ -1,5 +1,9 @@
package com.maibu.config; package com.maibu.config;
import com.maibu.config.properties.PermitAllUrlProperties;
import com.maibu.security.filter.JwtAuthenticationTokenFilter;
import com.maibu.security.handle.AuthenticationEntryPointImpl;
import com.maibu.security.handle.LogoutSuccessHandlerImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
@@ -18,10 +22,6 @@ import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.CorsConfigurationSource;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter; import org.springframework.web.filter.CorsFilter;
import com.fastbee.framework.config.properties.PermitAllUrlProperties;
import com.fastbee.framework.security.filter.JwtAuthenticationTokenFilter;
import com.fastbee.framework.security.handle.AuthenticationEntryPointImpl;
import com.fastbee.framework.security.handle.LogoutSuccessHandlerImpl;
import java.util.Arrays; import java.util.Arrays;

3
maibu-framework/src/main/java/com/maibu/config/ServerConfig.java
View File

@@ -1,8 +1,9 @@
package com.maibu.config; package com.maibu.config;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.maibu.utils.ServletUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.fastbee.common.utils.ServletUtils;
/** /**
* 服务相关配置 * 服务相关配置

2
maibu-framework/src/main/java/com/maibu/config/ThreadPoolConfig.java
View File

@@ -1,6 +1,6 @@
package com.maibu.config; package com.maibu.config;
import com.fastbee.common.utils.Threads; import com.maibu.utils.Threads;
import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.apache.commons.lang3.concurrent.BasicThreadFactory;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;

3
maibu-framework/src/main/java/com/maibu/config/properties/PermitAllUrlProperties.java
View File

@@ -5,6 +5,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import com.maibu.annotation.Anonymous;
import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.RegExUtils;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
@@ -15,7 +17,6 @@ import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.web.method.HandlerMethod; import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
import com.fastbee.common.annotation.Anonymous;
/** /**
* 设置Anonymous注解允许匿名访问的url * 设置Anonymous注解允许匿名访问的url

2
maibu-framework/src/main/java/com/maibu/config/sharding/ShardingAlgorithmTool.java
View File

@@ -3,7 +3,7 @@ package com.maibu.config.sharding;
import cn.hutool.extra.spring.SpringUtil; import cn.hutool.extra.spring.SpringUtil;
import com.alibaba.druid.util.StringUtils; import com.alibaba.druid.util.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.fastbee.framework.config.sharding.enums.ShardingTableCacheEnum; import com.maibu.config.sharding.enums.ShardingTableCacheEnum;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource; import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
import org.apache.shardingsphere.infra.config.RuleConfiguration; import org.apache.shardingsphere.infra.config.RuleConfiguration;

2
maibu-framework/src/main/java/com/maibu/config/sharding/TimeShardingAlgorithm.java
View File

@@ -1,7 +1,7 @@
package com.maibu.config.sharding; package com.maibu.config.sharding;
import com.fastbee.framework.config.sharding.enums.ShardingTableCacheEnum;
import com.google.common.collect.Range; import com.google.common.collect.Range;
import com.maibu.config.sharding.enums.ShardingTableCacheEnum;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue; import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue; import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;

2
maibu-framework/src/main/java/com/maibu/config/sharding/enums/ShardingTableCacheEnum.java
View File

@@ -3,7 +3,7 @@ package com.maibu.config.sharding.enums;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import java.util.*; import java.util.*;
import static com.fastbee.framework.config.sharding.ShardingAlgorithmTool.actualDataNodesRefresh; import static com.maibu.config.sharding.ShardingAlgorithmTool.actualDataNodesRefresh;
/** /**

2
maibu-framework/src/main/java/com/maibu/handler/KeyPrefixHandler.java
View File

@@ -1,6 +1,6 @@
package com.maibu.handler; package com.maibu.handler;
import com.fastbee.common.utils.StringUtils; import com.maibu.utils.StringUtils;
import org.redisson.api.NameMapper; import org.redisson.api.NameMapper;
/** /**

19
maibu-framework/src/main/java/com/maibu/interceptor/LanguageInterceptor.java
View File

@@ -1,8 +1,9 @@
package com.maibu.interceptor; package com.maibu.interceptor;
import com.fastbee.common.utils.SecurityUtils; import com.maibu.constant.Constants;
import com.fastbee.common.utils.StringUtils; import com.maibu.enums.Language;
import com.fastbee.system.enums.Language; import com.maibu.utils.SecurityUtils;
import com.maibu.utils.StringUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -13,8 +14,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Locale; import java.util.Locale;
import static com.fastbee.common.constant.Constants.LANGUAGE;
/** /**
* 国际化语言拦截器 * 国际化语言拦截器
@@ -25,16 +24,16 @@ public class LanguageInterceptor implements HandlerInterceptor {
@Override @Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
String language = request.getHeader(LANGUAGE); String language = request.getHeader(Constants.LANGUAGE);
if (StringUtils.isEmpty(language) || language.equals("undefined") if (StringUtils.isEmpty(language) || language.equals("undefined")
|| language.equals("")|| language.equals("null")){ || language.equals("") || language.equals("null")) {
//针对有些接口没有增加语言字段，先去token获取 //针对有些接口没有增加语言字段，先去token获取
language = SecurityUtils.getLanguage(); language = SecurityUtils.getLanguage();
}else if (!language.contains("-")){ } else if (!language.contains("-")) {
language = Language.matches(language); language = Language.matches(language);
} }
// 前端传递的language必须是zh-CN格式的，中间的-必须要完整，不能只传递zh或en // 前端传递的language必须是zh-CN格式的，中间的-必须要完整，不能只传递zh或en
Locale locale = new Locale(language.split("-")[0],language.split("-")[1]); Locale locale = new Locale(language.split("-")[0], language.split("-")[1]);
// 这样赋值以后，MessageUtils.message方法就不用修改了 // 这样赋值以后，MessageUtils.message方法就不用修改了
LocaleContextHolder.setLocale(locale); LocaleContextHolder.setLocale(locale);
return true; return true;

7
maibu-framework/src/main/java/com/maibu/interceptor/RepeatSubmitInterceptor.java
View File

@@ -3,13 +3,14 @@ package com.maibu.interceptor;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.maibu.annotation.RepeatSubmit;
import com.maibu.core.domain.AjaxResult;
import com.maibu.utils.ServletUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod; import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerInterceptor;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.fastbee.common.annotation.RepeatSubmit;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.utils.ServletUtils;
/** /**
* 防止重复提交拦截器 * 防止重复提交拦截器

15
maibu-framework/src/main/java/com/maibu/interceptor/impl/SameUrlDataInterceptor.java
View File

@@ -4,17 +4,18 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.maibu.annotation.RepeatSubmit;
import com.maibu.constant.CacheConstants;
import com.maibu.core.redis.RedisCache;
import com.maibu.filter.RepeatedlyRequestWrapper;
import com.maibu.interceptor.RepeatSubmitInterceptor;
import com.maibu.utils.StringUtils;
import com.maibu.utils.http.HttpHelper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.fastbee.common.annotation.RepeatSubmit;
import com.fastbee.common.constant.CacheConstants;
import com.fastbee.common.core.redis.RedisCache;
import com.fastbee.common.filter.RepeatedlyRequestWrapper;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.common.utils.http.HttpHelper;
import com.fastbee.framework.interceptor.RepeatSubmitInterceptor;
/** /**
* 判断请求url和数据是否和上一次相同， * 判断请求url和数据是否和上一次相同，

5
maibu-framework/src/main/java/com/maibu/manager/AsyncManager.java
View File

@@ -1,10 +1,11 @@
package com.maibu.manager; package com.maibu.manager;
import com.maibu.utils.Threads;
import com.maibu.utils.spring.SpringUtils;
import java.util.TimerTask; import java.util.TimerTask;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import com.fastbee.common.utils.Threads;
import com.fastbee.common.utils.spring.SpringUtils;
/** /**
* 异步任务管理器 * 异步任务管理器

2
maibu-framework/src/main/java/com/maibu/manager/CaffeineCacheDecorator.java
View File

@@ -1,7 +1,7 @@
package com.maibu.manager; package com.maibu.manager;
import com.maibu.utils.spring.SpringUtils;
import org.springframework.cache.Cache; import org.springframework.cache.Cache;
import com.fastbee.common.utils.spring.SpringUtils;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
/** /**

2
maibu-framework/src/main/java/com/maibu/manager/SpringCacheManager.java
View File

@@ -1,6 +1,6 @@
package com.maibu.manager; package com.maibu.manager;
import com.fastbee.framework.utils.RedisUtils; import com.maibu.utils.RedisUtils;
import org.redisson.api.RMap; import org.redisson.api.RMap;
import org.redisson.api.RMapCache; import org.redisson.api.RMapCache;
import org.redisson.spring.cache.CacheConfig; import org.redisson.spring.cache.CacheConfig;

23
maibu-framework/src/main/java/com/maibu/manager/factory/AsyncFactory.java
View File

@@ -1,19 +1,20 @@
package com.maibu.manager.factory; package com.maibu.manager.factory;
import java.util.TimerTask; import java.util.TimerTask;
import com.maibu.constant.Constants;
import com.maibu.domain.SysLogininfor;
import com.maibu.domain.SysOperLog;
import com.maibu.service.ISysLogininforService;
import com.maibu.service.ISysOperLogService;
import com.maibu.utils.LogUtils;
import com.maibu.utils.ServletUtils;
import com.maibu.utils.StringUtils;
import com.maibu.utils.ip.AddressUtils;
import com.maibu.utils.ip.IpUtils;
import com.maibu.utils.spring.SpringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.fastbee.common.constant.Constants;
import com.fastbee.common.utils.LogUtils;
import com.fastbee.common.utils.ServletUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.common.utils.ip.AddressUtils;
import com.fastbee.common.utils.ip.IpUtils;
import com.fastbee.common.utils.spring.SpringUtils;
import com.fastbee.system.domain.SysLogininfor;
import com.fastbee.system.domain.SysOperLog;
import com.fastbee.system.service.ISysLogininforService;
import com.fastbee.system.service.ISysOperLogService;
import eu.bitwalker.useragentutils.UserAgent; import eu.bitwalker.useragentutils.UserAgent;
/** /**

6
maibu-framework/src/main/java/com/maibu/mybatis/mapper/BaseMapperX.java
View File

@@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.baomidou.mybatisplus.extension.toolkit.Db; import com.baomidou.mybatisplus.extension.toolkit.Db;
import com.fastbee.common.core.domain.PageParam; import com.maibu.core.domain.PageParam;
import com.fastbee.common.core.domain.PageResult; import com.maibu.core.domain.PageResult;
import com.fastbee.framework.mybatis.utils.MyBatisUtils; import com.maibu.mybatis.utils.MyBatisUtils;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.Collection; import java.util.Collection;

4
maibu-framework/src/main/java/com/maibu/mybatis/utils/MyBatisUtils.java
View File

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fastbee.common.core.domain.PageParam; import com.maibu.core.domain.PageParam;
import com.fastbee.common.core.domain.SortingField; import com.maibu.core.domain.SortingField;
import net.sf.jsqlparser.expression.Alias; import net.sf.jsqlparser.expression.Alias;
import net.sf.jsqlparser.schema.Column; import net.sf.jsqlparser.schema.Column;
import net.sf.jsqlparser.schema.Table; import net.sf.jsqlparser.schema.Table;

2
maibu-framework/src/main/java/com/maibu/security/context/PermissionContextHolder.java
View File

@@ -1,8 +1,8 @@
package com.maibu.security.context; package com.maibu.security.context;
import com.maibu.core.text.Convert;
import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import com.fastbee.common.core.text.Convert;
/** /**
* 权限信息 * 权限信息

9
maibu-framework/src/main/java/com/maibu/security/filter/JwtAuthenticationTokenFilter.java
View File

@@ -5,16 +5,17 @@ import javax.servlet.FilterChain;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.maibu.core.domain.model.LoginUser;
import com.maibu.utils.SecurityUtils;
import com.maibu.utils.StringUtils;
import com.maibu.web.service.TokenService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter; import org.springframework.web.filter.OncePerRequestFilter;
import com.fastbee.common.core.domain.model.LoginUser;
import com.fastbee.common.utils.SecurityUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.framework.web.service.TokenService;
/** /**
* token过滤器 验证token有效性 * token过滤器 验证token有效性

9
maibu-framework/src/main/java/com/maibu/security/handle/AuthenticationEntryPointImpl.java
View File

@@ -4,14 +4,15 @@ import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.maibu.constant.HttpStatus;
import com.maibu.core.domain.AjaxResult;
import com.maibu.utils.ServletUtils;
import com.maibu.utils.StringUtils;
import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.fastbee.common.constant.HttpStatus;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.utils.ServletUtils;
import com.fastbee.common.utils.StringUtils;
/** /**
* 认证失败处理类 返回未授权 * 认证失败处理类 返回未授权

17
maibu-framework/src/main/java/com/maibu/security/handle/LogoutSuccessHandlerImpl.java
View File

@@ -4,19 +4,20 @@ import java.io.IOException;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.maibu.constant.Constants;
import com.maibu.core.domain.AjaxResult;
import com.maibu.core.domain.model.LoginUser;
import com.maibu.manager.AsyncManager;
import com.maibu.manager.factory.AsyncFactory;
import com.maibu.utils.ServletUtils;
import com.maibu.utils.StringUtils;
import com.maibu.web.service.TokenService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.fastbee.common.constant.Constants;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.core.domain.model.LoginUser;
import com.fastbee.common.utils.ServletUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.framework.manager.AsyncManager;
import com.fastbee.framework.manager.factory.AsyncFactory;
import com.fastbee.framework.web.service.TokenService;
/** /**
* 自定义退出处理类 返回成功 * 自定义退出处理类 返回成功

2
maibu-framework/src/main/java/com/maibu/utils/CacheUtils.java
View File

@@ -1,6 +1,6 @@
package com.maibu.utils; package com.maibu.utils;
import com.fastbee.common.utils.spring.SpringUtils; import com.maibu.utils.spring.SpringUtils;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.redisson.api.RMap; import org.redisson.api.RMap;

2
maibu-framework/src/main/java/com/maibu/utils/QueueUtils.java
View File

@@ -1,6 +1,6 @@
package com.maibu.utils; package com.maibu.utils;
import com.fastbee.common.utils.spring.SpringUtils; import com.maibu.utils.spring.SpringUtils;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.redisson.api.*; import org.redisson.api.*;

2
maibu-framework/src/main/java/com/maibu/utils/RedisUtils.java
View File

@@ -1,6 +1,6 @@
package com.maibu.utils; package com.maibu.utils;
import com.fastbee.common.utils.spring.SpringUtils; import com.maibu.utils.spring.SpringUtils;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.redisson.api.*; import org.redisson.api.*;

11
maibu-framework/src/main/java/com/maibu/web/service/PermissionService.java
View File

@@ -1,13 +1,14 @@
package com.maibu.web.service; package com.maibu.web.service;
import java.util.Set; import java.util.Set;
import com.maibu.core.domain.entity.SysRole;
import com.maibu.core.domain.model.LoginUser;
import com.maibu.security.context.PermissionContextHolder;
import com.maibu.utils.SecurityUtils;
import com.maibu.utils.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import com.fastbee.common.core.domain.entity.SysRole;
import com.fastbee.common.core.domain.model.LoginUser;
import com.fastbee.common.utils.SecurityUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.framework.security.context.PermissionContextHolder;
/** /**
* RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母 * RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母

30
maibu-framework/src/main/java/com/maibu/web/service/SysRegisterService.java
View File

@@ -1,23 +1,23 @@
package com.maibu.web.service; package com.maibu.web.service;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.maibu.constant.CacheConstants;
import com.maibu.constant.Constants;
import com.maibu.constant.UserConstants;
import com.maibu.core.domain.entity.SysUser;
import com.maibu.core.domain.model.RegisterBody;
import com.maibu.core.redis.RedisCache;
import com.maibu.exception.user.CaptchaException;
import com.maibu.exception.user.CaptchaExpireException;
import com.maibu.manager.AsyncManager;
import com.maibu.manager.factory.AsyncFactory;
import com.maibu.service.ISysConfigService;
import com.maibu.service.ISysUserService;
import com.maibu.utils.MessageUtils;
import com.maibu.utils.SecurityUtils;
import com.maibu.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.fastbee.common.constant.CacheConstants;
import com.fastbee.common.constant.Constants;
import com.fastbee.common.constant.UserConstants;
import com.fastbee.common.core.domain.entity.SysUser;
import com.fastbee.common.core.domain.model.RegisterBody;
import com.fastbee.common.core.redis.RedisCache;
import com.fastbee.common.exception.user.CaptchaException;
import com.fastbee.common.exception.user.CaptchaExpireException;
import com.fastbee.common.utils.MessageUtils;
import com.fastbee.common.utils.SecurityUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.framework.manager.AsyncManager;
import com.fastbee.framework.manager.factory.AsyncFactory;
import com.fastbee.system.service.ISysConfigService;
import com.fastbee.system.service.ISysUserService;
/** /**
* 注册校验方法 * 注册校验方法

25
maibu-framework/src/main/java/com/maibu/web/service/TokenService.java
View File

@@ -1,18 +1,17 @@
package com.maibu.web.service; package com.maibu.web.service;
import com.fastbee.common.constant.CacheConstants; import com.maibu.constant.CacheConstants;
import com.fastbee.common.constant.Constants; import com.maibu.constant.Constants;
import com.fastbee.common.core.domain.entity.SysUser; import com.maibu.core.domain.entity.SysUser;
import com.fastbee.common.core.domain.model.LoginUser; import com.maibu.core.domain.model.LoginUser;
import com.fastbee.common.core.redis.RedisCache; import com.maibu.core.redis.RedisCache;
import com.fastbee.common.exception.ServiceException; import com.maibu.domain.SysClient;
import com.fastbee.common.utils.ServletUtils; import com.maibu.service.ISysClientService;
import com.fastbee.common.utils.StringUtils; import com.maibu.utils.ServletUtils;
import com.fastbee.common.utils.ip.AddressUtils; import com.maibu.utils.StringUtils;
import com.fastbee.common.utils.ip.IpUtils; import com.maibu.utils.ip.AddressUtils;
import com.fastbee.common.utils.uuid.IdUtils; import com.maibu.utils.ip.IpUtils;
import com.fastbee.system.domain.SysClient; import com.maibu.utils.uuid.IdUtils;
import com.fastbee.system.service.ISysClientService;
import eu.bitwalker.useragentutils.UserAgent; import eu.bitwalker.useragentutils.UserAgent;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts; import io.jsonwebtoken.Jwts;

11
maibu-iotDA/src/main/java/com/maibu/controller/IoTDADeviceController.java
View File

@@ -1,11 +1,12 @@
package com.maibu.controller; package com.maibu.controller;
import com.fastbee.common.core.domain.AjaxResult; import com.maibu.core.domain.AjaxResult;
import com.fastbee.common.utils.json.JsonUtils; import com.maibu.dto.IoTDACommandDTO;
import com.fastbee.dto.IoTDACommandDTO; import com.maibu.dto.IoTDARuleDTO;
import com.fastbee.dto.IoTDARuleDTO; import com.maibu.service.IoTDADeviceService;
import com.fastbee.service.IoTDADeviceService; import com.maibu.utils.json.JsonUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.io.IOException; import java.io.IOException;

10
maibu-iotDA/src/main/java/com/maibu/init/InitIotResource.java
View File

@@ -3,12 +3,12 @@ package com.maibu.init;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.fastbee.entity.IoTDADeviceSecret;
import com.fastbee.mapper.IoTDADeviceSecretMapper;
import com.fastbee.memory.IotGlobalMemory;
import com.fastbee.utils.IoTDAAMQClient;
import com.fastbee.utils.IoTDAMqttClient;
import com.huaweicloud.sdk.iotda.v5.model.QueryDeviceSimplify; import com.huaweicloud.sdk.iotda.v5.model.QueryDeviceSimplify;
import com.maibu.entity.IoTDADeviceSecret;
import com.maibu.mapper.IoTDADeviceSecretMapper;
import com.maibu.memory.IotGlobalMemory;
import com.maibu.utils.IoTDAAMQClient;
import com.maibu.utils.IoTDAMqttClient;
import io.vertx.core.Vertx; import io.vertx.core.Vertx;
import io.vertx.core.VertxOptions; import io.vertx.core.VertxOptions;
import lombok.Getter; import lombok.Getter;

4
maibu-iotDA/src/main/java/com/maibu/mapper/IoTDADeviceSecretMapper.java
View File

@@ -1,7 +1,7 @@
package com.maibu.mapper; package com.maibu.mapper;
import com.fastbee.entity.IoTDADeviceSecret; import com.maibu.entity.IoTDADeviceSecret;
import com.fastbee.framework.mybatis.mapper.BaseMapperX; import com.maibu.mybatis.mapper.BaseMapperX;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**

6
maibu-iotDA/src/main/java/com/maibu/memory/IotGlobalMemory.java
View File

@@ -1,8 +1,8 @@
package com.maibu.memory; package com.maibu.memory;
import com.fastbee.utils.IoTDAAMQClient; import com.maibu.utils.IoTDAAMQClient;
import com.fastbee.utils.IoTDAMqttClient; import com.maibu.utils.IoTDAMqttClient;
import io.vertx.core.Vertx; import io.vertx.core.Vertx;
import lombok.Data; import lombok.Data;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -23,7 +23,7 @@ public class IotGlobalMemory {
*/ */
public static Vertx vertx; public static Vertx vertx;
public static Map<String,IoTDAMqttClient> ioTDAMqttClientMap = new ConcurrentHashMap<>(); public static Map<String, IoTDAMqttClient> ioTDAMqttClientMap = new ConcurrentHashMap<>();
public static IoTDAAMQClient ioTDAAMQClient; public static IoTDAAMQClient ioTDAAMQClient;

Some files were not shown because too many files have changed in this diff Show More