Skip to content

荆蔚杰 / java.archive

Go to a project
Toggle navigation
Toggle navigation pinning
24d62474 by 荆蔚杰
Options

接口逻辑优化

1 parent bb4d3f17
Inline Side-by-side
Showing 3 changed files with 19 additions and 18 deletions
...@@ -37,8 +37,8 @@ public class DgFileController { ...@@ -37,8 +37,8 @@ public class DgFileController {
37 37
38 @PostMapping("insertDgFile") 38 @PostMapping("insertDgFile")
39 @ApiOperation("新增档案文件信息") 39 @ApiOperation("新增档案文件信息")
40 public Result insertDgFile(@RequestBody List<AddDgFileRequest> request){ 40 public Result insertDgFile(@RequestBody List<AddDgFileRequest> request) {
41 if(dgfileService.insertDgFile(request)){ 41 if (dgfileService.insertDgFile(request)) {
42 return Result.ok(); 42 return Result.ok();
43 } 43 }
44 return Result.error("新增失败"); 44 return Result.error("新增失败");
...@@ -46,9 +46,9 @@ public class DgFileController { ...@@ -46,9 +46,9 @@ public class DgFileController {
46 46
47 @DeleteMapping("deleteDgFileByIds") 47 @DeleteMapping("deleteDgFileByIds")
48 @ApiOperation(value = "批量删除档案文件信息和附件") 48 @ApiOperation(value = "批量删除档案文件信息和附件")
49 public Result deleteDgFileByIds(@ApiParam("档案文件信息ID列表") @RequestParam(value = "bsmFileList") List<String> bsmFileList) { 49 public Result deleteDgFileByIds(@ApiParam("档案文件信息ID列表") @RequestBody List<String> bsmFileList) {
50 try { 50 try {
51 if(dgfileService.delete(bsmFileList)) { 51 if (dgfileService.delete(bsmFileList)) {
52 return Result.ok("删除成功"); 52 return Result.ok("删除成功");
53 } 53 }
54 } catch (Exception e) { 54 } catch (Exception e) {
...@@ -59,8 +59,8 @@ public class DgFileController { ...@@ -59,8 +59,8 @@ public class DgFileController {
59 59
60 @PutMapping("updateDgFile") 60 @PutMapping("updateDgFile")
61 @ApiOperation("修改档案文件信息") 61 @ApiOperation("修改档案文件信息")
62 public Result updateDgFile(@RequestBody UpdateDgFileRequest request){ 62 public Result updateDgFile(@RequestBody UpdateDgFileRequest request) {
63 if(dgfileService.updateDgFile(request)) { 63 if (dgfileService.updateDgFile(request)) {
64 return Result.ok("修改成功"); 64 return Result.ok("修改成功");
65 } 65 }
66 return Result.error("修改失败"); 66 return Result.error("修改失败");
...@@ -68,14 +68,14 @@ public class DgFileController { ...@@ -68,14 +68,14 @@ public class DgFileController {
68 68
69 @GetMapping("getDgFileDetailById") 69 @GetMapping("getDgFileDetailById")
70 @ApiOperation(value = "获取附件列表") 70 @ApiOperation(value = "获取附件列表")
71 public Result<List<DgCatalogWithFileVO>> getDgFileDetailById(@ApiParam("档案标识码") @RequestParam String bsmArchive){ 71 public Result<List<DgCatalogWithFileVO>> getDgFileDetailById(@ApiParam("档案标识码") @RequestParam String bsmArchive) {
72 return Result.ok(dgfileService.getFileList(bsmArchive)); 72 return Result.ok(dgfileService.getFileList(bsmArchive));
73 } 73 }
74 74
75 @PutMapping("updateFileSort") 75 @PutMapping("updateFileSort")
76 @ApiOperation("附件排序") 76 @ApiOperation("附件排序")
77 public Result updateFileSort(@RequestBody List<UpdateDgFileRequest> requests){ 77 public Result updateFileSort(@RequestBody List<UpdateDgFileRequest> requests) {
78 if(dgfileService.updateFileSort(requests)) { 78 if (dgfileService.updateFileSort(requests)) {
79 return Result.ok("修改成功"); 79 return Result.ok("修改成功");
80 } 80 }
81 return Result.error("修改失败"); 81 return Result.error("修改失败");
...@@ -85,7 +85,7 @@ public class DgFileController { ...@@ -85,7 +85,7 @@ public class DgFileController {
85 @ApiOperation("上传材料附件") 85 @ApiOperation("上传材料附件")
86 public Result upload(@RequestPart("file") MultipartFile file, AddDgFileRequest fileRequest) { 86 public Result upload(@RequestPart("file") MultipartFile file, AddDgFileRequest fileRequest) {
87 try { 87 try {
88 return Result.ok(dgfileService.upload(file,fileRequest)); 88 return Result.ok(dgfileService.upload(file, fileRequest));
89 } catch (Exception e) { 89 } catch (Exception e) {
90 return Result.exception(e.getMessage()); 90 return Result.exception(e.getMessage());
91 } 91 }
......
...@@ -137,8 +137,15 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple ...@@ -137,8 +137,15 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple
137 Integer firstXh = fileRequest.getXh(); 137 Integer firstXh = fileRequest.getXh();
138 String firstBsmCatalog = fileRequest.getBsmCatalog(); 138 String firstBsmCatalog = fileRequest.getBsmCatalog();
139 139
140 //文件信息入库
141 QueryWrapper<DgFileDO> fileWrapper = new QueryWrapper<>(); 140 QueryWrapper<DgFileDO> fileWrapper = new QueryWrapper<>();
141
142 //重新排序
143 fileWrapper.lambda().eq(DgFileDO::getBsmCatalog, firstBsmCatalog).ge(DgFileDO::getXh, firstXh + 1);
144 List<DgFileDO> list = this.list(fileWrapper);
145 list.forEach(item -> item.setXh(item.getXh() + 1));
146 this.updateBatchById(list);
147
148 //文件信息入库
142 DgFileDO fileDO = new DgFileDO(); 149 DgFileDO fileDO = new DgFileDO();
143 fileDO.setBsmCatalog(fileRequest.getBsmCatalog()); 150 fileDO.setBsmCatalog(fileRequest.getBsmCatalog());
144 fileDO.setFjurl(fileAttribute.getSaveUrl()); 151 fileDO.setFjurl(fileAttribute.getSaveUrl());
...@@ -149,12 +156,6 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple ...@@ -149,12 +156,6 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple
149 fileDO.setXh(firstXh + 1); 156 fileDO.setXh(firstXh + 1);
150 this.save(fileDO); 157 this.save(fileDO);
151 158
152 //重新排序
153 fileWrapper.lambda().eq(DgFileDO::getBsmCatalog, firstBsmCatalog).gt(DgFileDO::getXh, firstXh + 1);
154 List<DgFileDO> list = this.list(fileWrapper);
155 list.forEach(item -> item.setXh(item.getXh() + 1));
156 this.updateBatchById(list);
157
158 List<DgCatalogWithFileVO> fileList = dgfileMapper.getFileList(fileRequest.getBsmArchive()); 159 List<DgCatalogWithFileVO> fileList = dgfileMapper.getFileList(fileRequest.getBsmArchive());
159 fileList.forEach(item->item.getFileLists().forEach(file->file.setSaveUrl(file.getFjurl()))); 160 fileList.forEach(item->item.getFileLists().forEach(file->file.setSaveUrl(file.getFjurl())));
160 fileList.forEach(catalogWithFiles->catalogWithFiles.getFileLists().forEach(file->file.setFjurl(minioUtil.getPreviewUrl(file.getFjurl())))); 161 fileList.forEach(catalogWithFiles->catalogWithFiles.getFileLists().forEach(file->file.setFjurl(minioUtil.getPreviewUrl(file.getFjurl()))));
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
45 <select id="getFileList" resultMap="result"> 45 <select id="getFileList" resultMap="result">
46 select DF.*, DAC.XH as catalogXh, DAC.WJMC,DAC.BSM_CATALOG,DA.BSM_ARCHIVES 46 select DF.*, DAC.XH as catalogXh, DAC.WJMC,DAC.BSM_CATALOG,DA.BSM_ARCHIVES
47 from DG_FILE DF 47 from DG_FILE DF
48 join DG_ARCHIVES_CATALOG DAC on DAC.BSM_CATALOG = DF.BSM_CATALOG 48 right join DG_ARCHIVES_CATALOG DAC on DAC.BSM_CATALOG = DF.BSM_CATALOG
49 join DG_ARCHIVES DA on DAC.BSM_ARCHIVES = DA.BSM_ARCHIVES 49 join DG_ARCHIVES DA on DAC.BSM_ARCHIVES = DA.BSM_ARCHIVES
50 <where> 50 <where>
51 <if test="bsmArchive != null and bsmArchive != ''"> 51 <if test="bsmArchive != null and bsmArchive != ''">
......