chenxudong
/
electromagnetic-data
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.增加文件数据相关结构类，2.增加部分控制器相关代码。

This commit is contained in:
sxlong 2024-11-08 16:34:46 +08:00
parent ce12ce3b63
commit 661e5ac144
9 changed files with 366 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
.idea/workspace.xml
View File

@ -16,17 +16,21 @@
<item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
</path>
</expand>
<select />
<select>
<path>
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="BRANCH:develop" type="e8cecc67:BranchNodeDescriptor" />
</path>
</select>
</component>
<component name="ChangeListManager">
<list default="true" id="d75a3a91-5d58-44f3-9ee5-41347d560b6a" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/UserController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/parames/UserParams.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/parames/UserParams.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/repository/UserRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/repository/UserRepository.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/indicator/UserResponse.java" beforeDir="false" afterPath="$PROJECT_DIR$/facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/indicator/UserResponse.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/UserFacadelImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/src/main/resources/application.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/target/classes/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/classes/application.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/IndicatorCardMappersImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/IndicatorCardMappersImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappersImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappersImpl.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -79,11 +83,11 @@
<recent name="com.electromagnetic.industry.software.data.manage.service.mappers" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.electromagnetic.industry.software.data.manage.request.indicator" />
<recent name="com.electromagnetic.industry.software.data.manage.controller" />
<recent name="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model" />
<recent name="com.electromagnetic.industry.software.data.manage.repository.dao" />
<recent name="com.electromagnetic.industry.software.data.manage.repository.impl" />
<recent name="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.impl" />
<recent name="com.electromagnetic.industry.software.data.manage.service.mappers" />
<recent name="com.electromagnetic.industry.software.data.manage.response.indicator" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\projects\electromagnetic-data\bootstrap\src\main\java\com\electromagnetic\industry\software\data\manage\controller" />
@ -165,45 +169,45 @@
</state>
<state x="842" y="190" key="FileChooserDialogImpl/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730254963238" />
<state x="421" y="91" key="FileChooserDialogImpl/0.0.1280.672@0.0.1280.672" timestamp="1729594896548" />
<state width="1920" height="240" key="GridCell.Tab.0.bottom" timestamp="1730255920506">
<state width="1924" height="240" key="GridCell.Tab.0.bottom" timestamp="1731051644547">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1920" height="240" key="GridCell.Tab.0.bottom/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730255920506" />
<state width="1924" height="240" key="GridCell.Tab.0.bottom/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731051644547" />
<state width="1237" height="200" key="GridCell.Tab.0.bottom/0.0.1280.672@0.0.1280.672" timestamp="1729595008609" />
<state width="1920" height="240" key="GridCell.Tab.0.center" timestamp="1730255920506">
<state width="1924" height="240" key="GridCell.Tab.0.center" timestamp="1731051644547">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1920" height="240" key="GridCell.Tab.0.center/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730255920506" />
<state width="1924" height="240" key="GridCell.Tab.0.center/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731051644547" />
<state width="1237" height="200" key="GridCell.Tab.0.center/0.0.1280.672@0.0.1280.672" timestamp="1729595008608" />
<state width="1920" height="240" key="GridCell.Tab.0.left" timestamp="1730255920506">
<state width="1924" height="240" key="GridCell.Tab.0.left" timestamp="1731051644547">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1920" height="240" key="GridCell.Tab.0.left/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730255920506" />
<state width="1924" height="240" key="GridCell.Tab.0.left/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731051644547" />
<state width="1237" height="200" key="GridCell.Tab.0.left/0.0.1280.672@0.0.1280.672" timestamp="1729595008608" />
<state width="1920" height="240" key="GridCell.Tab.0.right" timestamp="1730255920506">
<state width="1924" height="240" key="GridCell.Tab.0.right" timestamp="1731051644547">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1920" height="240" key="GridCell.Tab.0.right/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730255920506" />
<state width="1924" height="240" key="GridCell.Tab.0.right/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731051644547" />
<state width="1237" height="200" key="GridCell.Tab.0.right/0.0.1280.672@0.0.1280.672" timestamp="1729595008609" />
<state width="1920" height="240" key="GridCell.Tab.1.bottom" timestamp="1730255920506">
<state width="1924" height="240" key="GridCell.Tab.1.bottom" timestamp="1731051644547">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1920" height="240" key="GridCell.Tab.1.bottom/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730255920506" />
<state width="1924" height="240" key="GridCell.Tab.1.bottom/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731051644547" />
<state width="1237" height="200" key="GridCell.Tab.1.bottom/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
<state width="1920" height="240" key="GridCell.Tab.1.center" timestamp="1730255920506">
<state width="1924" height="240" key="GridCell.Tab.1.center" timestamp="1731051644547">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1920" height="240" key="GridCell.Tab.1.center/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730255920506" />
<state width="1924" height="240" key="GridCell.Tab.1.center/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731051644547" />
<state width="1237" height="200" key="GridCell.Tab.1.center/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
<state width="1920" height="240" key="GridCell.Tab.1.left" timestamp="1730255920506">
<state width="1924" height="240" key="GridCell.Tab.1.left" timestamp="1731051644547">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1920" height="240" key="GridCell.Tab.1.left/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730255920506" />
<state width="1924" height="240" key="GridCell.Tab.1.left/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731051644547" />
<state width="1237" height="200" key="GridCell.Tab.1.left/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
<state width="1920" height="240" key="GridCell.Tab.1.right" timestamp="1730255920506">
<state width="1924" height="240" key="GridCell.Tab.1.right" timestamp="1731051644547">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1920" height="240" key="GridCell.Tab.1.right/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730255920506" />
<state width="1924" height="240" key="GridCell.Tab.1.right/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731051644547" />
<state width="1237" height="200" key="GridCell.Tab.1.right/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
<state width="1920" height="366" key="GridCell.Tab.2.bottom" timestamp="1730255920501">
<screen x="0" y="0" width="2560" height="1400" />
@ -238,10 +242,10 @@
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="991" y="256" width="1572" height="833" key="dock-window-1/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730163893500" />
<state x="676" y="81" width="1858" height="1238" key="find.popup" timestamp="1730252162153">
<state x="695" y="51" width="1858" height="1238" key="find.popup" timestamp="1730964306008">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="676" y="81" width="1858" height="1238" key="find.popup/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730252162153" />
<state x="695" y="51" width="1858" height="1238" key="find.popup/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730964306008" />
<state x="338" y="39" width="929" height="594" key="find.popup/0.0.1280.672@0.0.1280.672" timestamp="1729595280874" />
</component>
</project>

35
bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java Normal file
View File

@ -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<String> createFolder(@RequestBody EDDataRequest request){
return ElectromagneticResultUtil.success("新建文件夹接口");
}
//public ElectromagneticResult<UserPageResponse> createFolder(@RequestBody EDDataRequest request){
// return userFacade.getUserList(request);
}

4
bootstrap/src/main/resources/application.properties
View File

@ -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

4
bootstrap/target/classes/application.properties
View File

@ -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

64
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDCategory.java Normal file
View File

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

56
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDCategoryType.java Normal file
View File

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

84
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDDataInfo.java Normal file
View File

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

60
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDDataInfoVersion.java Normal file
View File

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

32
facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/indicator/EDDataRequest.java Normal file
View File

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