diff --git a/fastbee-admin/pom.xml b/fastbee-admin/pom.xml index c1b4449e..dc937c52 100644 --- a/fastbee-admin/pom.xml +++ b/fastbee-admin/pom.xml @@ -120,17 +120,17 @@ caffeine - - - - - + + + + + - - - - + + + + com.fastbee diff --git a/fastbee-admin/src/main/java/com/fastbee/FastBeeApplication.java b/fastbee-admin/src/main/java/com/fastbee/FastBeeApplication.java index cc65908a..8f589952 100644 --- a/fastbee-admin/src/main/java/com/fastbee/FastBeeApplication.java +++ b/fastbee-admin/src/main/java/com/fastbee/FastBeeApplication.java @@ -11,10 +11,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; */ @SpringBootApplication @ForestScan(basePackages = "com.fastbee") -public class FastBeeApplication -{ - public static void main(String[] args) - { +public class FastBeeApplication { + public static void main(String[] args) { // System.setProperty("spring.devtools.restart.enabled", "false"); SpringApplication.run(FastBeeApplication.class, args); } diff --git a/fastbee-admin/src/main/java/com/fastbee/FastBeeServletInitializer.java b/fastbee-admin/src/main/java/com/fastbee/FastBeeServletInitializer.java index 76586e58..ff844a75 100644 --- a/fastbee-admin/src/main/java/com/fastbee/FastBeeServletInitializer.java +++ b/fastbee-admin/src/main/java/com/fastbee/FastBeeServletInitializer.java @@ -5,14 +5,12 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer /** * web容器中进行部署 - * + * * @author ruoyi */ -public class FastBeeServletInitializer extends SpringBootServletInitializer -{ +public class FastBeeServletInitializer extends SpringBootServletInitializer { @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) - { + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { return application.sources(FastBeeApplication.class); } } diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/common/CaptchaController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/common/CaptchaController.java index 78c00b69..ed8a3cc9 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/common/CaptchaController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/common/CaptchaController.java @@ -1,19 +1,5 @@ package com.fastbee.web.controller.common; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.util.concurrent.TimeUnit; -import javax.annotation.Resource; -import javax.imageio.ImageIO; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.FastByteArrayOutputStream; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; -import com.google.code.kaptcha.Producer; import com.fastbee.common.config.RuoYiConfig; import com.fastbee.common.constant.CacheConstants; import com.fastbee.common.constant.Constants; @@ -22,6 +8,20 @@ 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; +import com.google.code.kaptcha.Producer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.FastByteArrayOutputStream; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.imageio.ImageIO; +import javax.servlet.http.HttpServletResponse; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.util.concurrent.TimeUnit; /** * 验证码操作处理 @@ -30,8 +30,7 @@ import com.fastbee.system.service.ISysConfigService; */ @Api(tags = "验证码操作") @RestController -public class CaptchaController -{ +public class CaptchaController { @Resource(name = "captchaProducer") private Producer captchaProducer; @@ -43,18 +42,17 @@ public class CaptchaController @Autowired private ISysConfigService configService; + /** * 生成验证码 */ @ApiOperation("获取验证码") @GetMapping("/captchaImage") - public AjaxResult getCode(HttpServletResponse response,Boolean showCode) throws IOException - { + public AjaxResult getCode(HttpServletResponse response, Boolean showCode) throws IOException { AjaxResult ajax = AjaxResult.success(); boolean captchaEnabled = configService.selectCaptchaEnabled(); ajax.put("captchaEnabled", captchaEnabled); - if (!captchaEnabled) - { + if (!captchaEnabled) { return ajax; } @@ -67,15 +65,12 @@ public class CaptchaController // 生成验证码 String captchaType = RuoYiConfig.getCaptchaType(); - if ("math".equals(captchaType)) - { + if ("math".equals(captchaType)) { String capText = captchaProducerMath.createText(); capStr = capText.substring(0, capText.lastIndexOf("@")); code = capText.substring(capText.lastIndexOf("@") + 1); image = captchaProducerMath.createImage(capStr); - } - else if ("char".equals(captchaType)) - { + } else if ("char".equals(captchaType)) { capStr = code = captchaProducer.createText(); image = captchaProducer.createImage(capStr); } @@ -83,12 +78,9 @@ public class CaptchaController redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); // 转换流信息写出 FastByteArrayOutputStream os = new FastByteArrayOutputStream(); - try - { + try { ImageIO.write(image, "jpg", os); - } - catch (IOException e) - { + } catch (IOException e) { return AjaxResult.error(e.getMessage()); } if (Boolean.TRUE.equals(showCode)) { diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/common/CommonController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/common/CommonController.java index a66d3b5e..e2210c8f 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/common/CommonController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/common/CommonController.java @@ -1,14 +1,14 @@ package com.fastbee.web.controller.common; -import java.io.IOException; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.fastbee.common.config.RuoYiConfig; +import com.fastbee.common.constant.Constants; +import com.fastbee.common.core.domain.AjaxResult; import com.fastbee.common.utils.MessageUtils; +import com.fastbee.common.utils.StringUtils; +import com.fastbee.common.utils.file.FileUploadUtils; +import com.fastbee.common.utils.file.FileUtils; import com.fastbee.common.utils.file.QRCodeUtils; +import com.fastbee.framework.config.ServerConfig; import com.google.zxing.client.j2se.MatrixToImageWriter; import com.google.zxing.common.BitMatrix; import io.swagger.annotations.Api; @@ -22,13 +22,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.fastbee.common.config.RuoYiConfig; -import com.fastbee.common.constant.Constants; -import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.utils.StringUtils; -import com.fastbee.common.utils.file.FileUploadUtils; -import com.fastbee.common.utils.file.FileUtils; -import com.fastbee.framework.config.ServerConfig; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; /** * 通用请求处理 @@ -38,8 +38,7 @@ import com.fastbee.framework.config.ServerConfig; @Api(tags = "通用请求处理") @RestController @RequestMapping("/common") -public class CommonController -{ +public class CommonController { private static final Logger log = LoggerFactory.getLogger(CommonController.class); @Autowired @@ -51,16 +50,13 @@ public class CommonController * 通用下载请求 * * @param fileName 文件名称 - * @param delete 是否删除 + * @param delete 是否删除 */ @ApiOperation("文件下载") @GetMapping("/download") - public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) - { - try - { - if (!FileUtils.checkAllowDownload(fileName)) - { + public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) { + try { + if (!FileUtils.checkAllowDownload(fileName)) { throw new Exception(StringUtils.format(MessageUtils.message("download.filename.not.valid"), fileName)); } String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); @@ -69,13 +65,10 @@ public class CommonController response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); FileUtils.setAttachmentResponseHeader(response, realFileName); FileUtils.writeBytes(filePath, response.getOutputStream()); - if (delete) - { + if (delete) { FileUtils.deleteFile(filePath); } - } - catch (Exception e) - { + } catch (Exception e) { log.error("下载文件失败", e); } } @@ -85,10 +78,8 @@ public class CommonController */ @ApiOperation("单个文件上传") @PostMapping("/upload") - public AjaxResult uploadFile(MultipartFile file) throws Exception - { - try - { + public AjaxResult uploadFile(MultipartFile file) throws Exception { + try { // 上传文件路径 String filePath = RuoYiConfig.getUploadPath(); // 上传并返回新文件名称 @@ -100,9 +91,7 @@ public class CommonController ajax.put("newFileName", FileUtils.getName(fileName)); ajax.put("originalFilename", file.getOriginalFilename()); return ajax; - } - catch (Exception e) - { + } catch (Exception e) { return AjaxResult.error(e.getMessage()); } } @@ -112,18 +101,15 @@ public class CommonController */ @ApiOperation("多个文件上传") @PostMapping("/uploads") - public AjaxResult uploadFiles(List files) throws Exception - { - try - { + public AjaxResult uploadFiles(List files) throws Exception { + try { // 上传文件路径 String filePath = RuoYiConfig.getUploadPath(); List urls = new ArrayList(); List fileNames = new ArrayList(); List newFileNames = new ArrayList(); List originalFilenames = new ArrayList(); - for (MultipartFile file : files) - { + for (MultipartFile file : files) { // 上传并返回新文件名称 String fileName = FileUploadUtils.upload(filePath, file); String url = serverConfig.getUrl() + fileName; @@ -138,9 +124,7 @@ public class CommonController ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER)); ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER)); return ajax; - } - catch (Exception e) - { + } catch (Exception e) { return AjaxResult.error(e.getMessage()); } } @@ -151,12 +135,9 @@ public class CommonController @GetMapping("/download/resource") @ApiOperation("本地资源通用下载") public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response) - throws Exception - { - try - { - if (!FileUtils.checkAllowDownload(resource)) - { + throws Exception { + try { + if (!FileUtils.checkAllowDownload(resource)) { throw new Exception(StringUtils.format(MessageUtils.message("download.resource.not.valid"), resource)); } // 本地资源路径 @@ -168,18 +149,16 @@ public class CommonController response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); FileUtils.setAttachmentResponseHeader(response, downloadName); FileUtils.writeBytes(downloadPath, response.getOutputStream()); - } - catch (Exception e) - { + } catch (Exception e) { log.error("下载文件失败", e); } } /** - * 生成二维码 + * 生成二维码 + * * @param url url - - * */ + */ @GetMapping(value = "/createQrCode") @ApiOperation("根据url生成二维码") public void getCode(String url, HttpServletResponse response) throws IOException { @@ -194,6 +173,6 @@ public class CommonController //获取一个二维码图片 BitMatrix bitMatrix = QRCodeUtils.createCode(url); //以流的形式输出到前端 - MatrixToImageWriter.writeToStream(bitMatrix , "jpg" , stream); + MatrixToImageWriter.writeToStream(bitMatrix, "jpg", stream); } } diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/CacheController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/CacheController.java index 2962d53c..7856ca18 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/CacheController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/CacheController.java @@ -1,28 +1,18 @@ package com.fastbee.web.controller.monitor; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - +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; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisCallback; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.access.prepost.PreAuthorize; -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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.fastbee.common.constant.CacheConstants; -import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.utils.StringUtils; -import com.fastbee.system.domain.SysCache; +import org.springframework.web.bind.annotation.*; + +import java.util.*; /** * 缓存监控 @@ -32,12 +22,12 @@ import com.fastbee.system.domain.SysCache; @Api(tags = "缓存监控") @RestController @RequestMapping("/monitor/cache") -public class CacheController -{ +public class CacheController { @Autowired private RedisTemplate redisTemplate; private final static List caches = new ArrayList(); + { caches.add(new SysCache(CacheConstants.LOGIN_TOKEN_KEY, "用户信息")); caches.add(new SysCache(CacheConstants.SYS_CONFIG_KEY, "配置信息")); @@ -51,8 +41,7 @@ public class CacheController @ApiOperation("获取缓存信息") @PreAuthorize("@ss.hasPermi('monitor:cache:list')") @GetMapping() - public AjaxResult getInfo() throws Exception - { + public AjaxResult getInfo() throws Exception { Properties info = (Properties) redisTemplate.execute((RedisCallback) connection -> connection.info()); Properties commandStats = (Properties) redisTemplate.execute((RedisCallback) connection -> connection.info("commandstats")); Object dbSize = redisTemplate.execute((RedisCallback) connection -> connection.dbSize()); @@ -76,16 +65,14 @@ public class CacheController @ApiOperation("缓存列表") @PreAuthorize("@ss.hasPermi('monitor:cache:list')") @GetMapping("/getNames") - public AjaxResult cache() - { + public AjaxResult cache() { return AjaxResult.success(caches); } @ApiOperation("键名列表") @PreAuthorize("@ss.hasPermi('monitor:cache:list')") @GetMapping("/getKeys/{cacheName}") - public AjaxResult getCacheKeys(@PathVariable String cacheName) - { + public AjaxResult getCacheKeys(@PathVariable String cacheName) { Set cacheKeys = redisTemplate.keys(cacheName + "*"); return AjaxResult.success(cacheKeys); } @@ -93,8 +80,7 @@ public class CacheController @ApiOperation("缓存内容") @PreAuthorize("@ss.hasPermi('monitor:cache:list')") @GetMapping("/getValue/{cacheName}/{cacheKey}") - public AjaxResult getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey) - { + public AjaxResult getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey) { String cacheValue = redisTemplate.opsForValue().get(cacheKey); SysCache sysCache = new SysCache(cacheName, cacheKey, cacheValue); return AjaxResult.success(sysCache); @@ -103,8 +89,7 @@ public class CacheController @ApiOperation("清理缓存名称") @PreAuthorize("@ss.hasPermi('monitor:cache:remove')") @DeleteMapping("/clearCacheName/{cacheName}") - public AjaxResult clearCacheName(@PathVariable String cacheName) - { + public AjaxResult clearCacheName(@PathVariable String cacheName) { Collection cacheKeys = redisTemplate.keys(cacheName + "*"); redisTemplate.delete(cacheKeys); return AjaxResult.success(); @@ -113,8 +98,7 @@ public class CacheController @ApiOperation("清理缓存键名") @PreAuthorize("@ss.hasPermi('monitor:cache:remove')") @DeleteMapping("/clearCacheKey/{cacheKey}") - public AjaxResult clearCacheKey(@PathVariable String cacheKey) - { + public AjaxResult clearCacheKey(@PathVariable String cacheKey) { redisTemplate.delete(cacheKey); return AjaxResult.success(); } @@ -122,8 +106,7 @@ public class CacheController @ApiOperation("清理所有缓存内容") @PreAuthorize("@ss.hasPermi('monitor:cache:remove')") @DeleteMapping("/clearCacheAll") - public AjaxResult clearCacheAll() - { + public AjaxResult clearCacheAll() { Collection cacheKeys = redisTemplate.keys("*"); redisTemplate.delete(cacheKeys); return AjaxResult.success(); diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/ServerController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/ServerController.java index 27510ed8..86c90345 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/ServerController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/ServerController.java @@ -1,29 +1,27 @@ package com.fastbee.web.controller.monitor; +import com.fastbee.common.core.domain.AjaxResult; +import com.fastbee.framework.web.domain.Server; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.framework.web.domain.Server; /** * 服务器监控 - * + * * @author ruoyi */ @Api(tags = "服务器监控") @RestController @RequestMapping("/monitor/server") -public class ServerController -{ +public class ServerController { @ApiOperation("获取服务器信息") @PreAuthorize("@ss.hasPermi('monitor:server:list')") @GetMapping() - public AjaxResult getInfo() throws Exception - { + public AjaxResult getInfo() throws Exception { Server server = new Server(); server.copyTo(); return AjaxResult.success(server); diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysLogininforController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysLogininforController.java index 3679fd96..72999978 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysLogininforController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysLogininforController.java @@ -1,19 +1,5 @@ package com.fastbee.web.controller.monitor; -import java.util.HashMap; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.annotation.Log; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; @@ -23,6 +9,14 @@ 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; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 系统访问记录 @@ -32,8 +26,7 @@ import com.fastbee.system.service.ISysLogininforService; @Api(tags = "日志管理：登录日志") @RestController @RequestMapping("/monitor/logininfor") -public class SysLogininforController extends BaseController -{ +public class SysLogininforController extends BaseController { @Autowired private ISysLogininforService logininforService; @@ -43,8 +36,7 @@ public class SysLogininforController extends BaseController @ApiOperation("获取列表登录信息") @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')") @GetMapping("/list") - public TableDataInfo list(SysLogininfor logininfor) - { + public TableDataInfo list(SysLogininfor logininfor) { startPage(); List list = logininforService.selectLogininforList(logininfor); return getDataTable(list); @@ -54,8 +46,7 @@ public class SysLogininforController extends BaseController @Log(title = "登录日志", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')") @PostMapping("/export") - public void export(HttpServletResponse response, SysLogininfor logininfor) - { + public void export(HttpServletResponse response, SysLogininfor logininfor) { List list = logininforService.selectLogininforList(logininfor); ExcelUtil util = new ExcelUtil(SysLogininfor.class); util.exportExcel(response, list, "登录日志"); @@ -65,8 +56,7 @@ public class SysLogininforController extends BaseController @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')") @Log(title = "登录日志", businessType = BusinessType.DELETE) @DeleteMapping("/{infoIds}") - public AjaxResult remove(@PathVariable Long[] infoIds) - { + public AjaxResult remove(@PathVariable Long[] infoIds) { return toAjax(logininforService.deleteLogininforByIds(infoIds)); } @@ -74,8 +64,7 @@ public class SysLogininforController extends BaseController @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')") @Log(title = "登录日志", businessType = BusinessType.CLEAN) @DeleteMapping("/clean") - public AjaxResult clean() - { + public AjaxResult clean() { logininforService.cleanLogininfor(); return success(); } @@ -84,8 +73,7 @@ public class SysLogininforController extends BaseController @PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')") @Log(title = "账户解锁", businessType = BusinessType.OTHER) @GetMapping("/unlock/{userName}") - public AjaxResult unlock(@PathVariable("userName") String userName) - { + public AjaxResult unlock(@PathVariable("userName") String userName) { passwordService.clearLoginRecordCache(userName); return success(); } @@ -93,8 +81,7 @@ public class SysLogininforController extends BaseController @ApiOperation("获取一周内每天用户统计") @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')") @GetMapping("/userCount") - public AjaxResult userCount() - { + public AjaxResult userCount() { return toAjax(logininforService.getUserCount()); } } diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysOperlogController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysOperlogController.java index d6ad7141..1e381060 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysOperlogController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysOperlogController.java @@ -1,18 +1,5 @@ package com.fastbee.web.controller.monitor; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.annotation.Log; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; @@ -21,25 +8,31 @@ 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; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 操作日志记录 - * + * * @author ruoyi */ @Api(tags = "日志管理：操作日志") @RestController @RequestMapping("/monitor/operlog") -public class SysOperlogController extends BaseController -{ +public class SysOperlogController extends BaseController { @Autowired private ISysOperLogService operLogService; @ApiOperation("获取操作日志列表") @PreAuthorize("@ss.hasPermi('monitor:operlog:list')") @GetMapping("/list") - public TableDataInfo list(SysOperLog operLog) - { + public TableDataInfo list(SysOperLog operLog) { startPage(); List list = operLogService.selectOperLogList(operLog); return getDataTable(list); @@ -49,8 +42,7 @@ public class SysOperlogController extends BaseController @Log(title = "操作日志", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('monitor:operlog:export')") @PostMapping("/export") - public void export(HttpServletResponse response, SysOperLog operLog) - { + public void export(HttpServletResponse response, SysOperLog operLog) { List list = operLogService.selectOperLogList(operLog); ExcelUtil util = new ExcelUtil(SysOperLog.class); util.exportExcel(response, list, "操作日志"); @@ -60,8 +52,7 @@ public class SysOperlogController extends BaseController @Log(title = "操作日志", businessType = BusinessType.DELETE) @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')") @DeleteMapping("/{operIds}") - public AjaxResult remove(@PathVariable Long[] operIds) - { + public AjaxResult remove(@PathVariable Long[] operIds) { return toAjax(operLogService.deleteOperLogByIds(operIds)); } @@ -69,8 +60,7 @@ public class SysOperlogController extends BaseController @Log(title = "操作日志", businessType = BusinessType.CLEAN) @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')") @DeleteMapping("/clean") - public AjaxResult clean() - { + public AjaxResult clean() { operLogService.cleanOperLog(); return success(); } diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysUserOnlineController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysUserOnlineController.java index 68d132d6..32b2cfa8 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysUserOnlineController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysUserOnlineController.java @@ -1,19 +1,5 @@ package com.fastbee.web.controller.monitor; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.annotation.Log; import com.fastbee.common.constant.CacheConstants; import com.fastbee.common.core.controller.BaseController; @@ -25,17 +11,26 @@ import com.fastbee.common.enums.BusinessType; import com.fastbee.common.utils.StringUtils; import com.fastbee.system.domain.SysUserOnline; import com.fastbee.system.service.ISysUserOnlineService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; /** * 在线用户监控 - * + * * @author ruoyi */ @Api(tags = "在线用户监控") @RestController @RequestMapping("/monitor/online") -public class SysUserOnlineController extends BaseController -{ +public class SysUserOnlineController extends BaseController { @Autowired private ISysUserOnlineService userOnlineService; @@ -45,36 +40,24 @@ public class SysUserOnlineController extends BaseController @ApiOperation("获取在线用户列表") @PreAuthorize("@ss.hasPermi('monitor:online:list')") @GetMapping("/list") - public TableDataInfo list(String ipaddr, String userName) - { + public TableDataInfo list(String ipaddr, String userName) { Collection keys = redisCache.keys(CacheConstants.LOGIN_TOKEN_KEY + "*"); List userOnlineList = new ArrayList(); - for (String key : keys) - { + for (String key : keys) { LoginUser user = redisCache.getCacheObject(key); - if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) - { - if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) - { + if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) { + if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) { userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user)); } - } - else if (StringUtils.isNotEmpty(ipaddr)) - { - if (StringUtils.equals(ipaddr, user.getIpaddr())) - { + } else if (StringUtils.isNotEmpty(ipaddr)) { + if (StringUtils.equals(ipaddr, user.getIpaddr())) { userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user)); } - } - else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser())) - { - if (StringUtils.equals(userName, user.getUsername())) - { + } else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser())) { + if (StringUtils.equals(userName, user.getUsername())) { userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user)); } - } - else - { + } else { userOnlineList.add(userOnlineService.loginUserToUserOnline(user)); } } @@ -90,8 +73,7 @@ public class SysUserOnlineController extends BaseController @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')") @Log(title = "在线用户", businessType = BusinessType.FORCE) @DeleteMapping("/{tokenId}") - public AjaxResult forceLogout(@PathVariable String tokenId) - { + public AjaxResult forceLogout(@PathVariable String tokenId) { redisCache.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId); return success(); } diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysClientController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysClientController.java index 7f9b65f2..25e1b159 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysClientController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysClientController.java @@ -1,30 +1,21 @@ package com.fastbee.web.controller.system; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.fastbee.common.core.domain.entity.SysUser; -import com.fastbee.framework.web.service.TokenService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; +import com.fastbee.common.core.domain.entity.SysUser; +import com.fastbee.common.core.page.TableDataInfo; +import com.fastbee.common.utils.poi.ExcelUtil; +import com.fastbee.framework.web.service.TokenService; 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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; -import static com.fastbee.common.utils.SecurityUtils.getLoginUser; +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 系统授权Controller diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysConfigController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysConfigController.java index 0cdb51be..0e13e949 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysConfigController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysConfigController.java @@ -1,21 +1,5 @@ package com.fastbee.web.controller.system; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.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.annotation.Log; import com.fastbee.common.constant.UserConstants; import com.fastbee.common.core.controller.BaseController; @@ -25,6 +9,15 @@ 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; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 参数配置 信息操作处理 @@ -34,8 +27,7 @@ import com.fastbee.system.service.ISysConfigService; @Api(tags = "参数设置") @RestController @RequestMapping("/system/config") -public class SysConfigController extends BaseController -{ +public class SysConfigController extends BaseController { @Autowired private ISysConfigService configService; @@ -45,8 +37,7 @@ public class SysConfigController extends BaseController @ApiOperation("获取参数配置列表") @PreAuthorize("@ss.hasPermi('system:config:list')") @GetMapping("/list") - public TableDataInfo list(SysConfig config) - { + public TableDataInfo list(SysConfig config) { startPage(); List list = configService.selectConfigList(config); return getDataTable(list); @@ -56,8 +47,7 @@ public class SysConfigController extends BaseController @Log(title = "参数管理", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:config:export')") @PostMapping("/export") - public void export(HttpServletResponse response, SysConfig config) - { + public void export(HttpServletResponse response, SysConfig config) { List list = configService.selectConfigList(config); ExcelUtil util = new ExcelUtil(SysConfig.class); util.exportExcel(response, list, "参数数据"); @@ -69,8 +59,7 @@ public class SysConfigController extends BaseController @ApiOperation("根据参数编号获取详细信息") @PreAuthorize("@ss.hasPermi('system:config:query')") @GetMapping(value = "/{configId}") - public AjaxResult getInfo(@PathVariable Long configId) - { + public AjaxResult getInfo(@PathVariable Long configId) { return success(configService.selectConfigById(configId)); } @@ -79,8 +68,7 @@ public class SysConfigController extends BaseController */ @ApiOperation("根据参数键名查询参数值") @GetMapping(value = "/configKey/{configKey}") - public AjaxResult getConfigKey(@PathVariable String configKey) - { + public AjaxResult getConfigKey(@PathVariable String configKey) { return success(configService.selectConfigByKey(configKey)); } @@ -91,10 +79,8 @@ public class SysConfigController extends BaseController @PreAuthorize("@ss.hasPermi('system:config:add')") @Log(title = "参数管理", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysConfig config) - { - if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) - { + public AjaxResult add(@Validated @RequestBody SysConfig config) { + if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) { return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在"); } config.setCreateBy(getUsername()); @@ -108,10 +94,8 @@ public class SysConfigController extends BaseController @PreAuthorize("@ss.hasPermi('system:config:edit')") @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysConfig config) - { - if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) - { + public AjaxResult edit(@Validated @RequestBody SysConfig config) { + if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) { return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在"); } config.setUpdateBy(getUsername()); @@ -125,8 +109,7 @@ public class SysConfigController extends BaseController @PreAuthorize("@ss.hasPermi('system:config:remove')") @Log(title = "参数管理", businessType = BusinessType.DELETE) @DeleteMapping("/{configIds}") - public AjaxResult remove(@PathVariable Long[] configIds) - { + public AjaxResult remove(@PathVariable Long[] configIds) { configService.deleteConfigByIds(configIds); return success(); } @@ -138,8 +121,7 @@ public class SysConfigController extends BaseController @PreAuthorize("@ss.hasPermi('system:config:refresh')") @Log(title = "参数管理", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") - public AjaxResult refreshCache() - { + public AjaxResult refreshCache() { configService.resetConfigCache(); return success(); } diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDeptController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDeptController.java index e43422ad..2e7ced43 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDeptController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDeptController.java @@ -8,20 +8,14 @@ import com.fastbee.common.core.domain.AjaxResult; import com.fastbee.common.core.domain.entity.*; import com.fastbee.common.enums.BusinessType; import com.fastbee.common.exception.ServiceException; +import com.fastbee.common.utils.MessageUtils; import com.fastbee.common.utils.StringUtils; import com.fastbee.iot.mapper.DeviceMapper; import com.fastbee.iot.model.RegisterUserInput; import com.fastbee.iot.model.RegisterUserOutput; import com.fastbee.iot.service.IToolService; -import com.fastbee.system.domain.SysRoleDept; -import com.fastbee.system.domain.SysRoleMenu; -import com.fastbee.system.domain.SysUserRole; import com.fastbee.system.domain.vo.SysDeptTypeVO; import com.fastbee.system.mapper.SysRoleDeptMapper; -import com.fastbee.system.mapper.SysRoleMenuMapper; -import com.fastbee.system.mapper.SysUserRoleMapper; -import com.fastbee.common.utils.MessageUtils; - import com.fastbee.system.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -34,15 +28,11 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; - -import static com.fastbee.common.constant.Constants.LANGUAGE; - /** * 机构信息 * @@ -51,8 +41,7 @@ import static com.fastbee.common.constant.Constants.LANGUAGE; @Api(tags = "机构管理") @RestController @RequestMapping("/system/dept") -public class SysDeptController extends BaseController -{ +public class SysDeptController extends BaseController { @Autowired private ISysDeptService deptService; @@ -83,8 +72,7 @@ public class SysDeptController extends BaseController @ApiOperation("获取机构列表") @PreAuthorize("@ss.hasPermi('system:dept:list')") @GetMapping("/list") - public AjaxResult list(SysDept dept) - { + public AjaxResult list(SysDept dept) { List depts = deptService.selectDeptList(dept); return success(depts); } @@ -95,8 +83,7 @@ public class SysDeptController extends BaseController @ApiOperation("查询机构列表（排除节点）") @PreAuthorize("@ss.hasPermi('system:dept:list')") @GetMapping("/list/exclude/{deptId}") - public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) - { + public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) { List depts = deptService.selectDeptList(new SysDept()); depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")); return success(depts); @@ -109,8 +96,7 @@ public class SysDeptController extends BaseController @PreAuthorize("@ss.hasPermi('system:dept:query')") @Transactional(rollbackFor = Exception.class) @GetMapping(value = "/{deptId}") - public AjaxResult getInfo(@PathVariable Long deptId) - { + public AjaxResult getInfo(@PathVariable Long deptId) { deptService.checkDeptDataScope(deptId); SysDept sysDept = deptService.selectDeptById(deptId); if (null != sysDept && null != sysDept.getDeptUserId()) { @@ -128,10 +114,8 @@ public class SysDeptController extends BaseController @PreAuthorize("@ss.hasPermi('system:dept:add')") @Log(title = "机构管理", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(HttpServletRequest request, @Validated @RequestBody SysDept dept) - { - if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) - { + public AjaxResult add(HttpServletRequest request, @Validated @RequestBody SysDept dept) { + if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) { return error(StringUtils.format(MessageUtils.message("dept.add.failed.name.exists"), dept.getDeptName())); } dept.setCreateBy(getUsername()); @@ -189,20 +173,14 @@ public class SysDeptController extends BaseController @PreAuthorize("@ss.hasPermi('system:dept:edit')") @Log(title = "机构管理", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysDept dept) - { + public AjaxResult edit(@Validated @RequestBody SysDept dept) { Long deptId = dept.getDeptId(); deptService.checkDeptDataScope(deptId); - if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) - { + if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) { return error(StringUtils.format(MessageUtils.message("dept.update.failed.name.exists"), dept.getDeptName())); - } - else if (dept.getParentId().equals(deptId)) - { + } else if (dept.getParentId().equals(deptId)) { return error(StringUtils.format(MessageUtils.message("dept.update.failed.parent.not.valid"), dept.getDeptName())); - } - else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) - { + } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) { return error(MessageUtils.message("dept.update.failed.child.not.valid")); } dept.setUpdateBy(getUsername()); @@ -216,10 +194,8 @@ public class SysDeptController extends BaseController @PreAuthorize("@ss.hasPermi('system:dept:remove')") @Log(title = "机构管理", businessType = BusinessType.DELETE) @DeleteMapping("/{deptId}") - public AjaxResult remove(@PathVariable Long deptId) - { - if (deptService.hasChildByDeptId(deptId)) - { + public AjaxResult remove(@PathVariable Long deptId) { + if (deptService.hasChildByDeptId(deptId)) { return warn(MessageUtils.message("dept.delete.failed.child.exists")); } // if (deptService.checkDeptExistUser(deptId)) @@ -238,6 +214,7 @@ public class SysDeptController extends BaseController /** * 获取机构类型 + * * @param deptType 父级类型 * @return com.fastbee.common.core.domain.AjaxResult */ @@ -277,6 +254,7 @@ public class SysDeptController extends BaseController /** * 获取机构角色 + * * @param deptId 机构id * @return com.fastbee.common.core.domain.AjaxResult */ diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDictDataController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDictDataController.java index a79cd1bb..0c6f45ab 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDictDataController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDictDataController.java @@ -1,19 +1,5 @@ package com.fastbee.web.controller.system; -import java.util.ArrayList; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.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.annotation.Log; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; @@ -24,6 +10,14 @@ 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; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.List; /** * 数据字典信息 @@ -33,8 +27,7 @@ import com.fastbee.system.service.ISysDictTypeService; @RestController @RequestMapping("/system/dict/data") -public class SysDictDataController extends BaseController -{ +public class SysDictDataController extends BaseController { @Autowired private ISysDictDataService dictDataService; @@ -43,8 +36,7 @@ public class SysDictDataController extends BaseController @PreAuthorize("@ss.hasPermi('system:dict:list')") @GetMapping("/list") - public TableDataInfo list(SysDictData dictData) - { + public TableDataInfo list(SysDictData dictData) { startPage(); List list = dictDataService.selectDictDataList(dictData); return getDataTable(list); @@ -53,8 +45,7 @@ public class SysDictDataController extends BaseController @Log(title = "字典数据", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:dict:export')") @PostMapping("/export") - public void export(HttpServletResponse response, SysDictData dictData) - { + public void export(HttpServletResponse response, SysDictData dictData) { List list = dictDataService.selectDictDataList(dictData); ExcelUtil util = new ExcelUtil<>(SysDictData.class); util.exportExcel(response, list, "字典数据"); @@ -65,8 +56,7 @@ public class SysDictDataController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:dict:query')") @GetMapping(value = "/{dictCode}") - public AjaxResult getInfo(@PathVariable Long dictCode) - { + public AjaxResult getInfo(@PathVariable Long dictCode) { return success(dictDataService.selectDictDataById(dictCode)); } @@ -74,11 +64,9 @@ public class SysDictDataController extends BaseController * 根据字典类型查询字典数据信息 */ @GetMapping(value = "/type/{dictType}") - public AjaxResult dictType(@PathVariable String dictType) - { + public AjaxResult dictType(@PathVariable String dictType) { List data = dictTypeService.selectDictDataByType(dictType); - if (StringUtils.isNull(data)) - { + if (StringUtils.isNull(data)) { data = new ArrayList<>(); } return success(data); @@ -90,8 +78,7 @@ public class SysDictDataController extends BaseController @PreAuthorize("@ss.hasPermi('system:dict:add')") @Log(title = "字典数据", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysDictData dict) - { + public AjaxResult add(@Validated @RequestBody SysDictData dict) { dict.setCreateBy(getUsername()); return toAjax(dictDataService.insertDictData(dict)); } @@ -102,8 +89,7 @@ public class SysDictDataController extends BaseController @PreAuthorize("@ss.hasPermi('system:dict:edit')") @Log(title = "字典数据", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysDictData dict) - { + public AjaxResult edit(@Validated @RequestBody SysDictData dict) { dict.setUpdateBy(getUsername()); return toAjax(dictDataService.updateDictData(dict)); } @@ -114,8 +100,7 @@ public class SysDictDataController extends BaseController @PreAuthorize("@ss.hasPermi('system:dict:remove')") @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping("/{dictCodes}") - public AjaxResult remove(@PathVariable Long[] dictCodes) - { + public AjaxResult remove(@PathVariable Long[] dictCodes) { dictDataService.deleteDictDataByIds(dictCodes); return success(); } diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDictTypeController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDictTypeController.java index 0a4de5e3..ff45d3ca 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDictTypeController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDictTypeController.java @@ -1,23 +1,5 @@ package com.fastbee.web.controller.system; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.fastbee.common.utils.MessageUtils; -import com.fastbee.common.utils.StringUtils; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.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.annotation.Log; import com.fastbee.common.constant.UserConstants; import com.fastbee.common.core.controller.BaseController; @@ -25,8 +7,19 @@ 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.MessageUtils; +import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.poi.ExcelUtil; import com.fastbee.system.service.ISysDictTypeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 数据字典信息 @@ -36,16 +29,14 @@ import com.fastbee.system.service.ISysDictTypeService; @Api(tags = "字典管理") @RestController @RequestMapping("/system/dict/type") -public class SysDictTypeController extends BaseController -{ +public class SysDictTypeController extends BaseController { @Autowired private ISysDictTypeService dictTypeService; @ApiOperation("获取字典分页列表") @PreAuthorize("@ss.hasPermi('system:dict:list')") @GetMapping("/list") - public TableDataInfo list(SysDictType dictType) - { + public TableDataInfo list(SysDictType dictType) { startPage(); List list = dictTypeService.selectDictTypeList(dictType); return getDataTable(list); @@ -55,8 +46,7 @@ public class SysDictTypeController extends BaseController @Log(title = "字典类型", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:dict:export')") @PostMapping("/export") - public void export(HttpServletResponse response, SysDictType dictType) - { + public void export(HttpServletResponse response, SysDictType dictType) { List list = dictTypeService.selectDictTypeList(dictType); ExcelUtil util = new ExcelUtil(SysDictType.class); util.exportExcel(response, list, "字典类型"); @@ -68,8 +58,7 @@ public class SysDictTypeController extends BaseController @ApiOperation("查询字典类型详细") @PreAuthorize("@ss.hasPermi('system:dict:query')") @GetMapping(value = "/{dictId}") - public AjaxResult getInfo(@PathVariable Long dictId) - { + public AjaxResult getInfo(@PathVariable Long dictId) { return success(dictTypeService.selectDictTypeById(dictId)); } @@ -80,10 +69,8 @@ public class SysDictTypeController extends BaseController @PreAuthorize("@ss.hasPermi('system:dict:add')") @Log(title = "字典类型", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysDictType dict) - { - if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) - { + public AjaxResult add(@Validated @RequestBody SysDictType dict) { + if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { return error(StringUtils.format(MessageUtils.message("dict.add.failed.type.exists"), dict.getDictName())); } dict.setCreateBy(getUsername()); @@ -97,10 +84,8 @@ public class SysDictTypeController extends BaseController @PreAuthorize("@ss.hasPermi('system:dict:edit')") @Log(title = "字典类型", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysDictType dict) - { - if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) - { + public AjaxResult edit(@Validated @RequestBody SysDictType dict) { + if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { return error(StringUtils.format(MessageUtils.message("dict.update.failed.type.exists"), dict.getDictName())); } dict.setUpdateBy(getUsername()); @@ -114,8 +99,7 @@ public class SysDictTypeController extends BaseController @PreAuthorize("@ss.hasPermi('system:dict:remove')") @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping("/{dictIds}") - public AjaxResult remove(@PathVariable Long[] dictIds) - { + public AjaxResult remove(@PathVariable Long[] dictIds) { dictTypeService.deleteDictTypeByIds(dictIds); return success(); } @@ -127,8 +111,7 @@ public class SysDictTypeController extends BaseController @PreAuthorize("@ss.hasPermi('system:dict:refresh')") @Log(title = "字典类型", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") - public AjaxResult refreshCache() - { + public AjaxResult refreshCache() { dictTypeService.resetDictCache(); return success(); } @@ -138,8 +121,7 @@ public class SysDictTypeController extends BaseController */ @ApiOperation("获取字典选择框列表") @GetMapping("/optionselect") - public AjaxResult optionselect() - { + public AjaxResult optionselect() { List dictTypes = dictTypeService.selectDictTypeAll(); return success(dictTypes); } diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysIndexController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysIndexController.java index d662c8dd..d6a4cf1a 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysIndexController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysIndexController.java @@ -1,11 +1,11 @@ package com.fastbee.web.controller.system; +import com.fastbee.common.config.RuoYiConfig; import com.fastbee.common.utils.MessageUtils; +import com.fastbee.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.fastbee.common.config.RuoYiConfig; -import com.fastbee.common.utils.StringUtils; /** * 首页 @@ -13,9 +13,10 @@ import com.fastbee.common.utils.StringUtils; * @author ruoyi */ @RestController -public class SysIndexController -{ - /** 系统基础配置 */ +public class SysIndexController { + /** + * 系统基础配置 + */ @Autowired private RuoYiConfig ruoyiConfig; @@ -23,8 +24,7 @@ public class SysIndexController * 访问首页，提示语 */ @RequestMapping("/") - public String index() - { + public String index() { return StringUtils.format(MessageUtils.message("index.welcome.message"), ruoyiConfig.getName(), ruoyiConfig.getVersion()); } } diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysLoginController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysLoginController.java index 80869403..88215cca 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysLoginController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysLoginController.java @@ -1,18 +1,5 @@ package com.fastbee.web.controller.system; -import java.util.List; -import java.util.Set; - -import com.fastbee.system.domain.AppPreferences; -import com.fastbee.system.service.IAppPreferencesService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.constant.Constants; import com.fastbee.common.core.domain.AjaxResult; import com.fastbee.common.core.domain.entity.SysMenu; @@ -21,10 +8,22 @@ import com.fastbee.common.core.domain.model.LoginBody; import com.fastbee.common.utils.SecurityUtils; import com.fastbee.framework.web.service.SysLoginService; import com.fastbee.framework.web.service.SysPermissionService; +import com.fastbee.system.domain.AppPreferences; +import com.fastbee.system.service.IAppPreferencesService; import com.fastbee.system.service.ISysMenuService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Set; import static com.fastbee.common.constant.Constants.LANGUAGE; @@ -35,8 +34,7 @@ import static com.fastbee.common.constant.Constants.LANGUAGE; */ @Api(tags = "登录验证") @RestController -public class SysLoginController -{ +public class SysLoginController { @Autowired private SysLoginService loginService; @@ -59,8 +57,7 @@ public class SysLoginController */ @ApiOperation("用户登录") @PostMapping("/login") - public AjaxResult login(HttpServletRequest request, @RequestBody LoginBody loginBody) - { + public AjaxResult login(HttpServletRequest request, @RequestBody LoginBody loginBody) { AjaxResult ajax = AjaxResult.success(); // 生成令牌 String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), @@ -76,8 +73,7 @@ public class SysLoginController */ @ApiOperation("获取用户信息") @GetMapping("getInfo") - public AjaxResult getInfo() - { + public AjaxResult getInfo() { SysUser user = SecurityUtils.getLoginUser().getUser(); // 角色集合 Set roles = permissionService.getRolePermission(user); @@ -88,7 +84,7 @@ public class SysLoginController ajax.put("user", user); ajax.put("roles", roles); ajax.put("permissions", permissions); - ajax.put("mqtt",enabled); + ajax.put("mqtt", enabled); ajax.put("language", appPreferences.getLanguage()); return ajax; } @@ -101,8 +97,7 @@ public class SysLoginController */ @ApiOperation("获取路由信息") @GetMapping("getRouters") - public AjaxResult getRouters(HttpServletRequest request) - { + public AjaxResult getRouters(HttpServletRequest request) { Long userId = SecurityUtils.getUserId(); List menus = menuService.selectMenuTreeByUserId(userId, request.getHeader(LANGUAGE)); return AjaxResult.success(menuService.buildMenus(menus)); diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysMenuController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysMenuController.java index d44bad38..8847ae4c 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysMenuController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysMenuController.java @@ -1,22 +1,22 @@ package com.fastbee.web.controller.system; -import java.util.List; - -import com.fastbee.common.utils.MessageUtils; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; import com.fastbee.common.annotation.Log; import com.fastbee.common.constant.UserConstants; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; import com.fastbee.common.core.domain.entity.SysMenu; import com.fastbee.common.enums.BusinessType; +import com.fastbee.common.utils.MessageUtils; import com.fastbee.common.utils.StringUtils; import com.fastbee.system.service.ISysMenuService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 菜单信息 @@ -26,8 +26,7 @@ import com.fastbee.system.service.ISysMenuService; @Api(tags = "菜单管理") @RestController @RequestMapping("/system/menu") -public class SysMenuController extends BaseController -{ +public class SysMenuController extends BaseController { @Autowired private ISysMenuService menuService; @@ -37,8 +36,7 @@ public class SysMenuController extends BaseController @ApiOperation("获取菜单列表") @PreAuthorize("@ss.hasPermi('system:menu:list')") @GetMapping("/list") - public AjaxResult list(SysMenu menu) - { + public AjaxResult list(SysMenu menu) { List menus = menuService.selectMenuList(menu, getUserId()); return success(menus); } @@ -49,8 +47,7 @@ public class SysMenuController extends BaseController @ApiOperation("根据菜单编号获取详细信息") @PreAuthorize("@ss.hasPermi('system:menu:query')") @GetMapping(value = "/{menuId}") - public AjaxResult getInfo(@PathVariable Long menuId) - { + public AjaxResult getInfo(@PathVariable Long menuId) { return success(menuService.selectMenuById(menuId)); } @@ -59,8 +56,7 @@ public class SysMenuController extends BaseController */ @ApiOperation("获取菜单下拉树列表") @GetMapping("/treeselect") - public AjaxResult treeselect(SysMenu menu) - { + public AjaxResult treeselect(SysMenu menu) { List menus = menuService.selectMenuList(menu, getUserId()); return success(menuService.buildMenuTreeSelect(menus)); } @@ -70,8 +66,7 @@ public class SysMenuController extends BaseController */ @ApiOperation("加载对应角色菜单列表树") @GetMapping(value = "/roleMenuTreeselect") - public AjaxResult roleMenuTreeselect(@RequestParam Long roleId, @RequestParam Long deptId) - { + public AjaxResult roleMenuTreeselect(@RequestParam Long roleId, @RequestParam Long deptId) { List menus = menuService.deptRoleMenuTreeselect(deptId, roleId); // List menus = menuService.selectMenuList(getUserId(), request.getHeader(LANGUAGE)); AjaxResult ajax = AjaxResult.success(); @@ -87,14 +82,10 @@ public class SysMenuController extends BaseController @PreAuthorize("@ss.hasPermi('system:menu:add')") @Log(title = "菜单管理", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysMenu menu) - { - if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) - { + public AjaxResult add(@Validated @RequestBody SysMenu menu) { + if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { return error(StringUtils.format(MessageUtils.message("menu.add.failed.name.exists"), menu.getMenuName())); - } - else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) - { + } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) { return error(StringUtils.format(MessageUtils.message("menu.add.failed.path.not.valid"), menu.getMenuName())); } menu.setCreateBy(getUsername()); @@ -108,18 +99,12 @@ public class SysMenuController extends BaseController @PreAuthorize("@ss.hasPermi('system:menu:edit')") @Log(title = "菜单管理", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysMenu menu) - { - if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) - { + public AjaxResult edit(@Validated @RequestBody SysMenu menu) { + if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { return error(StringUtils.format(MessageUtils.message("menu.update.failed.name.exists"), menu.getMenuName())); - } - else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) - { + } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) { return error(StringUtils.format(MessageUtils.message("menu.update.failed.path.not.valid"), menu.getMenuName())); - } - else if (menu.getMenuId().equals(menu.getParentId())) - { + } else if (menu.getMenuId().equals(menu.getParentId())) { return error(StringUtils.format(MessageUtils.message("menu.update.failed.parent.not.valid"), menu.getMenuName())); } menu.setUpdateBy(getUsername()); @@ -133,14 +118,11 @@ public class SysMenuController extends BaseController @PreAuthorize("@ss.hasPermi('system:menu:remove')") @Log(title = "菜单管理", businessType = BusinessType.DELETE) @DeleteMapping("/{menuId}") - public AjaxResult remove(@PathVariable("menuId") Long menuId) - { - if (menuService.hasChildByMenuId(menuId)) - { + public AjaxResult remove(@PathVariable("menuId") Long menuId) { + if (menuService.hasChildByMenuId(menuId)) { return warn(MessageUtils.message("menu.delete.failed.child.exists")); } - if (menuService.checkMenuExistRole(menuId)) - { + if (menuService.checkMenuExistRole(menuId)) { return warn(MessageUtils.message("menu.delete.failed.role.exists")); } return toAjax(menuService.deleteMenuById(menuId)); @@ -151,8 +133,7 @@ public class SysMenuController extends BaseController */ @ApiOperation("加载对应部门菜单列表树") @GetMapping(value = "/deptMenuTreeselect/{deptId}") - public AjaxResult deptMenuTreeselect(@PathVariable("deptId") Long deptId) - { + public AjaxResult deptMenuTreeselect(@PathVariable("deptId") Long deptId) { List menus = menuService.deptMenuTreeselect(deptId); return success(menuService.buildMenuTreeSelect(menus)); } diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysNoticeController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysNoticeController.java index da21a916..afa2a2bb 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysNoticeController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysNoticeController.java @@ -1,20 +1,5 @@ package com.fastbee.web.controller.system; -import java.util.List; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.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.annotation.Log; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; @@ -22,17 +7,24 @@ 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; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 公告 信息操作处理 - * + * * @author ruoyi */ @Api(tags = "通知公告") @RestController @RequestMapping("/system/notice") -public class SysNoticeController extends BaseController -{ +public class SysNoticeController extends BaseController { @Autowired private ISysNoticeService noticeService; @@ -42,8 +34,7 @@ public class SysNoticeController extends BaseController @ApiOperation("获取通知公告列表") @PreAuthorize("@ss.hasPermi('system:notice:list')") @GetMapping("/list") - public TableDataInfo list(SysNotice notice) - { + public TableDataInfo list(SysNotice notice) { startPage(); List list = noticeService.selectNoticeList(notice); return getDataTable(list); @@ -55,8 +46,7 @@ public class SysNoticeController extends BaseController @ApiOperation("根据通知公告编号获取详细信息") @PreAuthorize("@ss.hasPermi('system:notice:query')") @GetMapping(value = "/{noticeId}") - public AjaxResult getInfo(@PathVariable Long noticeId) - { + public AjaxResult getInfo(@PathVariable Long noticeId) { return success(noticeService.selectNoticeById(noticeId)); } @@ -67,8 +57,7 @@ public class SysNoticeController extends BaseController @PreAuthorize("@ss.hasPermi('system:notice:add')") @Log(title = "通知公告", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysNotice notice) - { + public AjaxResult add(@Validated @RequestBody SysNotice notice) { notice.setCreateBy(getUsername()); return toAjax(noticeService.insertNotice(notice)); } @@ -80,8 +69,7 @@ public class SysNoticeController extends BaseController @PreAuthorize("@ss.hasPermi('system:notice:edit')") @Log(title = "通知公告", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysNotice notice) - { + public AjaxResult edit(@Validated @RequestBody SysNotice notice) { notice.setUpdateBy(getUsername()); return toAjax(noticeService.updateNotice(notice)); } @@ -93,8 +81,7 @@ public class SysNoticeController extends BaseController @PreAuthorize("@ss.hasPermi('system:notice:remove')") @Log(title = "通知公告", businessType = BusinessType.DELETE) @DeleteMapping("/{noticeIds}") - public AjaxResult remove(@PathVariable Long[] noticeIds) - { + public AjaxResult remove(@PathVariable Long[] noticeIds) { return toAjax(noticeService.deleteNoticeByIds(noticeIds)); } } diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysPostController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysPostController.java index 2d69a8e7..1f4fa4b6 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysPostController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysPostController.java @@ -1,32 +1,25 @@ package com.fastbee.web.controller.system; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.fastbee.common.utils.MessageUtils; -import com.fastbee.common.utils.StringUtils; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.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.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.MessageUtils; +import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.poi.ExcelUtil; import com.fastbee.system.domain.SysPost; import com.fastbee.system.service.ISysPostService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 岗位信息操作处理 @@ -36,8 +29,7 @@ import com.fastbee.system.service.ISysPostService; @Api(tags = "岗位管理") @RestController @RequestMapping("/system/post") -public class SysPostController extends BaseController -{ +public class SysPostController extends BaseController { @Autowired private ISysPostService postService; @@ -47,8 +39,7 @@ public class SysPostController extends BaseController @ApiOperation("获取岗位列表") @PreAuthorize("@ss.hasPermi('system:post:list')") @GetMapping("/list") - public TableDataInfo list(SysPost post) - { + public TableDataInfo list(SysPost post) { startPage(); List list = postService.selectPostList(post); return getDataTable(list); @@ -58,8 +49,7 @@ public class SysPostController extends BaseController @Log(title = "岗位管理", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:post:export')") @PostMapping("/export") - public void export(HttpServletResponse response, SysPost post) - { + public void export(HttpServletResponse response, SysPost post) { List list = postService.selectPostList(post); ExcelUtil util = new ExcelUtil(SysPost.class); util.exportExcel(response, list, "岗位数据"); @@ -71,8 +61,7 @@ public class SysPostController extends BaseController @ApiOperation("根据岗位编号获取详细信息") @PreAuthorize("@ss.hasPermi('system:post:query')") @GetMapping(value = "/{postId}") - public AjaxResult getInfo(@PathVariable Long postId) - { + public AjaxResult getInfo(@PathVariable Long postId) { return success(postService.selectPostById(postId)); } @@ -83,14 +72,10 @@ public class SysPostController extends BaseController @PreAuthorize("@ss.hasPermi('system:post:add')") @Log(title = "岗位管理", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysPost post) - { - if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) - { + public AjaxResult add(@Validated @RequestBody SysPost post) { + if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) { return error(StringUtils.format(MessageUtils.message("post.add.failed.name.exists"), post.getPostName())); - } - else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) - { + } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) { return error(StringUtils.format(MessageUtils.message("post.add.failed.code.exists"), post.getPostName())); } post.setCreateBy(getUsername()); @@ -104,14 +89,10 @@ public class SysPostController extends BaseController @PreAuthorize("@ss.hasPermi('system:post:edit')") @Log(title = "岗位管理", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysPost post) - { - if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) - { + public AjaxResult edit(@Validated @RequestBody SysPost post) { + if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) { return error(StringUtils.format(MessageUtils.message("post.update.failed.name.exists"), post.getPostName())); - } - else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) - { + } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) { return error(StringUtils.format(MessageUtils.message("post.update.failed.code.exists"), post.getPostName())); } post.setUpdateBy(getUsername()); @@ -125,8 +106,7 @@ public class SysPostController extends BaseController @PreAuthorize("@ss.hasPermi('system:post:remove')") @Log(title = "岗位管理", businessType = BusinessType.DELETE) @DeleteMapping("/{postIds}") - public AjaxResult remove(@PathVariable Long[] postIds) - { + public AjaxResult remove(@PathVariable Long[] postIds) { return toAjax(postService.deletePostByIds(postIds)); } @@ -135,8 +115,7 @@ public class SysPostController extends BaseController */ @ApiOperation("获取岗位选择框列表") @GetMapping("/optionselect") - public AjaxResult optionselect() - { + public AjaxResult optionselect() { List posts = postService.selectPostAll(); return success(posts); } diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysProfileController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysProfileController.java index 346c4230..480d157d 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysProfileController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysProfileController.java @@ -22,13 +22,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -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.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -41,8 +35,7 @@ import java.util.List; @Api(tags = "个人中心") @RestController @RequestMapping("/system/user/profile") -public class SysProfileController extends BaseController -{ +public class SysProfileController extends BaseController { @Autowired private ISysUserService userService; @@ -57,8 +50,7 @@ public class SysProfileController extends BaseController */ @ApiOperation("获取个人信息") @GetMapping - public AjaxResult profile() - { + public AjaxResult profile() { LoginUser loginUser = getLoginUser(); SysUser user = loginUser.getUser(); AjaxResult ajax = AjaxResult.success(user); @@ -77,27 +69,23 @@ public class SysProfileController extends BaseController @ApiOperation("修改个人信息") @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult updateProfile(@RequestBody SysUser user) - { + public AjaxResult updateProfile(@RequestBody SysUser user) { LoginUser loginUser = getLoginUser(); SysUser sysUser = loginUser.getUser(); user.setUserName(sysUser.getUserName()); if (StringUtils.isNotEmpty(user.getPhonenumber()) - && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) - { + && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { return error(StringUtils.format(MessageUtils.message("user.update.failed.phone.exists"), user.getUserName())); } if (StringUtils.isNotEmpty(user.getEmail()) - && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) - { + && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { return error(StringUtils.format(MessageUtils.message("user.update.failed.email.exists"), user.getUserName())); } user.setUserId(sysUser.getUserId()); user.setPassword(null); user.setAvatar(null); user.setDeptId(sysUser.getDeptId()); - if (userService.updateUserProfile(user) > 0) - { + if (userService.updateUserProfile(user) > 0) { // 更新缓存用户信息 sysUser.setNickName(user.getNickName()); sysUser.setPhonenumber(user.getPhonenumber()); @@ -116,21 +104,17 @@ public class SysProfileController extends BaseController @PreAuthorize("@ss.hasPermi('systerm:user:updatePwd')") @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PutMapping("/updatePwd") - public AjaxResult updatePwd(String oldPassword, String newPassword) - { + public AjaxResult updatePwd(String oldPassword, String newPassword) { LoginUser loginUser = getLoginUser(); String userName = loginUser.getUsername(); String password = loginUser.getPassword(); - if (!SecurityUtils.matchesPassword(oldPassword, password)) - { + if (!SecurityUtils.matchesPassword(oldPassword, password)) { return error(MessageUtils.message("user.update.failed.password.wrong")); } - if (SecurityUtils.matchesPassword(newPassword, password)) - { + if (SecurityUtils.matchesPassword(newPassword, password)) { return error(MessageUtils.message("user.update.failed.password.same")); } - if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) - { + if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) { // 更新缓存用户密码 loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword)); tokenService.setLoginUser(loginUser); @@ -145,14 +129,11 @@ public class SysProfileController extends BaseController @ApiOperation("头像上传") @Log(title = "用户头像", businessType = BusinessType.UPDATE) @PostMapping("/avatar") - public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception - { - if (!file.isEmpty()) - { + public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception { + if (!file.isEmpty()) { LoginUser loginUser = getLoginUser(); String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION); - if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) - { + if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) { AjaxResult ajax = AjaxResult.success(); ajax.put("imgUrl", avatar); // 更新缓存用户头像 diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysRegisterController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysRegisterController.java index 2bb1c580..5d1b0ebd 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysRegisterController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysRegisterController.java @@ -1,27 +1,26 @@ package com.fastbee.web.controller.system; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; import com.fastbee.common.core.domain.model.RegisterBody; import com.fastbee.common.utils.StringUtils; import com.fastbee.framework.web.service.SysRegisterService; import com.fastbee.system.service.ISysConfigService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; /** * 注册验证 - * + * * @author ruoyi */ @Api(tags = "注册账号") @RestController -public class SysRegisterController extends BaseController -{ +public class SysRegisterController extends BaseController { @Autowired private SysRegisterService registerService; @@ -30,10 +29,8 @@ public class SysRegisterController extends BaseController @ApiOperation("注册账号") @PostMapping("/register") - public AjaxResult register(@RequestBody RegisterBody user) - { - if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) - { + public AjaxResult register(@RequestBody RegisterBody user) { + if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) { return error("当前系统没有开启注册功能！"); } String msg = registerService.register(user); diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysRoleController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysRoleController.java index 513c6514..33d55164 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysRoleController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysRoleController.java @@ -1,27 +1,7 @@ package com.fastbee.web.controller.system; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.fastbee.common.constant.HttpStatus; -import com.fastbee.common.utils.MessageUtils; -import com.fastbee.common.utils.collection.CollectionUtils; -import com.github.pagehelper.PageInfo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.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.annotation.Log; -import com.fastbee.common.constant.UserConstants; +import com.fastbee.common.constant.HttpStatus; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; import com.fastbee.common.core.domain.entity.SysDept; @@ -30,7 +10,9 @@ 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.MessageUtils; import com.fastbee.common.utils.StringUtils; +import com.fastbee.common.utils.collection.CollectionUtils; import com.fastbee.common.utils.poi.ExcelUtil; import com.fastbee.framework.web.service.SysPermissionService; import com.fastbee.framework.web.service.TokenService; @@ -38,6 +20,16 @@ import com.fastbee.system.domain.SysUserRole; import com.fastbee.system.service.ISysDeptService; import com.fastbee.system.service.ISysRoleService; import com.fastbee.system.service.ISysUserService; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 角色信息 @@ -47,8 +39,7 @@ import com.fastbee.system.service.ISysUserService; @Api(tags = "角色管理") @RestController @RequestMapping("/system/role") -public class SysRoleController extends BaseController -{ +public class SysRoleController extends BaseController { @Autowired private ISysRoleService roleService; @@ -67,8 +58,7 @@ public class SysRoleController extends BaseController @ApiOperation("获取角色分页列表") @PreAuthorize("@ss.hasPermi('system:role:list')") @GetMapping("/list") - public TableDataInfo list(SysRole role, Integer pageNum, Integer pageSize) - { + public TableDataInfo list(SysRole role, Integer pageNum, Integer pageSize) { // startPage(); List list = roleService.selectRoleList(role); TableDataInfo tableDataInfo = new TableDataInfo(); @@ -89,8 +79,7 @@ public class SysRoleController extends BaseController @Log(title = "角色管理", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:role:export')") @PostMapping("/export") - public void export(HttpServletResponse response, SysRole role) - { + public void export(HttpServletResponse response, SysRole role) { List list = roleService.selectRoleList(role); ExcelUtil util = new ExcelUtil(SysRole.class); util.exportExcel(response, list, "角色数据"); @@ -102,8 +91,7 @@ public class SysRoleController extends BaseController @ApiOperation("根据角色编号获取详细信息") @PreAuthorize("@ss.hasPermi('system:role:query')") @GetMapping(value = "/{roleId}") - public AjaxResult getInfo(@PathVariable Long roleId) - { + public AjaxResult getInfo(@PathVariable Long roleId) { roleService.checkRoleDataScope(roleId); return success(roleService.selectRoleById(roleId)); } @@ -115,8 +103,7 @@ public class SysRoleController extends BaseController @PreAuthorize("@ss.hasPermi('system:role:add')") @Log(title = "角色管理", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysRole role) - { + public AjaxResult add(@Validated @RequestBody SysRole role) { // if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) // { // return error(StringUtils.format(MessageUtils.message("role.add.failed.name.exists"), role.getRoleName())); @@ -140,8 +127,7 @@ public class SysRoleController extends BaseController @PreAuthorize("@ss.hasPermi('system:role:edit')") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysRole role) - { + public AjaxResult edit(@Validated @RequestBody SysRole role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); // if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) @@ -154,12 +140,10 @@ public class SysRoleController extends BaseController // } role.setUpdateBy(getUsername()); - if (roleService.updateRole(role) > 0) - { + if (roleService.updateRole(role) > 0) { // 更新缓存用户权限 LoginUser loginUser = getLoginUser(); - if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) - { + if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) { loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser())); loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName())); tokenService.setLoginUser(loginUser); @@ -176,8 +160,7 @@ public class SysRoleController extends BaseController @PreAuthorize("@ss.hasPermi('system:role:edit')") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping("/dataScope") - public AjaxResult dataScope(@RequestBody SysRole role) - { + public AjaxResult dataScope(@RequestBody SysRole role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); return toAjax(roleService.authDataScope(role)); @@ -190,8 +173,7 @@ public class SysRoleController extends BaseController @PreAuthorize("@ss.hasPermi('system:role:edit')") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public AjaxResult changeStatus(@RequestBody SysRole role) - { + public AjaxResult changeStatus(@RequestBody SysRole role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); role.setUpdateBy(getUsername()); @@ -205,8 +187,7 @@ public class SysRoleController extends BaseController @PreAuthorize("@ss.hasPermi('system:role:remove')") @Log(title = "角色管理", businessType = BusinessType.DELETE) @DeleteMapping("/{roleIds}") - public AjaxResult remove(@PathVariable Long[] roleIds) - { + public AjaxResult remove(@PathVariable Long[] roleIds) { return toAjax(roleService.deleteRoleByIds(roleIds)); } @@ -216,8 +197,7 @@ public class SysRoleController extends BaseController @ApiOperation("获取角色选择框列表") @PreAuthorize("@ss.hasPermi('system:role:query')") @GetMapping("/optionselect") - public AjaxResult optionselect() - { + public AjaxResult optionselect() { return success(roleService.selectRoleAll()); } @@ -227,8 +207,7 @@ public class SysRoleController extends BaseController @ApiOperation("查询已分配用户角色列表") @PreAuthorize("@ss.hasPermi('system:role:list')") @GetMapping("/authUser/allocatedList") - public TableDataInfo allocatedList(SysUser user) - { + public TableDataInfo allocatedList(SysUser user) { startPage(); List list = userService.selectAllocatedList(user); return getDataTable(list); @@ -240,8 +219,7 @@ public class SysRoleController extends BaseController @ApiOperation("查询未分配用户角色列表") @PreAuthorize("@ss.hasPermi('system:role:list')") @GetMapping("/authUser/unallocatedList") - public TableDataInfo unallocatedList(SysUser user) - { + public TableDataInfo unallocatedList(SysUser user) { startPage(); List list = userService.selectUnallocatedList(user); return getDataTable(list); @@ -254,8 +232,7 @@ public class SysRoleController extends BaseController @PreAuthorize("@ss.hasPermi('system:role:edit')") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancel") - public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole) - { + public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole) { return toAjax(roleService.deleteAuthUser(userRole)); } @@ -266,8 +243,7 @@ public class SysRoleController extends BaseController @PreAuthorize("@ss.hasPermi('system:role:edit')") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancelAll") - public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds) - { + public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds) { return toAjax(roleService.deleteAuthUsers(roleId, userIds)); } @@ -278,8 +254,7 @@ public class SysRoleController extends BaseController @PreAuthorize("@ss.hasPermi('system:role:edit')") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/selectAll") - public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds) - { + public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds) { roleService.checkRoleDataScope(roleId); return toAjax(roleService.insertAuthUsers(roleId, userIds)); } @@ -290,8 +265,7 @@ public class SysRoleController extends BaseController @ApiOperation("获取对应角色部门树列表") @PreAuthorize("@ss.hasPermi('system:role:query')") @GetMapping(value = "/deptTree/{roleId}") - public AjaxResult deptTree(@PathVariable("roleId") Long roleId) - { + public AjaxResult deptTree(@PathVariable("roleId") Long roleId) { AjaxResult ajax = AjaxResult.success(); ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId)); ajax.put("depts", deptService.selectDeptTreeList(new SysDept())); diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysTranslateController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysTranslateController.java index 85364f61..2c3b6e16 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysTranslateController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysTranslateController.java @@ -12,7 +12,10 @@ import io.swagger.annotations.ApiOperation; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -26,8 +29,7 @@ import java.util.List; @Api(tags = "翻译表管理") @RestController @RequestMapping("/system/translate") -public class SysTranslateController extends BaseController -{ +public class SysTranslateController extends BaseController { @Autowired private ISysTranslateService sysTranslateService; @@ -59,8 +61,7 @@ public class SysTranslateController extends BaseController @ApiOperation("导出翻译列表") @PreAuthorize("@ss.hasPermi('system:translate:export')") @PostMapping("/export") - public void export(HttpServletResponse response, SysTranslate sysTranslate, String type, @RequestParam(name = "isSource", required = false, defaultValue = "0") Boolean isSource) - { + public void export(HttpServletResponse response, SysTranslate sysTranslate, String type, @RequestParam(name = "isSource", required = false, defaultValue = "0") Boolean isSource) { if (StringUtils.isEmpty(type)) { return; } diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysUserController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysUserController.java index fff56103..1e89183f 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysUserController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysUserController.java @@ -1,25 +1,5 @@ package com.fastbee.web.controller.system; -import java.util.List; -import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; - -import com.fastbee.common.utils.MessageUtils; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.ArrayUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.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 org.springframework.web.multipart.MultipartFile; import com.fastbee.common.annotation.Log; import com.fastbee.common.constant.UserConstants; import com.fastbee.common.core.controller.BaseController; @@ -29,6 +9,7 @@ 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.MessageUtils; import com.fastbee.common.utils.SecurityUtils; import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.poi.ExcelUtil; @@ -36,6 +17,18 @@ import com.fastbee.system.service.ISysDeptService; import com.fastbee.system.service.ISysPostService; import com.fastbee.system.service.ISysRoleService; import com.fastbee.system.service.ISysUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.ArrayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.stream.Collectors; /** * 用户信息 @@ -45,8 +38,7 @@ import com.fastbee.system.service.ISysUserService; @Api(tags = "用户管理") @RestController @RequestMapping("/system/user") -public class SysUserController extends BaseController -{ +public class SysUserController extends BaseController { @Autowired private ISysUserService userService; @@ -65,8 +57,7 @@ public class SysUserController extends BaseController @ApiOperation("获取用户分页列表") @PreAuthorize("@ss.hasPermi('system:user:list')") @GetMapping("/list") - public TableDataInfo list(SysUser user) - { + public TableDataInfo list(SysUser user) { startPage(); if (null == user.getDeptId()) { user.setDeptId(getLoginUser().getDeptId()); @@ -79,8 +70,7 @@ public class SysUserController extends BaseController @Log(title = "用户管理", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:user:export')") @PostMapping("/export") - public void export(HttpServletResponse response, SysUser user) - { + public void export(HttpServletResponse response, SysUser user) { if (null == user.getDeptId()) { user.setDeptId(getLoginUser().getDeptId()); } @@ -93,8 +83,7 @@ public class SysUserController extends BaseController @Log(title = "用户管理", businessType = BusinessType.IMPORT) @PreAuthorize("@ss.hasPermi('system:user:import')") @PostMapping("/importData") - public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception - { + public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception { ExcelUtil util = new ExcelUtil(SysUser.class); List userList = util.importExcel(file.getInputStream()); String operName = getUsername(); @@ -105,8 +94,7 @@ public class SysUserController extends BaseController @ApiOperation("下载用户导入模板") @PostMapping("/importTemplate") - public void importTemplate(HttpServletResponse response) - { + public void importTemplate(HttpServletResponse response) { ExcelUtil util = new ExcelUtil(SysUser.class); util.importTemplateExcel(response, "用户数据"); } @@ -116,16 +104,14 @@ public class SysUserController extends BaseController */ @ApiOperation("根据用户编号获取详细信息") @PreAuthorize("@ss.hasPermi('system:user:query')") - @GetMapping(value = { "/", "/{userId}" }) - public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) - { + @GetMapping(value = {"/", "/{userId}"}) + public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) { userService.checkUserDataScope(userId); AjaxResult ajax = AjaxResult.success(); // List roles = roleService.selectRoleAll(); // ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); ajax.put("posts", postService.selectPostAll()); - if (StringUtils.isNotNull(userId)) - { + if (StringUtils.isNotNull(userId)) { SysUser sysUser = userService.selectUserById(userId); ajax.put(AjaxResult.DATA_TAG, sysUser); ajax.put("postIds", postService.selectPostListByUserId(userId)); @@ -146,20 +132,14 @@ public class SysUserController extends BaseController @PreAuthorize("@ss.hasPermi('system:user:add')") @Log(title = "用户管理", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysUser user) - { - if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) - { + public AjaxResult add(@Validated @RequestBody SysUser user) { + if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) { return error(StringUtils.format(MessageUtils.message("user.add.failed.name.exists"), user.getUserName())); - } - else if (StringUtils.isNotEmpty(user.getPhonenumber()) - && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) - { + } else if (StringUtils.isNotEmpty(user.getPhonenumber()) + && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { return error(StringUtils.format(MessageUtils.message("user.add.failed.phone.exists"), user.getUserName())); - } - else if (StringUtils.isNotEmpty(user.getEmail()) - && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) - { + } else if (StringUtils.isNotEmpty(user.getEmail()) + && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { return error(StringUtils.format(MessageUtils.message("user.add.failed.email.exists"), user.getUserName())); } user.setCreateBy(getUsername()); @@ -174,22 +154,16 @@ public class SysUserController extends BaseController @PreAuthorize("@ss.hasPermi('system:user:edit')") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysUser user) - { + public AjaxResult edit(@Validated @RequestBody SysUser user) { userService.checkUserAllowed(user); userService.checkUserDataScope(user.getUserId()); - if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) - { + if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) { return error(StringUtils.format(MessageUtils.message("user.update.failed.name.exists"), user.getUserName())); - } - else if (StringUtils.isNotEmpty(user.getPhonenumber()) - && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) - { + } else if (StringUtils.isNotEmpty(user.getPhonenumber()) + && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { return error(StringUtils.format(MessageUtils.message("user.update.failed.phone.exists"), user.getUserName())); - } - else if (StringUtils.isNotEmpty(user.getEmail()) - && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) - { + } else if (StringUtils.isNotEmpty(user.getEmail()) + && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { return error(StringUtils.format(MessageUtils.message("user.update.failed.email.exists"), user.getUserName())); } user.setUpdateBy(getUsername()); @@ -203,10 +177,8 @@ public class SysUserController extends BaseController @PreAuthorize("@ss.hasPermi('system:user:remove')") @Log(title = "用户管理", businessType = BusinessType.DELETE) @DeleteMapping("/{userIds}") - public AjaxResult remove(@PathVariable Long[] userIds) - { - if (ArrayUtils.contains(userIds, getUserId())) - { + public AjaxResult remove(@PathVariable Long[] userIds) { + if (ArrayUtils.contains(userIds, getUserId())) { return error(MessageUtils.message("user.delete.failed")); } return toAjax(userService.deleteUserByIds(userIds)); @@ -219,8 +191,7 @@ public class SysUserController extends BaseController @PreAuthorize("@ss.hasPermi('system:user:resetPwd')") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping("/resetPwd") - public AjaxResult resetPwd(@RequestBody SysUser user) - { + public AjaxResult resetPwd(@RequestBody SysUser user) { userService.checkUserAllowed(user); userService.checkUserDataScope(user.getUserId()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); @@ -235,8 +206,7 @@ public class SysUserController extends BaseController @PreAuthorize("@ss.hasPermi('system:user:edit')") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public AjaxResult changeStatus(@RequestBody SysUser user) - { + public AjaxResult changeStatus(@RequestBody SysUser user) { userService.checkUserAllowed(user); userService.checkUserDataScope(user.getUserId()); user.setUpdateBy(getUsername()); @@ -249,8 +219,7 @@ public class SysUserController extends BaseController @ApiOperation("根据用户编号获取授权角色") @PreAuthorize("@ss.hasPermi('system:user:query')") @GetMapping("/authRole/{userId}") - public AjaxResult authRole(@PathVariable("userId") Long userId) - { + public AjaxResult authRole(@PathVariable("userId") Long userId) { AjaxResult ajax = AjaxResult.success(); SysUser user = userService.selectUserById(userId); List roles = roleService.selectRolesByUserId(userId); @@ -266,8 +235,7 @@ public class SysUserController extends BaseController @PreAuthorize("@ss.hasPermi('system:user:edit')") @Log(title = "用户管理", businessType = BusinessType.GRANT) @PutMapping("/authRole") - public AjaxResult insertAuthRole(Long userId, Long[] roleIds) - { + public AjaxResult insertAuthRole(Long userId, Long[] roleIds) { userService.checkUserDataScope(userId); userService.insertUserAuth(userId, roleIds); return success(); @@ -279,21 +247,20 @@ public class SysUserController extends BaseController @ApiOperation("获取部门树列表") @PreAuthorize("@ss.hasPermi('system:user:list')") @GetMapping("/deptTree") - public AjaxResult deptTree(SysDept dept) - { + public AjaxResult deptTree(SysDept dept) { return success(deptService.selectDeptTreeList(dept)); } /** * 获取终端用户列表 + * * @param user 用户信息 * @return com.fastbee.common.core.page.TableDataInfo */ @ApiOperation("获取用户分页列表") @PreAuthorize("@ss.hasPermi('system:user:list')") @GetMapping("/listTerminal") - public TableDataInfo listTerminal(SysUser user) - { + public TableDataInfo listTerminal(SysUser user) { startPage(); List list = userService.listTerminal(user); return getDataTable(list); @@ -306,8 +273,7 @@ public class SysUserController extends BaseController @ApiOperation("根据机构id获取当前用户列表") @PreAuthorize("@ss.hasPermi('system:user:list')") @GetMapping("/getByDeptId") - public TableDataInfo getByDeptId() - { + public TableDataInfo getByDeptId() { startPage(); List list = userService.selectByDeptId(); return getDataTable(list); diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/tool/SwaggerController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/tool/SwaggerController.java index 94f0e3e4..6e1f8d51 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/tool/SwaggerController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/tool/SwaggerController.java @@ -1,24 +1,22 @@ package com.fastbee.web.controller.tool; +import com.fastbee.common.core.controller.BaseController; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import com.fastbee.common.core.controller.BaseController; /** * swagger 接口 - * + * * @author ruoyi */ @Controller @RequestMapping("/tool/swagger") -public class SwaggerController extends BaseController -{ +public class SwaggerController extends BaseController { @PreAuthorize("@ss.hasPermi('tool:swagger:view')") @GetMapping() - public String index() - { + public String index() { return redirect("/swagger-ui.html"); } } diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/tool/TestController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/tool/TestController.java index f05f972a..62d219c3 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/tool/TestController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/tool/TestController.java @@ -1,28 +1,15 @@ package com.fastbee.web.controller.tool; +import com.fastbee.common.core.controller.BaseController; +import com.fastbee.common.core.domain.R; +import com.fastbee.common.utils.StringUtils; +import io.swagger.annotations.*; +import org.springframework.web.bind.annotation.*; + 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 用户测试方法 @@ -32,9 +19,9 @@ import javax.annotation.Resource; @Api("swagger 用户测试方法") @RestController @RequestMapping("/test/user") -public class TestController extends BaseController -{ +public class TestController extends BaseController { private final static Map users = new LinkedHashMap(); + { users.put(1, new UserEntity(1, "admin", "admin123", "15888888888")); users.put(2, new UserEntity(2, "ry", "admin123", "15666666666")); @@ -42,8 +29,7 @@ public class TestController extends BaseController @ApiOperation("获取用户列表") @GetMapping("/list") - public R> userList() - { + public R> userList() { List userList = new ArrayList(users.values()); return R.ok(userList); } @@ -51,30 +37,24 @@ public class TestController extends BaseController @ApiOperation("获取用户详细") @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) @GetMapping("/{userId}") - public R getUser(@PathVariable Integer userId) - { - if (!users.isEmpty() && users.containsKey(userId)) - { + public R getUser(@PathVariable Integer userId) { + if (!users.isEmpty() && users.containsKey(userId)) { return R.ok(users.get(userId)); - } - else - { + } 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) + @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 save(UserEntity user) - { - if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) - { + public R save(UserEntity user) { + if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) { return R.fail("用户ID不能为空"); } users.put(user.getUserId(), user); @@ -83,14 +63,11 @@ public class TestController extends BaseController @ApiOperation("更新用户") @PutMapping("/update") - public R update(@RequestBody UserEntity user) - { - if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) - { + public R update(@RequestBody UserEntity user) { + if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) { return R.fail("用户ID不能为空"); } - if (users.isEmpty() || !users.containsKey(user.getUserId())) - { + if (users.isEmpty() || !users.containsKey(user.getUserId())) { return R.fail("用户不存在"); } users.remove(user.getUserId()); @@ -101,23 +78,18 @@ public class TestController extends BaseController @ApiOperation("删除用户信息") @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) @DeleteMapping("/{userId}") - public R delete(@PathVariable Integer userId) - { - if (!users.isEmpty() && users.containsKey(userId)) - { + public R delete(@PathVariable Integer userId) { + if (!users.isEmpty() && users.containsKey(userId)) { users.remove(userId); return R.ok(); - } - else - { + } else { return R.fail("用户不存在"); } } } @ApiModel(value = "UserEntity", description = "用户实体") -class UserEntity -{ +class UserEntity { @ApiModelProperty("用户ID") private Integer userId; @@ -130,56 +102,46 @@ class UserEntity @ApiModelProperty("用户手机") private String mobile; - public UserEntity() - { + public UserEntity() { } - public UserEntity(Integer userId, String username, String password, String mobile) - { + 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() - { + public Integer getUserId() { return userId; } - public void setUserId(Integer userId) - { + public void setUserId(Integer userId) { this.userId = userId; } - public String getUsername() - { + public String getUsername() { return username; } - public void setUsername(String username) - { + public void setUsername(String username) { this.username = username; } - public String getPassword() - { + public String getPassword() { return password; } - public void setPassword(String password) - { + public void setPassword(String password) { this.password = password; } - public String getMobile() - { + public String getMobile() { return mobile; } - public void setMobile(String mobile) - { + public void setMobile(String mobile) { this.mobile = mobile; } } diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/tool/TestController2.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/tool/TestController2.java index 4369bde0..b7cba831 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/tool/TestController2.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/tool/TestController2.java @@ -1,33 +1,32 @@ 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.domain.DeviceJob; +import com.fastbee.iot.domain.DeviceLog; import com.fastbee.iot.mapper.AlertLogMapper; +import com.fastbee.iot.mapper.DeviceJobMapper; +import com.fastbee.iot.mapper.DeviceLogMapper; 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; +import javax.annotation.Resource; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; + /** * 测试类 + * * @author fastb * @date 2023-09-13 11:42 */ @@ -47,8 +46,7 @@ public class TestController2 { private DeviceLogMapper deviceLogMapper; @GetMapping("/add") - public void add() - { + public void add() { Set deviceNumbers = new HashSet<>(); deviceNumbers.add("D1PGLPG58K88"); deviceNumbers.add("D1F0L7P84D8Z"); @@ -80,8 +78,7 @@ public class TestController2 { } @PostMapping("/handleExcel") - public String handleExcel(@RequestParam("file") MultipartFile file) throws Exception - { + public String handleExcel(@RequestParam("file") MultipartFile file) throws Exception { if (null == file) { return "导入失败，请先上传文件！"; } @@ -192,6 +189,7 @@ public class TestController2 { /** * 计算场景运算型变量的值 + * * @param id * @return java.lang.String */ diff --git a/fastbee-admin/src/main/java/com/fastbee/web/core/config/SwaggerConfig.java b/fastbee-admin/src/main/java/com/fastbee/web/core/config/SwaggerConfig.java index ab6bb7be..b394f399 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/core/config/SwaggerConfig.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/core/config/SwaggerConfig.java @@ -1,44 +1,45 @@ package com.fastbee.web.core.config; -import java.util.ArrayList; -import java.util.List; +import com.fastbee.common.config.RuoYiConfig; +import io.swagger.annotations.ApiOperation; +import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.fastbee.common.config.RuoYiConfig; -import io.swagger.annotations.ApiOperation; -import io.swagger.models.auth.In; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.ApiKey; -import springfox.documentation.service.AuthorizationScope; -import springfox.documentation.service.Contact; -import springfox.documentation.service.SecurityReference; -import springfox.documentation.service.SecurityScheme; +import springfox.documentation.service.*; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.service.contexts.SecurityContext; import springfox.documentation.spring.web.plugins.Docket; +import java.util.ArrayList; +import java.util.List; + /** * Swagger2的接口配置 * * @author ruoyi */ @Configuration -public class SwaggerConfig -{ - /** 系统基础配置 */ +public class SwaggerConfig { + /** + * 系统基础配置 + */ @Autowired private RuoYiConfig ruoyiConfig; - /** 是否开启swagger */ + /** + * 是否开启swagger + */ @Value("${swagger.enabled}") private boolean enabled; - /** 设置请求的统一前缀 */ + /** + * 设置请求的统一前缀 + */ @Value("${swagger.pathMapping}") private String pathMapping; @@ -46,8 +47,7 @@ public class SwaggerConfig * 创建API */ @Bean - public Docket createRestApi() - { + public Docket createRestApi() { return new Docket(DocumentationType.OAS_30) // 是否启用Swagger .enable(enabled) @@ -71,8 +71,7 @@ public class SwaggerConfig /** * 安全模式，这里指定token通过Authorization头请求头传递 */ - private List securitySchemes() - { + private List securitySchemes() { List apiKeyList = new ArrayList(); apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue())); return apiKeyList; @@ -81,8 +80,7 @@ public class SwaggerConfig /** * 安全上下文 */ - private List securityContexts() - { + private List securityContexts() { List securityContexts = new ArrayList<>(); securityContexts.add( SecurityContext.builder() @@ -95,8 +93,7 @@ public class SwaggerConfig /** * 默认的安全上引用 */ - private List defaultAuth() - { + private List defaultAuth() { AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); AuthorizationScope[] authorizationScopes = new AuthorizationScope[1]; authorizationScopes[0] = authorizationScope; @@ -108,8 +105,7 @@ public class SwaggerConfig /** * 添加摘要信息 */ - private ApiInfo apiInfo() - { + private ApiInfo apiInfo() { // 用ApiInfoBuilder进行定制 return new ApiInfoBuilder() // 设置标题 diff --git a/fastbee-admin/src/main/resources/application-sql.yml b/fastbee-admin/src/main/resources/application-sql.yml index e217a1e1..d02d4fa6 100644 --- a/fastbee-admin/src/main/resources/application-sql.yml +++ b/fastbee-admin/src/main/resources/application-sql.yml @@ -38,38 +38,38 @@ spring: username: root password: taosdata dbName: fastbee_log -# SQLServer: # 配置 SQLServer 数据源 -# type: com.alibaba.druid.pool.DruidDataSource -# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver -# url: jdbc:sqlserver://localhost:1433;databaseName=fastbee -# username: sa -# password: wumei@Tencent -# postgres: # 配置 postgres 数据源 -# type: com.alibaba.druid.pool.DruidDataSource -# driver-class-name: org.postgresql.Driver -# url: jdbc:postgresql://101.33.237.12:5432/fastbee -# username: postgres -# password: fastbee -# dameng: # 配置达梦数据源 -# type: com.alibaba.druid.pool.DruidDataSource -# driver-class-name: dm.jdbc.driver.DmDriver -# url: jdbc:dm://192.168.5.28:5236?schema=FASTBEE&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC -# username: FASTBEE -# password: wumei-Tencent -# oracle: # 配置 oracle 数据源 -# type: com.alibaba.druid.pool.DruidDataSource -# driver-class-name: oracle.jdbc.driver.OracleDriver -# url: jdbc:oracle:thin:@101.33.237.12:1521:helowin -# username: FASTBEE -# password: fastbee -# druid: -# validation-query: 'SELECT 1 FROM DUAL' -# slave: -# type: com.alibaba.druid.pool.DruidDataSource -# driver-class-name: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://localhost:3306/fastbee1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: root -# password: fastbee + # SQLServer: # 配置 SQLServer 数据源 + # type: com.alibaba.druid.pool.DruidDataSource + # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + # url: jdbc:sqlserver://localhost:1433;databaseName=fastbee + # username: sa + # password: wumei@Tencent + # postgres: # 配置 postgres 数据源 + # type: com.alibaba.druid.pool.DruidDataSource + # driver-class-name: org.postgresql.Driver + # url: jdbc:postgresql://101.33.237.12:5432/fastbee + # username: postgres + # password: fastbee + # dameng: # 配置达梦数据源 + # type: com.alibaba.druid.pool.DruidDataSource + # driver-class-name: dm.jdbc.driver.DmDriver + # url: jdbc:dm://192.168.5.28:5236?schema=FASTBEE&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC + # username: FASTBEE + # password: wumei-Tencent + # oracle: # 配置 oracle 数据源 + # type: com.alibaba.druid.pool.DruidDataSource + # driver-class-name: oracle.jdbc.driver.OracleDriver + # url: jdbc:oracle:thin:@101.33.237.12:1521:helowin + # username: FASTBEE + # password: fastbee + # druid: + # validation-query: 'SELECT 1 FROM DUAL' + # slave: + # type: com.alibaba.druid.pool.DruidDataSource + # driver-class-name: com.mysql.cj.jdbc.Driver + # url: jdbc:mysql://localhost:3306/fastbee1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + # username: root + # password: fastbee shardingsphere: props: diff --git a/fastbee-admin/src/main/resources/application.yml b/fastbee-admin/src/main/resources/application.yml index 0a79cd7b..87f37902 100644 --- a/fastbee-admin/src/main/resources/application.yml +++ b/fastbee-admin/src/main/resources/application.yml @@ -51,11 +51,11 @@ server: # Spring配置 spring: -# quartz: -# auto-startup: false # 上线前去掉 + # quartz: + # auto-startup: false # 上线前去掉 # 环境配置，dev=开发环境，prod=生产环境 profiles: - active: dev # 环境配置，dev=开发环境，prod=生产环境 + active: prod # 环境配置，dev=开发环境，prod=生产环境 # 资源信息 messages: # 国际化资源文件路径 @@ -63,8 +63,8 @@ spring: # 文件上传 servlet: multipart: - max-file-size: 10MB # 单个文件大小 - max-request-size: 20MB # 设置总上传的文件大小 + max-file-size: 10MB # 单个文件大小 + max-request-size: 20MB # 设置总上传的文件大小 # 服务模块 devtools: restart: @@ -161,7 +161,7 @@ redisson: # 发布和订阅连接池大小 subscriptionConnectionPoolSize: 50 -forest: # Forest配置 版本为1.5.36 +forest: # Forest配置 版本为1.5.36 backend: okhttp3 # 后端HTTP框架（默认为 okhttp3） max-connections: 1000 # 连接池最大连接数（默认为 500） max-route-connections: 500 # 每个路由的最大连接数（默认为 500） diff --git a/fastbee-admin/src/main/resources/i18n/messages.properties b/fastbee-admin/src/main/resources/i18n/messages.properties index 08312616..a4f179a6 100644 --- a/fastbee-admin/src/main/resources/i18n/messages.properties +++ b/fastbee-admin/src/main/resources/i18n/messages.properties @@ -10,12 +10,9 @@ user.password.delete=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u8D26\u53F7\u5DF2\u88A user.blocked=\u7528\u6237\u5DF2\u5C01\u7981\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458 role.blocked=\u89D2\u8272\u5DF2\u5C01\u7981\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458 user.logout.success=\u9000\u51FA\u6210\u529F - length.not.valid=\u957F\u5EA6\u5FC5\u987B\u5728{min}\u5230{max}\u4E2A\u5B57\u7B26\u4E4B\u95F4 - user.username.not.valid=* 2\u523020\u4E2A\u6C49\u5B57\u3001\u5B57\u6BCD\u3001\u6570\u5B57\u6216\u4E0B\u5212\u7EBF\u7EC4\u6210\uFF0C\u4E14\u5FC5\u987B\u4EE5\u975E\u6570\u5B57\u5F00\u5934 user.password.not.valid=* 5-50\u4E2A\u5B57\u7B26 - user.email.not.valid=\u90AE\u7BB1\u683C\u5F0F\u9519\u8BEF user.mobile.phone.number.not.valid=\u624B\u673A\u53F7\u683C\u5F0F\u9519\u8BEF user.login.success=\u767B\u5F55\u6210\u529F @@ -23,7 +20,6 @@ user.register.success=\u6CE8\u518C\u6210\u529F user.notfound=\u8BF7\u91CD\u65B0\u767B\u5F55 user.forcelogout=\u7BA1\u7406\u5458\u5F3A\u5236\u9000\u51FA\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55 user.unknown.error=\u672A\u77E5\u9519\u8BEF\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55 - ##\u6743\u9650 no.permission=\u60A8\u6CA1\u6709\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] no.create.permission=\u60A8\u6CA1\u6709\u521B\u5EFA\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] @@ -31,17 +27,14 @@ no.update.permission=\u60A8\u6CA1\u6709\u4FEE\u6539\u6570\u636E\u7684\u6743\u965 no.delete.permission=\u60A8\u6CA1\u6709\u5220\u9664\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] no.export.permission=\u60A8\u6CA1\u6709\u5BFC\u51FA\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] no.view.permission=\u60A8\u6CA1\u6709\u67E5\u770B\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] - ##\u6587\u4EF6\u4E0A\u4F20\u6D88\u606F upload.exceed.maxSize=\u4E0A\u4F20\u7684\u6587\u4EF6\u5927\u5C0F\u8D85\u51FA\u9650\u5236\u7684\u6587\u4EF6\u5927\u5C0F\uFF01
\u5141\u8BB8\u7684\u6587\u4EF6\u6700\u5927\u5927\u5C0F\u662F\uFF1A{0}MB\uFF01 upload.filename.exceed.length=\u4E0A\u4F20\u7684\u6587\u4EF6\u540D\u6700\u957F{0}\u4E2A\u5B57\u7B26 upload.success=\u4E0A\u4F20\u6210\u529F - ##\u6587\u4EF6\u4E0B\u8F7D\u6D88\u606F download.filename.not.valid=\u6587\u4EF6\u540D\u79F0[{}]\u975E\u6CD5\uFF0C\u4E0D\u5141\u8BB8\u4E0B\u8F7D download.file.failed=\u4E0B\u8F7D\u6587\u4EF6\u5931\u8D25 download.resource.not.valid=\u8D44\u6E90\u6587\u4EF6[{}]\u975E\u6CD5\uFF0C\u4E0D\u5141\u8BB8\u4E0B\u8F7D - ##Dept dept.add.failed.name.exists=\u65B0\u589E\u673A\u6784[{}]\u5931\u8D25\uFF0C\u673A\u6784\u540D\u79F0\u5DF2\u5B58\u5728 dept.update.failed.name.exists=\u4FEE\u6539\u673A\u6784[{}]\u5931\u8D25\uFF0C\u673A\u6784\u540D\u79F0\u5DF2\u5B58\u5728 @@ -49,14 +42,11 @@ dept.update.failed.parent.not.valid=\u4FEE\u6539\u673A\u6784[{}]\u5931\u8D25\uFF dept.update.failed.child.not.valid=\u8BE5\u673A\u6784\u5305\u542B\u672A\u505C\u7528\u7684\u5B50\u673A\u6784\uFF01 dept.delete.failed.child.exists=\u5B58\u5728\u4E0B\u7EA7\u673A\u6784\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664 dept.delete.failed.user.exists=\u673A\u6784\u5B58\u5728\u7528\u6237\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664 - ##Dict dict.add.failed.type.exists=\u65B0\u589E\u5B57\u5178[{}]\u5931\u8D25\uFF0C\u5B57\u5178\u7C7B\u578B\u5DF2\u5B58\u5728 dict.update.failed.type.exists=\u65B0\u589E\u5B57\u5178[{}]\u5931\u8D25\uFF0C\u5B57\u5178\u7C7B\u578B\u5DF2\u5B58\u5728 - ##Index index.welcome.message=\u6B22\u8FCE\u4F7F\u7528{}\u540E\u53F0\u7BA1\u7406\u6846\u67B6\uFF0C\u5F53\u524D\u7248\u672C\uFF1Av{}\uFF0C\u8BF7\u901A\u8FC7\u524D\u7AEF\u5730\u5740\u8BBF\u95EE\u3002 - ##Menu menu.add.failed.name.exists=\u65B0\u589E\u83DC\u5355[{}]\u5931\u8D25\uFF0C\u83DC\u5355\u540D\u79F0\u5DF2\u5B58\u5728 menu.add.failed.path.not.valid=\u65B0\u589E\u83DC\u5355[{}]\u5931\u8D25\uFF0C\u5730\u5740\u5FC5\u987B\u4EE5http(s)://\u5F00\u5934 @@ -65,13 +55,11 @@ menu.update.failed.path.not.valid=\u4FEE\u6539\u83DC\u5355[{}]\u5931\u8D25\uFF0C menu.update.failed.parent.not.valid=\u4FEE\u6539\u83DC\u5355[{}]\u5931\u8D25\uFF0C\u4E0A\u7EA7\u83DC\u5355\u4E0D\u80FD\u9009\u62E9\u81EA\u5DF1 menu.delete.failed.child.exists=\u5B58\u5728\u5B50\u83DC\u5355,\u4E0D\u5141\u8BB8\u5220\u9664 menu.delete.failed.role.exists=\u83DC\u5355\u5DF2\u5206\u914D,\u4E0D\u5141\u8BB8\u5220\u9664 - ##Post post.add.failed.name.exists=\u65B0\u589E\u5C97\u4F4D[{}]\u5931\u8D25\uFF0C\u5C97\u4F4D\u540D\u79F0\u5DF2\u5B58\u5728 post.add.failed.code.exists=\u65B0\u589E\u5C97\u4F4D[{}]\u5931\u8D25\uFF0C\u5C97\u4F4D\u7F16\u7801\u5DF2\u5B58\u5728 post.update.failed.name.exists=\u4FEE\u6539\u5C97\u4F4D[{}]\u5931\u8D25\uFF0C\u5C97\u4F4D\u540D\u79F0\u5DF2\u5B58\u5728 post.update.failed.code.exists=\u4FEE\u6539\u5C97\u4F4D[{}]\u5931\u8D25\uFF0C\u5C97\u4F4D\u7F16\u7801\u5DF2\u5B58\u5728 - ##User user.username.exists=\u7CFB\u7EDF\u8D26\u53F7\u540D\u79F0\u5DF2\u5B58\u5728\uFF0C\u8BF7\u4FEE\u6539\u540E\u91CD\u8BD5 user.password.differ=\u4E24\u6B21\u5BC6\u7801\u4E0D\u4E00\u81F4\uFF0C\u8BF7\u91CD\u65B0\u8F93\u5165 @@ -89,7 +77,6 @@ user.delete.failed=\u5F53\u524D\u7528\u6237\u4E0D\u80FD\u5220\u9664 user.upload.avatar.failed=\u4E0A\u4F20\u56FE\u7247\u5F02\u5E38\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458 user.not.login=\u8BF7\u767B\u5F55\u540E\u91CD\u8BD5 user.access.denied=\u7528\u6237\u62D2\u7EDD\u8BBF\u95EE - ##Role role.add.manager.failed=\u4E0D\u5141\u8BB8\u8BBE\u7F6E\u7BA1\u7406\u5458\u89D2\u8272\u6807\u8BC6 role.add.failed.name.exists=\u65B0\u589E\u89D2\u8272[{}]\u5931\u8D25\uFF0C\u89D2\u8272\u540D\u79F0\u5DF2\u5B58\u5728 @@ -97,13 +84,11 @@ role.add.failed.key.exists=\u65B0\u589E\u89D2\u8272[{}]\u5931\u8D25\uFF0C\u89D2\ role.update.failed.name.exists=\u4FEE\u6539\u89D2\u8272[{}]\u5931\u8D25\uFF0C\u89D2\u8272\u540D\u79F0\u5DF2\u5B58\u5728 role.update.failed.key.exists=\u4FEE\u6539\u89D2\u8272[{}]\u5931\u8D25\uFF0C\u89D2\u8272\u6743\u9650\u5DF2\u5B58\u5728 role.update.failed=\u4FEE\u6539\u89D2\u8272[{}]\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458 - ##Import import.failed.file.null=\u5BFC\u5165\u5931\u8D25\uFF0C\u8BF7\u5148\u4E0A\u4F20\u6587\u4EF6\uFF01 import.failed.data.null=\u5BFC\u5165\u5931\u8D25\uFF0C\u5BFC\u5165\u6570\u636E\u4E3A\u7A7A\uFF01 import.failed.device.name.null=\u5BFC\u5165\u5931\u8D25\uFF0C\u6A21\u677F\u91CC\u8BBE\u5907\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A\uFF01 import.success=\u5BFC\u5165\u6210\u529F - ##General success=\u6210\u529F fail=\u5931\u8D25 @@ -114,11 +99,9 @@ create.failed=\u521B\u5EFA\u5931\u8D25 save.success=\u4FDD\u5B58\u6210\u529F save.failed=\u4FDD\u5B58\u5931\u8D25 authorization.success=\u6388\u6743\u6210\u529F - ##Email email.format.error=\u90AE\u7BB1\u683C\u5F0F\u9519\u8BEF email.verification.code.send=\u90AE\u7BB1\u9A8C\u8BC1\u7801\u5DF2\u53D1\u9001 - ##Firmware firmware.task.upgrade.failed.time.not.valid=\u9884\u5B9A\u5347\u7EA7\u65F6\u95F4\u5E94\u5927\u4E8E\u5F53\u524D\u65F6\u95F4 ##Media @@ -174,7 +157,6 @@ record.app.null=app\u4E0D\u80FD\u4E3A\u7A7A record.stream.null=stream\u4E0D\u80FD\u4E3A\u7A7A record.time.not.valid=\u9519\u8BEF\u7684\u5F00\u59CB\u65F6\u95F4\u6216\u7ED3\u675F\u65F6\u95F4 record.file.null=\u672A\u627E\u5230\u89C6\u9891\u6587\u4EF6 - ##ErrorCodeConstants app.not.found=App \u4E0D\u5B58\u5728 app.is.disable=App \u5DF2\u7ECF\u88AB\u7981\u7528 diff --git a/fastbee-admin/src/main/resources/i18n/messages_en_US.properties b/fastbee-admin/src/main/resources/i18n/messages_en_US.properties index 2d300aa9..c1bf4f0b 100644 --- a/fastbee-admin/src/main/resources/i18n/messages_en_US.properties +++ b/fastbee-admin/src/main/resources/i18n/messages_en_US.properties @@ -10,12 +10,9 @@ user.password.delete=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u8D26\u53F7\u5DF2\u88A user.blocked=\u7528\u6237\u5DF2\u5C01\u7981\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458 role.blocked=\u89D2\u8272\u5DF2\u5C01\u7981\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458 user.logout.success=\u9000\u51FA\u6210\u529F - length.not.valid=\u957F\u5EA6\u5FC5\u987B\u5728{min}\u5230{max}\u4E2A\u5B57\u7B26\u4E4B\u95F4 - user.username.not.valid=* 2\u523020\u4E2A\u6C49\u5B57\u3001\u5B57\u6BCD\u3001\u6570\u5B57\u6216\u4E0B\u5212\u7EBF\u7EC4\u6210\uFF0C\u4E14\u5FC5\u987B\u4EE5\u975E\u6570\u5B57\u5F00\u5934 user.password.not.valid=* 5-50\u4E2A\u5B57\u7B26 - user.email.not.valid=\u90AE\u7BB1\u683C\u5F0F\u9519\u8BEF user.mobile.phone.number.not.valid=\u624B\u673A\u53F7\u683C\u5F0F\u9519\u8BEF user.login.success=\u767B\u5F55\u6210\u529F @@ -23,7 +20,6 @@ user.register.success=\u6CE8\u518C\u6210\u529F user.notfound=\u8BF7\u91CD\u65B0\u767B\u5F55 user.forcelogout=\u7BA1\u7406\u5458\u5F3A\u5236\u9000\u51FA\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55 user.unknown.error=\u672A\u77E5\u9519\u8BEF\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55 - ##\u6743\u9650 no.permission=\u60A8\u6CA1\u6709\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] no.create.permission=\u60A8\u6CA1\u6709\u521B\u5EFA\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] @@ -31,17 +27,14 @@ no.update.permission=\u60A8\u6CA1\u6709\u4FEE\u6539\u6570\u636E\u7684\u6743\u965 no.delete.permission=\u60A8\u6CA1\u6709\u5220\u9664\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] no.export.permission=\u60A8\u6CA1\u6709\u5BFC\u51FA\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] no.view.permission=\u60A8\u6CA1\u6709\u67E5\u770B\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] - ##\u6587\u4EF6\u4E0A\u4F20\u6D88\u606F upload.exceed.maxSize=\u4E0A\u4F20\u7684\u6587\u4EF6\u5927\u5C0F\u8D85\u51FA\u9650\u5236\u7684\u6587\u4EF6\u5927\u5C0F\uFF01
\u5141\u8BB8\u7684\u6587\u4EF6\u6700\u5927\u5927\u5C0F\u662F\uFF1A{0}MB\uFF01 upload.filename.exceed.length=\u4E0A\u4F20\u7684\u6587\u4EF6\u540D\u6700\u957F{0}\u4E2A\u5B57\u7B26 upload.success=\u4E0A\u4F20\u6210\u529F - ##\u6587\u4EF6\u4E0B\u8F7D\u6D88\u606F download.filename.not.valid=\u6587\u4EF6\u540D\u79F0[{}]\u975E\u6CD5\uFF0C\u4E0D\u5141\u8BB8\u4E0B\u8F7D download.file.failed=\u4E0B\u8F7D\u6587\u4EF6\u5931\u8D25 download.resource.not.valid=\u8D44\u6E90\u6587\u4EF6[{}]\u975E\u6CD5\uFF0C\u4E0D\u5141\u8BB8\u4E0B\u8F7D - ##Dept dept.add.failed.name.exists=\u65B0\u589E\u673A\u6784[{}]\u5931\u8D25\uFF0C\u673A\u6784\u540D\u79F0\u5DF2\u5B58\u5728 dept.update.failed.name.exists=\u4FEE\u6539\u673A\u6784[{}]\u5931\u8D25\uFF0C\u673A\u6784\u540D\u79F0\u5DF2\u5B58\u5728 @@ -49,14 +42,11 @@ dept.update.failed.parent.not.valid=\u4FEE\u6539\u673A\u6784[{}]\u5931\u8D25\uFF dept.update.failed.child.not.valid=\u8BE5\u673A\u6784\u5305\u542B\u672A\u505C\u7528\u7684\u5B50\u673A\u6784\uFF01 dept.delete.failed.child.exists=\u5B58\u5728\u4E0B\u7EA7\u673A\u6784\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664 dept.delete.failed.user.exists=\u673A\u6784\u5B58\u5728\u7528\u6237\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664 - ##Dict dict.add.failed.type.exists=\u65B0\u589E\u5B57\u5178[{}]\u5931\u8D25\uFF0C\u5B57\u5178\u7C7B\u578B\u5DF2\u5B58\u5728 dict.update.failed.type.exists=\u65B0\u589E\u5B57\u5178[{}]\u5931\u8D25\uFF0C\u5B57\u5178\u7C7B\u578B\u5DF2\u5B58\u5728 - ##Index index.welcome.message=\u6B22\u8FCE\u4F7F\u7528{}\u540E\u53F0\u7BA1\u7406\u6846\u67B6\uFF0C\u5F53\u524D\u7248\u672C\uFF1Av{}\uFF0C\u8BF7\u901A\u8FC7\u524D\u7AEF\u5730\u5740\u8BBF\u95EE\u3002 - ##Menu menu.add.failed.name.exists=\u65B0\u589E\u83DC\u5355[{}]\u5931\u8D25\uFF0C\u83DC\u5355\u540D\u79F0\u5DF2\u5B58\u5728 menu.add.failed.path.not.valid=\u65B0\u589E\u83DC\u5355[{}]\u5931\u8D25\uFF0C\u5730\u5740\u5FC5\u987B\u4EE5http(s)://\u5F00\u5934 @@ -65,13 +55,11 @@ menu.update.failed.path.not.valid=\u4FEE\u6539\u83DC\u5355[{}]\u5931\u8D25\uFF0C menu.update.failed.parent.not.valid=\u4FEE\u6539\u83DC\u5355[{}]\u5931\u8D25\uFF0C\u4E0A\u7EA7\u83DC\u5355\u4E0D\u80FD\u9009\u62E9\u81EA\u5DF1 menu.delete.failed.child.exists=\u5B58\u5728\u5B50\u83DC\u5355,\u4E0D\u5141\u8BB8\u5220\u9664 menu.delete.failed.role.exists=\u83DC\u5355\u5DF2\u5206\u914D,\u4E0D\u5141\u8BB8\u5220\u9664 - ##Post post.add.failed.name.exists=\u65B0\u589E\u5C97\u4F4D[{}]\u5931\u8D25\uFF0C\u5C97\u4F4D\u540D\u79F0\u5DF2\u5B58\u5728 post.add.failed.code.exists=\u65B0\u589E\u5C97\u4F4D[{}]\u5931\u8D25\uFF0C\u5C97\u4F4D\u7F16\u7801\u5DF2\u5B58\u5728 post.update.failed.name.exists=\u4FEE\u6539\u5C97\u4F4D[{}]\u5931\u8D25\uFF0C\u5C97\u4F4D\u540D\u79F0\u5DF2\u5B58\u5728 post.update.failed.code.exists=\u4FEE\u6539\u5C97\u4F4D[{}]\u5931\u8D25\uFF0C\u5C97\u4F4D\u7F16\u7801\u5DF2\u5B58\u5728 - ##User user.username.exists=\u7CFB\u7EDF\u8D26\u53F7\u540D\u79F0\u5DF2\u5B58\u5728\uFF0C\u8BF7\u4FEE\u6539\u540E\u91CD\u8BD5 user.password.differ=\u4E24\u6B21\u5BC6\u7801\u4E0D\u4E00\u81F4\uFF0C\u8BF7\u91CD\u65B0\u8F93\u5165 @@ -89,7 +77,6 @@ user.delete.failed=\u5F53\u524D\u7528\u6237\u4E0D\u80FD\u5220\u9664 user.upload.avatar.failed=\u4E0A\u4F20\u56FE\u7247\u5F02\u5E38\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458 user.not.login=\u8BF7\u767B\u5F55\u540E\u91CD\u8BD5 user.access.denied=\u7528\u6237\u62D2\u7EDD\u8BBF\u95EE - ##Role role.add.manager.failed=\u4E0D\u5141\u8BB8\u8BBE\u7F6E\u7BA1\u7406\u5458\u89D2\u8272\u6807\u8BC6 role.add.failed.name.exists=\u65B0\u589E\u89D2\u8272[{}]\u5931\u8D25\uFF0C\u89D2\u8272\u540D\u79F0\u5DF2\u5B58\u5728 @@ -97,13 +84,11 @@ role.add.failed.key.exists=\u65B0\u589E\u89D2\u8272[{}]\u5931\u8D25\uFF0C\u89D2\ role.update.failed.name.exists=\u4FEE\u6539\u89D2\u8272[{}]\u5931\u8D25\uFF0C\u89D2\u8272\u540D\u79F0\u5DF2\u5B58\u5728 role.update.failed.key.exists=\u4FEE\u6539\u89D2\u8272[{}]\u5931\u8D25\uFF0C\u89D2\u8272\u6743\u9650\u5DF2\u5B58\u5728 role.update.failed=\u4FEE\u6539\u89D2\u8272[{}]\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458 - ##Import import.failed.file.null=\u5BFC\u5165\u5931\u8D25\uFF0C\u8BF7\u5148\u4E0A\u4F20\u6587\u4EF6\uFF01 import.failed.data.null=\u5BFC\u5165\u5931\u8D25\uFF0C\u5BFC\u5165\u6570\u636E\u4E3A\u7A7A\uFF01 import.failed.device.name.null=\u5BFC\u5165\u5931\u8D25\uFF0C\u6A21\u677F\u91CC\u8BBE\u5907\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A\uFF01 import.success=\u5BFC\u5165\u6210\u529F - ##General success=\u6210\u529F fail=\u5931\u8D25 @@ -114,11 +99,9 @@ create.failed=\u521B\u5EFA\u5931\u8D25 save.success=\u4FDD\u5B58\u6210\u529F save.failed=\u4FDD\u5B58\u5931\u8D25 authorization.success=\u6388\u6743\u6210\u529F - ##Email email.format.error=\u90AE\u7BB1\u683C\u5F0F\u9519\u8BEF email.verification.code.send=\u90AE\u7BB1\u9A8C\u8BC1\u7801\u5DF2\u53D1\u9001 - ##Firmware firmware.task.upgrade.failed.time.not.valid=\u9884\u5B9A\u5347\u7EA7\u65F6\u95F4\u5E94\u5927\u4E8E\u5F53\u524D\u65F6\u95F4 ##Media @@ -174,7 +157,6 @@ record.app.null=app\u4E0D\u80FD\u4E3A\u7A7A record.stream.null=stream\u4E0D\u80FD\u4E3A\u7A7A record.time.not.valid=\u9519\u8BEF\u7684\u5F00\u59CB\u65F6\u95F4\u6216\u7ED3\u675F\u65F6\u95F4 record.file.null=\u672A\u627E\u5230\u89C6\u9891\u6587\u4EF6 - ##ErrorCodeConstants app.not.found=App \u4E0D\u5B58\u5728 app.is.disable=App \u5DF2\u7ECF\u88AB\u7981\u7528 diff --git a/fastbee-admin/src/main/resources/i18n/messages_zh_CN.properties b/fastbee-admin/src/main/resources/i18n/messages_zh_CN.properties index d1a8c07c..0b78c9a6 100644 --- a/fastbee-admin/src/main/resources/i18n/messages_zh_CN.properties +++ b/fastbee-admin/src/main/resources/i18n/messages_zh_CN.properties @@ -10,12 +10,9 @@ user.password.delete=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u8D26\u53F7\u5DF2\u88A user.blocked=\u7528\u6237\u5DF2\u5C01\u7981\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458 role.blocked=\u89D2\u8272\u5DF2\u5C01\u7981\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458 user.logout.success=\u9000\u51FA\u6210\u529F - length.not.valid=\u957F\u5EA6\u5FC5\u987B\u5728{min}\u5230{max}\u4E2A\u5B57\u7B26\u4E4B\u95F4 - user.username.not.valid=* 2\u523020\u4E2A\u6C49\u5B57\u3001\u5B57\u6BCD\u3001\u6570\u5B57\u6216\u4E0B\u5212\u7EBF\u7EC4\u6210\uFF0C\u4E14\u5FC5\u987B\u4EE5\u975E\u6570\u5B57\u5F00\u5934 user.password.not.valid=* 5-50\u4E2A\u5B57\u7B26 - user.email.not.valid=\u90AE\u7BB1\u683C\u5F0F\u9519\u8BEF user.mobile.phone.number.not.valid=\u624B\u673A\u53F7\u683C\u5F0F\u9519\u8BEF user.login.success=\u767B\u5F55\u6210\u529F @@ -23,7 +20,6 @@ user.register.success=\u6CE8\u518C\u6210\u529F user.notfound=\u8BF7\u91CD\u65B0\u767B\u5F55 user.forcelogout=\u7BA1\u7406\u5458\u5F3A\u5236\u9000\u51FA\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55 user.unknown.error=\u672A\u77E5\u9519\u8BEF\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55 - ##\u6743\u9650 no.permission=\u60A8\u6CA1\u6709\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] no.create.permission=\u60A8\u6CA1\u6709\u521B\u5EFA\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] @@ -31,17 +27,14 @@ no.update.permission=\u60A8\u6CA1\u6709\u4FEE\u6539\u6570\u636E\u7684\u6743\u965 no.delete.permission=\u60A8\u6CA1\u6709\u5220\u9664\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] no.export.permission=\u60A8\u6CA1\u6709\u5BFC\u51FA\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] no.view.permission=\u60A8\u6CA1\u6709\u67E5\u770B\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] - ##\u6587\u4EF6\u4E0A\u4F20\u6D88\u606F upload.exceed.maxSize=\u4E0A\u4F20\u7684\u6587\u4EF6\u5927\u5C0F\u8D85\u51FA\u9650\u5236\u7684\u6587\u4EF6\u5927\u5C0F\uFF01
\u5141\u8BB8\u7684\u6587\u4EF6\u6700\u5927\u5927\u5C0F\u662F\uFF1A{0}MB\uFF01 upload.filename.exceed.length=\u4E0A\u4F20\u7684\u6587\u4EF6\u540D\u6700\u957F{0}\u4E2A\u5B57\u7B26 upload.success=\u4E0A\u4F20\u6210\u529F - ##\u6587\u4EF6\u4E0B\u8F7D\u6D88\u606F download.filename.not.valid=\u6587\u4EF6\u540D\u79F0[{}]\u975E\u6CD5\uFF0C\u4E0D\u5141\u8BB8\u4E0B\u8F7D download.file.failed=\u4E0B\u8F7D\u6587\u4EF6\u5931\u8D25 download.resource.not.valid=\u8D44\u6E90\u6587\u4EF6[{}]\u975E\u6CD5\uFF0C\u4E0D\u5141\u8BB8\u4E0B\u8F7D - ##Dept dept.add.failed.name.exists=\u65B0\u589E\u673A\u6784[{}]\u5931\u8D25\uFF0C\u673A\u6784\u540D\u79F0\u5DF2\u5B58\u5728 dept.update.failed.name.exists=\u4FEE\u6539\u673A\u6784[{}]\u5931\u8D25\uFF0C\u673A\u6784\u540D\u79F0\u5DF2\u5B58\u5728 @@ -49,14 +42,11 @@ dept.update.failed.parent.not.valid=\u4FEE\u6539\u673A\u6784[{}]\u5931\u8D25\uFF dept.update.failed.child.not.valid=\u8BE5\u673A\u6784\u5305\u542B\u672A\u505C\u7528\u7684\u5B50\u673A\u6784\uFF01 dept.delete.failed.child.exists=\u5B58\u5728\u4E0B\u7EA7\u673A\u6784\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664 dept.delete.failed.user.exists=\u673A\u6784\u5B58\u5728\u7528\u6237\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664 - ##Dict dict.add.failed.type.exists=\u65B0\u589E\u5B57\u5178[{}]\u5931\u8D25\uFF0C\u5B57\u5178\u7C7B\u578B\u5DF2\u5B58\u5728 dict.update.failed.type.exists=\u65B0\u589E\u5B57\u5178[{}]\u5931\u8D25\uFF0C\u5B57\u5178\u7C7B\u578B\u5DF2\u5B58\u5728 - ##Index index.welcome.message=\u6B22\u8FCE\u4F7F\u7528{}\u540E\u53F0\u7BA1\u7406\u6846\u67B6\uFF0C\u5F53\u524D\u7248\u672C\uFF1Av{}\uFF0C\u8BF7\u901A\u8FC7\u524D\u7AEF\u5730\u5740\u8BBF\u95EE\u3002 - ##Menu menu.add.failed.name.exists=\u65B0\u589E\u83DC\u5355[{}]\u5931\u8D25\uFF0C\u83DC\u5355\u540D\u79F0\u5DF2\u5B58\u5728 menu.add.failed.path.not.valid=\u65B0\u589E\u83DC\u5355[{}]\u5931\u8D25\uFF0C\u5730\u5740\u5FC5\u987B\u4EE5http(s)://\u5F00\u5934 @@ -65,13 +55,11 @@ menu.update.failed.path.not.valid=\u4FEE\u6539\u83DC\u5355[{}]\u5931\u8D25\uFF0C menu.update.failed.parent.not.valid=\u4FEE\u6539\u83DC\u5355[{}]\u5931\u8D25\uFF0C\u4E0A\u7EA7\u83DC\u5355\u4E0D\u80FD\u9009\u62E9\u81EA\u5DF1 menu.delete.failed.child.exists=\u5B58\u5728\u5B50\u83DC\u5355,\u4E0D\u5141\u8BB8\u5220\u9664 menu.delete.failed.role.exists=\u83DC\u5355\u5DF2\u5206\u914D,\u4E0D\u5141\u8BB8\u5220\u9664 - ##Post post.add.failed.name.exists=\u65B0\u589E\u5C97\u4F4D[{}]\u5931\u8D25\uFF0C\u5C97\u4F4D\u540D\u79F0\u5DF2\u5B58\u5728 post.add.failed.code.exists=\u65B0\u589E\u5C97\u4F4D[{}]\u5931\u8D25\uFF0C\u5C97\u4F4D\u7F16\u7801\u5DF2\u5B58\u5728 post.update.failed.name.exists=\u4FEE\u6539\u5C97\u4F4D[{}]\u5931\u8D25\uFF0C\u5C97\u4F4D\u540D\u79F0\u5DF2\u5B58\u5728 post.update.failed.code.exists=\u4FEE\u6539\u5C97\u4F4D[{}]\u5931\u8D25\uFF0C\u5C97\u4F4D\u7F16\u7801\u5DF2\u5B58\u5728 - ##User user.username.exists=\u7CFB\u7EDF\u8D26\u53F7\u540D\u79F0\u5DF2\u5B58\u5728\uFF0C\u8BF7\u4FEE\u6539\u540E\u91CD\u8BD5 user.password.differ=\u4E24\u6B21\u5BC6\u7801\u4E0D\u4E00\u81F4\uFF0C\u8BF7\u91CD\u65B0\u8F93\u5165 @@ -89,7 +77,6 @@ user.delete.failed=\u5F53\u524D\u7528\u6237\u4E0D\u80FD\u5220\u9664 user.upload.avatar.failed=\u4E0A\u4F20\u56FE\u7247\u5F02\u5E38\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458 user.not.login=\u8BF7\u767B\u5F55\u540E\u91CD\u8BD5 user.access.denied=\u7528\u6237\u62D2\u7EDD\u8BBF\u95EE - ##Role role.add.manager.failed=\u4E0D\u5141\u8BB8\u8BBE\u7F6E\u7BA1\u7406\u5458\u89D2\u8272\u6807\u8BC6 role.add.failed.name.exists=\u65B0\u589E\u89D2\u8272[{}]\u5931\u8D25\uFF0C\u89D2\u8272\u540D\u79F0\u5DF2\u5B58\u5728 @@ -97,13 +84,11 @@ role.add.failed.key.exists=\u65B0\u589E\u89D2\u8272[{}]\u5931\u8D25\uFF0C\u89D2\ role.update.failed.name.exists=\u4FEE\u6539\u89D2\u8272[{}]\u5931\u8D25\uFF0C\u89D2\u8272\u540D\u79F0\u5DF2\u5B58\u5728 role.update.failed.key.exists=\u4FEE\u6539\u89D2\u8272[{}]\u5931\u8D25\uFF0C\u89D2\u8272\u6743\u9650\u5DF2\u5B58\u5728 role.update.failed=\u4FEE\u6539\u89D2\u8272[{}]\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458 - ##Import import.failed.file.null=\u5BFC\u5165\u5931\u8D25\uFF0C\u8BF7\u5148\u4E0A\u4F20\u6587\u4EF6\uFF01 import.failed.data.null=\u5BFC\u5165\u5931\u8D25\uFF0C\u5BFC\u5165\u6570\u636E\u4E3A\u7A7A\uFF01 import.failed.device.name.null=\u5BFC\u5165\u5931\u8D25\uFF0C\u6A21\u677F\u91CC\u8BBE\u5907\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A\uFF01 import.success=\u5BFC\u5165\u6210\u529F - ##General success=\u6210\u529F fail=\u5931\u8D25 @@ -114,11 +99,9 @@ create.failed=\u521B\u5EFA\u5931\u8D25 save.success=\u4FDD\u5B58\u6210\u529F save.failed=\u4FDD\u5B58\u5931\u8D25 authorization.success=\u6388\u6743\u6210\u529F - ##Email email.format.error=\u90AE\u7BB1\u683C\u5F0F\u9519\u8BEF email.verification.code.send=\u90AE\u7BB1\u9A8C\u8BC1\u7801\u5DF2\u53D1\u9001 - ##Firmware firmware.task.upgrade.failed.time.not.valid=\u9884\u5B9A\u5347\u7EA7\u65F6\u95F4\u5E94\u5927\u4E8E\u5F53\u524D\u65F6\u95F4 ##Media @@ -174,7 +157,6 @@ record.app.null=app\u4E0D\u80FD\u4E3A\u7A7A record.stream.null=stream\u4E0D\u80FD\u4E3A\u7A7A record.time.not.valid=\u9519\u8BEF\u7684\u5F00\u59CB\u65F6\u95F4\u6216\u7ED3\u675F\u65F6\u95F4 record.file.null=\u672A\u627E\u5230\u89C6\u9891\u6587\u4EF6 - ##ErrorCodeConstants app.not.found=App \u4E0D\u5B58\u5728 app.is.disable=App \u5DF2\u7ECF\u88AB\u7981\u7528 diff --git a/fastbee-admin/src/main/resources/logback.xml b/fastbee-admin/src/main/resources/logback.xml index a493ed09..492a8ade 100644 --- a/fastbee-admin/src/main/resources/logback.xml +++ b/fastbee-admin/src/main/resources/logback.xml @@ -1,9 +1,9 @@ - + - + @@ -129,19 +129,19 @@ - + - + - + - - + + diff --git a/fastbee-admin/src/main/resources/mybatis/mybatis-config.xml b/fastbee-admin/src/main/resources/mybatis/mybatis-config.xml index ac47c038..b0c7ce73 100644 --- a/fastbee-admin/src/main/resources/mybatis/mybatis-config.xml +++ b/fastbee-admin/src/main/resources/mybatis/mybatis-config.xml @@ -1,20 +1,20 @@ + PUBLIC "-//mybatis.org//DTD Config 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-config.dtd"> - + - + - - - + + + - - - + + + diff --git a/fastbee-common/src/main/java/com/fastbee/common/annotation/Anonymous.java b/fastbee-common/src/main/java/com/fastbee/common/annotation/Anonymous.java index 77d90ef0..78cd1f42 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/annotation/Anonymous.java +++ b/fastbee-common/src/main/java/com/fastbee/common/annotation/Anonymous.java @@ -1,10 +1,6 @@ package com.fastbee.common.annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * 匿名访问不鉴权注解 diff --git a/fastbee-common/src/main/java/com/fastbee/common/annotation/Excel.java b/fastbee-common/src/main/java/com/fastbee/common/annotation/Excel.java index 157c8825..d184c1e9 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/annotation/Excel.java +++ b/fastbee-common/src/main/java/com/fastbee/common/annotation/Excel.java @@ -1,13 +1,14 @@ package com.fastbee.common.annotation; +import com.fastbee.common.utils.poi.ExcelHandlerAdapter; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.IndexedColors; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.math.BigDecimal; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.IndexedColors; -import com.fastbee.common.utils.poi.ExcelHandlerAdapter; /** * 自定义导出Excel数据注解 diff --git a/fastbee-common/src/main/java/com/fastbee/common/annotation/Log.java b/fastbee-common/src/main/java/com/fastbee/common/annotation/Log.java index 2526dd45..622cd16c 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/annotation/Log.java +++ b/fastbee-common/src/main/java/com/fastbee/common/annotation/Log.java @@ -1,13 +1,10 @@ package com.fastbee.common.annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; import com.fastbee.common.enums.BusinessType; import com.fastbee.common.enums.OperatorType; +import java.lang.annotation.*; + /** * 自定义操作日志记录注解 * diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/domain/AjaxResult.java b/fastbee-common/src/main/java/com/fastbee/common/core/domain/AjaxResult.java index 9db8ee4e..e9dc93ef 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/domain/AjaxResult.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/domain/AjaxResult.java @@ -1,9 +1,10 @@ package com.fastbee.common.core.domain; -import java.util.HashMap; import com.fastbee.common.constant.HttpStatus; import com.fastbee.common.utils.StringUtils; +import java.util.HashMap; + /** * 操作消息提醒 * diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/domain/BaseEntity.java b/fastbee-common/src/main/java/com/fastbee/common/core/domain/BaseEntity.java index c8002bd7..f084a2cf 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/domain/BaseEntity.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/domain/BaseEntity.java @@ -1,16 +1,16 @@ package com.fastbee.common.core.domain; -import java.io.Serializable; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + /** * Entity基类 * diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/domain/R.java b/fastbee-common/src/main/java/com/fastbee/common/core/domain/R.java index fe572876..e0a26039 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/domain/R.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/domain/R.java @@ -1,8 +1,9 @@ package com.fastbee.common.core.domain; -import java.io.Serializable; import com.fastbee.common.constant.HttpStatus; +import java.io.Serializable; + /** * 响应信息主体 * diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/domain/TreeSelect.java b/fastbee-common/src/main/java/com/fastbee/common/core/domain/TreeSelect.java index cbb874b8..253fabec 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/domain/TreeSelect.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/domain/TreeSelect.java @@ -1,11 +1,12 @@ package com.fastbee.common.core.domain; +import com.fastbee.common.core.domain.entity.SysDept; +import com.fastbee.common.core.domain.entity.SysMenu; +import com.fasterxml.jackson.annotation.JsonInclude; + import java.io.Serializable; import java.util.List; import java.util.stream.Collectors; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fastbee.common.core.domain.entity.SysDept; -import com.fastbee.common.core.domain.entity.SysMenu; /** * Treeselect树结构实体类 diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysDept.java b/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysDept.java index 74a81549..9c929cd3 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysDept.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysDept.java @@ -1,17 +1,17 @@ package com.fastbee.common.core.domain.entity; -import java.util.ArrayList; -import java.util.List; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - +import com.fastbee.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.fastbee.common.core.domain.BaseEntity; + +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.ArrayList; +import java.util.List; /** * 部门表 sys_dept diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysDictData.java b/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysDictData.java index a4c25935..72f12f7b 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysDictData.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysDictData.java @@ -1,17 +1,17 @@ package com.fastbee.common.core.domain.entity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; - +import com.fastbee.common.annotation.Excel; +import com.fastbee.common.annotation.Excel.ColumnType; +import com.fastbee.common.constant.UserConstants; +import com.fastbee.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.fastbee.common.annotation.Excel; -import com.fastbee.common.annotation.Excel.ColumnType; -import com.fastbee.common.constant.UserConstants; -import com.fastbee.common.core.domain.BaseEntity; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; /** * 字典数据表 sys_dict_data diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysDictType.java b/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysDictType.java index 68c0083c..6bdaf961 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysDictType.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysDictType.java @@ -1,16 +1,16 @@ package com.fastbee.common.core.domain.entity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; - +import com.fastbee.common.annotation.Excel; +import com.fastbee.common.annotation.Excel.ColumnType; +import com.fastbee.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.fastbee.common.annotation.Excel; -import com.fastbee.common.annotation.Excel.ColumnType; -import com.fastbee.common.core.domain.BaseEntity; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; /** * 字典类型表 sys_dict_type diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysMenu.java b/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysMenu.java index f5d152f2..400d8f52 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysMenu.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysMenu.java @@ -1,16 +1,16 @@ package com.fastbee.common.core.domain.entity; -import java.util.ArrayList; -import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - +import com.fastbee.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.fastbee.common.core.domain.BaseEntity; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.ArrayList; +import java.util.List; /** * 菜单权限表 sys_menu diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysRole.java b/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysRole.java index 8bc2b450..7b7c488d 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysRole.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysRole.java @@ -1,17 +1,17 @@ package com.fastbee.common.core.domain.entity; -import java.util.Set; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - +import com.fastbee.common.annotation.Excel; +import com.fastbee.common.annotation.Excel.ColumnType; +import com.fastbee.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.fastbee.common.annotation.Excel; -import com.fastbee.common.annotation.Excel.ColumnType; -import com.fastbee.common.core.domain.BaseEntity; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.Set; /** * 角色表 sys_role diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysUser.java b/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysUser.java index 109e25c0..6c72d5ac 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysUser.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysUser.java @@ -1,19 +1,21 @@ package com.fastbee.common.core.domain.entity; -import java.util.Date; -import java.util.List; -import javax.validation.constraints.*; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.fastbee.common.annotation.Excel; import com.fastbee.common.annotation.Excel.ColumnType; import com.fastbee.common.annotation.Excel.Type; import com.fastbee.common.annotation.Excels; import com.fastbee.common.core.domain.BaseEntity; import com.fastbee.common.xss.Xss; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.util.Date; +import java.util.List; /** * 用户对象 sys_user diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/domain/model/LoginUser.java b/fastbee-common/src/main/java/com/fastbee/common/core/domain/model/LoginUser.java index 95a3a33c..fda5315f 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/domain/model/LoginUser.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/domain/model/LoginUser.java @@ -1,11 +1,12 @@ package com.fastbee.common.core.domain.model; +import com.alibaba.fastjson2.annotation.JSONField; +import com.fastbee.common.core.domain.entity.SysUser; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + import java.util.Collection; import java.util.Set; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; -import com.alibaba.fastjson2.annotation.JSONField; -import com.fastbee.common.core.domain.entity.SysUser; /** * 登录用户身份权限 diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/mq/DeviceReport.java b/fastbee-common/src/main/java/com/fastbee/common/core/mq/DeviceReport.java index fbf479f2..382407eb 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/mq/DeviceReport.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/mq/DeviceReport.java @@ -1,9 +1,7 @@ package com.fastbee.common.core.mq; -import com.fastbee.common.core.mq.message.SubDeviceMessage; import com.fastbee.common.core.protocol.Message; import com.fastbee.common.core.thingsModel.ThingsModelSimpleItem; -import com.fastbee.common.core.thingsModel.ThingsModelValuesInput; import com.fastbee.common.enums.FunctionReplyStatus; import com.fastbee.common.enums.ServerType; import lombok.Data; diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/mq/DeviceReportBo.java b/fastbee-common/src/main/java/com/fastbee/common/core/mq/DeviceReportBo.java index c9801968..54abbc11 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/mq/DeviceReportBo.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/mq/DeviceReportBo.java @@ -2,11 +2,9 @@ package com.fastbee.common.core.mq; import com.fastbee.common.core.mq.message.PropRead; import com.fastbee.common.core.thingsModel.ThingsModelSimpleItem; -import com.fastbee.common.core.thingsModel.ThingsModelValuesInput; import com.fastbee.common.enums.FunctionReplyStatus; import com.fastbee.common.enums.ServerType; import com.fastbee.common.enums.ThingsModelType; -import io.netty.buffer.ByteBuf; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/mq/message/DeviceDownMessage.java b/fastbee-common/src/main/java/com/fastbee/common/core/mq/message/DeviceDownMessage.java index 8747e13b..47369aab 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/mq/message/DeviceDownMessage.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/mq/message/DeviceDownMessage.java @@ -1,6 +1,5 @@ package com.fastbee.common.core.mq.message; -import com.alibaba.fastjson2.JSONObject; import com.fastbee.common.core.protocol.modbus.ModbusCode; import com.fastbee.common.enums.ServerType; import lombok.AllArgsConstructor; diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/mq/ota/OtaUpgradeBo.java b/fastbee-common/src/main/java/com/fastbee/common/core/mq/ota/OtaUpgradeBo.java index 87bc61a9..460ff444 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/mq/ota/OtaUpgradeBo.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/mq/ota/OtaUpgradeBo.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Builder; import lombok.Data; -import javax.validation.constraints.NotNull; import java.math.BigDecimal; /** diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/mq/ota/OtaUpgradeDelayTask.java b/fastbee-common/src/main/java/com/fastbee/common/core/mq/ota/OtaUpgradeDelayTask.java index fc8c02ec..8eb8a66b 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/mq/ota/OtaUpgradeDelayTask.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/mq/ota/OtaUpgradeDelayTask.java @@ -1,11 +1,9 @@ package com.fastbee.common.core.mq.ota; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fastbee.common.utils.DateUtils; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.springframework.lang.NonNull; -import java.lang.reflect.Member; import java.util.Date; import java.util.List; import java.util.concurrent.Delayed; diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/notify/WeChatServerParams.java b/fastbee-common/src/main/java/com/fastbee/common/core/notify/WeChatServerParams.java index d2790049..1f66e0c1 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/notify/WeChatServerParams.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/notify/WeChatServerParams.java @@ -3,7 +3,6 @@ package com.fastbee.common.core.notify; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; -import org.dromara.sms4j.provider.config.BaseConfig; /** * 微信服务号推送参数 diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/text/CharsetKit.java b/fastbee-common/src/main/java/com/fastbee/common/core/text/CharsetKit.java index eaf58bec..fcf26811 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/text/CharsetKit.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/text/CharsetKit.java @@ -1,8 +1,9 @@ package com.fastbee.common.core.text; +import com.fastbee.common.utils.StringUtils; + import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import com.fastbee.common.utils.StringUtils; /** * 字符集工具类 diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/text/Convert.java b/fastbee-common/src/main/java/com/fastbee/common/core/text/Convert.java index 528b19b4..75ea7349 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/text/Convert.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/text/Convert.java @@ -1,13 +1,14 @@ package com.fastbee.common.core.text; +import com.fastbee.common.utils.StringUtils; +import org.apache.commons.lang3.ArrayUtils; + import java.math.BigDecimal; import java.math.BigInteger; import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.text.NumberFormat; import java.util.Set; -import com.fastbee.common.utils.StringUtils; -import org.apache.commons.lang3.ArrayUtils; /** * 类型转换器 diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/thingsModel/SceneThingsModelItem.java b/fastbee-common/src/main/java/com/fastbee/common/core/thingsModel/SceneThingsModelItem.java index bd8626eb..7d47659f 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/thingsModel/SceneThingsModelItem.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/thingsModel/SceneThingsModelItem.java @@ -1,13 +1,9 @@ package com.fastbee.common.core.thingsModel; -import com.fastbee.common.utils.DateUtils; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import java.util.Date; - /** * 物模型值的项 * diff --git a/fastbee-common/src/main/java/com/fastbee/common/enums/DeviceLogTypeEnum.java b/fastbee-common/src/main/java/com/fastbee/common/enums/DeviceLogTypeEnum.java index 78d640a1..961851ac 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/enums/DeviceLogTypeEnum.java +++ b/fastbee-common/src/main/java/com/fastbee/common/enums/DeviceLogTypeEnum.java @@ -3,9 +3,6 @@ package com.fastbee.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.Arrays; -import java.util.List; - /** * 场景管理物模型、变量类型枚举 * 注意：以下4张表下的variable_type相关字段统一用该枚举，保持一致 diff --git a/fastbee-common/src/main/java/com/fastbee/common/enums/ExceptionCode.java b/fastbee-common/src/main/java/com/fastbee/common/enums/ExceptionCode.java index 88a74025..8ef863db 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/enums/ExceptionCode.java +++ b/fastbee-common/src/main/java/com/fastbee/common/enums/ExceptionCode.java @@ -1,7 +1,6 @@ package com.fastbee.common.enums; import lombok.AllArgsConstructor; -import lombok.Data; import lombok.Getter; /** diff --git a/fastbee-common/src/main/java/com/fastbee/common/enums/HttpMethod.java b/fastbee-common/src/main/java/com/fastbee/common/enums/HttpMethod.java index 7e085a28..f705502b 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/enums/HttpMethod.java +++ b/fastbee-common/src/main/java/com/fastbee/common/enums/HttpMethod.java @@ -1,8 +1,9 @@ package com.fastbee.common.enums; +import org.springframework.lang.Nullable; + import java.util.HashMap; import java.util.Map; -import org.springframework.lang.Nullable; /** * 请求方式 diff --git a/fastbee-common/src/main/java/com/fastbee/common/enums/NotifyChannelProviderEnum.java b/fastbee-common/src/main/java/com/fastbee/common/enums/NotifyChannelProviderEnum.java index 9e40678f..79e3c63c 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/enums/NotifyChannelProviderEnum.java +++ b/fastbee-common/src/main/java/com/fastbee/common/enums/NotifyChannelProviderEnum.java @@ -5,7 +5,10 @@ import com.fastbee.common.core.notify.config.DingTalkConfigParams; import com.fastbee.common.core.notify.config.EmailConfigParams; import com.fastbee.common.core.notify.config.VoiceConfigParams; import com.fastbee.common.core.notify.config.WeChatConfigParams; -import com.fastbee.common.core.notify.msg.*; +import com.fastbee.common.core.notify.msg.DingTalkMsgParams; +import com.fastbee.common.core.notify.msg.EmailMsgParams; +import com.fastbee.common.core.notify.msg.VoiceMsgParams; +import com.fastbee.common.core.notify.msg.WechatMsgParams; import com.fastbee.common.utils.StringUtils; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/fastbee-common/src/main/java/com/fastbee/common/enums/StatusEnum.java b/fastbee-common/src/main/java/com/fastbee/common/enums/StatusEnum.java index 1c63fbda..625489d7 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/enums/StatusEnum.java +++ b/fastbee-common/src/main/java/com/fastbee/common/enums/StatusEnum.java @@ -1,11 +1,8 @@ package com.fastbee.common.enums; -import com.fastbee.common.core.text.IntArrayValuable; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.Arrays; - /** * 通用状态枚举 diff --git a/fastbee-common/src/main/java/com/fastbee/common/enums/scenemodel/SceneModelVariableTypeEnum.java b/fastbee-common/src/main/java/com/fastbee/common/enums/scenemodel/SceneModelVariableTypeEnum.java index 989eb518..0992756a 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/enums/scenemodel/SceneModelVariableTypeEnum.java +++ b/fastbee-common/src/main/java/com/fastbee/common/enums/scenemodel/SceneModelVariableTypeEnum.java @@ -3,7 +3,6 @@ package com.fastbee.common.enums.scenemodel; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/fastbee-common/src/main/java/com/fastbee/common/exception/file/InvalidExtensionException.java b/fastbee-common/src/main/java/com/fastbee/common/exception/file/InvalidExtensionException.java index 0a75787b..b923390f 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/exception/file/InvalidExtensionException.java +++ b/fastbee-common/src/main/java/com/fastbee/common/exception/file/InvalidExtensionException.java @@ -1,8 +1,9 @@ package com.fastbee.common.exception.file; -import java.util.Arrays; import org.apache.commons.fileupload.FileUploadException; +import java.util.Arrays; + /** * 文件上传 误异常类 * diff --git a/fastbee-common/src/main/java/com/fastbee/common/filter/RepeatableFilter.java b/fastbee-common/src/main/java/com/fastbee/common/filter/RepeatableFilter.java index ed8bdda6..09dc9fa7 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/filter/RepeatableFilter.java +++ b/fastbee-common/src/main/java/com/fastbee/common/filter/RepeatableFilter.java @@ -1,15 +1,11 @@ package com.fastbee.common.filter; -import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import org.springframework.http.MediaType; import com.fastbee.common.utils.StringUtils; +import org.springframework.http.MediaType; + +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; /** * Repeatable 过滤器 diff --git a/fastbee-common/src/main/java/com/fastbee/common/filter/RepeatedlyRequestWrapper.java b/fastbee-common/src/main/java/com/fastbee/common/filter/RepeatedlyRequestWrapper.java index 53429f37..89ee884d 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/filter/RepeatedlyRequestWrapper.java +++ b/fastbee-common/src/main/java/com/fastbee/common/filter/RepeatedlyRequestWrapper.java @@ -1,16 +1,17 @@ package com.fastbee.common.filter; -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStreamReader; +import com.fastbee.common.constant.Constants; +import com.fastbee.common.utils.http.HttpHelper; + import javax.servlet.ReadListener; import javax.servlet.ServletInputStream; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import com.fastbee.common.utils.http.HttpHelper; -import com.fastbee.common.constant.Constants; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStreamReader; /** * 构建可重复读取inputStream的request diff --git a/fastbee-common/src/main/java/com/fastbee/common/filter/XssFilter.java b/fastbee-common/src/main/java/com/fastbee/common/filter/XssFilter.java index e5ec9238..435d69e8 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/filter/XssFilter.java +++ b/fastbee-common/src/main/java/com/fastbee/common/filter/XssFilter.java @@ -1,18 +1,14 @@ package com.fastbee.common.filter; +import com.fastbee.common.enums.HttpMethod; +import com.fastbee.common.utils.StringUtils; + +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.fastbee.common.utils.StringUtils; -import com.fastbee.common.enums.HttpMethod; /** * 防止XSS攻击的过滤器 diff --git a/fastbee-common/src/main/java/com/fastbee/common/filter/XssHttpServletRequestWrapper.java b/fastbee-common/src/main/java/com/fastbee/common/filter/XssHttpServletRequestWrapper.java index a514cf91..9065de54 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/filter/XssHttpServletRequestWrapper.java +++ b/fastbee-common/src/main/java/com/fastbee/common/filter/XssHttpServletRequestWrapper.java @@ -1,16 +1,17 @@ package com.fastbee.common.filter; -import java.io.ByteArrayInputStream; -import java.io.IOException; +import com.fastbee.common.utils.StringUtils; +import com.fastbee.common.utils.html.EscapeUtil; +import org.apache.commons.io.IOUtils; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; + import javax.servlet.ReadListener; import javax.servlet.ServletInputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import org.apache.commons.io.IOUtils; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import com.fastbee.common.utils.StringUtils; -import com.fastbee.common.utils.html.EscapeUtil; +import java.io.ByteArrayInputStream; +import java.io.IOException; /** * XSS过滤处理 diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/CaculateUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/CaculateUtils.java index 95be154a..94b3745f 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/CaculateUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/CaculateUtils.java @@ -3,16 +3,11 @@ package com.fastbee.common.utils; import com.fastbee.common.enums.ModbusDataType; import com.fastbee.common.exception.ServiceException; import io.netty.buffer.ByteBufUtil; -import org.apache.commons.codec.binary.Hex; import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; import java.math.BigDecimal; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.charset.StandardCharsets; -import java.text.DecimalFormat; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/CaculateVariableAndNumberUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/CaculateVariableAndNumberUtils.java index e5c6f2b9..c1e4e6f7 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/CaculateVariableAndNumberUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/CaculateVariableAndNumberUtils.java @@ -1,7 +1,6 @@ package com.fastbee.common.utils; import com.fastbee.common.exception.ServiceException; -import com.fastbee.common.utils.StringUtils; import java.io.ByteArrayInputStream; import java.io.DataInputStream; diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/DateUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/DateUtils.java index 6ec1ca3c..f2830059 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/DateUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/DateUtils.java @@ -1,18 +1,14 @@ package com.fastbee.common.utils; +import org.apache.commons.lang3.time.DateFormatUtils; + import java.lang.management.ManagementFactory; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.ZoneId; -import java.time.ZonedDateTime; +import java.time.*; import java.util.Date; import java.util.Random; -import org.apache.commons.lang3.time.DateFormatUtils; - /** * 时间工具类 * diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/DictUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/DictUtils.java index efed1759..82d2dbfe 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/DictUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/DictUtils.java @@ -1,13 +1,14 @@ package com.fastbee.common.utils; -import java.util.Collection; -import java.util.List; import com.alibaba.fastjson2.JSONArray; import com.fastbee.common.constant.CacheConstants; import com.fastbee.common.core.domain.entity.SysDictData; import com.fastbee.common.core.redis.RedisCache; import com.fastbee.common.utils.spring.SpringUtils; +import java.util.Collection; +import java.util.List; + import static com.fastbee.common.constant.Constants.EN_US; import static com.fastbee.common.constant.Constants.ZH_CN; diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/ExceptionUtil.java b/fastbee-common/src/main/java/com/fastbee/common/utils/ExceptionUtil.java index 927ac860..ec8728a0 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/ExceptionUtil.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/ExceptionUtil.java @@ -1,8 +1,9 @@ package com.fastbee.common.utils; +import org.apache.commons.lang3.exception.ExceptionUtils; + import java.io.PrintWriter; import java.io.StringWriter; -import org.apache.commons.lang3.exception.ExceptionUtils; /** * 错误信息处理类。 diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/MessageUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/MessageUtils.java index b28412f1..0671c82b 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/MessageUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/MessageUtils.java @@ -1,8 +1,8 @@ package com.fastbee.common.utils; +import com.fastbee.common.utils.spring.SpringUtils; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; -import com.fastbee.common.utils.spring.SpringUtils; /** * 获取i18n资源文件 diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/PageUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/PageUtils.java index 8de87f8d..8cc334bf 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/PageUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/PageUtils.java @@ -1,9 +1,9 @@ package com.fastbee.common.utils; -import com.github.pagehelper.PageHelper; import com.fastbee.common.core.page.PageDomain; import com.fastbee.common.core.page.TableSupport; import com.fastbee.common.utils.sql.SqlUtil; +import com.github.pagehelper.PageHelper; /** * 分页工具类 diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/SecurityUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/SecurityUtils.java index a683605d..fce4e052 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/SecurityUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/SecurityUtils.java @@ -1,11 +1,11 @@ package com.fastbee.common.utils; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import com.fastbee.common.constant.HttpStatus; import com.fastbee.common.core.domain.model.LoginUser; import com.fastbee.common.exception.ServiceException; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; /** * 安全服务工具类 diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/ServletUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/ServletUtils.java index 0eef316b..8170338e 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/ServletUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/ServletUtils.java @@ -1,5 +1,16 @@ package com.fastbee.common.utils; +import cn.hutool.extra.servlet.ServletUtil; +import com.fastbee.common.constant.Constants; +import com.fastbee.common.core.text.Convert; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -7,17 +18,6 @@ import java.net.URLEncoder; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -import cn.hutool.extra.servlet.ServletUtil; -import org.springframework.web.context.request.RequestAttributes; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; -import com.fastbee.common.constant.Constants; -import com.fastbee.common.core.text.Convert; /** * 客户端工具类 diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/Threads.java b/fastbee-common/src/main/java/com/fastbee/common/utils/Threads.java index bdba4628..294adba7 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/Threads.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/Threads.java @@ -1,13 +1,10 @@ package com.fastbee.common.utils; -import java.util.concurrent.CancellationException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.concurrent.*; + /** * 线程相关工具类. * diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/VerifyCodeUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/VerifyCodeUtils.java index 9b1de74b..690a43f2 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/VerifyCodeUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/VerifyCodeUtils.java @@ -1,10 +1,7 @@ package com.fastbee.common.utils; -import java.awt.Color; -import java.awt.Font; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.RenderingHints; +import javax.imageio.ImageIO; +import java.awt.*; import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; import java.io.IOException; @@ -12,7 +9,6 @@ import java.io.OutputStream; import java.security.SecureRandom; import java.util.Arrays; import java.util.Random; -import javax.imageio.ImageIO; /** * 验证码工具类 diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/bean/BeanValidators.java b/fastbee-common/src/main/java/com/fastbee/common/utils/bean/BeanValidators.java index 050a5ab4..469509ae 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/bean/BeanValidators.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/bean/BeanValidators.java @@ -1,9 +1,9 @@ package com.fastbee.common.utils.bean; -import java.util.Set; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; import javax.validation.Validator; +import java.util.Set; /** * bean对象属性验证 diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/file/FileTypeUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/file/FileTypeUtils.java index 8b6cf08f..cde7994a 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/file/FileTypeUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/file/FileTypeUtils.java @@ -1,8 +1,9 @@ package com.fastbee.common.utils.file; -import java.io.File; import org.apache.commons.lang3.StringUtils; +import java.io.File; + /** * 文件类型工具类 * diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/file/FileUploadUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/file/FileUploadUtils.java index b5a7ed32..9c8bd045 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/file/FileUploadUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/file/FileUploadUtils.java @@ -1,11 +1,5 @@ package com.fastbee.common.utils.file; -import java.io.File; -import java.io.IOException; -import java.nio.file.Paths; -import java.util.Objects; -import org.apache.commons.io.FilenameUtils; -import org.springframework.web.multipart.MultipartFile; import com.fastbee.common.config.RuoYiConfig; import com.fastbee.common.constant.Constants; import com.fastbee.common.exception.file.FileNameLengthLimitExceededException; @@ -14,6 +8,13 @@ import com.fastbee.common.exception.file.InvalidExtensionException; import com.fastbee.common.utils.DateUtils; import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.uuid.Seq; +import org.apache.commons.io.FilenameUtils; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Paths; +import java.util.Objects; /** * 文件上传工具类 diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/file/FileUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/file/FileUtils.java index 3fdcb711..02b6790a 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/file/FileUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/file/FileUtils.java @@ -1,27 +1,21 @@ package com.fastbee.common.utils.file; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.IdUtil; -import lombok.SneakyThrows; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.ArrayUtils; import com.fastbee.common.config.RuoYiConfig; import com.fastbee.common.utils.DateUtils; import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.uuid.IdUtils; +import lombok.SneakyThrows; import org.apache.commons.io.FilenameUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.ArrayUtils; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; /** * 文件处理工具类 diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/file/ImageUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/file/ImageUtils.java index 070a700f..5fb9d591 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/file/ImageUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/file/ImageUtils.java @@ -1,17 +1,18 @@ package com.fastbee.common.utils.file; +import com.fastbee.common.config.RuoYiConfig; +import com.fastbee.common.constant.Constants; +import com.fastbee.common.utils.StringUtils; +import org.apache.poi.util.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.InputStream; import java.net.URL; import java.net.URLConnection; import java.util.Arrays; -import org.apache.poi.util.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import com.fastbee.common.config.RuoYiConfig; -import com.fastbee.common.constant.Constants; -import com.fastbee.common.utils.StringUtils; /** * 图片处理工具类 diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/file/QRCodeUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/file/QRCodeUtils.java index 3476852b..3dc2eb6f 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/file/QRCodeUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/file/QRCodeUtils.java @@ -1,10 +1,5 @@ package com.fastbee.common.utils.file; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - - import com.google.zxing.BarcodeFormat; import com.google.zxing.EncodeHintType; import com.google.zxing.MultiFormatWriter; @@ -12,6 +7,10 @@ import com.google.zxing.WriterException; import com.google.zxing.common.BitMatrix; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + public class QRCodeUtils { /** diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/gateway/mq/TopicsUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/gateway/mq/TopicsUtils.java index 2f035ee9..593fce3e 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/gateway/mq/TopicsUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/gateway/mq/TopicsUtils.java @@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; - import java.util.*; /** diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/html/HTMLFilter.java b/fastbee-common/src/main/java/com/fastbee/common/utils/html/HTMLFilter.java index d2e5c43b..9ddce986 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/html/HTMLFilter.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/html/HTMLFilter.java @@ -1,10 +1,6 @@ package com.fastbee.common.utils.html; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.regex.Matcher; diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/http/HttpHelper.java b/fastbee-common/src/main/java/com/fastbee/common/utils/http/HttpHelper.java index 719a60b2..3d5f1708 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/http/HttpHelper.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/http/HttpHelper.java @@ -1,14 +1,15 @@ package com.fastbee.common.utils.http; +import org.apache.commons.lang3.exception.ExceptionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.servlet.ServletRequest; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; -import javax.servlet.ServletRequest; -import org.apache.commons.lang3.exception.ExceptionUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * 通用http工具封装 diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/http/HttpUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/http/HttpUtils.java index ba4e6859..5a0c219d 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/http/HttpUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/http/HttpUtils.java @@ -1,26 +1,18 @@ package com.fastbee.common.utils.http; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.PrintWriter; +import com.fastbee.common.constant.Constants; +import com.fastbee.common.utils.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.net.ssl.*; +import java.io.*; import java.net.ConnectException; import java.net.SocketTimeoutException; import java.net.URL; import java.net.URLConnection; import java.nio.charset.StandardCharsets; import java.security.cert.X509Certificate; -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSession; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import com.fastbee.common.constant.Constants; -import com.fastbee.common.utils.StringUtils; /** * 通用http发送方法 diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/ip/AddressUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/ip/AddressUtils.java index fddcd76f..90c2230e 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/ip/AddressUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/ip/AddressUtils.java @@ -1,13 +1,13 @@ package com.fastbee.common.utils.ip; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.fastbee.common.config.RuoYiConfig; import com.fastbee.common.constant.Constants; import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.http.HttpUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * 获取地址类 diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/ip/IpUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/ip/IpUtils.java index 6aea1506..7aad829d 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/ip/IpUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/ip/IpUtils.java @@ -1,9 +1,10 @@ package com.fastbee.common.utils.ip; +import com.fastbee.common.utils.StringUtils; + +import javax.servlet.http.HttpServletRequest; import java.net.InetAddress; import java.net.UnknownHostException; -import javax.servlet.http.HttpServletRequest; -import com.fastbee.common.utils.StringUtils; /** * 获取IP方法 diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/poi/ExcelUtil.java b/fastbee-common/src/main/java/com/fastbee/common/utils/poi/ExcelUtil.java index 792fd65f..40c1f23d 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/poi/ExcelUtil.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/poi/ExcelUtil.java @@ -1,76 +1,5 @@ package com.fastbee.common.utils.poi; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.math.BigDecimal; -import java.text.DecimalFormat; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; - -import com.fastbee.common.utils.SecurityUtils; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.RegExUtils; -import org.apache.commons.lang3.reflect.FieldUtils; -import org.apache.poi.hssf.usermodel.HSSFClientAnchor; -import org.apache.poi.hssf.usermodel.HSSFPicture; -import org.apache.poi.hssf.usermodel.HSSFPictureData; -import org.apache.poi.hssf.usermodel.HSSFShape; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ooxml.POIXMLDocumentPart; -import org.apache.poi.ss.usermodel.BorderStyle; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellStyle; -import org.apache.poi.ss.usermodel.CellType; -import org.apache.poi.ss.usermodel.ClientAnchor; -import org.apache.poi.ss.usermodel.DataValidation; -import org.apache.poi.ss.usermodel.DataValidationConstraint; -import org.apache.poi.ss.usermodel.DataValidationHelper; -import org.apache.poi.ss.usermodel.DateUtil; -import org.apache.poi.ss.usermodel.Drawing; -import org.apache.poi.ss.usermodel.FillPatternType; -import org.apache.poi.ss.usermodel.Font; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.IndexedColors; -import org.apache.poi.ss.usermodel.Name; -import org.apache.poi.ss.usermodel.PictureData; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.VerticalAlignment; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.ss.usermodel.WorkbookFactory; -import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.ss.util.CellRangeAddressList; -import org.apache.poi.util.IOUtils; -import org.apache.poi.xssf.streaming.SXSSFWorkbook; -import org.apache.poi.xssf.usermodel.XSSFClientAnchor; -import org.apache.poi.xssf.usermodel.XSSFDataValidation; -import org.apache.poi.xssf.usermodel.XSSFDrawing; -import org.apache.poi.xssf.usermodel.XSSFPicture; -import org.apache.poi.xssf.usermodel.XSSFShape; -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.fastbee.common.annotation.Excel; import com.fastbee.common.annotation.Excel.ColumnType; import com.fastbee.common.annotation.Excel.Type; @@ -81,11 +10,38 @@ import com.fastbee.common.core.text.Convert; import com.fastbee.common.exception.UtilException; import com.fastbee.common.utils.DateUtils; import com.fastbee.common.utils.DictUtils; +import com.fastbee.common.utils.SecurityUtils; import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.file.FileTypeUtils; import com.fastbee.common.utils.file.FileUtils; import com.fastbee.common.utils.file.ImageUtils; import com.fastbee.common.utils.reflect.ReflectUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.RegExUtils; +import org.apache.commons.lang3.reflect.FieldUtils; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ooxml.POIXMLDocumentPart; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.ss.util.CellRangeAddressList; +import org.apache.poi.util.IOUtils; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import org.apache.poi.xssf.usermodel.*; +import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.*; +import java.util.stream.Collectors; /** * Excel相关处理 diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/reflect/ReflectUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/reflect/ReflectUtils.java index 54eb6290..26e726ae 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/reflect/ReflectUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/reflect/ReflectUtils.java @@ -1,19 +1,15 @@ package com.fastbee.common.utils.reflect; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.Date; +import com.fastbee.common.core.text.Convert; +import com.fastbee.common.utils.DateUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.apache.poi.ss.usermodel.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fastbee.common.core.text.Convert; -import com.fastbee.common.utils.DateUtils; + +import java.lang.reflect.*; +import java.util.Date; /** * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/sign/Md5Utils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/sign/Md5Utils.java index ba4aab16..38711b91 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/sign/Md5Utils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/sign/Md5Utils.java @@ -1,9 +1,10 @@ package com.fastbee.common.utils.sign; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.nio.charset.StandardCharsets; import java.security.MessageDigest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Md5加密方法 diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/spring/SpringUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/spring/SpringUtils.java index 61138aaf..4f2506ab 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/spring/SpringUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/spring/SpringUtils.java @@ -1,5 +1,6 @@ package com.fastbee.common.utils.spring; +import com.fastbee.common.utils.StringUtils; import org.springframework.aop.framework.AopContext; import org.springframework.beans.BeansException; import org.springframework.beans.factory.NoSuchBeanDefinitionException; @@ -8,7 +9,6 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.stereotype.Component; -import com.fastbee.common.utils.StringUtils; import org.springframework.util.CollectionUtils; import java.lang.annotation.Annotation; diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/uuid/IdUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/uuid/IdUtils.java index 10659b34..61d01526 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/uuid/IdUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/uuid/IdUtils.java @@ -1,7 +1,8 @@ package com.fastbee.common.utils.uuid; -import lombok.extern.slf4j.Slf4j; import com.fastbee.common.utils.Md5Utils; +import lombok.extern.slf4j.Slf4j; + import java.util.Random; /** diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/uuid/Seq.java b/fastbee-common/src/main/java/com/fastbee/common/utils/uuid/Seq.java index 7ecd061d..a240871e 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/uuid/Seq.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/uuid/Seq.java @@ -1,9 +1,10 @@ package com.fastbee.common.utils.uuid; -import java.util.concurrent.atomic.AtomicInteger; import com.fastbee.common.utils.DateUtils; import com.fastbee.common.utils.StringUtils; +import java.util.concurrent.atomic.AtomicInteger; + /** * @author ruoyi 序列生成类 */ diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/uuid/UUID.java b/fastbee-common/src/main/java/com/fastbee/common/utils/uuid/UUID.java index 304f63a9..47b29ee7 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/uuid/UUID.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/uuid/UUID.java @@ -1,11 +1,12 @@ package com.fastbee.common.utils.uuid; +import com.fastbee.common.exception.UtilException; + import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; -import com.fastbee.common.exception.UtilException; /** * 提供通用唯一识别码（universally unique identifier）（UUID）实现 diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/wechat/WechatUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/wechat/WechatUtils.java index fe751176..670481a2 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/wechat/WechatUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/wechat/WechatUtils.java @@ -10,8 +10,6 @@ import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.http.HttpUtils; import com.fastbee.common.utils.spring.SpringUtils; import com.fastbee.common.wechat.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.time.LocalDateTime; import java.time.ZoneOffset; diff --git a/fastbee-common/src/main/java/com/fastbee/common/xss/XssValidator.java b/fastbee-common/src/main/java/com/fastbee/common/xss/XssValidator.java index cf6a6dee..780673c3 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/xss/XssValidator.java +++ b/fastbee-common/src/main/java/com/fastbee/common/xss/XssValidator.java @@ -1,6 +1,7 @@ package com.fastbee.common.xss; import com.fastbee.common.utils.StringUtils; + import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import java.util.regex.Matcher; diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/consumer/DeviceOtherMsgConsumer.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/consumer/DeviceOtherMsgConsumer.java index 1c95062b..f75ad672 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/consumer/DeviceOtherMsgConsumer.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/consumer/DeviceOtherMsgConsumer.java @@ -2,7 +2,6 @@ package com.fastbee.iot.data.consumer; import com.fastbee.common.constant.FastBeeConstant; import com.fastbee.common.core.mq.DeviceReportBo; - import com.fastbee.iot.data.service.impl.DeviceOtherMsgHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/consumer/DevicePropFetchConsumer.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/consumer/DevicePropFetchConsumer.java index d6b2c74f..a6d986a2 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/consumer/DevicePropFetchConsumer.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/consumer/DevicePropFetchConsumer.java @@ -28,7 +28,6 @@ import com.fastbee.iot.service.IModbusJobService; import com.fastbee.iot.service.IModbusParamsService; import com.fastbee.mq.producer.MessageProducer; import com.fastbee.mqttclient.PubMqttClient; -import io.netty.buffer.ByteBufUtil; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -137,12 +136,23 @@ public class DevicePropFetchConsumer { //处理子设备情况 handleSubDeviceStatus(modbusJobList); List commandList = modbusJobList.stream().map(ModbusJob::getCommand).collect(Collectors.toList()); + + // 检查是否有设备上电触发任务（cycleType=3） + boolean hasPowerOnTrigger = modbusJobList.stream() + .anyMatch(job -> job.getCycleType() != null && job.getCycleType() == 3); + // modbus-tcp 重新处理事务标识符 String subSerialNumber = modbusJobList.get(0).getSubSerialNumber(); String tcpKey = RedisKeyBuilder.buildModbusTcpCacheKey(subSerialNumber); String tcpObject = redisCache.getStrCacheObject(tcpKey); List tcpCommandList = new ArrayList<>(); - if (StringUtils.isNotEmpty(tcpObject)) { + + // 如果是设备上电触发任务（cycleType=3），跳过事务ID处理，直接使用原始指令 + if (hasPowerOnTrigger) { + log.info("检测到设备上电触发任务（cycleType=3），跳过事务ID处理，使用原始指令"); + tcpCommandList.addAll(commandList); + } else if (StringUtils.isNotEmpty(tcpObject)) { + // 原有的事务ID处理逻辑 String tcpRuntimeCacheKey = RedisKeyBuilder.buildModbusTcpRuntimeCacheKey(subSerialNumber); for (String command : commandList) { String tranNo = command.substring(0, 4); @@ -177,7 +187,6 @@ public class DevicePropFetchConsumer { return modbusPollMsg; } - /** * 处理子设备根据设备数据定时更新状态 */ diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/emq/subscribeCallback.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/emq/subscribeCallback.java index b870a0ba..047969c5 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/emq/subscribeCallback.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/emq/subscribeCallback.java @@ -6,10 +6,9 @@ import com.fastbee.common.enums.TopicType; import com.fastbee.common.utils.DateUtils; import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.gateway.mq.TopicsUtils; -import com.fastbee.common.utils.gateway.protocol.ByteUtils; -import com.fastbee.ruleEngine.context.MsgContext; import com.fastbee.iot.ruleEngine.RuleProcess; import com.fastbee.mqttclient.IEmqxMessageProducer; +import com.fastbee.ruleEngine.context.MsgContext; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.IMqttMessageListener; import org.eclipse.paho.client.mqttv3.MqttMessage; diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/job/DeviceAbstractQuartzJob.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/job/DeviceAbstractQuartzJob.java index 57bd019c..64d1a60a 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/job/DeviceAbstractQuartzJob.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/job/DeviceAbstractQuartzJob.java @@ -77,10 +77,25 @@ public abstract class DeviceAbstractQuartzJob implements Job final SysJobLog sysJobLog = new SysJobLog(); sysJobLog.setJobName(deviceJob.getJobName()); sysJobLog.setJobGroup(deviceJob.getJobGroup()); - sysJobLog.setInvokeTarget(deviceJob.getDeviceName()); + + // 设置 invokeTarget，确保不为空（数据库字段是 NOT NULL） + String invokeTarget = deviceJob.getDeviceName(); + if (StringUtils.isEmpty(invokeTarget)) { + // 如果设备名称为空，使用设备编号或任务名称作为默认值 + invokeTarget = StringUtils.isNotEmpty(deviceJob.getSerialNumber()) + ? deviceJob.getSerialNumber() + : deviceJob.getJobName(); + } + sysJobLog.setInvokeTarget(invokeTarget); + + // 确保 startTime 不为 null + if (startTime == null) { + startTime = new Date(); + } sysJobLog.setStartTime(startTime); - sysJobLog.setStopTime(new Date()); - long runMs = sysJobLog.getStopTime().getTime() - sysJobLog.getStartTime().getTime(); + Date stopTime = new Date(); + sysJobLog.setStopTime(stopTime); + long runMs = stopTime.getTime() - startTime.getTime(); sysJobLog.setJobMessage(sysJobLog.getJobName() + " 总共耗时：" + runMs + "毫秒"); if (e != null) { diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/listen/DeviceOtherListen.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/listen/DeviceOtherListen.java index 5abe8d7d..4c907caf 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/listen/DeviceOtherListen.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/listen/DeviceOtherListen.java @@ -2,11 +2,11 @@ package com.fastbee.iot.data.listen; import com.fastbee.common.constant.FastBeeConstant; import com.fastbee.common.core.mq.DeviceReportBo; +import com.fastbee.iot.data.consumer.DeviceOtherMsgConsumer; import com.fastbee.mq.queue.DeviceOtherQueue; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; -import com.fastbee.iot.data.consumer.DeviceOtherMsgConsumer; import javax.annotation.Resource; diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/ruleEngine/SceneContext.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/ruleEngine/SceneContext.java index 9597b950..44002bd2 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/ruleEngine/SceneContext.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/ruleEngine/SceneContext.java @@ -12,14 +12,17 @@ import com.fastbee.common.exception.ServiceException; import com.fastbee.common.utils.DateUtils; import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.spring.SpringUtils; -import com.fastbee.iot.domain.*; +import com.fastbee.iot.data.service.IFunctionInvoke; +import com.fastbee.iot.data.service.IRuleEngine; +import com.fastbee.iot.domain.AlertLog; +import com.fastbee.iot.domain.AlertNotifyTemplate; +import com.fastbee.iot.domain.Device; +import com.fastbee.iot.domain.DeviceAlertUser; import com.fastbee.iot.model.AlertSceneSendVO; import com.fastbee.iot.model.SceneTerminalUserVO; import com.fastbee.iot.model.ScriptTemplate; import com.fastbee.iot.model.ThingsModels.ValueItem; import com.fastbee.iot.service.*; -import com.fastbee.iot.data.service.IFunctionInvoke; -import com.fastbee.iot.data.service.IRuleEngine; import com.fastbee.notify.core.service.NotifySendService; import lombok.Data; import lombok.extern.slf4j.Slf4j; @@ -27,14 +30,13 @@ import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.*; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; - import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.*; import java.util.stream.Collectors; import static java.util.regex.Pattern.compile; diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IDeviceReportMessageService.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IDeviceReportMessageService.java index dd2f90ea..707d233a 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IDeviceReportMessageService.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IDeviceReportMessageService.java @@ -1,8 +1,6 @@ package com.fastbee.iot.data.service; -import com.fastbee.common.core.mq.DeviceReport; import com.fastbee.common.core.mq.DeviceReportBo; -import com.fastbee.iot.domain.Device; import com.fastbee.iot.model.DeviceStatusVO; import com.fastbee.protocol.base.protocol.IProtocol; diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IFirmwareTaskDetailService.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IFirmwareTaskDetailService.java index 96bed30f..8886dfa8 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IFirmwareTaskDetailService.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IFirmwareTaskDetailService.java @@ -1,14 +1,14 @@ package com.fastbee.iot.data.service; -import java.util.List; - +import com.baomidou.mybatisplus.extension.service.IService; import com.fastbee.common.enums.OTAUpgrade; import com.fastbee.iot.domain.FirmwareTaskDetail; -import com.baomidou.mybatisplus.extension.service.IService; import com.fastbee.iot.model.FirmwareTaskDetailInput; import com.fastbee.iot.model.FirmwareTaskDetailOutput; import com.fastbee.iot.model.FirmwareTaskDeviceStatistic; +import java.util.List; + /** * 固件升级任务详细对象Service接口 * diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IFirmwareTaskService.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IFirmwareTaskService.java index f1fe9ca6..0cc10d36 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IFirmwareTaskService.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IFirmwareTaskService.java @@ -1,12 +1,12 @@ package com.fastbee.iot.data.service; -import java.util.List; - +import com.baomidou.mybatisplus.extension.service.IService; import com.fastbee.common.core.mq.ota.OtaUpgradeDelayTask; import com.fastbee.iot.domain.FirmwareTask; -import com.baomidou.mybatisplus.extension.service.IService; import com.fastbee.iot.model.FirmwareTaskInput; +import java.util.List; + /** * 固件升级任务对象Service接口 * diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IFunctionInvoke.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IFunctionInvoke.java index 298c5fcd..36b89ddf 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IFunctionInvoke.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IFunctionInvoke.java @@ -3,8 +3,6 @@ package com.fastbee.iot.data.service; import com.fastbee.common.core.domain.AjaxResult; import com.fastbee.common.core.mq.InvokeReqDto; -import java.util.Map; - /** * 设备指令下发接口 * @author gsb diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IMqttMessagePublish.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IMqttMessagePublish.java index 790820ed..2f29c85a 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IMqttMessagePublish.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/IMqttMessagePublish.java @@ -1,16 +1,12 @@ package com.fastbee.iot.data.service; -import com.fastbee.common.core.mq.DeviceReportBo; import com.fastbee.common.core.mq.MQSendMessageBo; -import com.fastbee.common.core.mq.message.DeviceDownMessage; import com.fastbee.common.core.mq.message.FunctionCallBackBo; +import com.fastbee.common.core.mq.message.ReportDataBo; import com.fastbee.common.core.mq.ota.OtaUpgradeBo; import com.fastbee.common.core.thingsModel.ThingsModelSimpleItem; import com.fastbee.common.enums.DeviceStatus; -import com.fastbee.common.enums.TopicType; import com.fastbee.iot.domain.Device; -import com.fastbee.common.core.mq.message.ReportDataBo; -import org.checkerframework.checker.units.qual.C; import java.util.List; diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/DataHandlerImpl.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/DataHandlerImpl.java index 61533ad6..538018fd 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/DataHandlerImpl.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/DataHandlerImpl.java @@ -3,6 +3,9 @@ package com.fastbee.iot.data.service.impl; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.fastbee.common.core.mq.InvokeReqDto; +import com.fastbee.common.core.mq.message.ReportDataBo; +import com.fastbee.common.core.thingsModel.ThingsModelSimpleItem; +import com.fastbee.common.core.thingsModel.ThingsModelValuesInput; import com.fastbee.common.enums.DeviceLogTypeEnum; import com.fastbee.common.enums.FunctionReplyStatus; import com.fastbee.common.enums.TopicType; @@ -18,14 +21,14 @@ import com.fastbee.iot.data.service.IDataHandler; import com.fastbee.iot.data.service.IMqttMessagePublish; import com.fastbee.iot.data.service.IRuleEngine; import com.fastbee.iot.domain.*; -import com.fastbee.common.core.thingsModel.ThingsModelSimpleItem; -import com.fastbee.common.core.thingsModel.ThingsModelValuesInput; import com.fastbee.iot.mapper.SceneTagPointsMapper; import com.fastbee.iot.model.scenemodel.SceneModelTagCacheVO; import com.fastbee.iot.model.scenemodel.SceneModelTagCycleVO; -import com.fastbee.iot.service.*; +import com.fastbee.iot.service.IDeviceService; +import com.fastbee.iot.service.IEventLogService; +import com.fastbee.iot.service.IFunctionLogService; +import com.fastbee.iot.service.ISceneModelTagService; import com.fastbee.iot.tdengine.service.ILogService; -import com.fastbee.common.core.mq.message.ReportDataBo; import com.fastbee.mqtt.manager.MqttRemoteManager; import com.fastbee.mqtt.model.PushMessageBo; import lombok.extern.slf4j.Slf4j; diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/DeviceJobServiceImpl.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/DeviceJobServiceImpl.java index 726de075..1465aa68 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/DeviceJobServiceImpl.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/DeviceJobServiceImpl.java @@ -2,6 +2,7 @@ package com.fastbee.iot.data.service.impl; import com.fastbee.common.constant.ScheduleConstants; import com.fastbee.common.exception.job.TaskException; +import com.fastbee.common.utils.StringUtils; import com.fastbee.iot.data.job.DeviceScheduleUtils; import com.fastbee.iot.domain.DeviceJob; import com.fastbee.iot.mapper.DeviceJobMapper; @@ -51,7 +52,10 @@ public class DeviceJobServiceImpl implements IDeviceJobService List jobList = jobMapper.selectJobAll(); for (DeviceJob deviceJob : jobList) { - DeviceScheduleUtils.createScheduleJob(scheduler, deviceJob); + // 跳过设备上电触发任务，它们不需要加入调度器 + if (!isPowerOnTriggerTask(deviceJob) && StringUtils.isNotEmpty(deviceJob.getCronExpression())) { + DeviceScheduleUtils.createScheduleJob(scheduler, deviceJob); + } } // 系统定时任务 @@ -272,13 +276,38 @@ public class DeviceJobServiceImpl implements IDeviceJobService public int insertJob(DeviceJob deviceJob) throws SchedulerException, TaskException { int rows = jobMapper.insertJob(deviceJob); - if (rows > 0) - { - DeviceScheduleUtils.createScheduleJob(scheduler, deviceJob); + if (rows > 0) { + // 检查是否是设备上电触发任务（通过检查remark或cron表达式） + // 设备上电触发任务不需要创建定时任务，因为它是事件触发的 + boolean isPowerOnTrigger = isPowerOnTriggerTask(deviceJob); + if (!isPowerOnTrigger && StringUtils.isNotEmpty(deviceJob.getCronExpression())) { + DeviceScheduleUtils.createScheduleJob(scheduler, deviceJob); + } } return rows; } + /** + * 检查是否是设备上电触发任务 + * @param deviceJob 设备任务 + * @return true表示是设备上电触发任务 + */ + private boolean isPowerOnTriggerTask(DeviceJob deviceJob) { + if (deviceJob == null) { + return false; + } + String remark = deviceJob.getRemark(); + if (StringUtils.isNotEmpty(remark) && remark.contains("power_on_trigger")) { + return true; + } + // 如果cron表达式为空或null，且remark包含power_on_trigger，则认为是设备上电触发 + String cronExpression = deviceJob.getCronExpression(); + if (StringUtils.isEmpty(cronExpression) && StringUtils.isNotEmpty(remark) && remark.contains("power_on_trigger")) { + return true; + } + return false; + } + /** * 更新任务的时间表达式 * @@ -313,7 +342,11 @@ public class DeviceJobServiceImpl implements IDeviceJobService // 防止创建时存在数据问题 先移除，然后在执行创建操作 scheduler.deleteJob(jobKey); } - DeviceScheduleUtils.createScheduleJob(scheduler, deviceJob); + // 检查是否是设备上电触发任务，如果是则不创建定时任务 + boolean isPowerOnTrigger = isPowerOnTriggerTask(deviceJob); + if (!isPowerOnTrigger && StringUtils.isNotEmpty(deviceJob.getCronExpression())) { + DeviceScheduleUtils.createScheduleJob(scheduler, deviceJob); + } } /** diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/DeviceMessageServiceImpl.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/DeviceMessageServiceImpl.java index 486f5661..dd54e026 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/DeviceMessageServiceImpl.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/DeviceMessageServiceImpl.java @@ -19,8 +19,8 @@ import com.fastbee.common.utils.BitUtils; import com.fastbee.common.utils.DateUtils; import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.gateway.CRC16Utils; -import com.fastbee.common.utils.gateway.protocol.ByteUtils; import com.fastbee.common.utils.gateway.mq.TopicsUtils; +import com.fastbee.common.utils.gateway.protocol.ByteUtils; import com.fastbee.common.utils.modbus.ModbusUtils; import com.fastbee.iot.cache.ITSLCache; import com.fastbee.iot.data.service.IDeviceMessageService; diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/DeviceOtherMsgHandler.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/DeviceOtherMsgHandler.java index c5514cc2..110385ca 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/DeviceOtherMsgHandler.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/DeviceOtherMsgHandler.java @@ -2,13 +2,13 @@ package com.fastbee.iot.data.service.impl; import com.alibaba.fastjson2.JSONObject; import com.fastbee.common.core.mq.DeviceReportBo; +import com.fastbee.common.core.mq.message.ReportDataBo; import com.fastbee.common.core.mq.ota.OtaReplyMessage; import com.fastbee.common.enums.TopicType; import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.gateway.mq.TopicsUtils; import com.fastbee.iot.data.service.IDataHandler; import com.fastbee.iot.data.service.IMqttMessagePublish; -import com.fastbee.common.core.mq.message.ReportDataBo; import com.fastbee.iot.data.service.IOtaTaskUpgradeService; import com.fastbee.iot.domain.Firmware; import lombok.extern.slf4j.Slf4j; diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/FirmwareTaskDetailServiceImpl.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/FirmwareTaskDetailServiceImpl.java index 41ff94d7..c62b5453 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/FirmwareTaskDetailServiceImpl.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/FirmwareTaskDetailServiceImpl.java @@ -1,9 +1,5 @@ package com.fastbee.iot.data.service.impl; -import java.util.List; -import java.util.Map; -import java.util.Objects; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -12,14 +8,18 @@ import com.fastbee.common.enums.OTAUpgrade; import com.fastbee.common.utils.DateUtils; import com.fastbee.common.utils.StringUtils; import com.fastbee.iot.cache.IOtaTaskCache; +import com.fastbee.iot.data.service.IFirmwareTaskDetailService; +import com.fastbee.iot.domain.FirmwareTaskDetail; +import com.fastbee.iot.mapper.FirmwareTaskDetailMapper; import com.fastbee.iot.model.FirmwareTaskDetailInput; import com.fastbee.iot.model.FirmwareTaskDetailOutput; import com.fastbee.iot.model.FirmwareTaskDeviceStatistic; import org.springframework.stereotype.Service; + import javax.annotation.Resource; -import com.fastbee.iot.mapper.FirmwareTaskDetailMapper; -import com.fastbee.iot.domain.FirmwareTaskDetail; -import com.fastbee.iot.data.service.IFirmwareTaskDetailService; +import java.util.List; +import java.util.Map; +import java.util.Objects; /** * 固件升级任务详细对象Service业务层处理 diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/FirmwareTaskServiceImpl.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/FirmwareTaskServiceImpl.java index b2bedf63..3f7c4956 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/FirmwareTaskServiceImpl.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/FirmwareTaskServiceImpl.java @@ -1,11 +1,5 @@ package com.fastbee.iot.data.service.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,24 +10,24 @@ import com.fastbee.common.utils.DateUtils; import com.fastbee.common.utils.MessageUtils; import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.bean.BeanUtils; -import com.fastbee.iot.convert.FirmwareTaskConvert; -import com.fastbee.iot.data.service.IOtaUpgradeService; -import com.fastbee.iot.domain.Device; -import com.fastbee.iot.domain.FirmwareTaskDetail; -import com.fastbee.iot.mapper.FirmwareTaskDetailMapper; -import com.fastbee.iot.model.DeviceShortOutput; -import com.fastbee.iot.model.FirmwareTaskInput; import com.fastbee.iot.data.service.IFirmwareTaskDetailService; +import com.fastbee.iot.data.service.IFirmwareTaskService; +import com.fastbee.iot.data.service.IOtaUpgradeService; +import com.fastbee.iot.domain.FirmwareTask; +import com.fastbee.iot.domain.FirmwareTaskDetail; +import com.fastbee.iot.mapper.FirmwareTaskMapper; +import com.fastbee.iot.model.FirmwareTaskInput; import com.fastbee.iot.service.IDeviceService; import com.fastbee.mq.queue.DelayUpgradeQueue; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import com.fastbee.iot.mapper.FirmwareTaskMapper; -import com.fastbee.iot.domain.FirmwareTask; -import com.fastbee.iot.data.service.IFirmwareTaskService; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + /** * 固件升级任务对象Service业务层处理 * diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/MqttMessagePublishImpl.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/MqttMessagePublishImpl.java index 01b13e2d..6b3d67fc 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/MqttMessagePublishImpl.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/MqttMessagePublishImpl.java @@ -32,7 +32,6 @@ import com.fastbee.iot.domain.ModbusConfig; import com.fastbee.iot.enums.DeviceType; import com.fastbee.iot.model.NtpModel; import com.fastbee.iot.model.ThingsModels.ThingsModelValueItem; -import com.fastbee.ruleEngine.context.MsgContext; import com.fastbee.iot.ruleEngine.RuleProcess; import com.fastbee.iot.service.IDeviceService; import com.fastbee.iot.service.IFunctionLogService; @@ -41,6 +40,7 @@ import com.fastbee.iot.util.SnowflakeIdWorker; import com.fastbee.mqttclient.PubMqttClient; import com.fastbee.protocol.base.protocol.IProtocol; import com.fastbee.protocol.service.IProtocolManagerService; +import com.fastbee.ruleEngine.context.MsgContext; import com.fastbee.sip.service.IGatewayService; import io.netty.buffer.ByteBufUtil; import io.netty.buffer.Unpooled; diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/OtaTaskUpgradeServiceImpl.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/OtaTaskUpgradeServiceImpl.java index 135d014b..1090b3a4 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/OtaTaskUpgradeServiceImpl.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/OtaTaskUpgradeServiceImpl.java @@ -12,7 +12,6 @@ import com.fastbee.common.enums.TopicType; import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.file.FileUtils; import com.fastbee.common.utils.gateway.mq.TopicsUtils; -import com.fastbee.common.utils.ip.IpUtils; import com.fastbee.iot.cache.IOtaTaskCache; import com.fastbee.iot.cache.ITSLValueCache; import com.fastbee.iot.data.service.IFirmwareTaskDetailService; diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/OtaUpgradeServiceImpl.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/OtaUpgradeServiceImpl.java index a9fc9758..dd387801 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/OtaUpgradeServiceImpl.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/OtaUpgradeServiceImpl.java @@ -4,7 +4,6 @@ import com.fastbee.common.core.mq.ota.OtaUpgradeDelayTask; import com.fastbee.common.exception.ServiceException; import com.fastbee.iot.data.service.IOtaTaskUpgradeService; import com.fastbee.iot.data.service.IOtaUpgradeService; -import com.fastbee.iot.domain.Device; import com.fastbee.iot.domain.Firmware; import com.fastbee.iot.service.IDeviceService; import com.fastbee.iot.service.IFirmwareService; diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/RuleEngineHandler.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/RuleEngineHandler.java index 1b8ca299..fb36cced 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/RuleEngineHandler.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/RuleEngineHandler.java @@ -1,12 +1,13 @@ package com.fastbee.iot.data.service.impl; import com.alibaba.fastjson2.JSON; +import com.fastbee.common.core.mq.message.ReportDataBo; import com.fastbee.common.core.thingsModel.ThingsModelSimpleItem; import com.fastbee.iot.data.ruleEngine.SceneContext; import com.fastbee.iot.data.service.IRuleEngine; -import com.fastbee.iot.domain.*; +import com.fastbee.iot.domain.Scene; +import com.fastbee.iot.domain.SceneDevice; import com.fastbee.iot.service.ISceneDeviceService; -import com.fastbee.common.core.mq.message.ReportDataBo; import com.fastbee.ruleEngine.core.FlowLogExecutor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/fastbee-mq/src/main/java/com/fastbee/mq/producer/MessageProducer.java b/fastbee-mq/src/main/java/com/fastbee/mq/producer/MessageProducer.java index fb9fe15d..f477c067 100644 --- a/fastbee-mq/src/main/java/com/fastbee/mq/producer/MessageProducer.java +++ b/fastbee-mq/src/main/java/com/fastbee/mq/producer/MessageProducer.java @@ -4,10 +4,7 @@ import com.fastbee.common.core.mq.DeviceReportBo; import com.fastbee.common.core.mq.DeviceStatusBo; import com.fastbee.common.core.mq.DeviceTestReportBo; import com.fastbee.common.core.mq.MQSendMessageBo; -import com.fastbee.common.core.mq.message.ModbusPollMsg; import com.fastbee.common.core.mq.ota.OtaUpgradeBo; -import com.fastbee.common.core.mq.message.DeviceDownMessage; -import com.fastbee.iot.domain.DeviceJob; import com.fastbee.iot.model.modbus.ModbusPollJob; import com.fastbee.mq.queue.*; diff --git a/fastbee-mq/src/main/java/com/fastbee/mq/queue/DelayUpgradeQueue.java b/fastbee-mq/src/main/java/com/fastbee/mq/queue/DelayUpgradeQueue.java index eead203d..94efa35e 100644 --- a/fastbee-mq/src/main/java/com/fastbee/mq/queue/DelayUpgradeQueue.java +++ b/fastbee-mq/src/main/java/com/fastbee/mq/queue/DelayUpgradeQueue.java @@ -1,6 +1,5 @@ package com.fastbee.mq.queue; -import com.fastbee.common.core.mq.ota.OtaUpgradeBo; import com.fastbee.common.core.mq.ota.OtaUpgradeDelayTask; import lombok.extern.slf4j.Slf4j; diff --git a/fastbee-notify/fastbee-notify-core/src/main/java/com/fastbee/notify/core/service/impl/NotifySendServiceImpl.java b/fastbee-notify/fastbee-notify-core/src/main/java/com/fastbee/notify/core/service/impl/NotifySendServiceImpl.java index 85e487cb..93ffb69a 100644 --- a/fastbee-notify/fastbee-notify-core/src/main/java/com/fastbee/notify/core/service/impl/NotifySendServiceImpl.java +++ b/fastbee-notify/fastbee-notify-core/src/main/java/com/fastbee/notify/core/service/impl/NotifySendServiceImpl.java @@ -33,7 +33,6 @@ import com.fastbee.notify.service.INotifyTemplateService; import com.fastbee.notify.vo.NotifyVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; -import org.checkerframework.checker.units.qual.C; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/fastbee-notify/fastbee-notify-core/src/main/java/com/fastbee/notify/core/sms/config/ReadConfig.java b/fastbee-notify/fastbee-notify-core/src/main/java/com/fastbee/notify/core/sms/config/ReadConfig.java index 53d4aeb5..2f9718e3 100644 --- a/fastbee-notify/fastbee-notify-core/src/main/java/com/fastbee/notify/core/sms/config/ReadConfig.java +++ b/fastbee-notify/fastbee-notify-core/src/main/java/com/fastbee/notify/core/sms/config/ReadConfig.java @@ -3,7 +3,6 @@ package com.fastbee.notify.core.sms.config; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import com.alibaba.fastjson2.JSONObject; -import com.fastbee.common.enums.NotifyChannelEnum; import com.fastbee.common.enums.NotifyChannelProviderEnum; import com.fastbee.notify.domain.NotifyChannel; import com.fastbee.notify.domain.NotifyTemplate; diff --git a/fastbee-notify/fastbee-notify-core/src/main/java/com/fastbee/notify/core/wechat/service/WeChatPushService.java b/fastbee-notify/fastbee-notify-core/src/main/java/com/fastbee/notify/core/wechat/service/WeChatPushService.java index 9f03c6f5..0d6c7446 100644 --- a/fastbee-notify/fastbee-notify-core/src/main/java/com/fastbee/notify/core/wechat/service/WeChatPushService.java +++ b/fastbee-notify/fastbee-notify-core/src/main/java/com/fastbee/notify/core/wechat/service/WeChatPushService.java @@ -2,7 +2,6 @@ package com.fastbee.notify.core.wechat.service; import com.fastbee.common.core.notify.NotifySendResponse; import com.fastbee.notify.core.wechat.vo.WeChatMiniPushVO; -import com.fastbee.notify.core.wechat.vo.WxMssVo; import com.fastbee.notify.domain.NotifyChannel; import com.fastbee.notify.domain.NotifyTemplate; import com.fastbee.notify.vo.NotifyVO; diff --git a/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/controller/NotifyTemplateController.java b/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/controller/NotifyTemplateController.java index c43847ad..86ba64bb 100644 --- a/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/controller/NotifyTemplateController.java +++ b/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/controller/NotifyTemplateController.java @@ -5,7 +5,6 @@ import com.alibaba.fastjson2.JSONObject; 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.SysUser; import com.fastbee.common.core.page.TableDataInfo; import com.fastbee.common.enums.BusinessType; import com.fastbee.common.enums.NotifyChannelProviderEnum; diff --git a/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/mapper/NotifyChannelMapper.java b/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/mapper/NotifyChannelMapper.java index abb67237..9f6d06a5 100644 --- a/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/mapper/NotifyChannelMapper.java +++ b/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/mapper/NotifyChannelMapper.java @@ -1,6 +1,5 @@ package com.fastbee.notify.mapper; -import com.fastbee.framework.mybatis.mapper.BaseMapperX; import com.fastbee.notify.domain.NotifyChannel; import org.apache.ibatis.annotations.Param; diff --git a/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/mapper/NotifyLogMapper.java b/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/mapper/NotifyLogMapper.java index 28bebc0f..d514f8ff 100644 --- a/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/mapper/NotifyLogMapper.java +++ b/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/mapper/NotifyLogMapper.java @@ -1,6 +1,5 @@ package com.fastbee.notify.mapper; -import com.fastbee.framework.mybatis.mapper.BaseMapperX; import com.fastbee.notify.domain.NotifyLog; import java.util.List; diff --git a/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/mapper/NotifyTemplateMapper.java b/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/mapper/NotifyTemplateMapper.java index b9258870..5827b489 100644 --- a/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/mapper/NotifyTemplateMapper.java +++ b/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/mapper/NotifyTemplateMapper.java @@ -1,6 +1,5 @@ package com.fastbee.notify.mapper; -import com.fastbee.framework.mybatis.mapper.BaseMapperX; import com.fastbee.notify.domain.NotifyTemplate; import org.apache.ibatis.annotations.Param; diff --git a/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/service/impl/NotifyChannelServiceImpl.java b/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/service/impl/NotifyChannelServiceImpl.java index bbfc7799..2e37ffd0 100644 --- a/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/service/impl/NotifyChannelServiceImpl.java +++ b/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/service/impl/NotifyChannelServiceImpl.java @@ -1,7 +1,6 @@ package com.fastbee.notify.service.impl; import com.fastbee.common.core.domain.entity.SysDictData; -import com.fastbee.common.core.domain.entity.SysRole; import com.fastbee.common.core.domain.entity.SysUser; import com.fastbee.common.core.notify.NotifyConfigVO; import com.fastbee.common.enums.NotifyChannelProviderEnum; diff --git a/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/service/impl/NotifyLogServiceImpl.java b/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/service/impl/NotifyLogServiceImpl.java index 9d6e5a6e..609b93f3 100644 --- a/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/service/impl/NotifyLogServiceImpl.java +++ b/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/service/impl/NotifyLogServiceImpl.java @@ -1,6 +1,5 @@ package com.fastbee.notify.service.impl; -import com.fastbee.common.core.domain.entity.SysRole; import com.fastbee.common.core.domain.entity.SysUser; import com.fastbee.common.utils.DateUtils; import com.fastbee.notify.domain.NotifyChannel; diff --git a/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/service/impl/NotifyTemplateServiceImpl.java b/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/service/impl/NotifyTemplateServiceImpl.java index d1e4d63b..ac251113 100644 --- a/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/service/impl/NotifyTemplateServiceImpl.java +++ b/fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/service/impl/NotifyTemplateServiceImpl.java @@ -2,7 +2,6 @@ package com.fastbee.notify.service.impl; import com.alibaba.fastjson2.JSONObject; import com.fastbee.common.core.domain.AjaxResult; -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.notify.NotifyConfigVO; diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/dashBoard/DashBoardController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/dashBoard/DashBoardController.java index c72acbab..09a3f715 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/dashBoard/DashBoardController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/dashBoard/DashBoardController.java @@ -1,5 +1,6 @@ package com.fastbee.controller.dashBoard; +import com.fastbee.base.service.ISessionStore; import com.fastbee.common.constant.FastBeeConstant; import com.fastbee.common.core.domain.AjaxResult; import com.fastbee.common.core.redis.RedisCache; @@ -7,7 +8,6 @@ import com.fastbee.iot.model.dashBoard.DashMqttMetrics; import com.fastbee.iot.model.dashBoard.DashMqttStat; import com.fastbee.mqtt.manager.ClientManager; import com.fastbee.mqtt.manager.RetainMsgManager; -import com.fastbee.base.service.ISessionStore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceAlertUserController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceAlertUserController.java index 6ecb3ff7..96ce79c6 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceAlertUserController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceAlertUserController.java @@ -9,7 +9,6 @@ import com.fastbee.common.enums.BusinessType; import com.fastbee.iot.domain.DeviceAlertUser; import com.fastbee.iot.model.DeviceAlertUserVO; import com.fastbee.iot.service.IDeviceAlertUserService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceController.java index 19c526da..9fc7528f 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceController.java @@ -8,8 +8,8 @@ import com.fastbee.common.core.domain.entity.SysRole; 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.MessageUtils; import com.fastbee.common.exception.ServiceException; +import com.fastbee.common.utils.MessageUtils; import com.fastbee.common.utils.SecurityUtils; import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.poi.ExcelUtil; @@ -18,8 +18,8 @@ import com.fastbee.iot.model.DeviceAssignmentVO; import com.fastbee.iot.model.DeviceImportVO; import com.fastbee.iot.model.DeviceRelateUserInput; import com.fastbee.iot.model.SerialNumberVO; -import com.fastbee.iot.service.IDeviceService; import com.fastbee.iot.model.dto.ThingsModelDTO; +import com.fastbee.iot.service.IDeviceService; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceRecordController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceRecordController.java index e26e2320..3184cb72 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceRecordController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceRecordController.java @@ -1,26 +1,21 @@ package com.fastbee.controller.device; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.fastbee.common.core.domain.entity.SysUser; -import com.fastbee.iot.model.DeviceRecordVO; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.annotation.Log; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.enums.BusinessType; -import com.fastbee.iot.domain.DeviceRecord; -import com.fastbee.iot.service.IDeviceRecordService; -import com.fastbee.common.utils.poi.ExcelUtil; +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.poi.ExcelUtil; +import com.fastbee.iot.domain.DeviceRecord; +import com.fastbee.iot.model.DeviceRecordVO; +import com.fastbee.iot.service.IDeviceRecordService; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; /** * 设备记录Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceShareController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceShareController.java index 0df989b0..3677e9e7 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceShareController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceShareController.java @@ -1,20 +1,19 @@ package com.fastbee.controller.device; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.fastbee.iot.domain.DeviceUser; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; 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.iot.domain.DeviceShare; import com.fastbee.iot.service.IDeviceShareService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 设备分享Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceUserController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceUserController.java index dc440351..a640b17c 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceUserController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceUserController.java @@ -1,27 +1,20 @@ package com.fastbee.controller.device; -import java.util.List; - -import com.fastbee.common.utils.MessageUtils; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.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.MessageUtils; import com.fastbee.iot.domain.DeviceUser; import com.fastbee.iot.service.IDeviceUserService; -import com.fastbee.common.core.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 设备用户Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/CategoryController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/CategoryController.java index dba82a6e..c0a76fbb 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/CategoryController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/CategoryController.java @@ -1,34 +1,23 @@ package com.fastbee.controller.deviceConfig; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import javax.servlet.http.HttpServletResponse; - -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.utils.SecurityUtils; -import com.fastbee.iot.model.IdAndName; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.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.SecurityUtils; +import com.fastbee.common.utils.poi.ExcelUtil; import com.fastbee.iot.domain.Category; import com.fastbee.iot.service.ICategoryService; -import com.fastbee.common.utils.poi.ExcelUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Objects; /** * 产品分类Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/CommandPreferencesController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/CommandPreferencesController.java index 74b71bbe..4800a636 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/CommandPreferencesController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/CommandPreferencesController.java @@ -1,28 +1,19 @@ package com.fastbee.controller.deviceConfig; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.fastbee.common.annotation.Log; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.enums.BusinessType; +import com.fastbee.common.core.page.TableDataInfo; +import com.fastbee.common.utils.poi.ExcelUtil; import com.fastbee.iot.domain.CommandPreferences; import com.fastbee.iot.service.ICommandPreferencesService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 指令偏好设置Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/GroupController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/GroupController.java index 75025e11..f935f8dd 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/GroupController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/GroupController.java @@ -1,31 +1,22 @@ package com.fastbee.controller.deviceConfig; -import java.util.ArrayList; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.fastbee.iot.domain.DeviceGroup; -import com.fastbee.iot.model.DeviceGroupInput; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.annotation.Log; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.enums.BusinessType; -import com.fastbee.iot.domain.Group; -import com.fastbee.iot.service.IGroupService; -import com.fastbee.common.utils.poi.ExcelUtil; import com.fastbee.common.core.page.TableDataInfo; +import com.fastbee.common.enums.BusinessType; +import com.fastbee.common.utils.poi.ExcelUtil; +import com.fastbee.iot.domain.Group; +import com.fastbee.iot.model.DeviceGroupInput; +import com.fastbee.iot.service.IGroupService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 设备分组Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ProductAuthorizeController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ProductAuthorizeController.java index 7426cd8b..b6bc9346 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ProductAuthorizeController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ProductAuthorizeController.java @@ -1,23 +1,22 @@ package com.fastbee.controller.deviceConfig; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.fastbee.iot.model.ProductAuthorizeVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; import com.fastbee.common.annotation.Log; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.enums.BusinessType; -import com.fastbee.iot.domain.ProductAuthorize; -import com.fastbee.iot.service.IProductAuthorizeService; -import com.fastbee.common.utils.poi.ExcelUtil; import com.fastbee.common.core.page.TableDataInfo; +import com.fastbee.common.enums.BusinessType; +import com.fastbee.common.utils.poi.ExcelUtil; +import com.fastbee.iot.domain.ProductAuthorize; +import com.fastbee.iot.model.ProductAuthorizeVO; +import com.fastbee.iot.service.IProductAuthorizeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 产品授权码Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ProductController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ProductController.java index f2bb6b08..372a1192 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ProductController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ProductController.java @@ -24,8 +24,6 @@ import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Objects; -import static com.fastbee.common.utils.SecurityUtils.getLoginUser; - /** * 产品Controller * diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ThingsModelController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ThingsModelController.java index 4f1431ba..67e3bc4b 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ThingsModelController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ThingsModelController.java @@ -13,7 +13,6 @@ import com.fastbee.iot.domain.ThingsModel; import com.fastbee.iot.model.ImportThingsModelInput; import com.fastbee.iot.model.ThingsModelPerm; import com.fastbee.iot.model.modbus.ModbusAndThingsVO; -import com.fastbee.iot.model.varTemp.SyncModel; import com.fastbee.iot.service.IThingsModelService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -24,7 +23,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; import java.util.List; /** diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ThingsModelTemplateController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ThingsModelTemplateController.java index 4960d566..e68154bc 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ThingsModelTemplateController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ThingsModelTemplateController.java @@ -1,25 +1,23 @@ package com.fastbee.controller.deviceConfig; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.fastbee.iot.domain.ThingsModelJsonTemplate; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; 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.iot.domain.ThingsModelJsonTemplate; import com.fastbee.iot.domain.ThingsModelTemplate; import com.fastbee.iot.service.IThingsModelTemplateService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import static com.fastbee.common.utils.SecurityUtils.getLoginUser; +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 通用物模型Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceLog/AlertLogController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceLog/AlertLogController.java index 2c3fdcdb..e7c3a863 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceLog/AlertLogController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceLog/AlertLogController.java @@ -1,28 +1,21 @@ package com.fastbee.controller.deviceLog; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.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.iot.domain.AlertLog; import com.fastbee.iot.service.IAlertLogService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 设备告警Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceLog/EventLogController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceLog/EventLogController.java index 53c3c1e3..4df99c4e 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceLog/EventLogController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceLog/EventLogController.java @@ -1,8 +1,5 @@ package com.fastbee.controller.deviceLog; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - import com.fastbee.common.annotation.Log; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; @@ -11,19 +8,14 @@ import com.fastbee.common.enums.BusinessType; import com.fastbee.common.utils.poi.ExcelUtil; import com.fastbee.iot.domain.EventLog; import com.fastbee.iot.service.IEventLogService; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 事件日志Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceLog/FunctionLogController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceLog/FunctionLogController.java index 89636e1d..642b0f36 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceLog/FunctionLogController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceLog/FunctionLogController.java @@ -1,28 +1,21 @@ package com.fastbee.controller.deviceLog; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.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.iot.domain.FunctionLog; import com.fastbee.iot.service.IFunctionLogService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 设备服务下发日志Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/firmware/FirmwareController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/firmware/FirmwareController.java index 17f46cf9..52fdd2f1 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/firmware/FirmwareController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/firmware/FirmwareController.java @@ -1,32 +1,22 @@ package com.fastbee.controller.firmware; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.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.iot.domain.Firmware; import com.fastbee.iot.service.IFirmwareService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; /** * 产品固件Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/firmware/FirmwareTaskController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/firmware/FirmwareTaskController.java index 3ccebcf4..cfeaa3e8 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/firmware/FirmwareTaskController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/firmware/FirmwareTaskController.java @@ -1,36 +1,29 @@ package com.fastbee.controller.firmware; -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - +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.mq.ota.OtaUpgradeDelayTask; +import com.fastbee.common.core.page.TableDataInfo; +import com.fastbee.common.enums.BusinessType; +import com.fastbee.common.utils.poi.ExcelUtil; +import com.fastbee.iot.data.service.IFirmwareTaskDetailService; +import com.fastbee.iot.data.service.IFirmwareTaskService; +import com.fastbee.iot.domain.FirmwareTask; import com.fastbee.iot.domain.FirmwareTaskDetail; import com.fastbee.iot.model.FirmwareTaskDetailInput; import com.fastbee.iot.model.FirmwareTaskDetailOutput; import com.fastbee.iot.model.FirmwareTaskDeviceStatistic; import com.fastbee.iot.model.FirmwareTaskInput; -import com.fastbee.iot.data.service.IFirmwareTaskDetailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.fastbee.common.annotation.Log; -import com.fastbee.common.core.controller.BaseController; -import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.enums.BusinessType; -import com.fastbee.iot.domain.FirmwareTask; -import com.fastbee.iot.data.service.IFirmwareTaskService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; /** * 固件升级任务 Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/gateway/SubGatewayController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/gateway/SubGatewayController.java index 5fb36cb2..22c28151 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/gateway/SubGatewayController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/gateway/SubGatewayController.java @@ -3,7 +3,6 @@ package com.fastbee.controller.gateway; 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.utils.poi.ExcelUtil; import com.fastbee.iot.domain.SubGateway; import com.fastbee.iot.model.gateWay.GateSubDeviceVO; import com.fastbee.iot.model.gateWay.SubDeviceAddVO; @@ -15,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/goview/GoviewProjectController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/goview/GoviewProjectController.java index eb41c108..8a4e1fa3 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/goview/GoviewProjectController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/goview/GoviewProjectController.java @@ -5,7 +5,6 @@ import com.fastbee.common.config.RuoYiConfig; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; import com.fastbee.common.core.domain.entity.SysUser; -import com.fastbee.common.core.domain.model.LoginUser; import com.fastbee.common.core.page.TableDataInfo; import com.fastbee.common.enums.BusinessType; import com.fastbee.common.utils.MessageUtils; diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/media/SipDeviceController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/media/SipDeviceController.java index 359d9c84..4ed5e563 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/media/SipDeviceController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/media/SipDeviceController.java @@ -1,35 +1,28 @@ package com.fastbee.controller.media; +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.file.FileUploadUtils; +import com.fastbee.common.utils.poi.ExcelUtil; +import com.fastbee.sip.domain.SipDevice; +import com.fastbee.sip.service.ISipDeviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.compress.utils.IOUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.fastbee.common.utils.file.FileUploadUtils; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.compress.utils.IOUtils; -import org.springframework.http.MediaType; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.fastbee.common.annotation.Log; -import com.fastbee.common.core.controller.BaseController; -import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.enums.BusinessType; -import com.fastbee.sip.domain.SipDevice; -import com.fastbee.sip.service.ISipDeviceService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; /** * 监控设备Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/media/TalkController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/media/TalkController.java index 76192621..84995514 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/media/TalkController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/media/TalkController.java @@ -7,7 +7,10 @@ import com.fastbee.sip.service.ITalkService; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @Slf4j @RestController diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/modbus/ModbusConfigController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/modbus/ModbusConfigController.java index b742835b..e62309ae 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/modbus/ModbusConfigController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/modbus/ModbusConfigController.java @@ -8,14 +8,12 @@ import com.fastbee.common.enums.BusinessType; import com.fastbee.common.utils.MessageUtils; import com.fastbee.common.utils.poi.ExcelUtil; import com.fastbee.iot.domain.ModbusConfig; -import com.fastbee.iot.domain.ThingsModel; import com.fastbee.iot.model.modbus.ModbusConfigVO; import com.fastbee.iot.model.modbus.ModbusDataImport; import com.fastbee.iot.model.modbus.ModbusIoImport; import com.fastbee.iot.service.IModbusConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.aspectj.weaver.ast.Var; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/modbus/ModbusParamsController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/modbus/ModbusParamsController.java index 79826023..f5ccb9e8 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/modbus/ModbusParamsController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/modbus/ModbusParamsController.java @@ -1,29 +1,20 @@ package com.fastbee.controller.modbus; -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.fastbee.common.annotation.Log; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.enums.BusinessType; +import com.fastbee.common.core.page.TableDataInfo; +import com.fastbee.common.utils.poi.ExcelUtil; import com.fastbee.iot.domain.ModbusParams; import com.fastbee.iot.service.IModbusParamsService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; /** * 产品modbus配置参数Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/modbus/ProductModbusJobController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/modbus/ProductModbusJobController.java index bd89c6cb..9954073b 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/modbus/ProductModbusJobController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/modbus/ProductModbusJobController.java @@ -1,28 +1,20 @@ package com.fastbee.controller.modbus; -import java.util.List; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - +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.utils.poi.ExcelUtil; +import com.fastbee.iot.domain.ProductModbusJob; import com.fastbee.iot.model.modbus.ProductModbusJobVO; +import com.fastbee.iot.service.IProductModbusJobService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.fastbee.common.core.controller.BaseController; -import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.iot.domain.ProductModbusJob; -import com.fastbee.iot.service.IProductModbusJobService; -import com.fastbee.common.core.page.TableDataInfo; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 产品轮训任务列Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/modbus/ProductSubGatewayController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/modbus/ProductSubGatewayController.java index 9c9fa37a..21d99da8 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/modbus/ProductSubGatewayController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/modbus/ProductSubGatewayController.java @@ -1,28 +1,21 @@ package com.fastbee.controller.modbus; -import java.util.List; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - +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.utils.poi.ExcelUtil; +import com.fastbee.iot.domain.ProductSubGateway; import com.fastbee.iot.model.gateWay.ProductSubGatewayAddVO; import com.fastbee.iot.model.gateWay.ProductSubGatewayVO; +import com.fastbee.iot.service.IProductSubGatewayService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.fastbee.common.core.controller.BaseController; -import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.iot.domain.ProductSubGateway; -import com.fastbee.iot.service.IProductSubGatewayService; -import com.fastbee.common.core.page.TableDataInfo; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 网关与子产品关联Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/protocol/ProtocolController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/protocol/ProtocolController.java index 5beb113c..22453c64 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/protocol/ProtocolController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/protocol/ProtocolController.java @@ -1,28 +1,21 @@ package com.fastbee.controller.protocol; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.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.iot.domain.Protocol; import com.fastbee.iot.service.IProtocolService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 协议Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/ruleEngine/BridgeController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/ruleEngine/BridgeController.java index eae20881..0d2fe6dd 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/ruleEngine/BridgeController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/ruleEngine/BridgeController.java @@ -1,28 +1,19 @@ package com.fastbee.controller.ruleEngine; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.fastbee.common.annotation.Log; -import com.fastbee.common.enums.BusinessType; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; +import com.fastbee.common.core.page.TableDataInfo; import com.fastbee.common.utils.poi.ExcelUtil; import com.fastbee.iot.domain.Bridge; import com.fastbee.iot.service.IBridgeService; -import com.fastbee.common.core.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 数据桥接Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/ruleEngine/HttpBridgeController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/ruleEngine/HttpBridgeController.java index 68aed654..b90b525e 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/ruleEngine/HttpBridgeController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/ruleEngine/HttpBridgeController.java @@ -3,8 +3,8 @@ package com.fastbee.controller.ruleEngine; import com.alibaba.fastjson2.JSONObject; import com.fastbee.common.core.domain.AjaxResult; import com.fastbee.iot.model.ScriptCondition; -import com.fastbee.ruleEngine.context.MsgContext; import com.fastbee.iot.service.IScriptService; +import com.fastbee.ruleEngine.context.MsgContext; import com.fastbee.ruleEngine.core.FlowLogExecutor; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/ruleEngine/SceneController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/ruleEngine/SceneController.java index a8bef812..80451030 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/ruleEngine/SceneController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/ruleEngine/SceneController.java @@ -15,14 +15,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.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 org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/ruleEngine/ScriptController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/ruleEngine/ScriptController.java index 6786e549..1aa1adac 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/ruleEngine/ScriptController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/ruleEngine/ScriptController.java @@ -1,29 +1,20 @@ package com.fastbee.controller.ruleEngine; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.fastbee.common.core.domain.entity.SysUser; -import com.fastbee.iot.domain.Script; -import com.fastbee.iot.service.IScriptService; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.annotation.Log; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; +import com.fastbee.common.core.domain.entity.SysUser; +import com.fastbee.common.core.page.TableDataInfo; import com.fastbee.common.enums.BusinessType; import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; +import com.fastbee.iot.domain.Script; +import com.fastbee.iot.service.IScriptService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; -import static com.fastbee.common.utils.SecurityUtils.getLoginUser; +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 规则引擎脚本Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/sceneModel/SceneModelDataController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/sceneModel/SceneModelDataController.java index f2f67c55..7a929049 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/sceneModel/SceneModelDataController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/sceneModel/SceneModelDataController.java @@ -1,7 +1,6 @@ package com.fastbee.controller.sceneModel; import com.fastbee.common.annotation.Log; -import com.fastbee.common.constant.HttpStatus; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; import com.fastbee.common.core.page.TableDataExtendInfo; diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/sip/SipRelationController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/sip/SipRelationController.java index b8978ae8..6219fe2c 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/sip/SipRelationController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/sip/SipRelationController.java @@ -1,26 +1,19 @@ package com.fastbee.controller.sip; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; +import com.fastbee.common.core.page.TableDataInfo; +import com.fastbee.common.utils.poi.ExcelUtil; import com.fastbee.iot.domain.SipRelation; import com.fastbee.iot.service.ISipRelationService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 监控设备关联Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/socialUser/SocialPlatformController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/socialUser/SocialPlatformController.java index 4b6bd6b6..125a0fa5 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/socialUser/SocialPlatformController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/socialUser/SocialPlatformController.java @@ -1,28 +1,21 @@ package com.fastbee.controller.socialUser; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.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.iot.domain.SocialPlatform; import com.fastbee.iot.service.ISocialPlatformService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 第三方登录平台控制Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/tool/AuthResourceController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/tool/AuthResourceController.java index 7f34dc75..21a0a417 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/tool/AuthResourceController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/tool/AuthResourceController.java @@ -2,7 +2,9 @@ package com.fastbee.controller.tool; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.utils.MessageUtils; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * 设备告警Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/tool/NewsCategoryController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/tool/NewsCategoryController.java index 9df386e4..5d9716b5 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/tool/NewsCategoryController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/tool/NewsCategoryController.java @@ -1,29 +1,22 @@ package com.fastbee.controller.tool; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.fastbee.iot.model.IdAndName; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.annotation.Log; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.enums.BusinessType; -import com.fastbee.iot.domain.NewsCategory; -import com.fastbee.iot.service.INewsCategoryService; -import com.fastbee.common.utils.poi.ExcelUtil; import com.fastbee.common.core.page.TableDataInfo; +import com.fastbee.common.enums.BusinessType; +import com.fastbee.common.utils.poi.ExcelUtil; +import com.fastbee.iot.domain.NewsCategory; +import com.fastbee.iot.model.IdAndName; +import com.fastbee.iot.service.INewsCategoryService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 新闻分类Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/tool/NewsController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/tool/NewsController.java index 59a812c0..af54a7fb 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/tool/NewsController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/tool/NewsController.java @@ -1,29 +1,22 @@ package com.fastbee.controller.tool; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.fastbee.iot.model.CategoryNews; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.fastbee.common.annotation.Log; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.enums.BusinessType; -import com.fastbee.iot.domain.News; -import com.fastbee.iot.service.INewsService; -import com.fastbee.common.utils.poi.ExcelUtil; import com.fastbee.common.core.page.TableDataInfo; +import com.fastbee.common.enums.BusinessType; +import com.fastbee.common.utils.poi.ExcelUtil; +import com.fastbee.iot.domain.News; +import com.fastbee.iot.model.CategoryNews; +import com.fastbee.iot.service.INewsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 新闻资讯Controller diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/tool/ToolController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/tool/ToolController.java index 62b17073..639dcbae 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/tool/ToolController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/tool/ToolController.java @@ -8,32 +8,32 @@ import com.dtflys.forest.http.ForestResponse; import com.fastbee.common.ProtocolDeCodeService; import com.fastbee.common.annotation.Log; import com.fastbee.common.config.RuoYiConfig; -import com.fastbee.common.constant.CacheConstants; import com.fastbee.common.constant.Constants; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; import com.fastbee.common.core.domain.entity.SysUser; import com.fastbee.common.core.iot.response.DeCodeBo; +import com.fastbee.common.core.mq.message.ReportDataBo; import com.fastbee.common.core.page.TableDataInfo; import com.fastbee.common.enums.BusinessType; import com.fastbee.common.enums.DeviceStatus; -import com.fastbee.common.exception.ServiceException; import com.fastbee.common.exception.file.FileNameLengthLimitExceededException; import com.fastbee.common.utils.MessageUtils; import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.file.FileUploadUtils; -import com.fastbee.common.utils.file.FileUtils; import com.fastbee.common.utils.gateway.mq.TopicsUtils; import com.fastbee.iot.data.service.IMqttMessagePublish; import com.fastbee.iot.data.service.IRuleEngine; import com.fastbee.iot.domain.Device; -import com.fastbee.iot.model.*; +import com.fastbee.iot.model.EmqxApiConfig; +import com.fastbee.iot.model.MqttAuthenticationModel; +import com.fastbee.iot.model.MqttClientConnectModel; +import com.fastbee.iot.model.RegisterUserInput; import com.fastbee.iot.model.ThingsModels.ThingsModelShadow; import com.fastbee.iot.service.IDeviceService; import com.fastbee.iot.service.IToolService; import com.fastbee.iot.util.VelocityInitializer; import com.fastbee.iot.util.VelocityUtils; -import com.fastbee.common.core.mq.message.ReportDataBo; import com.fastbee.mqttclient.MqttClientConfig; import com.fastbee.mqttclient.PubMqttClient; import com.fastbee.system.service.ISysConfigService; @@ -50,14 +50,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/translate/AppPreferencesController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/translate/AppPreferencesController.java index f8649be5..a02a8b2c 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/translate/AppPreferencesController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/translate/AppPreferencesController.java @@ -12,7 +12,6 @@ import com.fastbee.system.domain.AppPreferences; import com.fastbee.system.service.IAppPreferencesService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/wechat/WeChatController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/wechat/WeChatController.java index bb9dd530..789ffe97 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/wechat/WeChatController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/wechat/WeChatController.java @@ -7,18 +7,14 @@ import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.sign.SignUtils; import com.fastbee.common.wechat.WeChatLoginBody; import com.fastbee.common.wechat.WeChatLoginResult; +import com.fastbee.iot.wechat.WeChatCallbackService; import com.fastbee.iot.wechat.WeChatService; import com.fastbee.iot.wechat.vo.WxBindReqVO; import com.fastbee.iot.wechat.vo.WxCancelBindReqVO; -import com.fastbee.iot.wechat.WeChatCallbackService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; diff --git a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/controller/GenController.java b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/controller/GenController.java index c30a3ebf..ad54d26e 100644 --- a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/controller/GenController.java +++ b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/controller/GenController.java @@ -1,25 +1,5 @@ package com.fastbee.generator.controller; -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.io.IOUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.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.annotation.Log; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; @@ -30,6 +10,19 @@ import com.fastbee.generator.domain.GenTable; import com.fastbee.generator.domain.GenTableColumn; import com.fastbee.generator.service.IGenTableColumnService; import com.fastbee.generator.service.IGenTableService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.io.IOUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 代码生成 操作处理 diff --git a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/domain/GenTable.java b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/domain/GenTable.java index 8048c173..811e620c 100644 --- a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/domain/GenTable.java +++ b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/domain/GenTable.java @@ -1,15 +1,15 @@ package com.fastbee.generator.domain; -import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.apache.commons.lang3.ArrayUtils; import com.fastbee.common.constant.GenConstants; import com.fastbee.common.core.domain.BaseEntity; import com.fastbee.common.utils.StringUtils; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.apache.commons.lang3.ArrayUtils; + +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import java.util.List; /** * 业务表 gen_table diff --git a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/domain/GenTableColumn.java b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/domain/GenTableColumn.java index 654bd2eb..9dc2e19e 100644 --- a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/domain/GenTableColumn.java +++ b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/domain/GenTableColumn.java @@ -1,11 +1,12 @@ package com.fastbee.generator.domain; -import javax.validation.constraints.NotBlank; import com.fastbee.common.core.domain.BaseEntity; import com.fastbee.common.utils.StringUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotBlank; + /** * 代码生成业务字段表 gen_table_column * diff --git a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/mapper/GenTableColumnMapper.java b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/mapper/GenTableColumnMapper.java index 893bc293..06d4b81d 100644 --- a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/mapper/GenTableColumnMapper.java +++ b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/mapper/GenTableColumnMapper.java @@ -1,10 +1,9 @@ package com.fastbee.generator.mapper; -import java.util.List; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fastbee.generator.domain.GenTableColumn; +import java.util.List; + /** * 业务字段 数据层 * diff --git a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/mapper/GenTableMapper.java b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/mapper/GenTableMapper.java index fd4e33f6..a1d966ee 100644 --- a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/mapper/GenTableMapper.java +++ b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/mapper/GenTableMapper.java @@ -1,10 +1,9 @@ package com.fastbee.generator.mapper; -import java.util.List; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fastbee.generator.domain.GenTable; +import java.util.List; + /** * 业务 数据层 * diff --git a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/service/GenTableColumnServiceImpl.java b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/service/GenTableColumnServiceImpl.java index 086e7a76..bffdb2d2 100644 --- a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/service/GenTableColumnServiceImpl.java +++ b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/service/GenTableColumnServiceImpl.java @@ -1,11 +1,12 @@ package com.fastbee.generator.service; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.fastbee.common.core.text.Convert; import com.fastbee.generator.domain.GenTableColumn; import com.fastbee.generator.mapper.GenTableColumnMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 业务字段 服务层实现 diff --git a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/service/GenTableServiceImpl.java b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/service/GenTableServiceImpl.java index 269067fc..e0134dbb 100644 --- a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/service/GenTableServiceImpl.java +++ b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/service/GenTableServiceImpl.java @@ -1,26 +1,5 @@ package com.fastbee.generator.service; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.fastbee.common.constant.Constants; @@ -36,6 +15,28 @@ import com.fastbee.generator.mapper.GenTableMapper; import com.fastbee.generator.util.GenUtils; import com.fastbee.generator.util.VelocityInitializer; import com.fastbee.generator.util.VelocityUtils; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.StringWriter; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; /** * 业务 服务层实现 diff --git a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/service/IGenTableColumnService.java b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/service/IGenTableColumnService.java index e2cd041b..bcb0a2b8 100644 --- a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/service/IGenTableColumnService.java +++ b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/service/IGenTableColumnService.java @@ -1,8 +1,9 @@ package com.fastbee.generator.service; -import java.util.List; import com.fastbee.generator.domain.GenTableColumn; +import java.util.List; + /** * 业务字段 服务层 * diff --git a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/service/IGenTableService.java b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/service/IGenTableService.java index d03dba4d..64a3cf96 100644 --- a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/service/IGenTableService.java +++ b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/service/IGenTableService.java @@ -1,8 +1,9 @@ package com.fastbee.generator.service; +import com.fastbee.generator.domain.GenTable; + import java.util.List; import java.util.Map; -import com.fastbee.generator.domain.GenTable; /** * 业务 服务层 diff --git a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/util/GenUtils.java b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/util/GenUtils.java index 59584d41..4951d528 100644 --- a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/util/GenUtils.java +++ b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/util/GenUtils.java @@ -1,12 +1,13 @@ package com.fastbee.generator.util; -import java.util.Arrays; -import org.apache.commons.lang3.RegExUtils; import com.fastbee.common.constant.GenConstants; import com.fastbee.common.utils.StringUtils; import com.fastbee.generator.config.GenConfig; import com.fastbee.generator.domain.GenTable; import com.fastbee.generator.domain.GenTableColumn; +import org.apache.commons.lang3.RegExUtils; + +import java.util.Arrays; /** * 代码生成器 工具类 diff --git a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/util/VelocityInitializer.java b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/util/VelocityInitializer.java index 832d9734..6427237e 100644 --- a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/util/VelocityInitializer.java +++ b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/util/VelocityInitializer.java @@ -1,8 +1,9 @@ package com.fastbee.generator.util; -import java.util.Properties; -import org.apache.velocity.app.Velocity; import com.fastbee.common.constant.Constants; +import org.apache.velocity.app.Velocity; + +import java.util.Properties; /** * VelocityEngine工厂 diff --git a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/util/VelocityUtils.java b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/util/VelocityUtils.java index a6115291..9bdfaa88 100644 --- a/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/util/VelocityUtils.java +++ b/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/util/VelocityUtils.java @@ -1,10 +1,5 @@ package com.fastbee.generator.util; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import org.apache.velocity.VelocityContext; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.fastbee.common.constant.GenConstants; @@ -12,6 +7,12 @@ import com.fastbee.common.utils.DateUtils; import com.fastbee.common.utils.StringUtils; import com.fastbee.generator.domain.GenTable; import com.fastbee.generator.domain.GenTableColumn; +import org.apache.velocity.VelocityContext; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * 模板处理工具类 diff --git a/fastbee-plugs/fastbee-generator/src/main/resources/vm/vue/index-tree.vue.vm b/fastbee-plugs/fastbee-generator/src/main/resources/vm/vue/index-tree.vue.vm index a4c64a09..07104a7b 100644 --- a/fastbee-plugs/fastbee-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/fastbee-plugs/fastbee-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -283,11 +283,11 @@