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

修改导出文件后缀名

This commit is contained in:
chenxudong 2024-12-04 09:52:20 +08:00
parent 03ee38a3f0
commit 78b8207bb0
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java
View File

@ -25,6 +25,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializationFeature;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import electromagnetic.data.framework.share.constants.ElectromagneticConstants;
import electromagnetic.data.framework.share.exception.LoggerConstant; import electromagnetic.data.framework.share.exception.LoggerConstant;
import electromagnetic.data.framework.share.id.IdWorker; import electromagnetic.data.framework.share.id.IdWorker;
import electromagnetic.data.framework.share.model.ElectromagneticResultUtil; import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
@ -274,7 +275,7 @@ public class EDDataServiceImpl implements EDDataService {
parames.setParentId(edDataInfo.getDataId()); parames.setParentId(edDataInfo.getDataId());
childFileCount += getChildFileCount(parames); childFileCount += getChildFileCount(parames);
} }
else if(edDataInfo.getDataType().equals(dataTypeFile)) else if(edDataInfo.getDataType().equals(dataTypeFile) && edDataInfo.getEffectFlag().equals(1))
{ {
++childFileCount; ++childFileCount;
} }
@ -561,7 +562,7 @@ public class EDDataServiceImpl implements EDDataService {
String dateString = sdf.format(date); String dateString = sdf.format(date);
zipPathFileName = dataCachePath + "/exportData_" + dateString; zipPathFileName = dataCachePath + "/exportData_" + dateString;
enCodeZipPathFileName = dataCachePath + "/exportData_" + dateString + ".comac"; enCodeZipPathFileName = dataCachePath + "/exportData_" + dateString + ElectromagneticConstants.EXPORT_FILE_SUFFIX;
ZipUtil.zip(exportDataCachePath, zipPathFileName); ZipUtil.zip(exportDataCachePath, zipPathFileName);

2
electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/constants/ElectromagneticConstants.java
View File

@ -38,4 +38,6 @@ public final class ElectromagneticConstants {
public static final String TAG_SEGMENT="TagSegment"; public static final String TAG_SEGMENT="TagSegment";
public static final String TYPE_SEGMENT="TypeSegment"; public static final String TYPE_SEGMENT="TypeSegment";
public static final String EXPORT_FILE_SUFFIX = ".colib";
} }

3
service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java
View File

