From 0e59cb76736b19c3288cce8293d2df1b5f63797e Mon Sep 17 00:00:00 2001 From: sxlong Date: Mon, 11 Nov 2024 17:38:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=87=BD=E6=95=B0=E5=A3=B0=E6=98=8E=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 53 +++++---- .../manage/controller/EDDataController.java | 48 +++++++- .../indicator/parames/EDDataParams.java | 35 ++++++ .../indicator/service/EDDataService.java | 42 +++++++ .../service/impl/EDDataServiceImpl.java | 103 ++++++++++++++++++ .../data/manage/facade/EDDataFacade.java | 42 +++++++ .../service/facade/EDDataFacadeImpl.java | 103 ++++++++++++++++++ .../manage/service/mappers/EDDataMappers.java | 31 ++++++ .../service/mappers/EDDataMappersImpl.java | 24 ++++ 9 files changed, 448 insertions(+), 33 deletions(-) create mode 100644 domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/parames/EDDataParams.java create mode 100644 domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/EDDataService.java create mode 100644 domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java create mode 100644 facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/EDDataFacade.java create mode 100644 service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java create mode 100644 service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappers.java create mode 100644 service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappersImpl.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 782e7d7..8ecebac 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -27,10 +27,7 @@ - - - - + @@ -169,45 +168,45 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -242,10 +241,10 @@ - + - + \ No newline at end of file diff --git a/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java b/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java index d488e11..a0ad483 100644 --- a/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java +++ b/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java @@ -2,7 +2,7 @@ package com.electromagnetic.industry.software.data.manage.controller; import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.UserPage; import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.UserParams; -import com.electromagnetic.industry.software.data.manage.facade.UserFacade; +import com.electromagnetic.industry.software.data.manage.facade.EDDataFacade; import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest; import com.electromagnetic.industry.software.data.manage.response.indicator.UserPageResponse; import com.electromagnetic.industry.software.data.manage.service.mappers.UserMappers; @@ -21,15 +21,51 @@ import javax.annotation.Resource; public class EDDataController { @Resource - private UserFacade userFacade; + private EDDataFacade edDataFacade; @ApiOperation(value = "新建文件夹",notes = "") @RequestMapping(value = "/createFolder",method = RequestMethod.POST) - public ElectromagneticResult createFolder(@RequestBody EDDataRequest request){ - return ElectromagneticResultUtil.success("新建文件夹接口"); + public ElectromagneticResult createFolder(@RequestBody EDDataRequest request){ + //return ElectromagneticResultUtil.success("新建文件夹接口"); + return edDataFacade.createFolder(request); } - //public ElectromagneticResult createFolder(@RequestBody EDDataRequest request){ - // return userFacade.getUserList(request); + + @ApiOperation(value = "获取文件信息列表",notes = "") + @RequestMapping(value = "/getFileInfoList",method = RequestMethod.POST) + public ElectromagneticResult getFileInfoList(@RequestBody EDDataRequest request){ + //return ElectromagneticResultUtil.success("获取文件信息列表"); + return edDataFacade.getFileInfoList(request); + } + + + @ApiOperation(value = "上传",notes = "") + @RequestMapping(value = "/upload",method = RequestMethod.POST) + public ElectromagneticResult upload(@RequestBody EDDataRequest request){ + //return ElectromagneticResultUtil.success("上传"); + return edDataFacade.upload(request); + } + + + @ApiOperation(value = "下载",notes = "") + @RequestMapping(value = "/download",method = RequestMethod.POST) + public ElectromagneticResult download(@RequestBody EDDataRequest request){ + //return ElectromagneticResultUtil.success("下载"); + return edDataFacade.download(request); + } + + + @ApiOperation(value = "复制",notes = "") + @RequestMapping(value = "/copy",method = RequestMethod.POST) + public ElectromagneticResult copy(@RequestBody EDDataRequest request){ + return ElectromagneticResultUtil.success("复制"); + } + + + @ApiOperation(value = "重命名",notes = "") + @RequestMapping(value = "/rename",method = RequestMethod.POST) + public ElectromagneticResult rename(@RequestBody EDDataRequest request){ + return ElectromagneticResultUtil.success("重命名"); + } } diff --git a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/parames/EDDataParams.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/parames/EDDataParams.java new file mode 100644 index 0000000..712a127 --- /dev/null +++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/parames/EDDataParams.java @@ -0,0 +1,35 @@ +package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class EDDataParams implements Serializable { + private static final long serialVersionUID = -4835122199589863011L; + /** + * 当前页 + */ + private Integer pageIndex = 1; + /** + * 每页数据 + */ + private Integer pageSize = 10; + /** + * 上级文件夹数据码,为空是顶级 + */ + private Long parentId; + /** + * 文件夹名称 + */ + private String name; + /** + * 关键词 + */ + private String keyWord; + /** + * 文件数据编码 + */ + private String dataId; +} 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 new file mode 100644 index 0000000..cbe4629 --- /dev/null +++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/EDDataService.java @@ -0,0 +1,42 @@ +package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service; + +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; +import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest; +import electromagnetic.data.framework.share.model.ElectromagneticResult; +import electromagnetic.data.framework.share.model.ElectromagneticResultUtil; + +import java.util.List; + +public interface EDDataService { + + /** + * 创建文件夹 + * @param parames + * @return + */ + Boolean createFolder(EDDataParams request); + + /** + * 获取文件信息列表 + * @param parames + * @return + */ + Boolean getFileInfoList(EDDataParams request); + + /** + * 上传 + * @param parames + * @return + */ + Boolean upload(EDDataParams request); + + /** + * 下载 + * @param parames + * @return + */ + Boolean download(EDDataParams request); + +} 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 new file mode 100644 index 0000000..a174a87 --- /dev/null +++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java @@ -0,0 +1,103 @@ +/** + * Copyright (c) 2004-2024 All Rights Reserved. + */ +package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.impl; + +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.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.service.EDDataService; +import com.github.pagehelper.PageInfo; +import electromagnetic.data.framework.share.enums.ElectromagneticSceneIncidentEnum; +import electromagnetic.data.framework.share.exception.ElectromagneticBizRuntimeException; +import electromagnetic.data.framework.share.exception.LoggerConstant; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @author + * @version $Id: IndicatorCardServiceImpl.java, v 0.1 2024-07-26 17:20 + */ +@Service +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; + //} + + /** + * 创建文件夹 + * @param parames + * @return + */ + public Boolean createFolder(EDDataParams request) + { + + return Boolean.TRUE; + } + + /** + * 获取文件信息列表 + * @param parames + * @return + */ + public Boolean getFileInfoList(EDDataParams request) + { + + return Boolean.TRUE; + } + + /** + * 上传 + * @param parames + * @return + */ + public Boolean upload(EDDataParams request) + { + + return Boolean.TRUE; + } + + /** + * 下载 + * @param parames + * @return + */ + public Boolean download(EDDataParams request) + { + + return Boolean.TRUE; + } + + + +} \ No newline at end of file diff --git a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/EDDataFacade.java b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/EDDataFacade.java new file mode 100644 index 0000000..464ac14 --- /dev/null +++ b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/EDDataFacade.java @@ -0,0 +1,42 @@ +package com.electromagnetic.industry.software.data.manage.facade; + +import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest; +import com.electromagnetic.industry.software.data.manage.request.indicator.IndicatorCardRequest; +import com.electromagnetic.industry.software.data.manage.request.indicator.UserRequest; +import com.electromagnetic.industry.software.data.manage.response.indicator.UserPageResponse; +import electromagnetic.data.framework.share.model.ElectromagneticResult; +import electromagnetic.data.framework.share.model.ElectromagneticResultUtil; + +public interface EDDataFacade { + + /** + * 创建文件夹 + * @param request + * @return + */ + ElectromagneticResult createFolder(EDDataRequest request); + + + /** + * 获取文件信息列表 + * @param request + * @return + */ + public ElectromagneticResult getFileInfoList(EDDataRequest request); + + /** + * 上传 + * @param request + * @return + */ + public ElectromagneticResult upload(EDDataRequest request); + + /** + * 下载 + * @param request + * @return + */ + public ElectromagneticResult download(EDDataRequest request); + + +} 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 new file mode 100644 index 0000000..fe1e15a --- /dev/null +++ b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java @@ -0,0 +1,103 @@ +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.parames.EDDataParams; +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.EDDataService; +import com.electromagnetic.industry.software.data.manage.facade.EDDataFacade; +import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest; +import com.electromagnetic.industry.software.data.manage.request.indicator.UserRequest; +import com.electromagnetic.industry.software.data.manage.response.indicator.UserPageResponse; +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 org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class EDDataFacadeImpl implements EDDataFacade { + + @Resource + private EDDataService edDataService; + + + ///** + // * 获取用户列表 + // * WISDOM_INDICATORCARDLISTCONFIG + // * /platform/api/dataplatform/wisdomdecision/indicator/card/getIndicatorCardListConfig + // * @param request + // * @return + // */ + //@Override + //public ElectromagneticResult getUserList(UserRequest request) { + // UserParams parames= UserMappers.INSTANCE.getUserParames(request); + // //获取中支指标配置列表 + // UserPage userExtends = userService.getUserList(parames); + // //模型转换 + // UserPageResponse userPageResponse = UserMappers.INSTANCE.getUserToModel(userExtends); + // return ElectromagneticResultUtil.success(userPageResponse); + //} + + /** + * 创建文件夹 + * WISDOM_CREATE_FOLDER + * /data/ed/file/createFolder + * + * @param request + * @return + */ + @Override + public ElectromagneticResult createFolder(EDDataRequest request) { + EDDataParams parames = EDDataMappers.INSTANCE.getEDDataParames(request); + edDataService.createFolder(parames); + + return ElectromagneticResultUtil.success(Boolean.TRUE); + } + + + /** + * 获取文件信息列表 + * WISDOM_GET_FILEINFOLIST + * /data/ed/file/getFileInfoList + * + * @param request + * @return + */ + public ElectromagneticResult getFileInfoList(EDDataRequest request) + { + EDDataParams parames= EDDataMappers.INSTANCE.getEDDataParames(request); + edDataService.getFileInfoList(parames); + return ElectromagneticResultUtil.success(Boolean.TRUE); + } + + /** + * 上传 + * WISDOM_UPLOAD + * /data/ed/file/upload + * @param request + * @return + */ + public ElectromagneticResult upload(EDDataRequest request) + { + EDDataParams parames= EDDataMappers.INSTANCE.getEDDataParames(request); + edDataService.upload(parames); + return ElectromagneticResultUtil.success(Boolean.TRUE); + } + + /** + * 下载 + * WISDOM_DOWNLOAD + * /data/ed/file/download + * @param request + * @return + */ + public ElectromagneticResult download(EDDataRequest request) + { + EDDataParams parames= EDDataMappers.INSTANCE.getEDDataParames(request); + edDataService.download(parames); + 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 new file mode 100644 index 0000000..758b056 --- /dev/null +++ b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappers.java @@ -0,0 +1,31 @@ +/** + * Copyright (c) 2004-2024 All Rights Reserved. + */ +package com.electromagnetic.industry.software.data.manage.service.mappers; + + +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; +import com.electromagnetic.industry.software.data.manage.request.indicator.UserRequest; +import com.electromagnetic.industry.software.data.manage.response.indicator.UserPageResponse; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * 电磁数据-文件数据模型转换 + * @author + * @version $Id: IndicatorCardMappers.java, v 0.1 2024-07-29 18:03 + */ +@Mapper +public interface EDDataMappers { + EDDataMappers INSTANCE= Mappers.getMapper(EDDataMappers.class); + + /** + * 文件数据扩展模型入参转换 + * @param request + * @return + */ + EDDataParams getEDDataParames(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 new file mode 100644 index 0000000..101a1fc --- /dev/null +++ b/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappersImpl.java @@ -0,0 +1,24 @@ +package com.electromagnetic.industry.software.data.manage.service.mappers; + +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", + comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_432 (Temurin)" +) +public class EDDataMappersImpl implements EDDataMappers { + + @Override + public EDDataParams getEDDataParames(EDDataRequest request) { + if ( request == null ) { + return null; + } + + EDDataParams eDDataParams = new EDDataParams(); + + return eDDataParams; + } +} From 2be0613aab0e7cd62daa13d9c3431725c5de977b Mon Sep 17 00:00:00 2001 From: sxlong Date: Tue, 12 Nov 2024 16:39:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E5=AE=9E=E7=8E=B0=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E6=8E=A5=E5=8F=A3=E8=83=BD=E5=86=99?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 99 +++-- .../src/main/resources/application.properties | 7 +- .../target/classes/application.properties | 7 +- .../repository/EDDataRepository.java | 50 +++ .../indicator/service/EDDataService.java | 9 +- .../service/impl/EDDataServiceImpl.java | 40 +- .../request/indicator/EDDataRequest.java | 4 +- .../manage/repository/dao/EDDataMapper.java | 45 ++ .../repository/impl/EDDataRepositoryImpl.java | 76 ++++ .../sqlmapper/IndicatorCardMapper.xml | 403 ++++++++++-------- .../classes/sqlmapper/IndicatorCardMapper.xml | 403 ++++++++++-------- .../service/facade/EDDataFacadeImpl.java | 20 +- .../manage/service/mappers/EDDataMappers.java | 7 + .../service/mappers/EDDataMappersImpl.java | 14 +- 14 files changed, 735 insertions(+), 449 deletions(-) create mode 100644 domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/repository/EDDataRepository.java create mode 100644 infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/EDDataMapper.java create mode 100644 infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/impl/EDDataRepositoryImpl.java 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 @@ - + + + + + + + + @@ -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; + } }