From 4ad81053fb460672ca723c3bc486ad08250faabd Mon Sep 17 00:00:00 2001 From: chenxudong Date: Fri, 13 Dec 2024 16:12:27 +0800 Subject: [PATCH] reformat code --- electrmangnetic/pom.xml | 4 +- .../manage/config/LoginInterceptor.java | 6 +- .../software/manage/config/WebMvcConfig.java | 1 - .../manage/controller/EDDataController.java | 56 ++--- .../manage/controller/UserController.java | 8 +- .../manage/mapper/CategoryMapper.java | 5 + .../software/manage/mapper/EDDataMapper.java | 3 + .../software/manage/mapper/EDDataMappers.java | 7 +- .../software/manage/mapper/TokenMapper.java | 3 + .../software/manage/mapper/UserMapper.java | 10 +- .../software/manage/mapper/UserMappers.java | 11 +- .../manage/pojo/other/EDDataPage.java | 1 + .../software/manage/pojo/req/BaseRequest.java | 8 +- .../software/manage/pojo/req/UserRequest.java | 4 +- .../manage/service/EDDataService.java | 10 + .../software/manage/service/TokenService.java | 2 + .../software/manage/service/UserService.java | 9 + .../serviceimpl/CategoryServiceImpl.java | 5 +- .../serviceimpl/EDDataServiceImpl.java | 131 ++++------ .../service/serviceimpl/UserServiceImpl.java | 59 ++--- .../src/main/resources/application.properties | 4 - .../src/main/resources/log4j2-spring-prod.xml | 3 +- .../src/main/resources/log4j2-spring.xml | 3 +- .../resources/sqlmapper/CategoryMapper.xml | 48 ++-- .../resources/sqlmapper/EdDataInfoMapper.xml | 236 +++++++++--------- .../main/resources/sqlmapper/TokenMapper.xml | 21 +- .../main/resources/sqlmapper/UserMapper.xml | 130 +++++----- electromagnetic-common/pom.xml | 4 +- .../software/common/cons/UserConstants.java | 2 +- .../software/common/enums/EffectFlagEnum.java | 4 +- .../software/common/enums/ErrorLevels.java | 20 +- .../software/common/enums/ErrorTypes.java | 22 +- .../software/common/enums/PublishEnum.java | 4 +- .../software/common/resp/ResultCode.java | 84 ++++--- .../software/common/util/AESUtils.java | 10 +- .../util/ElectromagneticResultUtil.java | 6 +- .../software/common/util/IdWorker.java | 106 ++++---- .../software/common/util/SignUtils.java | 30 +-- 38 files changed, 586 insertions(+), 494 deletions(-) diff --git a/electrmangnetic/pom.xml b/electrmangnetic/pom.xml index 4fe8767..f255d8a 100644 --- a/electrmangnetic/pom.xml +++ b/electrmangnetic/pom.xml @@ -1,6 +1,6 @@ - 4.0.0 diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java index 5fa6631..208b9cf 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java @@ -29,7 +29,7 @@ public class LoginInterceptor implements HandlerInterceptor { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { String token = request.getHeader("Authorization"); - if (token==null) { + if (token == null) { log.error("Authorization header is null"); response.setStatus(401); return false; @@ -43,7 +43,7 @@ public class LoginInterceptor implements HandlerInterceptor { return false; } else { Claims claims = TokenUtil.getLoginInfo(token); - if (claims==null) { + if (claims == null) { log.error("User info is missing"); response.setStatus(401); return false; @@ -68,7 +68,7 @@ public class LoginInterceptor implements HandlerInterceptor { UserThreadLocal.remove(); } - public Boolean isTokenValid(String tokenStr){ + public Boolean isTokenValid(String tokenStr) { Token token = tokenMapper.selectToken(tokenStr); Date now = new Date(SystemClock.now()); return token != null && now.before(token.getExpireAt()); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/WebMvcConfig.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/WebMvcConfig.java index 10fd9c6..28b6ebe 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/WebMvcConfig.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/WebMvcConfig.java @@ -18,7 +18,6 @@ public class WebMvcConfig implements WebMvcConfigurer { private LoginInterceptor loginInterceptor; /** - * * @param registry registry */ @Override diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EDDataController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EDDataController.java index 4defbe6..c147180 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EDDataController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EDDataController.java @@ -1,6 +1,6 @@ package com.electromagnetic.industry.software.manage.controller; -import com.electromagnetic.industry.software.common.resp.*; +import com.electromagnetic.industry.software.common.resp.ElectromagneticResult; import com.electromagnetic.industry.software.manage.pojo.req.EDDataRequest; import com.electromagnetic.industry.software.manage.pojo.req.FileChunkDTO; import com.electromagnetic.industry.software.manage.service.EDDataService; @@ -23,39 +23,39 @@ public class EDDataController { @Resource private EDDataService edDataService; - @ApiOperation(value = "新建文件夹",notes = "") - @RequestMapping(value = "/createFolder",method = RequestMethod.POST) - public ElectromagneticResult createFolder(@RequestBody EDDataRequest request){ + @ApiOperation(value = "新建文件夹", notes = "") + @RequestMapping(value = "/createFolder", method = RequestMethod.POST) + public ElectromagneticResult createFolder(@RequestBody EDDataRequest request) { return edDataService.createFolder(request); } - @ApiOperation(value = "获取文件信息列表",notes = "") - @RequestMapping(value = "/getFileInfoList",method = RequestMethod.POST) - public ElectromagneticResult getFileInfoList(@RequestBody EDDataRequest request){ + @ApiOperation(value = "获取文件信息列表", notes = "") + @RequestMapping(value = "/getFileInfoList", method = RequestMethod.POST) + public ElectromagneticResult getFileInfoList(@RequestBody EDDataRequest request) { return edDataService.getDataInfoList(request); } - @ApiOperation(value = "更新文件信息",notes = "") - @RequestMapping(value = "/updateFileInfo",method = RequestMethod.POST) - public ElectromagneticResult updateFileInfo(@RequestBody EDDataRequest request){ + @ApiOperation(value = "更新文件信息", notes = "") + @RequestMapping(value = "/updateFileInfo", method = RequestMethod.POST) + public ElectromagneticResult updateFileInfo(@RequestBody EDDataRequest request) { return edDataService.updateFileInfo(request); } - @ApiOperation(value = "获取子文件数量",notes = "") - @RequestMapping(value = "/getChildFileCount",method = RequestMethod.POST) - public ElectromagneticResult getChildFileCount(@RequestBody EDDataRequest request){ + @ApiOperation(value = "获取子文件数量", notes = "") + @RequestMapping(value = "/getChildFileCount", method = RequestMethod.POST) + public ElectromagneticResult getChildFileCount(@RequestBody EDDataRequest request) { return edDataService.getChildFileCount(request); } - @ApiOperation(value = "上传",notes = "") - @RequestMapping(value = "/upload", consumes = "multipart/form-data",method = RequestMethod.POST) + @ApiOperation(value = "上传", notes = "") + @RequestMapping(value = "/upload", consumes = "multipart/form-data", method = RequestMethod.POST) public ElectromagneticResult upload(@RequestParam("parentId") String parentId, @RequestParam("file") MultipartFile file, - @RequestParam("gmtBatchUpload") Long gmtBatchUpload){ + @RequestParam("gmtBatchUpload") Long gmtBatchUpload) { EDDataRequest request = new EDDataRequest(); request.setParentId(parentId); request.setFileData(file); @@ -64,41 +64,41 @@ public class EDDataController { } - @ApiOperation(value = "下载",notes = "") - @RequestMapping(value = "/download",method = RequestMethod.GET) + @ApiOperation(value = "下载", notes = "") + @RequestMapping(value = "/download", method = RequestMethod.GET) public ResponseEntity download(@RequestParam String dataId, HttpServletResponse response) throws IOException { return edDataService.download(dataId, response); } - @ApiOperation(value = "数据导出",notes = "") - @RequestMapping(value = "/batchExport",method = RequestMethod.GET) + @ApiOperation(value = "数据导出", notes = "") + @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public ResponseEntity batchExport(@RequestParam String dataIdArr, HttpServletResponse response) throws IOException { return edDataService.batchExport(dataIdArr, response); } - @ApiOperation(value = "获取已经上传的分片",notes = "") - @RequestMapping(value = "/getUploadedChunkNums",method = RequestMethod.GET) + @ApiOperation(value = "获取已经上传的分片", notes = "") + @RequestMapping(value = "/getUploadedChunkNums", method = RequestMethod.GET) public ElectromagneticResult getUploadedChunkNums(@RequestParam String identifier) { return edDataService.getUploadedChunkNums(identifier); } - @ApiOperation(value = "合并分片",notes = "") - @RequestMapping(value = "/mergeChunks",method = RequestMethod.GET) + @ApiOperation(value = "合并分片", notes = "") + @RequestMapping(value = "/mergeChunks", method = RequestMethod.GET) public ElectromagneticResult mergeChunks(@RequestParam String identifier, @RequestParam String fileName, @RequestParam Integer totalChunks) { return edDataService.mergeChunks(identifier, fileName, totalChunks); } - @ApiOperation(value = "分片上传",notes = "") - @RequestMapping(value = "/batchImport",method = RequestMethod.POST) + @ApiOperation(value = "分片上传", notes = "") + @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public ElectromagneticResult batchImport(FileChunkDTO fileChunkDTO) { return edDataService.batchImport(fileChunkDTO); } - @ApiOperation(value = "检查分片是否存在",notes = "") - @RequestMapping(value = "/batchImport",method = RequestMethod.GET) + @ApiOperation(value = "检查分片是否存在", notes = "") + @RequestMapping(value = "/batchImport", method = RequestMethod.GET) public ElectromagneticResult checkChunkExist(FileChunkDTO fileChunkDTO) { return edDataService.checkChunkExist(fileChunkDTO); } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java index c9f1600..f75b07d 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java @@ -27,9 +27,9 @@ public class UserController { return userService.createUser(userRequest); } - @ApiOperation(value="编辑用户信息",notes = "") + @ApiOperation(value = "编辑用户信息", notes = "") @PutMapping("/updateUser") - public ElectromagneticResult updateUser(@RequestBody UserModiRequest userModiRequest){ + public ElectromagneticResult updateUser(@RequestBody UserModiRequest userModiRequest) { return userService.modifyUser(userModiRequest); } @@ -57,13 +57,13 @@ public class UserController { return userService.validateWorkNum(userWorkNumRequest); } - @ApiOperation(value="删除用户信息",notes="") + @ApiOperation(value = "删除用户信息", notes = "") @PostMapping(value = "/deleteUser") public ElectromagneticResult deleteUser(@RequestBody UserDeleteRequest userDeleteRequest) { return userService.deleteUser(userDeleteRequest); } - @ApiOperation(value="登出", notes = "") + @ApiOperation(value = "登出", notes = "") @RequestMapping(value = "/logout", method = RequestMethod.POST) public ElectromagneticResult logout(@RequestHeader("Authorization") String token) { return userService.logout(token); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/CategoryMapper.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/CategoryMapper.java index 3dcf249..58c318d 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/CategoryMapper.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/CategoryMapper.java @@ -11,30 +11,35 @@ public interface CategoryMapper extends BaseMapper { /** * 获取顶级节点 + * * @return */ List selectTopCategories(); /** * 获取所有节点 + * * @return */ List selectAllCategories(); /** * 获取节点通过编码ID + * * @return */ List selectCategories(Category category); /** * 获取子节点通过父ID + * * @return */ List selectChildCategories(Category category); /** * 创建目录树节点数据 + * * @return */ Boolean createCategory(Category category); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/EDDataMapper.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/EDDataMapper.java index f864d85..c9fb5b4 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/EDDataMapper.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/EDDataMapper.java @@ -12,6 +12,7 @@ import java.util.List; public interface EDDataMapper extends BaseMapper { /** * 创建文件/文件夹数据信息 + * * @param edDataInfo * @return */ @@ -19,6 +20,7 @@ public interface EDDataMapper extends BaseMapper { /** * 获取文件信息列表 + * * @param parames * @return */ @@ -26,6 +28,7 @@ public interface EDDataMapper extends BaseMapper { /** * 更新文件信息 + * * @param parames * @return */ diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/EDDataMappers.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/EDDataMappers.java index df57f8c..6db729d 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/EDDataMappers.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/EDDataMappers.java @@ -11,22 +11,27 @@ import org.mapstruct.factory.Mappers; @Mapper public interface EDDataMappers { - EDDataMappers INSTANCE= Mappers.getMapper(EDDataMappers.class); + EDDataMappers INSTANCE = Mappers.getMapper(EDDataMappers.class); /** * 文件数据扩展模型入参转换 + * * @param request * @return */ EDDataParams getEDDataParames(EDDataRequest request); + /** * 文件数据扩展模型入参转换 + * * @param request * @return */ EDDataInfo getEDDataInfo(EDDataRequest request); + /** * 指标卡扩展模型返回 + * * @param edDataPage * @return */ diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/TokenMapper.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/TokenMapper.java index b61cb96..303b6d1 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/TokenMapper.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/TokenMapper.java @@ -9,6 +9,7 @@ public interface TokenMapper extends BaseMapper { /** * 插入 + * * @param token * @return */ @@ -16,6 +17,7 @@ public interface TokenMapper extends BaseMapper { /** * 查询 + * * @param token * @return Token */ @@ -23,6 +25,7 @@ public interface TokenMapper extends BaseMapper { /** * 删除token + * * @param token * @return */ diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMapper.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMapper.java index 5940696..cbb196a 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMapper.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMapper.java @@ -13,6 +13,7 @@ public interface UserMapper { /** * 插入 + * * @param user * @return */ @@ -20,6 +21,7 @@ public interface UserMapper { /** * 编辑 + * * @param user * @return */ @@ -27,6 +29,7 @@ public interface UserMapper { /** * 发布 + * * @param publishParam * @return */ @@ -34,6 +37,7 @@ public interface UserMapper { /** * 通过工号查询用户 + * * @param workNumber * @return */ @@ -41,6 +45,7 @@ public interface UserMapper { /** * 通过用户编码查询用户 + * * @param userId * @return */ @@ -48,6 +53,7 @@ public interface UserMapper { /** * 通过用户编码查询用户 + * * @param searchKeywords * @return */ @@ -55,13 +61,15 @@ public interface UserMapper { /** * 查询数据总条目数 + * * @param searchKeywords * @return */ - int getTotalCount (SearchKeyWords searchKeywords); + int getTotalCount(SearchKeyWords searchKeywords); /** * 通过用户ID删除用户 + * * @param userId * @return */ diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMappers.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMappers.java index c15c345..ba31ecf 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMappers.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMappers.java @@ -14,10 +14,11 @@ import java.util.List; @Mapper public interface UserMappers { - UserMappers INSTANCE= Mappers.getMapper(UserMappers.class); + UserMappers INSTANCE = Mappers.getMapper(UserMappers.class); /** * 用户Request转用户模型 + * * @param userRequest * @return */ @@ -25,6 +26,7 @@ public interface UserMappers { /** * 用户登录Request转用户登录模型 + * * @param loginRequest * @return */ @@ -32,6 +34,7 @@ public interface UserMappers { /** * 获取单条用户信息Request转用户模型 + * * @param user * @return */ @@ -40,6 +43,7 @@ public interface UserMappers { /** * 用户发布request转用户发布参数模型 + * * @param userPublishRequest * @return */ @@ -47,6 +51,7 @@ public interface UserMappers { /** * 获取单条用户信息Request转用户模型 + * * @param searchUserRequest * @return */ @@ -54,6 +59,7 @@ public interface UserMappers { /** * 获取用户列表转response列表 + * * @param users * @return */ @@ -61,6 +67,7 @@ public interface UserMappers { /** * 编辑用户Request转用户模型 + * * @param userModiRequest * @return */ @@ -68,6 +75,7 @@ public interface UserMappers { /** * 校验工号唯一性Request转用户模型 + * * @param userWorkNumRequest * @return */ @@ -75,6 +83,7 @@ public interface UserMappers { /** * 删除单条用户信息Request转用户模型 + * * @param userDeleteRequest * @return */ diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/EDDataPage.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/EDDataPage.java index f44d170..5e232a2 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/EDDataPage.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/EDDataPage.java @@ -8,6 +8,7 @@ import java.io.Serializable; /** * 分页综合返回 + * * @author * @version $Id: IndicatorCardPage.java, v 0.1 2024-08-14 17:30 */ diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/BaseRequest.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/BaseRequest.java index aa72004..ab43fd1 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/BaseRequest.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/BaseRequest.java @@ -5,7 +5,7 @@ import lombok.Data; import java.io.Serializable; @Data -public class BaseRequest implements Serializable { +public class BaseRequest implements Serializable { private static final long serialVersionUID = -9017146892952264211L; @@ -34,15 +34,15 @@ public class BaseRequest implements Serializable { */ private String appName; /** - *人员编码 + * 人员编码 */ private String personNo; /** - *人员姓名 + * 人员姓名 */ private String personName; /** - * 权限码 + * 权限码 */ private String permissionCode; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserRequest.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserRequest.java index dd4272e..c41cf5b 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserRequest.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserRequest.java @@ -39,7 +39,7 @@ public class UserRequest extends BaseRequest implements Serializable { /** * 入职日期 */ - @JsonFormat(pattern="yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date joinTime; /** @@ -50,7 +50,7 @@ public class UserRequest extends BaseRequest implements Serializable { /** * 实习截止日期 */ - @JsonFormat(pattern="yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date internshipEndDate; } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EDDataService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EDDataService.java index f7c9c2a..ec9f52f 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EDDataService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EDDataService.java @@ -16,6 +16,7 @@ import java.util.Map; public interface EDDataService { /** * 创建文件夹 + * * @param request * @return */ @@ -24,6 +25,7 @@ public interface EDDataService { /** * 获取文件信息列表 + * * @param request * @return */ @@ -31,6 +33,7 @@ public interface EDDataService { /** * 更新文件信息 + * * @param request * @return */ @@ -38,6 +41,7 @@ public interface EDDataService { /** * 获取子文件数量 + * * @param request * @return */ @@ -45,6 +49,7 @@ public interface EDDataService { /** * 上传 + * * @param request * @return */ @@ -60,6 +65,7 @@ public interface EDDataService { /** * 导出数据 + * * @param dataIdArr * @return */ @@ -67,6 +73,7 @@ public interface EDDataService { /** * 导入数据 + * * @param fileChunkDTO * @return */ @@ -74,6 +81,7 @@ public interface EDDataService { /** * 获取已经上传的分片 + * * @param identifier * @return */ @@ -82,6 +90,7 @@ public interface EDDataService { /** * 合并分片 + * * @param identifier * @param fileName * @param totalChunks @@ -92,6 +101,7 @@ public interface EDDataService { /** * 检查分片是否存在 + * * @param fileChunkDTO * @return */ diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/TokenService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/TokenService.java index 3c4c1a1..c1eb6f0 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/TokenService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/TokenService.java @@ -8,6 +8,7 @@ public interface TokenService { /** * 创建令牌 + * * @param loginInfo * @return 令牌 */ @@ -15,6 +16,7 @@ public interface TokenService { /** * 创建用户令牌 + * * @param user * @param tokenStr * @return diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/UserService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/UserService.java index ce1ef24..2eaae30 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/UserService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/UserService.java @@ -7,6 +7,7 @@ public interface UserService { /** * 用户登录 + * * @param loginRequest * @return */ @@ -14,6 +15,7 @@ public interface UserService { /** * 新增用户信息 + * * @param userRequest * @return */ @@ -21,6 +23,7 @@ public interface UserService { /** * 编辑用户信息 + * * @param userModiRequest * @return */ @@ -29,6 +32,7 @@ public interface UserService { /** * 发布用户 + * * @param userPublishRequest * @return */ @@ -36,6 +40,7 @@ public interface UserService { /** * 校验工号唯一性 + * * @param workNumberRequest * @return */ @@ -43,6 +48,7 @@ public interface UserService { /** * 通过用户编码获取单条用户信息 + * * @param getSingleUserRequest * @return */ @@ -50,6 +56,7 @@ public interface UserService { /** * 查询用户信息 + * * @param searchUserRequest * @return */ @@ -57,6 +64,7 @@ public interface UserService { /** * 刪除用戶（逻辑删除） + * * @param userDeleteRequest * @return */ @@ -64,6 +72,7 @@ public interface UserService { /** * 用户登出 + * * @param token * @return */ diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CategoryServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CategoryServiceImpl.java index c274bc4..a4ff55a 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CategoryServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CategoryServiceImpl.java @@ -39,10 +39,11 @@ public class CategoryServiceImpl implements CategoryService { /** * 递归列表 + * * @param list * @param category */ - private void recursionFn (List list, Category category) { + private void recursionFn(List list, Category category) { List childList = getChildList(list, category); category.setChildren(childList); for (Category child : childList) { @@ -54,6 +55,7 @@ public class CategoryServiceImpl implements CategoryService { /** * 得到子节点列表 + * * @param list * @param category * @return @@ -72,6 +74,7 @@ public class CategoryServiceImpl implements CategoryService { /** * 判断是否有子节点 + * * @param list * @param category * @return diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EDDataServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EDDataServiceImpl.java index f739a2c..c07c831 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EDDataServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EDDataServiceImpl.java @@ -56,27 +56,23 @@ import java.util.stream.Collectors; @Slf4j public class EDDataServiceImpl implements EDDataService { + private static final String UPLOAD_FILE_CHUNK_SUFFIX = ".part"; + // 文件夹名称分隔符 + private static final String FOLDER_NAME_SEPARATOR = "_"; @Resource private EDDataMapper edDataMapper; @Resource private CategoryMapper categoryMapper; - - @Value("${data.windows.path}") private String uploadFilePath; - @Value("${data.file.storage.dir}") private String fileStorageDir; - @Value("${data.import.cache.dir}") private String importCacheDir; - @Value("${file.encode.passwd}") private String encodePasswd; - @Value("${data.type.folder}") private String dataTypeFolder; - @Value("${data.windows.path}") private String windowsDir; @Value("${data.file.cache.dir}") @@ -88,11 +84,6 @@ public class EDDataServiceImpl implements EDDataService { @Value("${data.type.file}") private String dataTypeFile; - private static final String UPLOAD_FILE_CHUNK_SUFFIX = ".part"; - // 文件夹名称分隔符 - private static final String FOLDER_NAME_SEPARATOR = "_"; - - @Override public ElectromagneticResult createFolder(EDDataRequest request) { @@ -123,8 +114,7 @@ public class EDDataServiceImpl implements EDDataService { } - public Boolean createDataInfo(EDDataInfo edDataInfo) throws Exception - { + public Boolean createDataInfo(EDDataInfo edDataInfo) throws Exception { // 获取上级目录的名称 String fileName = edDataInfo.getDataName(); Assert.isTrue(EleCommonUtil.isFileNameValid(fileName), "文件名不符合规范，只能包含中文字符、下划线、连字符、加号、数字和英文字符且长度小于32。"); @@ -133,32 +123,29 @@ public class EDDataServiceImpl implements EDDataService { categoryParent.setCategoryId(edDataInfo.getCategoryId()); List categoryParentList = categoryMapper.selectCategories(categoryParent); - if(categoryParentList.size() < 1) { + if (categoryParentList.size() < 1) { throw new Exception("上级文件夹不存在"); - } - else - { + } else { // 获取新文件夹路径信息 categoryParent = categoryParentList.get(0); String dataStoragePath = getDataStoragePath(); - String folderParent = categoryParent.getCategoryId() + FOLDER_NAME_SEPARATOR + categoryParent.getCategoryName() ; - String folderNew = dataStoragePath + File.separator + folderParent + File.separator + edDataInfo.getDataName(); + String folderParent = categoryParent.getCategoryId() + FOLDER_NAME_SEPARATOR + categoryParent.getCategoryName(); + String folderNew = dataStoragePath + File.separator + folderParent + File.separator + edDataInfo.getDataName(); // 判断文件夹名称是否存在 EDDataParams folderParames = new EDDataParams(); folderParames.setParentId(edDataInfo.getCategoryId()); List childFileInfoList = edDataMapper.getDataInfoList(folderParames); - for(EDDataInfo fileInfo : childFileInfoList) - { - if(fileInfo.getDataName().equals(edDataInfo.getDataName())){ + for (EDDataInfo fileInfo : childFileInfoList) { + if (fileInfo.getDataName().equals(edDataInfo.getDataName())) { throw new Exception("文件夹已存在"); } } // 将文件夹数据写到数据库中 - if(edDataMapper.createDataInfo(edDataInfo)) { - if (!FileUtil.exist(folderNew)){ + if (edDataMapper.createDataInfo(edDataInfo)) { + if (!FileUtil.exist(folderNew)) { FileUtil.mkdir(folderNew); } } @@ -169,6 +156,7 @@ public class EDDataServiceImpl implements EDDataService { /** * 获取数据存储目录 + * * @return */ public String getDataStoragePath() { @@ -178,7 +166,7 @@ public class EDDataServiceImpl implements EDDataService { @Override public ElectromagneticResult getDataInfoList(EDDataRequest request) { - EDDataParams parames= EDDataMappers.INSTANCE.getEDDataParames(request); + EDDataParams parames = EDDataMappers.INSTANCE.getEDDataParames(request); //获取中支指标配置列表 PageHelper.startPage(parames.getPageIndex(), parames.getPageSize()); List edDataInfoList = edDataMapper.getDataInfoList(parames); @@ -207,14 +195,14 @@ public class EDDataServiceImpl implements EDDataService { public Boolean updateFileInfo(EDDataParams parames) throws Exception { String dataStoragePath = getDataStoragePath(); - if (!FileUtil.exist(dataStoragePath)){ + if (!FileUtil.exist(dataStoragePath)) { throw new Exception("数据存储文件夹不存在"); } EDDataParams paramesFind = new EDDataParams(); paramesFind.setDataId(parames.getDataId()); List edDataInfoList = edDataMapper.getDataInfoList(paramesFind); - if(edDataInfoList.size() < 1) { + if (edDataInfoList.size() < 1) { throw new Exception("文件信息不存在"); } @@ -223,19 +211,19 @@ public class EDDataServiceImpl implements EDDataService { String fileType = StrUtil.isEmpty(edDataInfo.getFileType()) ? "" : "." + edDataInfo.getFileType(); String fileStorageFullPath = dataStoragePath + filePathOfFolder + File.separator + edDataInfo.getDataName() + fileType; - if (!FileUtil.exist(fileStorageFullPath)){ + if (!FileUtil.exist(fileStorageFullPath)) { throw new Exception("文件不存在"); } String fileNameNew = parames.getName() + fileType; - if(fileNameNew != null && fileNameNew != "" && !fileNameNew.equals(edDataInfo.getDataName())) { - FileUtil.rename(Paths.get(fileStorageFullPath) ,fileNameNew,true); + if (fileNameNew != null && fileNameNew != "" && !fileNameNew.equals(edDataInfo.getDataName())) { + FileUtil.rename(Paths.get(fileStorageFullPath), fileNameNew, true); } // 修改文件夹 edDataMapper.updateFileInfo(parames); // 修改文件夹中的文件 - if(edDataInfo.getDataType().equals(dataTypeFolder) && parames.getEffectFlag() != null) { + if (edDataInfo.getDataType().equals(dataTypeFolder) && parames.getEffectFlag() != null) { EDDataParams paramesChild = new EDDataParams(); paramesChild.setParentId(edDataInfo.getDataId()); paramesChild.setEffectFlag(parames.getEffectFlag()); @@ -253,17 +241,17 @@ public class EDDataServiceImpl implements EDDataService { folderParames.setDataId(categoryId); List edDataInfoList = edDataMapper.getDataInfoList(folderParames); EDDataInfo edDataInfoParent = null; - if(CollUtil.isNotEmpty(edDataInfoList)) { + if (CollUtil.isNotEmpty(edDataInfoList)) { categoryIdHighest = edDataInfoList.get(0).getCategoryId(); edDataInfoParent = edDataInfoList.get(0); } Category categoryParent = new Category(); categoryParent.setCategoryId(categoryIdHighest); List categoryParentList = categoryMapper.selectCategories(categoryParent); - if(categoryParentList.size() > 0){ + if (categoryParentList.size() > 0) { categoryParent = categoryParentList.get(0); filePathOfFolder = categoryParent.getCategoryId() + FOLDER_NAME_SEPARATOR + categoryParent.getCategoryName(); - if(edDataInfoParent != null) { + if (edDataInfoParent != null) { String fileType = StrUtil.isEmpty(edDataInfoParent.getFileType()) ? "" : "." + edDataInfoParent.getFileType(); filePathOfFolder = filePathOfFolder + File.separator + edDataInfoParent.getDataName() + fileType; } @@ -274,7 +262,7 @@ public class EDDataServiceImpl implements EDDataService { @Override public ElectromagneticResult> getChildFileCount(EDDataRequest request) { - EDDataParams parames= EDDataMappers.INSTANCE.getEDDataParames(request); + EDDataParams parames = EDDataMappers.INSTANCE.getEDDataParames(request); Integer fileCount = getChildFileCount(parames); Map result = new HashMap<>(); result.put("fileCount", fileCount); @@ -287,13 +275,10 @@ public class EDDataServiceImpl implements EDDataService { List edDataInfoList = edDataMapper.getDataInfoList(parames); parames.setDataId(null); for (EDDataInfo edDataInfo : edDataInfoList) { - if(edDataInfo.getDataType().equals(dataTypeFolder)) - { + if (edDataInfo.getDataType().equals(dataTypeFolder)) { parames.setParentId(edDataInfo.getDataId()); childFileCount += getChildFileCount(parames); - } - else if(edDataInfo.getDataType().equals(dataTypeFile) && edDataInfo.getEffectFlag().equals(1)) - { + } else if (edDataInfo.getDataType().equals(dataTypeFile) && edDataInfo.getEffectFlag().equals(1)) { ++childFileCount; } } @@ -304,7 +289,7 @@ public class EDDataServiceImpl implements EDDataService { @Override public ElectromagneticResult uploadFile(EDDataRequest request) { try { - EDDataParams parames= EDDataMappers.INSTANCE.getEDDataParames(request); + EDDataParams parames = EDDataMappers.INSTANCE.getEDDataParames(request); parames.setUserId(UserThreadLocal.getUserId()); parames.setUserName(UserThreadLocal.getUsername()); return ElectromagneticResultUtil.success(upload(parames)); @@ -337,15 +322,14 @@ public class EDDataServiceImpl implements EDDataService { EDDataParams folderParames = new EDDataParams(); folderParames.setParentId(categoryId); List childFileInfoList = edDataMapper.getDataInfoList(folderParames); - for(EDDataInfo fileInfo : childFileInfoList) - { - if(fileInfo.getDataName().equals(fileFullName)){ + for (EDDataInfo fileInfo : childFileInfoList) { + if (fileInfo.getDataName().equals(fileFullName)) { throw new Exception("上传的文件已存在"); } } String dataStoragePath = getDataStoragePath(); - if (!FileUtil.exist(dataStoragePath)){ + if (!FileUtil.exist(dataStoragePath)) { FileUtil.mkdir(dataStoragePath); } @@ -382,14 +366,14 @@ public class EDDataServiceImpl implements EDDataService { // 文件保存目录路径 String fileSavePath = dataStoragePath + File.separator + filePathOfFolder; - String newFileName = edDataInfo.getDataId() + FOLDER_NAME_SEPARATOR + fileFullName; - if (!FileUtil.exist(fileSavePath)){ + String newFileName = edDataInfo.getDataId() + FOLDER_NAME_SEPARATOR + fileFullName; + if (!FileUtil.exist(fileSavePath)) { FileUtil.mkdir(fileSavePath); } String dataCachePath = getDataCachePath(); String uploadFileCachePath = dataCachePath + uploadCacheDir + FOLDER_NAME_SEPARATOR + getTimeStampString(); - if (!FileUtil.exist(uploadFileCachePath)){ + if (!FileUtil.exist(uploadFileCachePath)) { FileUtil.mkdir(uploadFileCachePath); } @@ -408,15 +392,12 @@ public class EDDataServiceImpl implements EDDataService { fileParames.setDataId(edDataInfo.getDataId()); - if(fileInput.getSize() == saveFile.length()) - { + if (fileInput.getSize() == saveFile.length()) { Path source = Paths.get(fileCacheFullPath); Path target = Paths.get(fileSaveFullPath); Files.move(source, target); fileParames.setSaveStatus("success"); - } - else - { + } else { saveFile.delete(); fileParames.setSaveStatus("failure"); } @@ -439,6 +420,7 @@ public class EDDataServiceImpl implements EDDataService { /** * 获取时间戳字符串 + * * @return */ public String getTimeStampString() { @@ -448,6 +430,7 @@ public class EDDataServiceImpl implements EDDataService { /** * 获取数据缓存目录 + * * @return */ public String getDataCachePath() { @@ -476,7 +459,7 @@ public class EDDataServiceImpl implements EDDataService { headers.add("Pragma", "no-cache"); headers.add("Expires", "0"); String fileName = Base64.encode(fileSystemResource.getFilename()); - response.setHeader("content-disposition","attachment;filename=" + fileName); + response.setHeader("content-disposition", "attachment;filename=" + fileName); // 构建响应实体(可以返回 edDataInfoList = edDataMapper.getDataInfoList(folderParames); EDDataInfo edDataInfoParent = null; - if(CollUtil.isNotEmpty(edDataInfoList)) { + if (CollUtil.isNotEmpty(edDataInfoList)) { categoryIdHighest = edDataInfoList.get(0).getCategoryId(); edDataInfoParent = edDataInfoList.get(0); } Category categoryParent = new Category(); categoryParent.setCategoryId(categoryIdHighest); List categoryParentList = categoryMapper.selectCategories(categoryParent); - if(categoryParentList.size() > 0){ + if (categoryParentList.size() > 0) { categoryParent = categoryParentList.get(0); filePathOfFolder = categoryParent.getCategoryId() + FOLDER_NAME_SEPARATOR + categoryParent.getCategoryName(); - if(edDataInfoParent != null) { + if (edDataInfoParent != null) { String fileType = StrUtil.isEmpty(edDataInfoParent.getFileType()) ? "" : "." + edDataInfoParent.getFileType(); filePathOfFolder = filePathOfFolder + File.separator + edDataInfoParent.getDataName() + fileType; } @@ -524,7 +506,7 @@ public class EDDataServiceImpl implements EDDataService { Map result = new HashMap<>(); List dataIdList = Arrays.asList(dataIdArr.split(",")); - if(!dataIdList.isEmpty()) { + if (!dataIdList.isEmpty()) { String filePath = exportData(dataIdList); Assert.isTrue(FileUtil.exist(filePath), "下载文件不存在。"); @@ -536,7 +518,7 @@ public class EDDataServiceImpl implements EDDataService { String fileName = Base64.encode(fileSystemResource.getFilename()); headers.add("Pragma", "no-cache"); headers.add("Expires", "0"); - response.setHeader("content-disposition","attachment;filename=" + fileName); + response.setHeader("content-disposition", "attachment;filename=" + fileName); // 构建响应实体(可以返回 importFileFail = new ArrayList(); String dataStoragePath = getDataStoragePath(); - if (!FileUtil.exist(dataStoragePath)){ + if (!FileUtil.exist(dataStoragePath)) { FileUtil.mkdir(dataStoragePath); } @@ -874,22 +854,19 @@ public class EDDataServiceImpl implements EDDataService { && FileUtil.exist(importFileCachePath) && FileUtil.exist(importFileCacheFullPath) && !FileUtil.exist(fileStorageFullPath) - ) - { - if(fileInfo.getDataType().equals(dataTypeFolder)) { + ) { + if (fileInfo.getDataType().equals(dataTypeFolder)) { if (!FileUtil.exist(fileStorageFullPath)) { FileUtil.mkdir(fileStorageFullPath); } - } else if(fileInfo.getDataType().equals(dataTypeFile)) { + } else if (fileInfo.getDataType().equals(dataTypeFile)) { Path source = Paths.get(importFileCacheFullPath); Path target = Paths.get(fileStorageFullPath); - FileUtil.move(source,target,true); + FileUtil.move(source, target, true); } importFileSuccess.add(fileInfo.getDataId() + FOLDER_NAME_SEPARATOR + fileInfo.getDataName()); - } - else - { + } else { importFileFail.add(fileInfo.getDataId() + FOLDER_NAME_SEPARATOR + fileInfo.getDataName()); } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java index 01478d5..1ab48dd 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java @@ -28,7 +28,6 @@ import org.apache.commons.lang3.RandomStringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; - import java.util.HashMap; import java.util.List; import java.util.Map; @@ -45,6 +44,7 @@ public class UserServiceImpl implements UserService { /** * 用户登录 + * * @param loginRequest * @return */ @@ -55,7 +55,7 @@ public class UserServiceImpl implements UserService { User user = userMapper.selectUserByWorkNumber(info.getWorkNumber()); info.setUserId(user.getUserId()); info.setUsername(user.getUserName()); - if ( checkUserValid(user) && matchPassword(user, decodePwd)) { + if (checkUserValid(user) && matchPassword(user, decodePwd)) { String tokenStr = createToken(info); createUserToken(user, tokenStr); UserLoginResponse userLoginResponse = new UserLoginResponse(); @@ -63,30 +63,30 @@ public class UserServiceImpl implements UserService { userLoginResponse.setUserId(user.getUserId()); return ElectromagneticResultUtil.success(userLoginResponse); } - return ElectromagneticResultUtil.fail("500","用户不存在/密码错误"); + return ElectromagneticResultUtil.fail("500", "用户不存在/密码错误"); } - public Boolean createUserToken (User user, String tokenStr){ + public Boolean createUserToken(User user, String tokenStr) { Token token = new Token(); token.setUserId(user.getUserId()); token.setToken(tokenStr); - token.setExpireAt(new DateTime(SystemClock.now()+ UserConstants.DEFAULT_EXPIRE_TIME)); - return tokenMapper.insert(token)>0; + token.setExpireAt(new DateTime(SystemClock.now() + UserConstants.DEFAULT_EXPIRE_TIME)); + return tokenMapper.insert(token) > 0; } - public Boolean checkUserValid(User user){ - if ( user == null + public Boolean checkUserValid(User user) { + if (user == null || user.getIsPublished() == PublishEnum.UNPUBLISHED.getCode() || user.getEffectFlag() == EffectFlagEnum.EFFECT_FLAG_0.getCode() ) { return false; - } else if( user.getInternshipEndDate()!=null && user.getInternshipEndDate().before(now())) { + } else if (user.getInternshipEndDate() != null && user.getInternshipEndDate().before(now())) { return false; } return true; } - public String createToken(UserLoginInfo loginInfo){ + public String createToken(UserLoginInfo loginInfo) { Map claims = new HashMap<>(); claims.put(UserConstants.LOGIN_USER_ID, loginInfo.getUserId()); claims.put(UserConstants.LOGIN_USER_NAME, loginInfo.getUsername()); @@ -98,14 +98,15 @@ public class UserServiceImpl implements UserService { .compact(); } - public Boolean matchPassword(User user, String password){ + public Boolean matchPassword(User user, String password) { String salt = user.getSalt(); - String encodePwd = SignUtils.MD5(password+salt); + String encodePwd = SignUtils.MD5(password + salt); return user.getUserPwd().equals(encodePwd); } /** * 新增用户信息 + * * @param userRequest * @return */ @@ -115,7 +116,7 @@ public class UserServiceImpl implements UserService { User user = UserMappers.INSTANCE.getUserRequestToModel(userRequest); user.setSalt(RandomStringUtils.randomAlphanumeric(16)); user.setUserId(IdWorker.getSnowFlakeIdString()); - user.setUserPwd(SignUtils.MD5(UserConstants.DEFAULT_PASSWORD+user.getSalt())); + user.setUserPwd(SignUtils.MD5(UserConstants.DEFAULT_PASSWORD + user.getSalt())); user.setIsPublished(UserConstants.DEFAULT_PUBLISH_STATUS); user.setCreator(UserThreadLocal.getUserId()); user.setCreatorName(UserThreadLocal.getUsername()); @@ -124,6 +125,7 @@ public class UserServiceImpl implements UserService { /** * 修改用户信息 + * * @param userModiRequest * @return */ @@ -137,6 +139,7 @@ public class UserServiceImpl implements UserService { /** * 发布用户信息 + * * @param userPublishRequest * @return */ @@ -145,7 +148,7 @@ public class UserServiceImpl implements UserService { PublishParam model = UserMappers.INSTANCE.getUserPublishRequestToModel(userPublishRequest); model.setModifier(UserThreadLocal.getUserId()); model.setModifierName(UserThreadLocal.getUsername()); - return ElectromagneticResultUtil.success(userMapper.publish(model) > 0 ); + return ElectromagneticResultUtil.success(userMapper.publish(model) > 0); } @Override @@ -154,30 +157,30 @@ public class UserServiceImpl implements UserService { User user = UserMappers.INSTANCE.getUserWorkNumRequestToModel(workNumberRequest); //根据请求对象的userId判断当前处于什么状态 - if(user.getUserId()==null){ + if (user.getUserId() == null) { //userId为空，表示是新增用户阶段 //判断数据库中有无该工号对应的用户 User existingUser = userMapper.selectUserByWorkNumber(user.getWorkNumber()); //如果有该用户就返回false,如果没有(==null)就返回true boolean isWorkNumberUnique = (existingUser == null); return ElectromagneticResultUtil.success(isWorkNumberUnique); - }else{ + } else { //userId不为空，表示是编辑用户阶段 //请求对象的userWordNum在数据库中对应的user User existingUser = userMapper.selectUserByWorkNumber(user.getWorkNumber()); //判断，请求对象的userId对应的user和请求对象的userWordNum在数据库中对应的user是否为用一个 - if(existingUser!=null){ + if (existingUser != null) { //请求对象的userWordNum在数据库中对应的user与请求对象的userId对应的user是否为同一个 - if(user.getUserId().equals(existingUser.getUserId())){ + if (user.getUserId().equals(existingUser.getUserId())) { // 如果获取到的用户ID与当前编辑的用户ID相同，说明工号未改变，直接返回true return ElectromagneticResultUtil.success(true); - }else{ + } else { // 如果获取到的用户ID与当前编辑的用户ID不同，说明工号已改变，需要判断新工号是否唯一 // 如果根据新工号获取不到用户，说明新工号唯一 boolean isWorkNumberUnique = (userMapper.selectUserByWorkNumber(user.getWorkNumber()) == null); return ElectromagneticResultUtil.success(isWorkNumberUnique); } - }else{ + } else { //请求对象的userWordNum在数据库中不存在对应的user return ElectromagneticResultUtil.success(true); } @@ -194,12 +197,12 @@ public class UserServiceImpl implements UserService { @Override public ElectromagneticResult searchUser(SearchUserRequest searchUserRequest) { - searchUserRequest.setPageIndex((searchUserRequest.getPageIndex()-1)*searchUserRequest.getPageSize()); + searchUserRequest.setPageIndex((searchUserRequest.getPageIndex() - 1) * searchUserRequest.getPageSize()); SearchKeyWords model = UserMappers.INSTANCE.getSearchKeywordsRequestToModel(searchUserRequest); - List userList = userMapper.search(model); + List userList = userMapper.search(model); int totalCount = userMapper.getTotalCount(model); List singleUserResponseList = UserMappers.INSTANCE.userListToResponseList(userList); - UserSearchResponse userSearchResponse = new UserSearchResponse(); + UserSearchResponse userSearchResponse = new UserSearchResponse(); userSearchResponse.setUserList(singleUserResponseList); userSearchResponse.setTotalCount(totalCount); return ElectromagneticResultUtil.success(userSearchResponse); @@ -215,15 +218,15 @@ public class UserServiceImpl implements UserService { // 检查用户是否已经被逻辑删除 User existingUser = userMapper.getSingleUser(userDeleteKeyWords.getUserId()); - if(existingUser != null && existingUser.getEffectFlag()==0){ + if (existingUser != null && existingUser.getEffectFlag() == 0) { // 如果用户已经被逻辑删除（在这个假设中，0 表示已删除），则不进行任何操作或返回错误 - return ElectromagneticResultUtil.fail(ElectromagneticErrorEnum. FINE_DELETE_USER_ERROR); + return ElectromagneticResultUtil.fail(ElectromagneticErrorEnum.FINE_DELETE_USER_ERROR); } - if(existingUser!=null && existingUser.getEffectFlag()==1){// 在这个假设中，1 表示未删除 + if (existingUser != null && existingUser.getEffectFlag() == 1) {// 在这个假设中，1 表示未删除 return ElectromagneticResultUtil.success(userMapper.deleteUser(userDeleteKeyWords)); - }else{ + } else { // 如果用户不存在（理论上不应该发生，除非数据库状态不一致），则返回错误 - return ElectromagneticResultUtil.fail(ElectromagneticErrorEnum. FINE_DELETE_USER_ERROR); + return ElectromagneticResultUtil.fail(ElectromagneticErrorEnum.FINE_DELETE_USER_ERROR); } } diff --git a/electrmangnetic/src/main/resources/application.properties b/electrmangnetic/src/main/resources/application.properties index 69c3cc7..d2a6a4f 100644 --- a/electrmangnetic/src/main/resources/application.properties +++ b/electrmangnetic/src/main/resources/application.properties @@ -9,15 +9,12 @@ loggerPath=electromagnetic-data logging.level.com.aliyun.fsi.insurance=${LOG_LEVEL:INFO} #日志配置 logging.config=classpath:${LOG_CONFIG:log4j2-spring.xml} - - spring.datasource.typd=com.alibaba.druid.pool.DruidDataSource spring.datasource.url=jdbc:mysql://139.224.43.89:3306/em_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true spring.datasource.username=comac spring.datasource.password=2024*Comac spring.servlet.multipart.max-file-size=500MB spring.servlet.multipart.max-request-size=10MB - spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.type=com.alibaba.druid.pool.DruidDataSource mybatis-plus.mapper-locations=classpath:sqlmapper/*.xml @@ -25,7 +22,6 @@ mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl pagehelper.helperDialect=mysql pagehelper.reasonable=false server.port=8888 - #windows文件存储目录 data.windows.path=E:/comacFileStorage/ #文件缓存路径 diff --git a/electrmangnetic/src/main/resources/log4j2-spring-prod.xml b/electrmangnetic/src/main/resources/log4j2-spring-prod.xml index 199e1fc..ca47405 100644 --- a/electrmangnetic/src/main/resources/log4j2-spring-prod.xml +++ b/electrmangnetic/src/main/resources/log4j2-spring-prod.xml @@ -4,7 +4,8 @@ - + diff --git a/electrmangnetic/src/main/resources/log4j2-spring.xml b/electrmangnetic/src/main/resources/log4j2-spring.xml index 4a41574..698bf69 100644 --- a/electrmangnetic/src/main/resources/log4j2-spring.xml +++ b/electrmangnetic/src/main/resources/log4j2-spring.xml @@ -4,7 +4,8 @@ - + diff --git a/electrmangnetic/src/main/resources/sqlmapper/CategoryMapper.xml b/electrmangnetic/src/main/resources/sqlmapper/CategoryMapper.xml index d5f91a2..3d6e53a 100644 --- a/electrmangnetic/src/main/resources/sqlmapper/CategoryMapper.xml +++ b/electrmangnetic/src/main/resources/sqlmapper/CategoryMapper.xml @@ -2,46 +2,56 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - select category_type_id, parent_id, category_id, category_name, category_status, - creator, creator_name, gmt_create, modifier, modifier_name, gmt_modified, effect_flag + select category_type_id, + parent_id, + category_id, + category_name, + category_status, + creator, + creator_name, + gmt_create, + modifier, + modifier_name, + gmt_modified, + effect_flag from ed_category diff --git a/electrmangnetic/src/main/resources/sqlmapper/EdDataInfoMapper.xml b/electrmangnetic/src/main/resources/sqlmapper/EdDataInfoMapper.xml index da9db2e..b3ec40d 100644 --- a/electrmangnetic/src/main/resources/sqlmapper/EdDataInfoMapper.xml +++ b/electrmangnetic/src/main/resources/sqlmapper/EdDataInfoMapper.xml @@ -3,130 +3,132 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - id,category_id,data_id,data_no,data_name,data_type,file_type,version,content, + + + + + + + + + + + + + + + + + + + + + + + + + + id + ,category_id,data_id,data_no,data_name,data_type,file_type,version,content, implant_json,data_status,note,editor,gmt_batch_upload,save_status,creator,creator_name,gmt_create,modifier,modifier_name, gmt_modified,effect_flag - + - - - SELECT LAST_INSERT_ID() - - replace into ed_data_info (category_id, - data_id, data_no, data_name, - data_type, file_type, version, - content, implant_json, data_status, - note, editor, gmt_batch_upload, save_status, - creator, creator_name, gmt_create, - modifier, modifier_name, gmt_modified, - effect_flag - ) - values (#{categoryId,jdbcType=VARCHAR}, - #{dataId,jdbcType=VARCHAR}, #{dataNo,jdbcType=VARCHAR}, #{dataName,jdbcType=VARCHAR}, - #{dataType,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR},#{version,jdbcType=VARCHAR}, - #{content,jdbcType=VARCHAR}, #{implantJson,jdbcType=VARCHAR}, #{dataStatus,jdbcType=VARCHAR}, - #{note,jdbcType=VARCHAR}, #{editor,jdbcType=VARCHAR}, #{gmtBatchUpload,jdbcType=TIMESTAMP}, #{saveStatus,jdbcType=VARCHAR}, - #{creator,jdbcType=VARCHAR}, #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR}, - #{modifierName,jdbcType=VARCHAR},now(),1 - ) - + + + SELECT LAST_INSERT_ID() + + replace into ed_data_info (category_id, + data_id, data_no, data_name, + data_type, file_type, version, + content, implant_json, data_status, + note, editor, gmt_batch_upload, save_status, + creator, creator_name, gmt_create, + modifier, modifier_name, gmt_modified, + effect_flag + ) + values (#{categoryId,jdbcType=VARCHAR}, + #{dataId,jdbcType=VARCHAR}, #{dataNo,jdbcType=VARCHAR}, #{dataName,jdbcType=VARCHAR}, + #{dataType,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR},#{version,jdbcType=VARCHAR}, + #{content,jdbcType=VARCHAR}, #{implantJson,jdbcType=VARCHAR}, #{dataStatus,jdbcType=VARCHAR}, + #{note,jdbcType=VARCHAR}, #{editor,jdbcType=VARCHAR}, #{gmtBatchUpload,jdbcType=TIMESTAMP}, + #{saveStatus,jdbcType=VARCHAR}, + #{creator,jdbcType=VARCHAR}, #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR}, + #{modifierName,jdbcType=VARCHAR},now(),1 + ) + - + - - update ed_data_info - - - data_name = #{name,jdbcType=VARCHAR}, - - - data_status = #{dataStatus,jdbcType=VARCHAR}, - - - note = #{note,jdbcType=VARCHAR}, - - - save_status = #{saveStatus,jdbcType=VARCHAR}, - - - effect_flag = #{effectFlag,jdbcType=VARCHAR}, - - - modifier = #{userId,jdbcType=VARCHAR}, - - - modifier_name = #{userName,jdbcType=VARCHAR}, - - gmt_modified = now() - - - - - data_id = #{dataId,jdbcType=VARCHAR} - - - - category_id = #{parentId,jdbcType=VARCHAR} - - + + update ed_data_info + + + data_name = #{name,jdbcType=VARCHAR}, + + + data_status = #{dataStatus,jdbcType=VARCHAR}, + + + note = #{note,jdbcType=VARCHAR}, + + + save_status = #{saveStatus,jdbcType=VARCHAR}, + + + effect_flag = #{effectFlag,jdbcType=VARCHAR}, + + + modifier = #{userId,jdbcType=VARCHAR}, + + + modifier_name = #{userName,jdbcType=VARCHAR}, + + gmt_modified = now() + + + + + data_id = #{dataId,jdbcType=VARCHAR} + + + + category_id = #{parentId,jdbcType=VARCHAR} + + - + diff --git a/electrmangnetic/src/main/resources/sqlmapper/TokenMapper.xml b/electrmangnetic/src/main/resources/sqlmapper/TokenMapper.xml index a986bdd..1de66a1 100644 --- a/electrmangnetic/src/main/resources/sqlmapper/TokenMapper.xml +++ b/electrmangnetic/src/main/resources/sqlmapper/TokenMapper.xml @@ -2,16 +2,17 @@ - - - - - - + + + + + + - select id, user_id, token, is_long_term, created_at, expire_at from tokens + select id, user_id, token, is_long_term, created_at, expire_at + from tokens @@ -32,12 +33,14 @@ - delete from tokens where token=#{token} + delete + from tokens + where token = #{token} \ No newline at end of file diff --git a/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml b/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml index af1e27d..13e9b62 100644 --- a/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml +++ b/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml @@ -1,38 +1,54 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - select user_id, user_name, work_number, mobile, user_dept, user_title, user_pwd, - join_time, is_published, salt, user_status, internship_end_date, - creator, creator_name, gmt_create, modifier, modifier_name, gmt_modified, effect_flag - from ed_users - + + select user_id, + user_name, + work_number, + mobile, + user_dept, + user_title, + user_pwd, + join_time, + is_published, + salt, + user_status, + internship_end_date, + creator, + creator_name, + gmt_create, + modifier, + modifier_name, + gmt_modified, + effect_flag + from ed_users + - - insert into ed_users( + + insert into ed_users( user_id, user_name, work_number, @@ -49,7 +65,7 @@ creator_name, gmt_create, effect_flag) - values ( + values ( #{userId}, #{userName}, #{workNumber}, @@ -66,26 +82,26 @@ #{creatorName}, now(), 1 - ) - - - update ed_users - - user_id = #{userId}, - user_name = #{userName}, - work_number = #{workNumber}, - mobile = #{mobile}, - user_dept = #{userDept}, - user_title = #{userTitle}, - join_time = #{joinTime}, - user_status = #{userStatus}, - internship_end_date = #{internshipEndDate}, - modifier = #{modifier}, - modifier_name = #{modifierName}, - gmt_modified=now() - - where user_id= #{userId} - + ) + + + update ed_users + + user_id = #{userId}, + user_name = #{userName}, + work_number = #{workNumber}, + mobile = #{mobile}, + user_dept = #{userDept}, + user_title = #{userTitle}, + join_time = #{joinTime}, + user_status = #{userStatus}, + internship_end_date = #{internshipEndDate}, + modifier = #{modifier}, + modifier_name = #{modifierName}, + gmt_modified=now() + + where user_id= #{userId} + @@ -102,7 +118,8 @@ - SELECT * FROM ed_users @@ -146,7 +163,8 @@ LIMIT #{pageSize} OFFSET #{pageIndex} - SELECT COUNT(*) FROM ed_users @@ -190,12 +208,12 @@ + diff --git a/electromagnetic-common/pom.xml b/electromagnetic-common/pom.xml index 89395fd..58d52ab 100644 --- a/electromagnetic-common/pom.xml +++ b/electromagnetic-common/pom.xml @@ -1,6 +1,6 @@ - 4.0.0 diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/cons/UserConstants.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/cons/UserConstants.java index 4693c1c..cc68708 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/cons/UserConstants.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/cons/UserConstants.java @@ -15,7 +15,7 @@ public interface UserConstants { /** * 默认令牌过期时间（7天） */ - long DEFAULT_EXPIRE_TIME = 7*24*60*60*1000; + long DEFAULT_EXPIRE_TIME = 7 * 24 * 60 * 60 * 1000; /** * 令牌密钥 diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/EffectFlagEnum.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/EffectFlagEnum.java index 8203d55..33a1285 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/EffectFlagEnum.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/EffectFlagEnum.java @@ -15,11 +15,11 @@ public enum EffectFlagEnum { /** * 有效 */ - EFFECT_FLAG_1(1,"有效"), + EFFECT_FLAG_1(1, "有效"), /** * 无效 */ - EFFECT_FLAG_0(0,"无效"), + EFFECT_FLAG_0(0, "无效"), ; private Integer code; private String desc; diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/ErrorLevels.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/ErrorLevels.java index d323de2..2588fc5 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/ErrorLevels.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/ErrorLevels.java @@ -6,15 +6,23 @@ package com.electromagnetic.industry.software.common.enums; */ public interface ErrorLevels { - /** INFO级别 */ - public static final String INFO = "1"; + /** + * INFO级别 + */ + public static final String INFO = "1"; - /** WARN级别 */ - public static final String WARN = "3"; + /** + * WARN级别 + */ + public static final String WARN = "3"; - /** ERROR级别 */ + /** + * ERROR级别 + */ public static final String ERROR = "5"; - /** FATAL级别 */ + /** + * FATAL级别 + */ public static final String FATAL = "7"; } \ No newline at end of file diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/ErrorTypes.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/ErrorTypes.java index fc053e7..cab393c 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/ErrorTypes.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/ErrorTypes.java @@ -2,17 +2,25 @@ package com.electromagnetic.industry.software.common.enums; public interface ErrorTypes { - /** 系统错误 */ - public static final String SYSTEM = "0"; + /** + * 系统错误 + */ + public static final String SYSTEM = "0"; - /** 业务错误 */ + /** + * 业务错误 + */ @Deprecated - public static final String BIZ = "1"; + public static final String BIZ = "1"; - /** 第三方错误 */ + /** + * 第三方错误 + */ @Deprecated - public static final String THIRD_PARTY = "2"; + public static final String THIRD_PARTY = "2"; - /** 业务错误，客户感知 */ + /** + * 业务错误，客户感知 + */ public static final String BIZ_CUSTOMER = "9"; } \ No newline at end of file diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/PublishEnum.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/PublishEnum.java index 2387b32..d56a4cd 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/PublishEnum.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/PublishEnum.java @@ -9,11 +9,11 @@ public enum PublishEnum { /** * 已发布 */ - PUBLISHED(1,"已发布"), + PUBLISHED(1, "已发布"), /** * 未发布 */ - UNPUBLISHED(0,"未发布"), + UNPUBLISHED(0, "未发布"), ; private Integer code; private String desc; diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/resp/ResultCode.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/resp/ResultCode.java index ee0e351..42378a3 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/resp/ResultCode.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/resp/ResultCode.java @@ -4,35 +4,53 @@ import java.io.Serializable; public class ResultCode implements Serializable { - /** 序列ID */ - private static final long serialVersionUID = 3951948353107763580L; + /** + * 结果码固定前缀 + */ + protected static final String PREFIX = "CE"; + /** + * 序列ID + */ + private static final long serialVersionUID = 3951948353107763580L; + /** + * 结果码版本 + */ + private String version; - /** 结果码固定前缀 */ - protected static final String PREFIX = "CE"; + /** + * 结果码级别[第9位]，INFO-1,WARN-3,ERROR-5,FATAL-7，参见ResultCodeLevel定义 + */ + private String codeLevel; - /** 结果码版本 */ - private String version; + /** + * 结果码类型[第10位]，SUCCESS-0,BIZ_ERROR-1,SYS_ERROR-2,THIRD_ERROR-3，参见ResultCodeType定义 + */ + private String codeType; - /** 结果码级别[第9位]，INFO-1,WARN-3,ERROR-5,FATAL-7，参见ResultCodeLevel定义 */ - private String codeLevel; + /** + * 系统编号[第11-13位]，见SystemCode定义 + */ + private String systemCode; - /** 结果码类型[第10位]，SUCCESS-0,BIZ_ERROR-1,SYS_ERROR-2,THIRD_ERROR-3，参见ResultCodeType定义 */ - private String codeType; + /** + * 系统名称 + */ + private String systemName; - /** 系统编号[第11-13位]，见SystemCode定义 */ - private String systemCode; + /** + * 具体结果码[第14-17位] + */ + private String errorSpecific; - /** 系统名称 */ - private String systemName; + /** + * 错误英文简称 + */ + private String errorName; - /** 具体结果码[第14-17位] */ - private String errorSpecific; - - /** 错误英文简称 */ - private String errorName; - - /** 结果码信息描述，可空 */ - private String description; + /** + * 结果码信息描述，可空 + */ + private String description; // ~~~ 构造方法 @@ -46,7 +64,7 @@ public class ResultCode implements Serializable { /** * 构造方法。 * - * @param resultCode 结果码字符串 + * @param resultCode 结果码字符串 */ public ResultCode(String resultCode) { @@ -60,8 +78,8 @@ public class ResultCode implements Serializable { /** * 构造方法。 * - * @param resultCode 结果码字符串 - * @param errorName 错误码英文简称 + * @param resultCode 结果码字符串 + * @param errorName 错误码英文简称 */ public ResultCode(String resultCode, String errorName) { this(resultCode); @@ -71,9 +89,9 @@ public class ResultCode implements Serializable { /** * 构造方法。 * - * @param resultCode 结果码字符串 - * @param errorName 错误码英文简称 - * @param description 结果码信息描述 + * @param resultCode 结果码字符串 + * @param errorName 错误码英文简称 + * @param description 结果码信息描述 */ public ResultCode(String resultCode, String errorName, String description) { this(resultCode); @@ -119,7 +137,7 @@ public class ResultCode implements Serializable { /** * 组装返回码字符串。 * - * @return 返回码字符串 + * @return 返回码字符串 */ public String fetchResultCode() { StringBuffer sb = new StringBuffer(); @@ -138,7 +156,7 @@ public class ResultCode implements Serializable { * 组装返回码字符串。 解决enum 单利线程安全问题 * * @param eventCode - * @return 返回码字符串 + * @return 返回码字符串 */ public String fetchResultCode(String eventCode) { StringBuffer sb = new StringBuffer(); @@ -234,7 +252,7 @@ public class ResultCode implements Serializable { /** * 解析和拆分结果码。 * - * @param resultCode 结果码字符串 + * @param resultCode 结果码字符串 */ private void spliteResultCode(String resultCode) { if (!resultCode.startsWith(PREFIX)) { @@ -256,8 +274,8 @@ public class ResultCode implements Serializable { /** * 字符串长度检查。 * - * @param resultCode 结果码字符串 - * @param length 长度 + * @param resultCode 结果码字符串 + * @param length 长度 */ private void checkStringLength(String resultCode, int length) { if (resultCode == null || resultCode.length() != length) { diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/AESUtils.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/AESUtils.java index 5b85bb3..0327284 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/AESUtils.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/AESUtils.java @@ -4,7 +4,6 @@ package com.electromagnetic.industry.software.common.util; import cn.hutool.core.codec.Base64; import org.bouncycastle.jce.provider.BouncyCastleProvider; - import javax.crypto.*; import javax.crypto.spec.SecretKeySpec; import java.io.UnsupportedEncodingException; @@ -15,6 +14,7 @@ import java.security.Security; /** *

Description: [AES对称加密和解密]

+ * * @description: * @author: * @create: 2022/07/06 10:52 @@ -24,8 +24,9 @@ public class AESUtils { /** *

Discription:[加密]

* Created on 2022/07/06 10:52 + * * @param content 明文 用JSON.toJSONString(Map map)转换的json字符串 - * @param key 加解密规则 访客系统提供key + * @param key 加解密规则 访客系统提供key * @return String 密文 */ public static String ecodes(String content, String key) { @@ -34,7 +35,7 @@ public class AESUtils { } try { KeyGenerator kgen = KeyGenerator.getInstance("AES"); - SecureRandom random= SecureRandom.getInstance("SHA1PRNG"); + SecureRandom random = SecureRandom.getInstance("SHA1PRNG"); random.setSeed(key.getBytes()); kgen.init(128, random); SecretKey secretKey = kgen.generateKey(); @@ -72,12 +73,13 @@ public class AESUtils { /** * 前端使用ECB，后端解密方法 + * * @param enc * @param key * @return */ public static String decrypt(String enc, String key) { - try{ + try { SecretKeySpec secretKeySpec = new SecretKeySpec(key.getBytes(), "AES"); Security.addProvider(new BouncyCastleProvider()); Cipher cipher = Cipher.getInstance("AES/ECB/PKCS7Padding"); diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/ElectromagneticResultUtil.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/ElectromagneticResultUtil.java index 8004c77..3abc9c7 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/ElectromagneticResultUtil.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/ElectromagneticResultUtil.java @@ -5,7 +5,7 @@ import com.electromagnetic.industry.software.common.resp.ElectromagneticResult; public class ElectromagneticResultUtil { - public static ElectromagneticResult success(T data){ + public static ElectromagneticResult success(T data) { ElectromagneticResult electromagneticResult = new ElectromagneticResult<>(); electromagneticResult.setSuccess(true); electromagneticResult.setData(data); @@ -13,7 +13,7 @@ public class ElectromagneticResultUtil { } - public static ElectromagneticResult fail(String code , String msg){ + public static ElectromagneticResult fail(String code, String msg) { ElectromagneticResult electromagneticResult = new ElectromagneticResult<>(); electromagneticResult.setSuccess(false); electromagneticResult.setErrorCode(code); @@ -21,7 +21,7 @@ public class ElectromagneticResultUtil { return electromagneticResult; } - public static ElectromagneticResult fail(ErrorEnum errorEnum){ + public static ElectromagneticResult fail(ErrorEnum errorEnum) { ElectromagneticResult electromagneticResult = new ElectromagneticResult<>(); electromagneticResult.setSuccess(false); electromagneticResult.setErrorCode(errorEnum.getCode()); diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/IdWorker.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/IdWorker.java index a0c0c63..ceb9047 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/IdWorker.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/IdWorker.java @@ -6,8 +6,6 @@ import java.net.NetworkInterface; public class IdWorker { - private static IdWorker idWorker=new IdWorker(); - // 时间起始标记点，作为基准，一般取系统的最近时间（一旦确定不能变动） private final static long twepoch = 1288834974657L; // 机器标识位数 @@ -26,26 +24,24 @@ public class IdWorker { private final static long datacenterIdShift = sequenceBits + workerIdBits; // 时间毫秒左移22位 private final static long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits; - private final static long sequenceMask = -1L ^ (-1L << sequenceBits); + private static IdWorker idWorker = new IdWorker(); /* 上次生产id时间戳 */ private static long lastTimestamp = -1L; - // 0，并发控制 - private long sequence = 0L; - private final long workerId; // 数据标识id部分 private final long datacenterId; + // 0，并发控制 + private long sequence = 0L; - public IdWorker(){ + public IdWorker() { this.datacenterId = getDatacenterId(maxDatacenterId); this.workerId = getMaxWorkerId(datacenterId, maxWorkerId); } + /** - * @param workerId - * 工作机器ID - * @param datacenterId - * 序列号 + * @param workerId 工作机器ID + * @param datacenterId 序列号 */ public IdWorker(long workerId, long datacenterId) { if (workerId > maxWorkerId || workerId < 0) { @@ -57,47 +53,6 @@ public class IdWorker { this.workerId = workerId; this.datacenterId = datacenterId; } - /** - * 获取下一个ID - * - * @return - */ - public synchronized long nextId() { - long timestamp = timeGen(); - if (timestamp < lastTimestamp) { - throw new RuntimeException(String.format("Clock moved backwards. Refusing to generate id for %d milliseconds", lastTimestamp - timestamp)); - } - - if (lastTimestamp == timestamp) { - // 当前毫秒内，则+1 - sequence = (sequence + 1) & sequenceMask; - if (sequence == 0) { - // 当前毫秒内计数满了，则等待下一秒 - timestamp = tilNextMillis(lastTimestamp); - } - } else { - sequence = 0L; - } - lastTimestamp = timestamp; - // ID偏移组合生成最终的ID，并返回ID - long nextId = ((timestamp - twepoch) << timestampLeftShift) - | (datacenterId << datacenterIdShift) - | (workerId << workerIdShift) | sequence; - - return nextId; - } - - private long tilNextMillis(final long lastTimestamp) { - long timestamp = this.timeGen(); - while (timestamp <= lastTimestamp) { - timestamp = this.timeGen(); - } - return timestamp; - } - - private long timeGen() { - return System.currentTimeMillis(); - } /** *

@@ -143,12 +98,55 @@ public class IdWorker { } return id; } - public static long getSnowFlakeId(){ + + public static long getSnowFlakeId() { return idWorker.nextId(); } - public static String getSnowFlakeIdString(){ + public static String getSnowFlakeIdString() { return String.valueOf(getSnowFlakeId()); } + /** + * 获取下一个ID + * + * @return + */ + public synchronized long nextId() { + long timestamp = timeGen(); + if (timestamp < lastTimestamp) { + throw new RuntimeException(String.format("Clock moved backwards. Refusing to generate id for %d milliseconds", lastTimestamp - timestamp)); + } + + if (lastTimestamp == timestamp) { + // 当前毫秒内，则+1 + sequence = (sequence + 1) & sequenceMask; + if (sequence == 0) { + // 当前毫秒内计数满了，则等待下一秒 + timestamp = tilNextMillis(lastTimestamp); + } + } else { + sequence = 0L; + } + lastTimestamp = timestamp; + // ID偏移组合生成最终的ID，并返回ID + long nextId = ((timestamp - twepoch) << timestampLeftShift) + | (datacenterId << datacenterIdShift) + | (workerId << workerIdShift) | sequence; + + return nextId; + } + + private long tilNextMillis(final long lastTimestamp) { + long timestamp = this.timeGen(); + while (timestamp <= lastTimestamp) { + timestamp = this.timeGen(); + } + return timestamp; + } + + private long timeGen() { + return System.currentTimeMillis(); + } + } diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/SignUtils.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/SignUtils.java index 1e9d137..d5c76d9 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/SignUtils.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/SignUtils.java @@ -55,39 +55,29 @@ public class SignUtils { } public static Boolean equals(String v1, String v2) { - if (v1 == null && v2 == null) - { + if (v1 == null && v2 == null) { return true; } - if (v1 != null && v2 != null && v1.equals(v2)) - { + if (v1 != null && v2 != null && v1.equals(v2)) { return true; - } - else - { + } else { return false; } } - public static String getString(Map params, String key, String defaultValue){ + public static String getString(Map params, String key, String defaultValue) { String temp = null; - if(params.get(key)==null){ + if (params.get(key) == null) { return defaultValue; - } - - else if(params.get(key).getClass().isArray()) - { - temp = getArray(params,key)[0]; - } - else - { + } else if (params.get(key).getClass().isArray()) { + temp = getArray(params, key)[0]; + } else { temp = params.get(key).toString(); } - if(temp != null){ + if (temp != null) { temp = temp.replaceAll("%", "\\%"); } - if(temp==null) - { + if (temp == null) { return defaultValue; } return temp;