@ -17,6 +17,7 @@ import com.electromagnetic.industry.software.data.manage.request.indicator.FileC
import com.electromagnetic.industry.software.data.manage.request.indicator.FileChunkResultDTO; import com.electromagnetic.industry.software.data.manage.request.indicator.FileChunkResultDTO;
import com.electromagnetic.industry.software.data.manage.response.indicator.EDDataPageResponse; import com.electromagnetic.industry.software.data.manage.response.indicator.EDDataPageResponse;
import com.electromagnetic.industry.software.data.manage.service.mappers.EDDataMappers; import com.electromagnetic.industry.software.data.manage.service.mappers.EDDataMappers;
import electromagnetic.data.framework.share.constants.ElectromagneticConstants;
import electromagnetic.data.framework.share.id.IdWorker; import electromagnetic.data.framework.share.id.IdWorker;
import electromagnetic.data.framework.share.model.ElectromagneticResult; import electromagnetic.data.framework.share.model.ElectromagneticResult;
import electromagnetic.data.framework.share.model.ElectromagneticResultUtil; import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
@ -315,7 +316,7 @@ public class EDDataFacadeImpl implements EDDataFacade {
return FileUtil.listFileNames(destPath) return FileUtil.listFileNames(destPath)
.stream() .stream()
.filter(e -> !e.endsWith(".comac")) .filter(e -> !e.endsWith(ElectromagneticConstants.EXPORT_FILE_SUFFIX))
.map(e -> e.replace(UPLOAD_FILE_CHUNK_SUFFIX, "")) .map(e -> e.replace(UPLOAD_FILE_CHUNK_SUFFIX, ""))
.map(Integer::parseInt) .map(Integer::parseInt)
.collect(Collectors.toList()); .collect(Collectors.toList());

17
service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappersImpl.java
View File

@ -1,7 +1,6 @@
package com.electromagnetic.industry.software.data.manage.service.mappers; package com.electromagnetic.industry.software.data.manage.service.mappers;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User; import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.UserLoginInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.PublishParam; import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.PublishParam;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.SearchKeyWords; import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.SearchKeyWords;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.UserDeleteKeyWords; import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.UserDeleteKeyWords;
@ -13,14 +12,15 @@ import com.electromagnetic.industry.software.data.manage.request.user.UserPublis
import com.electromagnetic.industry.software.data.manage.request.user.UserRequest; import com.electromagnetic.industry.software.data.manage.request.user.UserRequest;
import com.electromagnetic.industry.software.data.manage.request.user.UserWorkNumRequest; import com.electromagnetic.industry.software.data.manage.request.user.UserWorkNumRequest;
import com.electromagnetic.industry.software.data.manage.response.user.SingleUserResponse; import com.electromagnetic.industry.software.data.manage.response.user.SingleUserResponse;
import electromagnetic.data.framework.share.model.UserLoginInfo;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.annotation.Generated; import javax.annotation.Generated;
@Generated( @Generated(
value = "org.mapstruct.ap.MappingProcessor", value = "org.mapstruct.ap.MappingProcessor",
date = "2024-11-21T15:49:09+0800", date = "2024-12-04T09:28:17+0800",
comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_281 (Oracle Corporation)" comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_432 (Temurin)"
) )
public class UserMappersImpl implements UserMappers { public class UserMappersImpl implements UserMappers {
@ -41,10 +41,6 @@ public class UserMappersImpl implements UserMappers {
user.setJoinTime( userRequest.getJoinTime() ); user.setJoinTime( userRequest.getJoinTime() );
user.setUserStatus( userRequest.getUserStatus() ); user.setUserStatus( userRequest.getUserStatus() );
user.setInternshipEndDate( userRequest.getInternshipEndDate() ); user.setInternshipEndDate( userRequest.getInternshipEndDate() );
user.setCreator( userRequest.getCreator() );
user.setCreatorName( userRequest.getCreatorName() );
user.setModifier( userRequest.getModifier() );
user.setModifierName( userRequest.getModifierName() );
return user; return user;
} }
@ -58,6 +54,7 @@ public class UserMappersImpl implements UserMappers {
UserLoginInfo userLoginInfo = new UserLoginInfo(); UserLoginInfo userLoginInfo = new UserLoginInfo();
userLoginInfo.setWorkNumber( loginRequest.getWorkNumber() ); userLoginInfo.setWorkNumber( loginRequest.getWorkNumber() );
userLoginInfo.setUserId( loginRequest.getUserId() );
userLoginInfo.setUserPwd( loginRequest.getUserPwd() ); userLoginInfo.setUserPwd( loginRequest.getUserPwd() );
return userLoginInfo; return userLoginInfo;
@ -107,8 +104,6 @@ public class UserMappersImpl implements UserMappers {
if ( list != null ) { if ( list != null ) {
publishParam.setUserIds( new ArrayList<String>( list ) ); publishParam.setUserIds( new ArrayList<String>( list ) );
} }
publishParam.setModifier( userPublishRequest.getModifier() );
publishParam.setModifierName( userPublishRequest.getModifierName() );
return publishParam; return publishParam;
} }
@ -164,8 +159,6 @@ public class UserMappersImpl implements UserMappers {
user.setJoinTime( userModiRequest.getJoinTime() ); user.setJoinTime( userModiRequest.getJoinTime() );
user.setUserStatus( userModiRequest.getUserStatus() ); user.setUserStatus( userModiRequest.getUserStatus() );
user.setInternshipEndDate( userModiRequest.getInternshipEndDate() ); user.setInternshipEndDate( userModiRequest.getInternshipEndDate() );
user.setModifier( userModiRequest.getModifier() );
user.setModifierName( userModiRequest.getModifierName() );
return user; return user;
} }
@ -194,8 +187,6 @@ public class UserMappersImpl implements UserMappers {
UserDeleteKeyWords userDeleteKeyWords = new UserDeleteKeyWords(); UserDeleteKeyWords userDeleteKeyWords = new UserDeleteKeyWords();
userDeleteKeyWords.setUserId( userDeleteRequest.getUserId() ); userDeleteKeyWords.setUserId( userDeleteRequest.getUserId() );
userDeleteKeyWords.setModifier( userDeleteRequest.getModifier() );
userDeleteKeyWords.setModifierName( userDeleteRequest.getModifierName() );
return userDeleteKeyWords; return userDeleteKeyWords;
} }