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; + } +}