diff --git a/archives/pom.xml b/archives/pom.xml new file mode 100644 index 0000000..2716d5d --- /dev/null +++ b/archives/pom.xml @@ -0,0 +1,20 @@ + + + + yxk_StoreroomSystem + com.storeroom + 1.0 + + 4.0.0 + + archives + 档案配置 + + + 17 + 17 + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 17fc3ae..933fdd4 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,7 @@ common system logging + archives 智能库房综合管理系统 diff --git a/system/src/main/java/com/storeroom/modules/system/controller/DictDetailController.java b/system/src/main/java/com/storeroom/modules/system/controller/DictDetailController.java index 577c73a..a9a7ef3 100644 --- a/system/src/main/java/com/storeroom/modules/system/controller/DictDetailController.java +++ b/system/src/main/java/com/storeroom/modules/system/controller/DictDetailController.java @@ -15,8 +15,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.web.PageableDefault; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -36,20 +34,20 @@ public class DictDetailController { @ApiOperation("查询字典详情") @GetMapping - public ResponseEntity queryDictDetail(DictDetailQueryCriteria criteria, + public ApiResponse queryDictDetail(DictDetailQueryCriteria criteria, @PageableDefault(sort = {"dictSort"}, direction = Sort.Direction.ASC) Pageable pageable) { - return new ResponseEntity<>(dictDetailService.queryAll(criteria, pageable), HttpStatus.OK); + return ApiResponse.success(dictDetailService.queryAll(criteria, pageable)); } @ApiOperation("查询多个字典详情") @GetMapping(value = "/map") - public ResponseEntity getDictDetailMaps(@RequestParam String dictName) { + public ApiResponse getDictDetailMaps(@RequestParam String dictName) { String[] names = dictName.split("[,,]"); Map> dictMap = new HashMap<>(16); for (String name : names) { dictMap.put(name, dictDetailService.getDictByName(name)); } - return new ResponseEntity<>(dictMap, HttpStatus.OK); + return ApiResponse.success(dictMap); } @Log("新增字典详情")