From b7be8e0b8f44f409112fcd49bc4f9e2c827322a1 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Mon, 6 Nov 2023 13:22:57 +0800 Subject: [PATCH] =?UTF-8?q?APP=E6=A0=B9=E6=8D=AE=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=A4=B4=E5=92=8C=E7=89=88=E6=9C=AC=E5=8F=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=BB=E4=BF=A1=E6=81=AF=E4=BB=A5=E5=8F=8A=E5=AD=90=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=9B=86=E5=90=88=20APP=E5=AD=97=E5=85=B8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/controller/dict/DictTypeController.java | 6 ++++-- .../controller/dict/vo/data/DictDataSimpleRespVO.java | 3 +++ .../wms/controller/labeltype/LabeltypeController.java | 5 +++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/dict/DictTypeController.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/dict/DictTypeController.java index 38d93b40..25329469 100644 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/dict/DictTypeController.java +++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/dict/DictTypeController.java @@ -7,6 +7,7 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.controller.dict.vo.data.DictDataExcelVO; import com.win.module.system.controller.dict.vo.data.DictDataExportReqVO; +import com.win.module.system.controller.dict.vo.data.DictDataSimpleRespVO; import com.win.module.system.controller.dict.vo.type.*; import com.win.module.system.convert.dict.DictDataConvert; import com.win.module.system.convert.dict.DictTypeConvert; @@ -106,6 +107,7 @@ public class DictTypeController { @Operation(summary = "/根据类型查询展示类型下所有详细列表") @PostMapping("/getDictByTypes") + @Parameter(name = "types", description = "字典类型数组", required = false, example = "\"types\":[\"infra_config_type\",\"user_type\"]") @PreAuthorize("@ss.hasPermission('system:dict:query')") public CommonResult> getByTypes(@RequestBody Map> map) { System.out.println(Json.pretty(map)); @@ -117,8 +119,8 @@ public class DictTypeController { dictDataExportReqVO.setDictType(en.getType()); dictDataExportReqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); List dictDataList = dictDataService.getDictDataList(dictDataExportReqVO); - List dictDataExcelVOS = DictDataConvert.INSTANCE.convertList02(dictDataList); - en.setSubList(dictDataExcelVOS); + List dictDataSimpleRespVOS = DictDataConvert.INSTANCE.convertList(dictDataList); + en.setSubList(dictDataSimpleRespVOS); } return success(result); } diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/dict/vo/data/DictDataSimpleRespVO.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/dict/vo/data/DictDataSimpleRespVO.java index 4b3b8bb8..f84be742 100644 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/dict/vo/data/DictDataSimpleRespVO.java +++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/dict/vo/data/DictDataSimpleRespVO.java @@ -22,4 +22,7 @@ public class DictDataSimpleRespVO { @Schema(description = "css 样式", example = "btn-visible") private String cssClass; + @Schema(description = "备注", example = "我是一个角色") + private String remark; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java index f0707665..95a358ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java @@ -131,8 +131,9 @@ public class LabeltypeController { } @GetMapping("/getDetailsByHeader") - @Operation(summary = "根据标签头及版本获取类型信息以及类型下所有的条码片段信息") - @Parameter(name = "id", description = "编号", required = true, example = "1024") + @Operation(summary = "APP根据标签头及版本获取类型信息以及类型下所有的条码片段信息") + @Parameter(name = "header", description = "数据头", required = true, example = "HPQ") + @Parameter(name = "version", description = "版本号", required = true, example = "V1.0") @PreAuthorize("@ss.hasPermission('wms:labeltypeService:query')") public CommonResult getDetailsByHeader(LabeltypeRespVO LabeltypeRespVO) { if(LabeltypeRespVO.getHeader()!=null&& !LabeltypeRespVO.getHeader().isEmpty()&& LabeltypeRespVO.getVersion()!=null&& !LabeltypeRespVO.getVersion().isEmpty()){