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

1.增加获取文件信息列表接口(未成功运行)。

This commit is contained in:
sxlong 2024-11-13 16:46:01 +08:00
parent 27309fccec
commit 75daf40994
19 changed files with 287 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ public class EDDataController {
@RequestMapping(value = "/getFileInfoList",method = RequestMethod.POST)
public ElectromagneticResult<?> getFileInfoList(@RequestBody EDDataRequest request){
//return ElectromagneticResultUtil.success("获取文件信息列表");
return edDataFacade.getFileInfoList(request);
return edDataFacade.getDataInfoList(request);
}

1
domain/domain.iml
View File

@ -10,7 +10,6 @@
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />

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

@ -0,0 +1,25 @@
/**
* Copyright (c) 2004-2024 All Rights Reserved.
*/
package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model;
import com.github.pagehelper.PageInfo;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 分页综合返回
* @author
* @version $Id: IndicatorCardPage.java, v 0.1 2024-08-14 17:30
*/
@Data
public class EDDataPage implements Serializable {
private static final long serialVersionUID = -6207631048120337133L;
/**
* 电磁数据-文件数据列表
*/
private PageInfo<EDDataInfo> edDataInfo;
}

2
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/repository/EDDataRepository.java
View File

@ -30,7 +30,7 @@ public interface EDDataRepository {
* @param parames
* @return
*/
Boolean getFileInfoList(EDDataParams parames);
PageInfo<EDDataInfo> getDataInfoList(EDDataParams parames);
/**
* 上传

6
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/EDDataService.java
View File

@ -1,8 +1,10 @@
package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service;
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;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
@ -23,7 +25,7 @@ public interface EDDataService {
* @param parames
* @return
*/
Boolean getFileInfoList(EDDataParams parames);
EDDataPage getDataInfoList(EDDataParams parames);
/**
* 上传

14
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java
View File

@ -1,13 +1,16 @@
/**
/**
* 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.IndicatorCardHomeDisplayEnum;
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.repository.EDDataRepository;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.EDDataService;
@ -53,10 +56,13 @@ public class EDDataServiceImpl implements EDDataService {
* @param parames
* @return
*/
public Boolean getFileInfoList(EDDataParams parames)
public EDDataPage getDataInfoList(EDDataParams parames)
{
edDataRepository.getFileInfoList(parames);
return Boolean.TRUE;
EDDataPage edDataPage=new EDDataPage();
//数据查询
PageInfo<EDDataInfo> pageInfo = edDataRepository.getDataInfoList(parames);
edDataPage.setEdDataInfo(pageInfo);
return edDataPage;
}
/**

10
facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/EDDataFacade.java
View File

@ -1,8 +1,14 @@
package com.electromagnetic.industry.software.data.manage.facade;
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 java.util.List;
import java.util.Map;
public interface EDDataFacade {
/**
@ -18,7 +24,7 @@ public interface EDDataFacade {
* @param request
* @return
*/
public ElectromagneticResult<Boolean> getFileInfoList(EDDataRequest request);
public ElectromagneticResult<EDDataPageResponse> getDataInfoList(EDDataRequest request);
/**
* 上传

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

@ -7,7 +7,6 @@ import java.util.Date;
@Data
public class EDDataRequest extends BaseRequest {
private static final long serialVersionUID = 8717292719122744818L;
/**
* 当前页
@ -25,6 +24,10 @@ public class EDDataRequest extends BaseRequest {
* 文件夹名称
*/
private String name;
/**
* 文件夹名称
*/
private String fileName;
/**
* 关键词
*/

24
facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/indicator/EDDataPageResponse.java Normal file
View File

@ -0,0 +1,24 @@
/**
* Copyright (c) 2004-2024 All Rights Reserved.
*/
package com.electromagnetic.industry.software.data.manage.response.indicator;
import com.github.pagehelper.PageInfo;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author
* @version $Id: IndicatorCardpageResponse.java, v 0.1 2024-08-14 17:36
*/
@Data
public class EDDataPageResponse implements Serializable {
private static final long serialVersionUID = 3464355768912308150L;
/**
* 指电磁数据-文件信息数据
*/
private PageInfo<EDDataResponse> edDataPage;
}

92
facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/indicator/EDDataResponse.java Normal file
View File

@ -0,0 +1,92 @@
/**
* Copyright (c) 2004-2024 All Rights Reserved.
*/
package com.electromagnetic.industry.software.data.manage.response.indicator;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 指标卡Response
* @author
* @version $Id: IndicatorCardResponse.java, v 0.1 2024-08-14 11:23
*/
@Data
public class EDDataResponse implements Serializable {
private static final long serialVersionUID = -4835122199589863011L;
/**
* 主键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;
}

1
infrastructure/repository/repository.iml
View File

@ -11,7 +11,6 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />

7
infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/EDDataMapper.java
View File

@ -5,6 +5,7 @@ import com.electromagnetic.industry.software.data.manage.domain.boardservice.ind
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 org.apache.ibatis.annotations.Mapper;
import java.util.List;
@ -14,7 +15,7 @@ public interface EDDataMapper {
/**
* 创建文件夹
* @param parames
* @param edDataInfo
* @return
*/
Boolean createFolder(EDDataInfo edDataInfo);
@ -24,7 +25,7 @@ public interface EDDataMapper {
* @param parames
* @return
*/
Boolean getFileInfoList(EDDataParams parames);
List<EDDataInfo> getDataInfoList(EDDataParams parames);
/**
* 上传
@ -40,6 +41,4 @@ public interface EDDataMapper {
*/
Boolean download(EDDataParams parames);
}

6
infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/impl/EDDataRepositoryImpl.java
View File

@ -45,9 +45,11 @@ public class EDDataRepositoryImpl implements EDDataRepository {
* @return
*/
@Override
public Boolean getFileInfoList(EDDataParams parames)
public PageInfo<EDDataInfo> getDataInfoList(EDDataParams parames)
{
return edDataMapper.getFileInfoList(parames);
PageHelper.startPage(parames.getPageIndex(), parames.getPageSize());
List<EDDataInfo> edDataInfoList=edDataMapper.getDataInfoList(parames);
return new PageInfo<>(edDataInfoList);
}
/**

30
infrastructure/repository/src/main/resources/sqlmapper/IndicatorCardMapper.xml
View File

@ -22,6 +22,36 @@
#{modifierName,jdbcType=VARCHAR},now(),1
)
</insert>
<select id="getDataInfoList" resultMap="EDDataMapper" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams">
SELECT
data.id,
data.category_id,
data.data_id,
data.data_no,
data.data_name,
data.data_type,
data.file_type,
data.version,
data.content,
data.implant_json,
data.data_status,
data.creator, card.creator_name, card.gmt_create, card.modifier,
data.modifier_name,card.gmt_modified,card.effect_flag
FROM
ed_data_info data
<where>
data.effect_flag = 1
<if test="parentId!=null and parentId!=''">
and data.category_id='${parentId}'
</if>
<if test="keyWord!=null and keyWord!=''">
and data.data_name LIKE '%${keyWord}%'
</if>
</where>
GROUP BY data.id
order by data.gmt_modified asc
</select>
</mapper>

30
infrastructure/repository/target/classes/sqlmapper/IndicatorCardMapper.xml
View File

@ -22,6 +22,36 @@
#{modifierName,jdbcType=VARCHAR},now(),1
)
</insert>
<select id="getDataInfoList" resultMap="EDDataMapper" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams">
SELECT
data.id,
data.category_id,
data.data_id,
data.data_no,
data.data_name,
data.data_type,
data.file_type,
data.version,
data.content,
data.implant_json,
data.data_status,
data.creator, card.creator_name, card.gmt_create, card.modifier,
data.modifier_name,card.gmt_modified,card.effect_flag
FROM
ed_data_info data
<where>
data.effect_flag = 1
<if test="parentId!=null and parentId!=''">
and data.category_id='${parentId}'
</if>
<if test="keyWord!=null and keyWord!=''">
and data.data_name LIKE '%${keyWord}%'
</if>
</where>
GROUP BY data.id
order by data.gmt_modified asc
</select>
</mapper>

2
service/service.iml
View File

@ -9,8 +9,8 @@
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />

16
service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java
View File

@ -1,11 +1,16 @@
package com.electromagnetic.industry.software.data.manage.service.facade;
package com.electromagnetic.industry.software.data.manage.service.facade;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataPage;
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.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 com.electromagnetic.industry.software.data.manage.service.mappers.IndicatorCardMappers;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
import electromagnetic.data.framework.share.id.IdWorker;
@ -75,11 +80,14 @@ public class EDDataFacadeImpl implements EDDataFacade {
* @param request
* @return
*/
public ElectromagneticResult<Boolean> getFileInfoList(EDDataRequest request)
public ElectromagneticResult<EDDataPageResponse> getDataInfoList(EDDataRequest request)
{
EDDataParams parames= EDDataMappers.INSTANCE.getEDDataParames(request);
edDataService.getFileInfoList(parames);
return ElectromagneticResultUtil.success(Boolean.TRUE);
//获取中支指标配置列表
EDDataPage edDataPage = edDataService.getDataInfoList(parames);
//模型转换
EDDataPageResponse edDataPageResponse = EDDataMappers.INSTANCE.getEDDataInfoToModel(edDataPage);
return ElectromagneticResultUtil.success(edDataPageResponse);
}
/**

11
service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappers.java
View File

@ -1,12 +1,15 @@
/**
/**
* 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.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;
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;
@ -31,5 +34,11 @@ public interface EDDataMappers {
* @return
*/
EDDataInfo getEDDataInfo(EDDataRequest request);
/**
* 指标卡扩展模型返回
* @param edDataPage
* @return
*/
EDDataPageResponse getEDDataInfoToModel(EDDataPage edDataPage);
}

29
service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappersImpl.java
View File

@ -1,13 +1,17 @@
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.EDDataPage;
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.response.indicator.EDDataPageResponse;
import com.electromagnetic.industry.software.data.manage.response.indicator.EDDataResponse;
import com.github.pagehelper.PageInfo;
import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2024-11-12T16:08:00+0800",
date = "2024-11-13T15:53:51+0800",
comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_432 (Temurin)"
)
public class EDDataMappersImpl implements EDDataMappers {
@ -33,4 +37,27 @@ public class EDDataMappersImpl implements EDDataMappers {
return eDDataInfo;
}
@Override
public EDDataPageResponse getEDDataInfoToModel(EDDataPage edDataPage) {
if ( edDataPage == null ) {
return null;
}
EDDataPageResponse eDDataPageResponse = new EDDataPageResponse();
eDDataPageResponse.setEdDataPage( eDDataPageToEDDataResponsePageInfo( edDataPage ) );
return eDDataPageResponse;
}
protected PageInfo<EDDataResponse> eDDataPageToEDDataResponsePageInfo(EDDataPage eDDataPage) {
if ( eDDataPage == null ) {
return null;
}
PageInfo<EDDataResponse> pageInfo = new PageInfo<EDDataResponse>();
return pageInfo;
}
}