diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60cc2f0..782e7d7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -16,17 +16,21 @@ - + + + + + + - - - - - + + + \ 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 new file mode 100644 index 0000000..d488e11 --- /dev/null +++ b/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java @@ -0,0 +1,35 @@ +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.request.indicator.EDDataRequest; +import com.electromagnetic.industry.software.data.manage.response.indicator.UserPageResponse; +import com.electromagnetic.industry.software.data.manage.service.mappers.UserMappers; +import electromagnetic.data.framework.share.model.ElectromagneticResult; +import electromagnetic.data.framework.share.model.ElectromagneticResultUtil; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RequestMapping("/data/ed/file") +@RestController +public class EDDataController { + + @Resource + private UserFacade userFacade; + + @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 userFacade.getUserList(request); + +} diff --git a/bootstrap/src/main/resources/application.properties b/bootstrap/src/main/resources/application.properties index 4878dfe..cfdc88c 100644 --- a/bootstrap/src/main/resources/application.properties +++ b/bootstrap/src/main/resources/application.properties @@ -15,9 +15,9 @@ 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://192.168.1.21:3306/comac?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true +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=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 4878dfe..cfdc88c 100644 --- a/bootstrap/target/classes/application.properties +++ b/bootstrap/target/classes/application.properties @@ -15,9 +15,9 @@ 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://192.168.1.21:3306/comac?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true +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=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/model/EDCategory.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDCategory.java new file mode 100644 index 0000000..0514a93 --- /dev/null +++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDCategory.java @@ -0,0 +1,64 @@ +package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model; + +import lombok.Data; + +import java.util.Date; + +/** + * 目录 + */ +@Data +public class EDCategory { + /** + * 主键ID + */ + private Long id; + /** + * 目录类型编码 + */ + private String categoryTypeId; + /** + * 上级编码，为空则为一级 + */ + private String parentId; + /** + * 数据编码 + */ + private String categoryId; + /** + * 目录名称 + */ + private String categoryName; + /** + * 状态：available:可用，invalid:无效 + */ + private String categoryStatus; + /** + * 创建人 + */ + private String creator; + /** + * 创建人姓名 + */ + private String creatorName; + /** + * 创建时间 + */ + private Date gmtCreate; + /** + * 更新人 + */ + private String modifier; + /** + * 更新人姓名 + */ + private String modifierName; + /** + * 更新时间 + */ + private Date gmtModified; + /** + * 是否有效:0-无效 1-有效 + */ + private Integer effectFlag; +} \ No newline at end of file diff --git a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDCategoryType.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDCategoryType.java new file mode 100644 index 0000000..f80dafc --- /dev/null +++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDCategoryType.java @@ -0,0 +1,56 @@ +package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model; + +import lombok.Data; + +import java.util.Date; + +/** + * 目录类型 + */ +@Data +public class EDCategoryType { + /** + * 主键ID + */ + private Long id; + /** + * 目录类型编码 + */ + private String categoryTypeId; + /** + * 目录类型名称 + */ + private String categoryTypeName; + /** + * 状态：available:可用，invalid:无效 + */ + private String categoryTypeStatus; + /** + * 创建人 + */ + private String creator; + /** + * 创建人姓名 + */ + private String creatorName; + /** + * 创建时间 + */ + private Date gmtCreate; + /** + * 更新人 + */ + private String modifier; + /** + * 更新人姓名 + */ + private String modifierName; + /** + * 更新时间 + */ + private Date gmtModified; + /** + * 是否有效:0-无效 1-有效 + */ + private Integer effectFlag; +} \ No newline at end of file diff --git a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDDataInfo.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDDataInfo.java new file mode 100644 index 0000000..8586d69 --- /dev/null +++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDDataInfo.java @@ -0,0 +1,84 @@ +package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model; + +import lombok.Data; + +import java.util.Date; + +/** + * 电磁数据信息 + */ +@Data +public class EDDataInfo { + /** + * 主键ID + */ + private Long id; + /** + * 目录编码 + */ + private String categoryId; + /** + * 数据编码 + */ + private String dataId; + /** + * 数据可视化码 + */ + private String dataNo; + /** + * 数据名称 + */ + private String dataName; + /** + * 数据类型：folder文件夹；file文件 + */ + private String dataType; + /** + * 文件类型 + */ + private String fileType; + /** + * 当前版本 + */ + private String version; + /** + * 富文本内容 + */ + private String content; + /** + * 文件地址JSON + */ + private String implantJson; + /** + * 状态：publish:发布，occupy:占用 + */ + private String dataStatus; + /** + * 创建人 + */ + private String creator; + /** + * 创建人姓名 + */ + private String creatorName; + /** + * 创建时间 + */ + private Date gmtCreate; + /** + * 更新人 + */ + private String modifier; + /** + * 更新人姓名 + */ + private String modifierName; + /** + * 更新时间 + */ + private Date gmtModified; + /** + * 是否有效:0-无效 1-有效 + */ + private Integer effectFlag; +} \ No newline at end of file diff --git a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDDataInfoVersion.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDDataInfoVersion.java new file mode 100644 index 0000000..6c0f136 --- /dev/null +++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDDataInfoVersion.java @@ -0,0 +1,60 @@ +package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model; + +import lombok.Data; + +import java.util.Date; + +/** + * 电磁数据信息版本 + */ +@Data +public class EDDataInfoVersion { + /** + * 主键ID + */ + private Long id; + /** + * 数据版本编码 + */ + private String versionId; + /** + * 数据编码 + */ + private String dataId; + /** + * 数据可视化码 + */ + private String dataNo; + /** + * json内容 + */ + private String content; + /** + * 创建人 + */ + private String creator; + /** + * 创建人姓名 + */ + private String creatorName; + /** + * 创建时间 + */ + private Date gmtCreate; + /** + * 更新人 + */ + private String modifier; + /** + * 更新人姓名 + */ + private String modifierName; + /** + * 更新时间 + */ + private Date gmtModified; + /** + * 是否有效:0-无效 1-有效 + */ + private Integer effectFlag; +} \ No newline at end of file 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 new file mode 100644 index 0000000..e539f9b --- /dev/null +++ b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/indicator/EDDataRequest.java @@ -0,0 +1,32 @@ +package com.electromagnetic.industry.software.data.manage.request.indicator; + +import java.util.Date; + +public class EDDataRequest { + private static final long serialVersionUID = 8717292719122744818L; + + /** + * 当前页 + */ + private Integer pageIndex = 1; + /** + * 每页数据 + */ + private Integer pageSize = 10; + /** + * 上级文件夹数据码,为空是顶级 + */ + private Long parentId; + /** + * 文件夹名称 + */ + private String name; + /** + * 关键词 + */ + private String keyWord; + /** + * 文件数据编码 + */ + private String dataId; +}