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