diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8ecebac..d1cdd3d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -27,7 +27,14 @@
-
+
+
+
+
+
+
+
+
@@ -80,11 +87,11 @@
+
+
+
-
-
-
@@ -121,7 +128,8 @@
-
+
+
@@ -163,70 +171,74 @@
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -237,14 +249,35 @@
-
+
-
-
+
+
-
+
+
+
+
+
+ file://$PROJECT_DIR$/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java
+ 29
+
+
+
+ file://$PROJECT_DIR$/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java
+ 50
+
+
+
+ file://$PROJECT_DIR$/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java
+ 66
+
+
+
+
+
\ No newline at end of file
diff --git a/bootstrap/src/main/resources/application.properties b/bootstrap/src/main/resources/application.properties
index cfdc88c..fc762de 100644
--- a/bootstrap/src/main/resources/application.properties
+++ b/bootstrap/src/main/resources/application.properties
@@ -15,9 +15,12 @@ spring.datasource.typd=com.alibaba.druid.pool.DruidDataSource
#spring.datasource.url=jdbc:mysql://${DATASOURCE_URL:obproxy-0c63.ops.cloud.cic.inter}:3306/${DATASOURCE_HOST:dataplatform_ptst}?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
#spring.datasource.username=${DATASOURCE_NAME:dataplatform@ProjectTest_tenant5#testdb}
#spring.datasource.password=${DATASOURCE_PASSWORD:Y7G6v4_3ijn77K_Kbl_U85}
-spring.datasource.url=jdbc:mysql://139.196.179.195:3306/em_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
+spring.datasource.url=jdbc:mysql://192.168.1.21: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.datasource.password=comac
+#spring.datasource.url=jdbc:mysql://139.196.179.195: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.datasource.driver-class-name=com.mysql.jdbc.Driver
diff --git a/bootstrap/target/classes/application.properties b/bootstrap/target/classes/application.properties
index cfdc88c..fc762de 100644
--- a/bootstrap/target/classes/application.properties
+++ b/bootstrap/target/classes/application.properties
@@ -15,9 +15,12 @@ spring.datasource.typd=com.alibaba.druid.pool.DruidDataSource
#spring.datasource.url=jdbc:mysql://${DATASOURCE_URL:obproxy-0c63.ops.cloud.cic.inter}:3306/${DATASOURCE_HOST:dataplatform_ptst}?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
#spring.datasource.username=${DATASOURCE_NAME:dataplatform@ProjectTest_tenant5#testdb}
#spring.datasource.password=${DATASOURCE_PASSWORD:Y7G6v4_3ijn77K_Kbl_U85}
-spring.datasource.url=jdbc:mysql://139.196.179.195:3306/em_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
+spring.datasource.url=jdbc:mysql://192.168.1.21: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.datasource.password=comac
+#spring.datasource.url=jdbc:mysql://139.196.179.195: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.datasource.driver-class-name=com.mysql.jdbc.Driver
diff --git a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/repository/EDDataRepository.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/repository/EDDataRepository.java
new file mode 100644
index 0000000..3280c35
--- /dev/null
+++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/repository/EDDataRepository.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2004-2024 All Rights Reserved.
+ */
+package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository;
+
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+
+/**
+ * @author
+ * @version $Id: EDDataRepos.java, v 0.1 2024-07-29 19:02
+ */
+public interface EDDataRepository {
+
+ /**
+ * 创建文件夹
+ * @param parames
+ * @return
+ */
+ Boolean createFolder(EDDataInfo edDataInfo);
+
+ /**
+ * 获取文件信息列表
+ * @param parames
+ * @return
+ */
+ Boolean getFileInfoList(EDDataParams parames);
+
+ /**
+ * 上传
+ * @param parames
+ * @return
+ */
+ Boolean upload(EDDataParams parames);
+
+ /**
+ * 下载
+ * @param parames
+ * @return
+ */
+ Boolean download(EDDataParams parames);
+
+
+}
\ No newline at end of file
diff --git a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/EDDataService.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/EDDataService.java
index cbe4629..746385f 100644
--- a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/EDDataService.java
+++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/EDDataService.java
@@ -1,5 +1,6 @@
package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.UserPage;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
@@ -16,27 +17,27 @@ public interface EDDataService {
* @param parames
* @return
*/
- Boolean createFolder(EDDataParams request);
+ Boolean createFolder(EDDataInfo edDataInfo);
/**
* 获取文件信息列表
* @param parames
* @return
*/
- Boolean getFileInfoList(EDDataParams request);
+ Boolean getFileInfoList(EDDataParams parames);
/**
* 上传
* @param parames
* @return
*/
- Boolean upload(EDDataParams request);
+ Boolean upload(EDDataParams parames);
/**
* 下载
* @param parames
* @return
*/
- Boolean download(EDDataParams request);
+ Boolean download(EDDataParams parames);
}
diff --git a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java
index a174a87..7928cb2 100644
--- a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java
+++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java
@@ -6,12 +6,13 @@ package com.electromagnetic.industry.software.data.manage.domain.boardservice.in
import com.electromagnetic.industry.software.data.manage.common.ElectromagneticErrorEnum;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.enums.EffectFlagEnum;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.enums.IndicatorCardStatusEnum;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.UserExtend;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.UserPage;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.UserParams;
-import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository.UserRepository;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository.EDDataRepository;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.EDDataService;
import com.github.pagehelper.PageInfo;
import electromagnetic.data.framework.share.enums.ElectromagneticSceneIncidentEnum;
@@ -35,33 +36,18 @@ public class EDDataServiceImpl implements EDDataService {
private static final Logger LOGGER = LoggerFactory.getLogger(LoggerConstant.DOMAIN_SERVICE);
- //@Resource
- //private UserRepository userRepository;
- ///**
- // * 获取中支指标配置列表
- // * @param parames
- // * @return
- // */
- //@Override
- //public UserPage getUserList(UserParams parames) {
- // UserPage userPage=new UserPage();
- // //数据查询
- // PageInfo pageInfo=userRepository.getUserList(parames);
- // List userStrings=new ArrayList<>();
- // pageInfo.getList().forEach(e->userStrings.add(e.getUserAccount()));
- // //查询指标
- // userPage.setUserExtends(pageInfo);
- // return userPage;
- //}
+ @Resource
+ private EDDataRepository edDataRepository;
+
/**
* 创建文件夹
* @param parames
* @return
*/
- public Boolean createFolder(EDDataParams request)
+ public Boolean createFolder(EDDataInfo edDataInfo)
{
-
+ edDataRepository.createFolder(edDataInfo);
return Boolean.TRUE;
}
@@ -70,9 +56,9 @@ public class EDDataServiceImpl implements EDDataService {
* @param parames
* @return
*/
- public Boolean getFileInfoList(EDDataParams request)
+ public Boolean getFileInfoList(EDDataParams parames)
{
-
+ edDataRepository.getFileInfoList(parames);
return Boolean.TRUE;
}
@@ -81,9 +67,9 @@ public class EDDataServiceImpl implements EDDataService {
* @param parames
* @return
*/
- public Boolean upload(EDDataParams request)
+ public Boolean upload(EDDataParams parames)
{
-
+ edDataRepository.upload(parames);
return Boolean.TRUE;
}
@@ -92,9 +78,9 @@ public class EDDataServiceImpl implements EDDataService {
* @param parames
* @return
*/
- public Boolean download(EDDataParams request)
+ public Boolean download(EDDataParams parames)
{
-
+ edDataRepository.download(parames);
return Boolean.TRUE;
}
diff --git a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/indicator/EDDataRequest.java b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/indicator/EDDataRequest.java
index e539f9b..7cf96cb 100644
--- a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/indicator/EDDataRequest.java
+++ b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/indicator/EDDataRequest.java
@@ -1,8 +1,10 @@
package com.electromagnetic.industry.software.data.manage.request.indicator;
+import electromagnetic.data.framework.share.model.BaseRequest;
+
import java.util.Date;
-public class EDDataRequest {
+public class EDDataRequest extends BaseRequest {
private static final long serialVersionUID = 8717292719122744818L;
/**
diff --git a/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/EDDataMapper.java b/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/EDDataMapper.java
new file mode 100644
index 0000000..6ead166
--- /dev/null
+++ b/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/EDDataMapper.java
@@ -0,0 +1,45 @@
+package com.electromagnetic.industry.software.data.manage.repository.dao;
+
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface EDDataMapper {
+
+ /**
+ * 创建文件夹
+ * @param parames
+ * @return
+ */
+ Boolean createFolder(EDDataInfo edDataInfo);
+
+ /**
+ * 获取文件信息列表
+ * @param parames
+ * @return
+ */
+ Boolean getFileInfoList(EDDataParams parames);
+
+ /**
+ * 上传
+ * @param parames
+ * @return
+ */
+ Boolean upload(EDDataParams parames);
+
+ /**
+ * 下载
+ * @param parames
+ * @return
+ */
+ Boolean download(EDDataParams parames);
+
+
+
+}
\ No newline at end of file
diff --git a/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/impl/EDDataRepositoryImpl.java b/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/impl/EDDataRepositoryImpl.java
new file mode 100644
index 0000000..2d86198
--- /dev/null
+++ b/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/impl/EDDataRepositoryImpl.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) 2004-2024 All Rights Reserved.
+ */
+package com.electromagnetic.industry.software.data.manage.repository.impl;
+
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository.EDDataRepository;
+import com.electromagnetic.industry.software.data.manage.repository.dao.EDDataMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author
+ * @version $Id: IndicatorCardRepositoryImpl.java, v 0.1 2024-07-29 19:04
+ */
+@Repository
+public class EDDataRepositoryImpl implements EDDataRepository {
+
+ @Resource
+ private EDDataMapper edDataMapper;
+
+ /**
+ * 创建文件夹
+ *
+ * @param parames
+ * @return
+ */
+ @Override
+ public Boolean createFolder(EDDataInfo edDataInfo)
+ {
+ return edDataMapper.createFolder(edDataInfo);
+ }
+
+ /**
+ * 获取文件信息列表
+ * @param parames
+ * @return
+ */
+ @Override
+ public Boolean getFileInfoList(EDDataParams parames)
+ {
+ return edDataMapper.getFileInfoList(parames);
+ }
+
+ /**
+ * 上传
+ * @param parames
+ * @return
+ */
+ @Override
+ public Boolean upload(EDDataParams parames)
+ {
+ return edDataMapper.upload(parames);
+ }
+
+ /**
+ * 下载
+ * @param parames
+ * @return
+ */
+ @Override
+ public Boolean download(EDDataParams parames)
+ {
+ return edDataMapper.download(parames);
+ }
+
+
+}
\ No newline at end of file
diff --git a/infrastructure/repository/src/main/resources/sqlmapper/IndicatorCardMapper.xml b/infrastructure/repository/src/main/resources/sqlmapper/IndicatorCardMapper.xml
index dc2bda4..c5d8eab 100644
--- a/infrastructure/repository/src/main/resources/sqlmapper/IndicatorCardMapper.xml
+++ b/infrastructure/repository/src/main/resources/sqlmapper/IndicatorCardMapper.xml
@@ -1,198 +1,225 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ SELECT LAST_INSERT_ID()
+
+ insert into ed_data_info (id, category_id,
+ data_id, data_no, data_name,
+ data_type, file_type,
+ version,content, implant_json, data_status,
+ creator, creator_name, gmt_create,
+ modifier, modifier_name, gmt_modified,
+ effect_flag
+ )
+ values (#{id,jdbcType=VARCHAR}, #{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},
+ #{creator,jdbcType=VARCHAR}, #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR},
+ #{modifierName,jdbcType=VARCHAR},now(),1
+ )
+
+
+
+
+
\ No newline at end of file
diff --git a/infrastructure/repository/target/classes/sqlmapper/IndicatorCardMapper.xml b/infrastructure/repository/target/classes/sqlmapper/IndicatorCardMapper.xml
index dc2bda4..c5d8eab 100644
--- a/infrastructure/repository/target/classes/sqlmapper/IndicatorCardMapper.xml
+++ b/infrastructure/repository/target/classes/sqlmapper/IndicatorCardMapper.xml
@@ -1,198 +1,225 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ SELECT LAST_INSERT_ID()
+
+ insert into ed_data_info (id, category_id,
+ data_id, data_no, data_name,
+ data_type, file_type,
+ version,content, implant_json, data_status,
+ creator, creator_name, gmt_create,
+ modifier, modifier_name, gmt_modified,
+ effect_flag
+ )
+ values (#{id,jdbcType=VARCHAR}, #{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},
+ #{creator,jdbcType=VARCHAR}, #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR},
+ #{modifierName,jdbcType=VARCHAR},now(),1
+ )
+
+
+
+
+
\ No newline at end of file
diff --git a/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java
index fe1e15a..289aa69 100644
--- a/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java
+++ b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java
@@ -1,6 +1,6 @@
package com.electromagnetic.industry.software.data.manage.service.facade;
-import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.UserPage;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.EDDataService;
import com.electromagnetic.industry.software.data.manage.facade.EDDataFacade;
@@ -10,6 +10,7 @@ import com.electromagnetic.industry.software.data.manage.response.indicator.User
import com.electromagnetic.industry.software.data.manage.service.mappers.EDDataMappers;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
+import electromagnetic.data.framework.share.id.IdWorker;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -48,9 +49,22 @@ public class EDDataFacadeImpl implements EDDataFacade {
*/
@Override
public ElectromagneticResult createFolder(EDDataRequest request) {
- EDDataParams parames = EDDataMappers.INSTANCE.getEDDataParames(request);
- edDataService.createFolder(parames);
+ EDDataInfo edDataInfo = EDDataMappers.INSTANCE.getEDDataInfo(request);
+ edDataInfo.setCreator(request.getUserId());
+ edDataInfo.setCreatorName(request.getPersonName());
+ //edDataInfo.setModifier(request.getUserId());
+ edDataInfo.setModifierName(request.getPersonName());
+ edDataInfo.setModifier(IdWorker.getSnowFlakeIdString());
+ edDataInfo.setCategoryId(IdWorker.getSnowFlakeIdString());
+ edDataInfo.setDataNo(IdWorker.getSnowFlakeIdString());
+ edDataInfo.setDataId(IdWorker.getSnowFlakeIdString());
+ edDataInfo.setDataType("folder");
+ edDataInfo.setDataName("testFolder");
+ edDataInfo.setVersion("1.0.0");
+ edDataInfo.setDataStatus("publish");
+
+ edDataService.createFolder(edDataInfo);
return ElectromagneticResultUtil.success(Boolean.TRUE);
}
diff --git a/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappers.java b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappers.java
index 758b056..f1bb7f8 100644
--- a/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappers.java
+++ b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappers.java
@@ -4,6 +4,7 @@
package com.electromagnetic.industry.software.data.manage.service.mappers;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.UserPage;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
@@ -27,5 +28,11 @@ public interface EDDataMappers {
* @return
*/
EDDataParams getEDDataParames(EDDataRequest request);
+ /**
+ * 文件数据扩展模型入参转换
+ * @param request
+ * @return
+ */
+ EDDataInfo getEDDataInfo(EDDataRequest request);
}
\ No newline at end of file
diff --git a/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappersImpl.java b/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappersImpl.java
index 101a1fc..b1d190f 100644
--- a/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappersImpl.java
+++ b/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappersImpl.java
@@ -1,12 +1,13 @@
package com.electromagnetic.industry.software.data.manage.service.mappers;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
- date = "2024-11-11T16:03:11+0800",
+ date = "2024-11-12T16:08:00+0800",
comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_432 (Temurin)"
)
public class EDDataMappersImpl implements EDDataMappers {
@@ -21,4 +22,15 @@ public class EDDataMappersImpl implements EDDataMappers {
return eDDataParams;
}
+
+ @Override
+ public EDDataInfo getEDDataInfo(EDDataRequest request) {
+ if ( request == null ) {
+ return null;
+ }
+
+ EDDataInfo eDDataInfo = new EDDataInfo();
+
+ return eDDataInfo;
+ }
}