chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

formate code

This commit is contained in:
chenxudong 2025-09-25 15:11:58 +08:00
parent 28665df41e
commit 9078a4cc0d
10 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java
View File

@ -44,12 +44,11 @@ public class FileController {
JSONConfig jsonConfig = JSONConfig.create();
jsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");
backupFileResLog.setBackupEndTime(new Date());
StringBuffer info = new StringBuffer()
.append("\n")
.append("#")
.append("\n")
.append(JSONUtil.toJsonStr(backupFileResLog, jsonConfig));
FileUtil.appendUtf8String(info.toString(), backupPro.getLogPath());
String info = "\n" +
"#" +
"\n" +
JSONUtil.toJsonStr(backupFileResLog, jsonConfig);
FileUtil.appendUtf8String(info, backupPro.getLogPath());
return ElectromagneticResultUtil.success(JSONUtil.toJsonStr(backupFileResLog, jsonConfig));
}
@ -83,12 +82,11 @@ public class FileController {
JSONConfig jsonConfig = JSONConfig.create();
jsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");
backupFileResLog.setBackupEndTime(new Date());
StringBuffer info = new StringBuffer()
.append("\n")
.append("#")
.append("\n")
.append(JSONUtil.toJsonStr(backupFileResLog, jsonConfig));
FileUtil.appendUtf8String(info.toString(), backupPro.getLogPath());
String info = "\n" +
"#" +
"\n" +
JSONUtil.toJsonStr(backupFileResLog, jsonConfig);
FileUtil.appendUtf8String(info, backupPro.getLogPath());
return ElectromagneticResultUtil.success(JSONUtil.toJsonStr(backupFileResLog, jsonConfig));
}
}

1
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/ElePropertyConfig.java
View File

@ -217,5 +217,4 @@ public class ElePropertyConfig {
}
}

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileFavoriteService.java
View File

@ -12,6 +12,6 @@ public interface EdFileFavoriteService extends IService<EdFileFavorite> {
* @param fileId
* @return
*/
public boolean logicRemove(String userId, String fileId);
boolean logicRemove(String userId, String fileId);
}

1
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/ImportTableService.java
View File

@ -5,7 +5,6 @@ import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
import com.electromagnetic.industry.software.manage.pojo.models.ImportTableInfo;
import com.electromagnetic.industry.software.manage.pojo.req.DownloadImportTableDataDTO;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.core.io.InputStreamResource;
import org.springframework.http.ResponseEntity;
import java.util.Map;

3
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java
View File

@ -136,8 +136,7 @@ public class FileRecycleServiceImpl implements FileRecycleService {
.eq(EdFileInfo::getFileId, fileId));
for (EdFileInfo edFileInfo : edFileInfos) {
String fileSysPath = commonService.getFileSysPath(edFileInfo.getId());
if (!EleCommonUtil.isWinOs())
{
if (!EleCommonUtil.isWinOs()) {
backupHandler.backupFiles(fileSysPath);
}
String fileDbPath = commonService.getDbPath(edFileInfo.getFilePath());

14
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ImportTableServiceImpl.java
View File

@ -1,27 +1,20 @@
package com.electromagnetic.industry.software.manage.service.serviceimpl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.text.StrFormatter;
import cn.hutool.json.JSONUtil;
import com.alibaba.druid.sql.visitor.functions.Char;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.electromagnetic.industry.software.common.enums.EffectFlagEnum;
import com.electromagnetic.industry.software.common.exception.BizException;
import com.electromagnetic.industry.software.common.pojo.RespPageVO;
import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
import com.electromagnetic.industry.software.common.util.EleCommonUtil;
import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
import com.electromagnetic.industry.software.common.util.IdWorker;
import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import com.electromagnetic.industry.software.manage.mapper.ImportTableDataMapper;
import com.electromagnetic.industry.software.manage.mapper.ImportTableInfoMapper;
import com.electromagnetic.industry.software.manage.pojo.models.ImportFileInfo;
import com.electromagnetic.industry.software.manage.pojo.models.ImportTableData;
import com.electromagnetic.industry.software.manage.pojo.models.ImportTableInfo;
import com.electromagnetic.industry.software.manage.pojo.req.DownloadImportTableDataDTO;
@ -30,15 +23,12 @@ import com.electromagnetic.industry.software.manage.service.ImportTableService;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.InputStreamResource;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.File;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.List;
@ -163,7 +153,7 @@ public class ImportTableServiceImpl implements ImportTableService {
if (CollUtil.isEmpty(importTableData)) {
return ResponseEntity.ok()
.header(HttpHeaders.CONTENT_DISPOSITION,attachement)
.header(HttpHeaders.CONTENT_DISPOSITION, attachement)
.contentType(MediaType.APPLICATION_OCTET_STREAM)
.contentLength(0)
.body("".getBytes());
@ -176,7 +166,7 @@ public class ImportTableServiceImpl implements ImportTableService {
map.put("data", importTableData);
byte[] data = JSONUtil.toJsonStr(map).getBytes(Charset.defaultCharset());
return ResponseEntity.ok()
.header(HttpHeaders.CONTENT_DISPOSITION,attachement)
.header(HttpHeaders.CONTENT_DISPOSITION, attachement)
.contentType(MediaType.APPLICATION_OCTET_STREAM)
.contentLength(data.length)
.body(data);

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java
View File

@ -75,7 +75,7 @@ public class UserAccessLogServiceImpl extends ServiceImpl<UserAccessLogMapper, U
Set<String> operationObjSet = new HashSet<>();
Set<String> userIdSet = userMapper.selectList(Wrappers.<User>lambdaQuery().select(User::getId).like(User::getUserName, pars.getKeyWord())).stream().map(User::getId).collect(Collectors.toSet());
for (UserOperationModuleEnum e : UserOperationModuleEnum.values()) {
if (e.desc.contains(pars.getKeyWord())){
if (e.desc.contains(pars.getKeyWord())) {
operationObjSet.add(e.key);
}
}

2
electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java
View File

@ -90,7 +90,7 @@ public final class EleCommonUtil {
String tmpPath = filePath + ".tmp";
try (
InputStream inputStream = Files.newInputStream(Paths.get(filePath));
OutputStream outputStream = Files.newOutputStream(Paths.get(tmpPath));
OutputStream outputStream = Files.newOutputStream(Paths.get(tmpPath))
) {
if (encrypt) {
aes.encrypt(inputStream, outputStream, true);

2
electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/IdWorker.java
View File

@ -25,7 +25,7 @@ public class IdWorker {
// 时间毫秒左移22位
private final static long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
private final static long sequenceMask = -1L ^ (-1L << sequenceBits);
private static IdWorker idWorker = new IdWorker();
private static final IdWorker idWorker = new IdWorker();
/* 上次生产id时间戳 */
private static long lastTimestamp = -1L;
private final long workerId;

3
electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/SignUtils.java
View File

@ -2,6 +2,7 @@ package com.electromagnetic.industry.software.common.util;
import lombok.extern.slf4j.Slf4j;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
@Slf4j
@ -17,7 +18,7 @@ public class SignUtils {
try {
MessageDigest md = MessageDigest.getInstance("MD5");
md.reset();
md.update(str.getBytes("UTF-8"));
md.update(str.getBytes(StandardCharsets.UTF_8));
byte[] byteArray = md.digest();
StringBuffer md5StrBuff = new StringBuffer();
for (int i = 0; i < byteArray.length; i++) {