From 0d39365aabf0283c880066b9c859afa24d1cc064 Mon Sep 17 00:00:00 2001 From: sxlong Date: Wed, 13 Nov 2024 17:55:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E8=A7=84=E5=88=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2d351a5..a8e2439 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,8 @@ hs_err_pid* .vs -.idea \ No newline at end of file +.idea +*.iml +**/target/ + + From c84aea4b0ff0eefeb4ea66c2a134e169a2c71e79 Mon Sep 17 00:00:00 2001 From: "578646533@qq.com" <123456qq> Date: Wed, 13 Nov 2024 18:00:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/user/UserController.java | 6 +- .../indicator/model/EDDataPage.java | 1 - .../indicator/parames/EDDataParams.java | 1 - .../repository/EDDataRepository.java | 5 -- .../indicator/service/EDDataService.java | 7 -- .../service/impl/EDDataServiceImpl.java | 10 --- .../share/config/DefaultValidationTool.java | 3 +- .../ValidationToolAutoConfiguration.java | 2 +- .../share/log/ServiceResultHandleUtil.java | 2 +- .../framework/share/model/BaseResult.java | 3 - .../util/DefaultSimpleValidationTool.java | 2 +- ...gneticValidationToolAutoConfiguration.java | 2 +- ...ectromagneticSimpleValidationToolImpl.java | 2 +- .../data/manage/facade/EDDataFacade.java | 3 - .../manage/facade/IndicatorCardFacade.java | 3 +- .../data/manage/facade/user/UserFacade.java | 1 - .../request/indicator/EDDataRequest.java | 2 - .../indicator/EDDataPageResponse.java | 3 +- .../manage/repository/ObMybatisConfig.java | 1 - .../manage/repository/dao/EDDataMapper.java | 4 -- .../repository/impl/EDDataRepositoryImpl.java | 3 - .../resources/sqlmapper/EdDataInfoMapper.xml | 72 +++++++++++++++++++ .../sqlmapper/IndicatorCardMapper.xml | 56 --------------- .../service/facade/EDDataFacadeImpl.java | 3 +- .../facade/IndicatorCardFacadeImpl.java | 2 +- .../manage/service/mappers/UserMappers.java | 2 - 26 files changed, 86 insertions(+), 115 deletions(-) create mode 100644 infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml diff --git a/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/user/UserController.java b/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/user/UserController.java index 918ed6a..89b9024 100644 --- a/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/user/UserController.java +++ b/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/user/UserController.java @@ -3,9 +3,11 @@ package com.electromagnetic.industry.software.data.manage.controller.user; import com.electromagnetic.industry.software.data.manage.facade.user.UserFacade; import com.electromagnetic.industry.software.data.manage.request.user.UserRequest; import electromagnetic.data.framework.share.model.BaseResult; -import electromagnetic.data.framework.share.model.ElectromagneticResult; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; diff --git a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDDataPage.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDDataPage.java index df58d98..bd1546d 100644 --- a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDDataPage.java +++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDDataPage.java @@ -7,7 +7,6 @@ import com.github.pagehelper.PageInfo; import lombok.Data; import java.io.Serializable; -import java.util.List; /** * 分页综合返回 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 index 712a127..5da9486 100644 --- 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 @@ -3,7 +3,6 @@ package com.electromagnetic.industry.software.data.manage.domain.boardservice.in import lombok.Data; import java.io.Serializable; -import java.util.Date; @Data public class EDDataParams implements Serializable { 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 index d11a563..0b1440c 100644 --- 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 @@ -4,14 +4,9 @@ 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 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 952ae78..22e47da 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,15 +1,8 @@ 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.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.request.indicator.EDDataRequest; -import electromagnetic.data.framework.share.model.ElectromagneticResult; -import electromagnetic.data.framework.share.model.ElectromagneticResultUtil; - -import java.util.List; public interface EDDataService { 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 dc9dd16..11f7c75 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 @@ -3,28 +3,18 @@ */ 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.EDDataPage; 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; 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 diff --git a/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/config/DefaultValidationTool.java b/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/config/DefaultValidationTool.java index 531b457..b196ac5 100644 --- a/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/config/DefaultValidationTool.java +++ b/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/config/DefaultValidationTool.java @@ -10,18 +10,17 @@ import electromagnetic.data.framework.share.util.Functions; import electromagnetic.data.framework.share.util.Results; import electromagnetic.data.framework.share.validation.ValidationResult; import electromagnetic.data.framework.share.validation.ValidationTool; -import electromagnetic.data.framework.share.util.*; import org.hibernate.validator.HibernateValidator; import org.hibernate.validator.HibernateValidatorConfiguration; import org.springframework.beans.factory.InitializingBean; import javax.validation.ConstraintViolation; import javax.validation.Validation; +import javax.validation.Validator; import javax.validation.ValidatorFactory; import java.util.Set; import java.util.function.BiFunction; import java.util.function.Consumer; -import javax.validation.Validator; /** * 默认的验证工具实现，支持函数化的编程方式 diff --git a/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/config/ValidationToolAutoConfiguration.java b/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/config/ValidationToolAutoConfiguration.java index eacf013..3d04db4 100644 --- a/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/config/ValidationToolAutoConfiguration.java +++ b/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/config/ValidationToolAutoConfiguration.java @@ -3,9 +3,9 @@ */ package electromagnetic.data.framework.share.config; +import electromagnetic.data.framework.share.util.DefaultSimpleValidationTool; import electromagnetic.data.framework.share.validation.SimpleValidationTool; import electromagnetic.data.framework.share.validation.ValidationTool; -import electromagnetic.data.framework.share.util.DefaultSimpleValidationTool; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/log/ServiceResultHandleUtil.java b/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/log/ServiceResultHandleUtil.java index 3b00e67..912edb0 100644 --- a/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/log/ServiceResultHandleUtil.java +++ b/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/log/ServiceResultHandleUtil.java @@ -8,11 +8,11 @@ import electromagnetic.data.framework.share.enums.ElectromagneticCommonErrorEnum import electromagnetic.data.framework.share.enums.ElectromagneticSceneIncidentEnum; import electromagnetic.data.framework.share.exception.BizRuntimeException; import electromagnetic.data.framework.share.exception.ElectromagneticBizRuntimeException; +import electromagnetic.data.framework.share.exception.IllegalParameterException; import electromagnetic.data.framework.share.model.ElectromagneticPaginationResult; import electromagnetic.data.framework.share.model.ElectromagneticResult; import electromagnetic.data.framework.share.model.PageModel; import electromagnetic.data.framework.share.result.CallbackResult; -import electromagnetic.data.framework.share.exception.IllegalParameterException; import javax.xml.bind.ValidationException; import java.util.Optional; diff --git a/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/model/BaseResult.java b/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/model/BaseResult.java index 07852fc..2407b91 100644 --- a/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/model/BaseResult.java +++ b/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/model/BaseResult.java @@ -1,8 +1,5 @@ package electromagnetic.data.framework.share.model; -import electromagnetic.data.framework.share.result.Message; -import electromagnetic.data.framework.share.result.Result; - import java.io.Serializable; public class BaseResult implements Serializable{ diff --git a/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/util/DefaultSimpleValidationTool.java b/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/util/DefaultSimpleValidationTool.java index 96ea2bb..ee52040 100644 --- a/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/util/DefaultSimpleValidationTool.java +++ b/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/util/DefaultSimpleValidationTool.java @@ -3,9 +3,9 @@ */ package electromagnetic.data.framework.share.util; +import electromagnetic.data.framework.share.exception.IllegalParameterException; import electromagnetic.data.framework.share.validation.SimpleValidationTool; import electromagnetic.data.framework.share.validation.ValidationTool; -import electromagnetic.data.framework.share.exception.IllegalParameterException; /** * @author wsk diff --git a/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/validation/config/ElectromagneticValidationToolAutoConfiguration.java b/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/validation/config/ElectromagneticValidationToolAutoConfiguration.java index 1520074..2072797 100644 --- a/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/validation/config/ElectromagneticValidationToolAutoConfiguration.java +++ b/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/validation/config/ElectromagneticValidationToolAutoConfiguration.java @@ -4,10 +4,10 @@ package electromagnetic.data.framework.share.validation.config; -import electromagnetic.data.framework.share.validation.ValidationTool; import electromagnetic.data.framework.share.config.DefaultValidationTool; import electromagnetic.data.framework.share.config.ValidationToolAutoConfiguration; import electromagnetic.data.framework.share.validation.ElectromagneticSimpleValidationTool; +import electromagnetic.data.framework.share.validation.ValidationTool; import electromagnetic.data.framework.share.validation.impl.ElectromagneticSimpleValidationToolImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/validation/impl/ElectromagneticSimpleValidationToolImpl.java b/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/validation/impl/ElectromagneticSimpleValidationToolImpl.java index 3ec8c75..126f316 100644 --- a/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/validation/impl/ElectromagneticSimpleValidationToolImpl.java +++ b/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/validation/impl/ElectromagneticSimpleValidationToolImpl.java @@ -4,9 +4,9 @@ package electromagnetic.data.framework.share.validation.impl; -import electromagnetic.data.framework.share.validation.ValidationTool; import electromagnetic.data.framework.share.exception.IllegalParameterException; import electromagnetic.data.framework.share.validation.ElectromagneticSimpleValidationTool; +import electromagnetic.data.framework.share.validation.ValidationTool; /** */ 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 index c1e1586..dcd4eb6 100644 --- 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 @@ -4,9 +4,6 @@ import com.electromagnetic.industry.software.data.manage.request.indicator.EDDat import com.electromagnetic.industry.software.data.manage.response.indicator.EDDataPageResponse; import electromagnetic.data.framework.share.model.ElectromagneticResult; -import java.util.List; -import java.util.Map; - public interface EDDataFacade { /** diff --git a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/IndicatorCardFacade.java b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/IndicatorCardFacade.java index 41b5348..fba7c86 100644 --- a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/IndicatorCardFacade.java +++ b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/IndicatorCardFacade.java @@ -4,12 +4,11 @@ package com.electromagnetic.industry.software.data.manage.facade; - -import electromagnetic.data.framework.share.model.ElectromagneticResult; import com.electromagnetic.industry.software.data.manage.request.indicator.IndicatorCardRequest; import com.electromagnetic.industry.software.data.manage.request.indicator.IndicatorDataRequest; import com.electromagnetic.industry.software.data.manage.response.indicator.IndicatorCardDetailReponse; import com.electromagnetic.industry.software.data.manage.response.indicator.IndicatorCardPageResponse; +import electromagnetic.data.framework.share.model.ElectromagneticResult; import java.util.List; import java.util.Map; diff --git a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/user/UserFacade.java b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/user/UserFacade.java index 4fc3b20..9d11592 100644 --- a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/user/UserFacade.java +++ b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/user/UserFacade.java @@ -2,7 +2,6 @@ package com.electromagnetic.industry.software.data.manage.facade.user; import com.electromagnetic.industry.software.data.manage.request.user.UserRequest; import electromagnetic.data.framework.share.model.BaseResult; -import electromagnetic.data.framework.share.model.ElectromagneticResult; public interface UserFacade { 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 c275313..8366b2a 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 @@ -3,8 +3,6 @@ package com.electromagnetic.industry.software.data.manage.request.indicator; import electromagnetic.data.framework.share.model.BaseRequest; import lombok.Data; -import java.util.Date; - @Data public class EDDataRequest extends BaseRequest { diff --git a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/indicator/EDDataPageResponse.java b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/indicator/EDDataPageResponse.java index 44332cf..9f5e6d9 100644 --- a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/indicator/EDDataPageResponse.java +++ b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/indicator/EDDataPageResponse.java @@ -8,7 +8,6 @@ import com.github.pagehelper.PageInfo; import lombok.Data; import java.io.Serializable; -import java.util.List; /** * @author @@ -20,5 +19,5 @@ public class EDDataPageResponse implements Serializable { /** * 指电磁数据-文件信息数据 */ - private PageInfo edDataPage; + private PageInfo edDataInfo; } \ No newline at end of file diff --git a/infrastructure/common/src/main/java/com/electromagnetic/industry/software/data/manage/repository/ObMybatisConfig.java b/infrastructure/common/src/main/java/com/electromagnetic/industry/software/data/manage/repository/ObMybatisConfig.java index 688131a..eaad16f 100644 --- a/infrastructure/common/src/main/java/com/electromagnetic/industry/software/data/manage/repository/ObMybatisConfig.java +++ b/infrastructure/common/src/main/java/com/electromagnetic/industry/software/data/manage/repository/ObMybatisConfig.java @@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.jdbc.DataSourceBuilder; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.jdbc.core.JdbcTemplate; 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 index f810ed4..a8595e7 100644 --- 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 @@ -1,11 +1,7 @@ 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 com.github.pagehelper.PageInfo; import org.apache.ibatis.annotations.Mapper; import java.util.List; 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 index 20e9407..5c51dc7 100644 --- 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 @@ -4,10 +4,7 @@ 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; diff --git a/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml b/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml new file mode 100644 index 0000000..8ac7123 --- /dev/null +++ b/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + 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 + ) + + + + + + diff --git a/infrastructure/repository/src/main/resources/sqlmapper/IndicatorCardMapper.xml b/infrastructure/repository/src/main/resources/sqlmapper/IndicatorCardMapper.xml index 9b05b25..ba4caa8 100644 --- a/infrastructure/repository/src/main/resources/sqlmapper/IndicatorCardMapper.xml +++ b/infrastructure/repository/src/main/resources/sqlmapper/IndicatorCardMapper.xml @@ -1,61 +1,6 @@ - - - - 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 02cefab..cd8fc05 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 @@ -8,10 +8,9 @@ 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.EDDataPageResponse; 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.id.IdWorker; 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; diff --git a/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/IndicatorCardFacadeImpl.java b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/IndicatorCardFacadeImpl.java index 098e5b8..8e8bb92 100644 --- a/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/IndicatorCardFacadeImpl.java +++ b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/IndicatorCardFacadeImpl.java @@ -3,13 +3,13 @@ */ package com.electromagnetic.industry.software.data.manage.service.facade; -import com.electromagnetic.industry.software.data.manage.facade.IndicatorCardFacade; import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.Indicator; import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard; import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardDetial; import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardPage; import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams; import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.IndicatorCardService; +import com.electromagnetic.industry.software.data.manage.facade.IndicatorCardFacade; import com.electromagnetic.industry.software.data.manage.request.indicator.IndicatorCardRequest; import com.electromagnetic.industry.software.data.manage.request.indicator.IndicatorDataRequest; import com.electromagnetic.industry.software.data.manage.response.indicator.IndicatorCardDetailReponse; diff --git a/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappers.java b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappers.java index 11a915e..a7ff0e7 100644 --- a/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappers.java +++ b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappers.java @@ -8,8 +8,6 @@ import com.electromagnetic.industry.software.data.manage.request.user.UserReques import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import java.util.List; - /** * 用户模型转换 * @author szt From 3b027797c1ddc0cd96e9615aa33b7785af85c587 Mon Sep 17 00:00:00 2001 From: sxlong Date: Thu, 14 Nov 2024 16:29:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=8A=B6=E6=80=81=E6=8E=A5=E5=8F=A3(?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=90=AF=E5=8A=A8);?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/controller/EDDataController.java | 11 ++++--- .../indicator/parames/EDDataParams.java | 4 +++ .../repository/EDDataRepository.java | 9 +++++- .../indicator/service/EDDataService.java | 7 ++++ .../service/impl/EDDataServiceImpl.java | 11 +++++++ .../data/manage/facade/EDDataFacade.java | 7 ++++ .../request/indicator/EDDataRequest.java | 8 ++--- .../manage/repository/dao/EDDataMapper.java | 7 ++++ .../repository/impl/EDDataRepositoryImpl.java | 13 +++++++- .../resources/sqlmapper/EdDataInfoMapper.xml | 13 +++++++- .../service/facade/EDDataFacadeImpl.java | 32 ++++++++----------- 11 files changed, 93 insertions(+), 29 deletions(-) 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 5acfe2b..a094597 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 @@ -22,7 +22,6 @@ public class EDDataController { @ApiOperation(value = "新建文件夹",notes = "") @RequestMapping(value = "/createFolder",method = RequestMethod.POST) public ElectromagneticResult createFolder(@RequestBody EDDataRequest request){ - //return ElectromagneticResultUtil.success("新建文件夹接口"); return edDataFacade.createFolder(request); } @@ -30,15 +29,20 @@ public class EDDataController { @ApiOperation(value = "获取文件信息列表",notes = "") @RequestMapping(value = "/getFileInfoList",method = RequestMethod.POST) public ElectromagneticResult getFileInfoList(@RequestBody EDDataRequest request){ - //return ElectromagneticResultUtil.success("获取文件信息列表"); return edDataFacade.getDataInfoList(request); } + @ApiOperation(value = "更新文件占用状态",notes = "") + @RequestMapping(value = "/updateFileStatus",method = RequestMethod.POST) + public ElectromagneticResult updateFileStatus(@RequestBody EDDataRequest request){ + return edDataFacade.updateFileStatus(request); + } + + @ApiOperation(value = "上传",notes = "") @RequestMapping(value = "/upload",method = RequestMethod.POST) public ElectromagneticResult upload(@RequestBody EDDataRequest request){ - //return ElectromagneticResultUtil.success("上传"); return edDataFacade.upload(request); } @@ -46,7 +50,6 @@ public class EDDataController { @ApiOperation(value = "下载",notes = "") @RequestMapping(value = "/download",method = RequestMethod.POST) public ElectromagneticResult download(@RequestBody EDDataRequest request){ - //return ElectromagneticResultUtil.success("下载"); return edDataFacade.download(request); } 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 index 5da9486..beddb88 100644 --- 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 @@ -31,4 +31,8 @@ public class EDDataParams implements Serializable { * 文件数据编码 */ private String dataId; + /** + * 文件数据状态 + */ + private String dataStatus; } 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 index 0b1440c..804a225 100644 --- 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 @@ -15,7 +15,7 @@ public interface EDDataRepository { /** * 创建文件夹 - * @param parames + * @param edDataInfo * @return */ Boolean createFolder(EDDataInfo edDataInfo); @@ -27,6 +27,13 @@ public interface EDDataRepository { */ PageInfo getDataInfoList(EDDataParams parames); + /** + * 更新文件占用状态 + * @param parames + * @return + */ + Boolean updateFileStatus(EDDataParams parames); + /** * 上传 * @param parames 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 22e47da..e6971d7 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 @@ -20,6 +20,13 @@ public interface EDDataService { */ EDDataPage getDataInfoList(EDDataParams parames); + /** + * 更新文件占用状态 + * @param parames + * @return + */ + Boolean updateFileStatus(EDDataParams parames); + /** * 上传 * @param 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 11f7c75..ac83e68 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 @@ -54,6 +54,17 @@ public class EDDataServiceImpl implements EDDataService { return edDataPage; } + /** + * 更新文件占用状态 + * @param parames + * @return + */ + public Boolean updateFileStatus(EDDataParams parames) + { + edDataRepository.updateFileStatus(parames); + return Boolean.TRUE; + } + /** * 上传 * @param parames 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 index dcd4eb6..67480c6 100644 --- 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 @@ -21,6 +21,13 @@ public interface EDDataFacade { */ ElectromagneticResult getDataInfoList(EDDataRequest request); + /** + * 更新文件占用状态 + * @param request + * @return + */ + ElectromagneticResult updateFileStatus(EDDataRequest request); + /** * 上传 * @param request 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 8366b2a..bdfac2d 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 @@ -22,10 +22,6 @@ public class EDDataRequest extends BaseRequest { * 文件夹名称 */ private String name; - /** - * 文件夹名称 - */ - private String fileName; /** * 关键词 */ @@ -34,4 +30,8 @@ public class EDDataRequest extends BaseRequest { * 文件数据编码 */ private String dataId; + /** + * 文件数据状态 + */ + private String dataStatus; } 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 index a8595e7..0895338 100644 --- 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 @@ -23,6 +23,13 @@ public interface EDDataMapper { */ List getDataInfoList(EDDataParams parames); + /** + * 更新文件占用状态 + * @param parames + * @return + */ + Boolean updateFileStatus(EDDataParams parames); + /** * 上传 * @param parames 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 index 5c51dc7..d5756fb 100644 --- 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 @@ -27,7 +27,7 @@ public class EDDataRepositoryImpl implements EDDataRepository { /** * 创建文件夹 * - * @param parames + * @param edDataInfo * @return */ @Override @@ -49,6 +49,17 @@ public class EDDataRepositoryImpl implements EDDataRepository { return new PageInfo<>(edDataInfoList); } + /** + * 更新文件占用状态 + * @param parames + * @return + */ + @Override + public Boolean updateFileStatus(EDDataParams parames) + { + return edDataMapper.updateFileStatus(parames); + } + /** * 上传 * @param parames diff --git a/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml b/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml index 8ac7123..798a071 100644 --- a/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml +++ b/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml @@ -55,7 +55,7 @@ SELECT FROM - ed_data_info data + ed_data_info where effect_flag = 1 @@ -68,5 +68,16 @@ order by gmt_modified asc + + update ed_data_info + + + data_status = #{dataStatus,jdbcType=VARCHAR}, + + gmt_modified = now() + + where data_id = #{dataId,jdbcType=VARCHAR} and effect_flag = 1 + + 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 cd8fc05..abb0fe7 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 @@ -21,24 +21,6 @@ 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 @@ -87,6 +69,20 @@ public class EDDataFacadeImpl implements EDDataFacade { return ElectromagneticResultUtil.success(edDataPageResponse); } + /** + * 更新文件占用状态 + * WISDOM_UPDATE_FILESTATUS + * /data/ed/file/updateFileStatus + * @param request + * @return + */ + public ElectromagneticResult updateFileStatus(EDDataRequest request) + { + EDDataParams parames= EDDataMappers.INSTANCE.getEDDataParames(request); + edDataService.updateFileStatus(parames); + return ElectromagneticResultUtil.success(Boolean.TRUE); + } + /** * 上传 * WISDOM_UPLOAD From ec74835a08581b0742a579439ff99e27767938fc Mon Sep 17 00:00:00 2001 From: sxlong Date: Thu, 14 Nov 2024 16:45:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=8A=B6=E6=80=81=E6=8E=A5=E5=8F=A3(?= =?UTF-8?q?=E8=83=BD=E6=AD=A3=E5=B8=B8=E8=BF=90=E8=A1=8C);?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EDDataServiceImpl.java | 2 +- .../manage/repository/dao/EDDataMapper.java | 17 ++--------------- .../repository/impl/EDDataRepositoryImpl.java | 9 ++++++--- .../resources/sqlmapper/EdDataInfoMapper.xml | 4 ++-- 4 files changed, 11 insertions(+), 21 deletions(-) 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 ac83e68..f35cceb 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 @@ -31,7 +31,7 @@ public class EDDataServiceImpl implements EDDataService { /** * 创建文件夹 - * @param parames + * @param edDataInfo * @return */ public Boolean createFolder(EDDataInfo edDataInfo) 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 index 0895338..575e341 100644 --- 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 @@ -10,11 +10,11 @@ import java.util.List; public interface EDDataMapper { /** - * 创建文件夹 + * 创建文件/文件夹数据信息 * @param edDataInfo * @return */ - Boolean createFolder(EDDataInfo edDataInfo); + Boolean createDataInfo(EDDataInfo edDataInfo); /** * 获取文件信息列表 @@ -30,18 +30,5 @@ public interface EDDataMapper { */ Boolean updateFileStatus(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 index d5756fb..c2c1118 100644 --- 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 @@ -33,7 +33,7 @@ public class EDDataRepositoryImpl implements EDDataRepository { @Override public Boolean createFolder(EDDataInfo edDataInfo) { - return edDataMapper.createFolder(edDataInfo); + return edDataMapper.createDataInfo(edDataInfo); } /** @@ -68,7 +68,9 @@ public class EDDataRepositoryImpl implements EDDataRepository { @Override public Boolean upload(EDDataParams parames) { - return edDataMapper.upload(parames); + //return edDataMapper.upload(parames); + //edDataMapper.createDataInfo(edDataInfo); + return Boolean.TRUE; } /** @@ -79,7 +81,8 @@ public class EDDataRepositoryImpl implements EDDataRepository { @Override public Boolean download(EDDataParams parames) { - return edDataMapper.download(parames); + //return edDataMapper.download(parames); + return Boolean.TRUE; } diff --git a/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml b/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml index 798a071..740b2a9 100644 --- a/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml +++ b/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml @@ -29,7 +29,7 @@ - + SELECT LAST_INSERT_ID() @@ -68,7 +68,7 @@ order by gmt_modified asc - + update ed_data_info