修改导出文件后缀名

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

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

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

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

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

@@ -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.response.indicator.EDDataPageResponse;
 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.model.ElectromagneticResult;
 import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
@@ -315,7 +316,7 @@ public class EDDataFacadeImpl implements EDDataFacade {
 
         return FileUtil.listFileNames(destPath)
                 .stream()
-                .filter(e -> !e.endsWith(".comac"))
+                .filter(e -> !e.endsWith(ElectromagneticConstants.EXPORT_FILE_SUFFIX))
                 .map(e -> e.replace(UPLOAD_FILE_CHUNK_SUFFIX, ""))
                 .map(Integer::parseInt)
                 .collect(Collectors.toList());

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

@@ -1,7 +1,6 @@
 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.UserLoginInfo;
 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.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.UserWorkNumRequest;
 import com.electromagnetic.industry.software.data.manage.response.user.SingleUserResponse;
+import electromagnetic.data.framework.share.model.UserLoginInfo;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Generated;
 
 @Generated(
     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 {
 
@@ -41,10 +41,6 @@ public class UserMappersImpl implements UserMappers {
         user.setJoinTime( userRequest.getJoinTime() );
         user.setUserStatus( userRequest.getUserStatus() );
         user.setInternshipEndDate( userRequest.getInternshipEndDate() );
-        user.setCreator( userRequest.getCreator() );
-        user.setCreatorName( userRequest.getCreatorName() );
-        user.setModifier( userRequest.getModifier() );
-        user.setModifierName( userRequest.getModifierName() );
 
         return user;
     }
@@ -58,6 +54,7 @@ public class UserMappersImpl implements UserMappers {
         UserLoginInfo userLoginInfo = new UserLoginInfo();
 
         userLoginInfo.setWorkNumber( loginRequest.getWorkNumber() );
+        userLoginInfo.setUserId( loginRequest.getUserId() );
         userLoginInfo.setUserPwd( loginRequest.getUserPwd() );
 
         return userLoginInfo;
@@ -107,8 +104,6 @@ public class UserMappersImpl implements UserMappers {
         if ( list != null ) {
             publishParam.setUserIds( new ArrayList<String>( list ) );
         }
-        publishParam.setModifier( userPublishRequest.getModifier() );
-        publishParam.setModifierName( userPublishRequest.getModifierName() );
 
         return publishParam;
     }
@@ -164,8 +159,6 @@ public class UserMappersImpl implements UserMappers {
         user.setJoinTime( userModiRequest.getJoinTime() );
         user.setUserStatus( userModiRequest.getUserStatus() );
         user.setInternshipEndDate( userModiRequest.getInternshipEndDate() );
-        user.setModifier( userModiRequest.getModifier() );
-        user.setModifierName( userModiRequest.getModifierName() );
 
         return user;
     }
@@ -194,8 +187,6 @@ public class UserMappersImpl implements UserMappers {
         UserDeleteKeyWords userDeleteKeyWords = new UserDeleteKeyWords();
 
         userDeleteKeyWords.setUserId( userDeleteRequest.getUserId() );
-        userDeleteKeyWords.setModifier( userDeleteRequest.getModifier() );
-        userDeleteKeyWords.setModifierName( userDeleteRequest.getModifierName() );
 
         return userDeleteKeyWords;
     }