reformate code

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java

@@ -2,7 +2,6 @@ package com.electromagnetic.industry.software.manage.config;
 
 import cn.hutool.core.date.SystemClock;
 import com.electromagnetic.industry.software.common.cons.UserConstants;
-import com.electromagnetic.industry.software.common.enums.AdminTypeEnum;
 import com.electromagnetic.industry.software.common.pojo.UserLoginInfo;
 import com.electromagnetic.industry.software.common.util.TokenUtil;
 import com.electromagnetic.industry.software.common.util.UserThreadLocal;

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java

@@ -4,7 +4,6 @@ import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
 import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
 import com.electromagnetic.industry.software.manage.pojo.models.EdFileRelation;
 import com.electromagnetic.industry.software.manage.pojo.req.CheckNameUniqueRequest;
-import com.electromagnetic.industry.software.manage.service.EdFileInfoService;
 import com.electromagnetic.industry.software.manage.service.EdFileRelationService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -20,6 +19,7 @@ public class EdFileRelationController {
 
     /**
      * 创建文件关系
+     *
      * @param relation
      * @return
      */
@@ -30,6 +30,7 @@ public class EdFileRelationController {
 
     /**
      * 取消文件关系
+     *
      * @param relationId 关系主键id
      * @return
      */

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RoleController.java

@@ -7,7 +7,6 @@ import com.electromagnetic.industry.software.manage.pojo.req.RoleDTO;
 import com.electromagnetic.industry.software.manage.pojo.req.RolePageDTO;
 import com.electromagnetic.industry.software.manage.service.RoleService;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileRelation.java

@@ -2,7 +2,6 @@ package com.electromagnetic.industry.software.manage.pojo.models;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/SingleUserResponse.java

@@ -1,7 +1,6 @@
 package com.electromagnetic.industry.software.manage.pojo.other;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Builder;
 import lombok.Data;
 
 import java.util.Date;

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/UploadRecordVO.java

@@ -14,6 +14,6 @@ import java.util.List;
 public class UploadRecordVO {
 
     private long total;
-    List<UploadRecordDTO> records = new ArrayList<>();
+    private List<UploadRecordDTO> records = new ArrayList<>();
 
 }

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java

@@ -7,7 +7,6 @@ import com.electromagnetic.industry.software.manage.pojo.req.FileInfoQueryDTO;
 import com.electromagnetic.industry.software.manage.pojo.req.UpdateFileInfoDTO;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.http.ResponseEntity;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -141,12 +140,14 @@ public interface EdFileInfoService {
 
     /**
      * 发布管理
+     *
      * @return
      */
     ElectromagneticResult<?> uploadRecord(int pageNum, int pageSize);
 
     /**
      * 查询文件详情
+     *
      * @param id
      * @return
      */

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileRelationService.java

@@ -9,6 +9,7 @@ public interface EdFileRelationService {
 
     /**
      * 创建文件关系
+     *
      * @param edFileRelation
      * @return
      */
@@ -16,6 +17,7 @@ public interface EdFileRelationService {
 
     /**
      * 取消文件关系
+     *
      * @param id
      * @return
      */
@@ -23,6 +25,7 @@ public interface EdFileRelationService {
 
     /**
      * 获取关系展示数据
+     *
      * @param id
      * @return
      */
@@ -30,6 +33,7 @@ public interface EdFileRelationService {
 
     /**
      * 检查文件名是否唯一
+     *
      * @param parentId
      * @param fileName
      * @return

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdPrjService.java

@@ -92,6 +92,7 @@ public interface EdPrjService {
 
     /**
      * 获取项目的发布状态
+     *
      * @param queryPublishStatus
      * @return
      */

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java

@@ -8,6 +8,7 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.text.StrFormatter;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
 import cn.hutool.crypto.SecureUtil;
@@ -61,9 +62,9 @@ import static com.electromagnetic.industry.software.common.cons.ElectromagneticC
 @Service
 public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo> implements EdFileInfoService {
 
+    private final EleLog log = new EleLog(EdFileInfoServiceImpl.class);
     @Resource
     private CommonService commonService;
-    private final EleLog log = new EleLog(EdFileInfoServiceImpl.class);
     @Resource
     private FileSystemService fileSystemService;
     @Resource
@@ -91,46 +92,45 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
     /**
      * 查询文件列表
      *
-     * @param fileInfoQueryDTO
+     * @param pars
      * @return
      */
     @Override
-    public ElectromagneticResult<?> queryEdFileInfo(FileInfoQueryDTO fileInfoQueryDTO) {
+    public ElectromagneticResult<?> queryEdFileInfo(FileInfoQueryDTO pars) {
 
         LambdaQueryWrapper<EdFileInfo> queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class)
                 .select()
                 .eq(EdFileInfo::getSaveStatus, EleDataSaveStatusEnum.SUCCESS.code)
                 .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
-                .eq(EdFileInfo::getParentId, fileInfoQueryDTO.getParentId())
+                .eq(EdFileInfo::getParentId, pars.getParentId())
-                .eq(Objects.equals(fileInfoQueryDTO.getDataStatus(), EleDataStatusEnum.NOT_PUBLISHED.code), EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code)
+                .eq(ObjUtil.equals(pars.getDataStatus(), EleDataStatusEnum.NOT_PUBLISHED.code), EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code)
-                .eq(Objects.equals(fileInfoQueryDTO.getDataStatus(), EleDataStatusEnum.PUBLISHED.code), EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code)
+                .eq(ObjUtil.equals(pars.getDataStatus(), EleDataStatusEnum.PUBLISHED.code), EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code)
-                .eq(Objects.equals(fileInfoQueryDTO.getDataStatus(), EleDataStatusEnum.OCCUPY.code), EdFileInfo::getDataStatus, EleDataStatusEnum.OCCUPY.code)
+                .eq(ObjUtil.equals(pars.getDataStatus(), EleDataStatusEnum.OCCUPY.code), EdFileInfo::getDataStatus, EleDataStatusEnum.OCCUPY.code)
-                .eq(StrUtil.isNotEmpty(fileInfoQueryDTO.getFileType()), EdFileInfo::getFileType, fileInfoQueryDTO.getFileType())
+                .eq(StrUtil.isNotEmpty(pars.getFileType()), EdFileInfo::getFileType, pars.getFileType())
 
-                .like(StrUtil.isNotEmpty(fileInfoQueryDTO.getKeyword()), EdFileInfo::getFileName, fileInfoQueryDTO.getKeyword())
+                .like(StrUtil.isNotEmpty(pars.getKeyword()), EdFileInfo::getFileName, pars.getKeyword())
-                .like(StrUtil.isNotEmpty(fileInfoQueryDTO.getKeyword()), EdFileInfo::getFileNote, fileInfoQueryDTO.getKeyword())
+                .like(StrUtil.isNotEmpty(pars.getKeyword()), EdFileInfo::getFileNote, pars.getKeyword())
 
-                .orderByAsc(Objects.equals(fileInfoQueryDTO.getCreatedTime(), 0), EdFileInfo::getCreatedTime)
+                .orderByAsc(ObjUtil.equals(pars.getCreatedTime(), 0), EdFileInfo::getCreatedTime)
-                .orderByDesc(Objects.equals(fileInfoQueryDTO.getCreatedTime(), 1), EdFileInfo::getCreatedTime)
+                .orderByDesc(ObjUtil.equals(pars.getCreatedTime(), 1), EdFileInfo::getCreatedTime)
+                .orderByDesc(ObjUtil.isAllEmpty(pars.getCreatedTime(), pars.getFileVersion(), pars.getFileSize(), pars.getFileNameSort(), pars.getUpdatedTime(), pars.getFileTypeSort()), EdFileInfo::getCreatedTime)
 
-                .orderByAsc(Objects.equals(fileInfoQueryDTO.getFileVersion(), 0), EdFileInfo::getFileVersion)
+                .orderByAsc(ObjUtil.equals(pars.getFileVersion(), 0), EdFileInfo::getFileVersion)
-                .orderByDesc(Objects.equals(fileInfoQueryDTO.getFileVersion(), 1), EdFileInfo::getFileVersion)
+                .orderByDesc(ObjUtil.equals(pars.getFileVersion(), 1), EdFileInfo::getFileVersion)
 
-                .orderByAsc(Objects.equals(fileInfoQueryDTO.getFileSize(), 0), EdFileInfo::getFileSize)
+                .orderByAsc(ObjUtil.equals(pars.getFileSize(), 0), EdFileInfo::getFileSize)
-                .orderByDesc(Objects.equals(fileInfoQueryDTO.getFileSize(), 1), EdFileInfo::getFileSize)
+                .orderByDesc(ObjUtil.equals(pars.getFileSize(), 1), EdFileInfo::getFileSize)
 
-                .orderByAsc(Objects.equals(fileInfoQueryDTO.getFileNameSort(), 0), EdFileInfo::getFileName)
+                .orderByAsc(ObjUtil.equals(pars.getFileNameSort(), 0), EdFileInfo::getFileName)
-                .orderByDesc(Objects.equals(fileInfoQueryDTO.getFileNameSort(), 1), EdFileInfo::getFileName)
+                .orderByDesc(ObjUtil.equals(pars.getFileNameSort(), 1), EdFileInfo::getFileName)
 
-                .orderByAsc(Objects.equals(fileInfoQueryDTO.getUpdatedTime(), 0), EdFileInfo::getUpdatedTime)
+                .orderByAsc(ObjUtil.equals(pars.getUpdatedTime(), 0), EdFileInfo::getUpdatedTime)
-                .orderByDesc(Objects.equals(fileInfoQueryDTO.getUpdatedTime(), 1), EdFileInfo::getUpdatedTime)
+                .orderByDesc(ObjUtil.equals(pars.getUpdatedTime(), 1), EdFileInfo::getUpdatedTime)
 
-                .orderByAsc(Objects.equals(fileInfoQueryDTO.getFileTypeSort(), 0), EdFileInfo::getFileType)
+                .orderByAsc(ObjUtil.equals(pars.getFileTypeSort(), 0), EdFileInfo::getSort)
-                .orderByDesc(Objects.equals(fileInfoQueryDTO.getFileTypeSort(), 1), EdFileInfo::getFileType)
+                .orderByDesc(ObjUtil.equals(pars.getFileTypeSort(), 1), EdFileInfo::getSort);
 
-                .orderByAsc(Objects.equals(fileInfoQueryDTO.getCreatedTime(), 0), EdFileInfo::getCreatedTime)
+        Page<EdFileInfo> edFileInfoPage = this.baseMapper.selectPage(new Page<>(pars.getPageNum(), pars.getPageSize()), queryWrapper);
-                .orderByDesc(Objects.equals(fileInfoQueryDTO.getCreatedTime(), 1), EdFileInfo::getCreatedTime);
-        Page<EdFileInfo> edFileInfoPage = this.baseMapper.selectPage(new Page<>(fileInfoQueryDTO.getPageNum(), fileInfoQueryDTO.getPageSize()), queryWrapper);
         long total = edFileInfoPage.getTotal();
         List<FileInfoVO> records = BeanUtil.copyToList(edFileInfoPage.getRecords(), FileInfoVO.class);
         resetFileSize(records);
@@ -153,6 +153,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
 
     /**
      * 新建文件夹
+     *
      * @return
      */
     @Override
@@ -502,7 +503,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                     String preVersionId = dbVersionRelation.get(id);
                     EdFileInfo tmp = importIdMap.get(preVersionId);
                     saveObj.setPreVersion(tmp.getFileVersion());
-                    int effect = Objects.equals(saveObj.getId(), effectId) ? EffectFlagEnum.EFFECT.code : EffectFlagEnum.NOT_EFFECTIVE.code;
+                    int effect = ObjUtil.equals(saveObj.getId(), effectId) ? EffectFlagEnum.EFFECT.code : EffectFlagEnum.NOT_EFFECTIVE.code;
                     saveObj.setEffectFlag(effect);
                 }
                 allObjs.addAll(saveObjs);
@@ -557,7 +558,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         for (EdFileInfo edFileInfo : edFileInfos) {
             Integer preVersion = edFileInfo.getPreVersion();
             EdFileInfo fileInfo = versionMap.get(preVersion);
-            String preVersionId = Objects.isNull(fileInfo) ? null : fileInfo.getId();
+            String preVersionId = ObjUtil.isNull(fileInfo) ? null : fileInfo.getId();
             versionRelation.put(edFileInfo.getId(), preVersionId);
         }
         return versionRelation;

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java

@@ -22,7 +22,6 @@ import com.electromagnetic.industry.software.manage.pojo.resp.FileSimpleInfoVO;
 import com.electromagnetic.industry.software.manage.service.EdFileRelationService;
 import com.electromagnetic.industry.software.manage.service.FileSystemService;
 import org.springframework.beans.BeanUtils;
-import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -35,18 +34,19 @@ import static com.electromagnetic.industry.software.common.cons.ElectromagneticC
 @Service
 public class EdFileRelationServiceImpl extends ServiceImpl<EdFileRelationMapper, EdFileRelation> implements EdFileRelationService {
 
+    private final EleLog log = new EleLog(EdFileInfoServiceImpl.class);
     @Resource
     EdFileInfoMapper edFileInfoMapper;
     @Resource
     EdFileInfoServiceImpl edFileInfoService;
     @Resource
     private CommonService commonService;
-    private final EleLog log = new EleLog(EdFileInfoServiceImpl.class);
     @Resource
     private FileSystemService fileSystemService;
 
     /**
      * 创建文件关系
+     *
      * @param edFileRelation
      * @return
      */
@@ -71,6 +71,7 @@ public class EdFileRelationServiceImpl extends ServiceImpl<EdFileRelationMapper,
 
     /**
      * 取消文件关系
+     *
      * @param id
      * @return
      */
@@ -130,6 +131,7 @@ public class EdFileRelationServiceImpl extends ServiceImpl<EdFileRelationMapper,
 
     /**
      * 检查文件名是否唯一
+     *
      * @param parentId
      * @param fileName
      * @return

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java

@@ -8,7 +8,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.electromagnetic.industry.software.common.enums.*;
+import com.electromagnetic.industry.software.common.enums.EffectFlagEnum;
+import com.electromagnetic.industry.software.common.enums.EleDataSaveStatusEnum;
+import com.electromagnetic.industry.software.common.enums.EleDataStatusEnum;
+import com.electromagnetic.industry.software.common.enums.EleDataTypeEnum;
 import com.electromagnetic.industry.software.common.exception.BizException;
 import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
 import com.electromagnetic.industry.software.common.util.EleCommonUtil;

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java

@@ -24,8 +24,10 @@ import com.electromagnetic.industry.software.manage.pojo.models.UserRole;
 import com.electromagnetic.industry.software.manage.pojo.req.RoleDTO;
 import com.electromagnetic.industry.software.manage.pojo.req.RolePageDTO;
 import com.electromagnetic.industry.software.manage.pojo.req.RolePermissionDTO;
-import com.electromagnetic.industry.software.manage.service.*;
+import com.electromagnetic.industry.software.manage.service.PermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.electromagnetic.industry.software.manage.service.RolePermissionService;
+import com.electromagnetic.industry.software.manage.service.RoleService;
+import com.electromagnetic.industry.software.manage.service.UserRoleService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -365,6 +367,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
 
     /**
      * 获取层级树结构
+     *
      * @return
      */
     private List<EdFileInfo> getFiles() {

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java

@@ -30,8 +30,6 @@ import com.electromagnetic.industry.software.manage.service.UserService;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>