From da8d9f2fede8799a9a209d22fe276b01b04db999 Mon Sep 17 00:00:00 2001 From: AlanScipio Date: Tue, 20 Feb 2024 18:20:27 +0800 Subject: [PATCH] =?UTF-8?q?BaseController=E5=BC=BA=E5=8C=96json=E5=93=8D?= =?UTF-8?q?=E5=BA=94,=E8=BF=BD=E5=8A=A0=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/web/controller/BaseController.java | 25 ++ .../vm/java/controller-dynamic.java.vm | 4 + .../wms/controller/ItemInfoController.java | 4 + .../wms/controller/ItemTypeController.java | 4 + .../wms/controller/UnitInfoController.java | 4 + .../controller/WarehouseInfoController.java | 4 + ruoyi-ui/src/assets/icons/svg/box-archive.svg | 1 + ruoyi-ui/src/assets/icons/svg/box.svg | 1 + .../src/assets/icons/svg/boxes-stacked.svg | 1 + ruoyi-ui/src/assets/icons/svg/circle-info.svg | 1 + .../src/assets/icons/svg/cloud-arrow-down.svg | 1 + .../src/assets/icons/svg/cloud-arrow-up.svg | 1 + ruoyi-ui/src/assets/icons/svg/cloud.svg | 1 + .../src/assets/icons/svg/cubes-stacked.svg | 1 + ruoyi-ui/src/assets/icons/svg/cubes.svg | 1 + ruoyi-ui/src/assets/icons/svg/database.svg | 1 + ruoyi-ui/src/assets/icons/svg/folder-open.svg | 1 + ruoyi-ui/src/assets/icons/svg/folder-tree.svg | 1 + ruoyi-ui/src/assets/icons/svg/folder.svg | 1 + ruoyi-ui/src/assets/icons/svg/hard-drive.svg | 1 + ruoyi-ui/src/assets/icons/svg/house.svg | 1 + ruoyi-ui/src/assets/icons/svg/industry.svg | 1 + .../src/assets/icons/svg/object-group.svg | 1 + .../src/assets/icons/svg/object-ungroup.svg | 1 + .../assets/icons/svg/share-from-square.svg | 1 + ruoyi-ui/src/assets/icons/svg/snowflake.svg | 1 + ruoyi-ui/src/assets/icons/svg/trash-can.svg | 1 + ruoyi-ui/src/assets/icons/svg/warehouse.svg | 1 + ruoyi-ui/src/views/index.vue | 2 +- ruoyi-ui/src/views/wms/ItemInfo/index.vue | 388 ++++++++++++------ 30 files changed, 329 insertions(+), 128 deletions(-) create mode 100644 ruoyi-ui/src/assets/icons/svg/box-archive.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/box.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/boxes-stacked.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/circle-info.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/cloud-arrow-down.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/cloud-arrow-up.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/cloud.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/cubes-stacked.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/cubes.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/database.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/folder-open.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/folder-tree.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/folder.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/hard-drive.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/house.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/industry.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/object-group.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/object-ungroup.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/share-from-square.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/snowflake.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/trash-can.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/warehouse.svg diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java index c34cbd31..db8b1926 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java @@ -1,17 +1,20 @@ package com.ruoyi.common.core.web.controller; +import com.alibaba.fastjson2.JSON; import com.github.pagehelper.PageInfo; import com.ruoyi.common.core.constant.HttpStatus; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.PageUtils; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.TableDataInfo; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import java.beans.PropertyEditorSupport; +import java.io.PrintWriter; import java.util.Date; import java.util.List; @@ -125,4 +128,26 @@ public class BaseController { protected AjaxResult toAjax(boolean result) { return result ? success() : error(); } + + public void responseJson(HttpServletResponse response, Object obj) { + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + try (PrintWriter writer = response.getWriter()) { + writer.write(JSON.toJSONString(obj)); + } catch (Exception e) { + logger.error("Response error", e); + } + } + + public void responseJsonSuccess(HttpServletResponse response, Object obj) { + responseJson(response, AjaxResult.success(obj)); + } + + public void responseJsonError(HttpServletResponse response, String message) { + responseJson(response, AjaxResult.error(message)); + } + + public void responseJsonWarn(HttpServletResponse response, String message) { + responseJson(response, AjaxResult.warn(message)); + } } diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller-dynamic.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller-dynamic.java.vm index 5c142aac..9d08d3a8 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller-dynamic.java.vm +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller-dynamic.java.vm @@ -67,6 +67,10 @@ public class ${ClassName}Controller extends BaseController // public void export(HttpServletResponse response, ${ClassName} ${className}) // { // List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); +// if (list.isEmpty()) { +// responseJsonWarn(response, "没有数据可以导出"); +// return; +// } // ExcelUtil<${ClassName}> util = new ExcelUtil<>(${ClassName}.class); // util.exportExcel(response, list, "${functionName}数据"); // } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/ItemInfoController.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/ItemInfoController.java index fb7d8041..9ab2d307 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/ItemInfoController.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/ItemInfoController.java @@ -46,6 +46,10 @@ public class ItemInfoController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, ItemInfo itemInfo) { List list = itemInfoService.selectItemInfoList(itemInfo); + if (list.isEmpty()) { + responseJsonWarn(response, "没有数据可以导出"); + return; + } ExcelUtil util = new ExcelUtil<>(ItemInfo.class); util.exportExcel(response, list, "物品基础信息数据"); } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/ItemTypeController.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/ItemTypeController.java index 9b8adf7e..74a327a7 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/ItemTypeController.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/ItemTypeController.java @@ -46,6 +46,10 @@ public class ItemTypeController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, ItemType itemType) { List list = itemTypeService.selectItemTypeList(itemType); + if (list.isEmpty()) { + responseJsonWarn(response, "没有数据可以导出"); + return; + } ExcelUtil util = new ExcelUtil<>(ItemType.class); util.exportExcel(response, list, "物品类型数据"); } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/UnitInfoController.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/UnitInfoController.java index 85ee1fe1..d60d3a6c 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/UnitInfoController.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/UnitInfoController.java @@ -46,6 +46,10 @@ public class UnitInfoController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, UnitInfo unitInfo) { List list = unitInfoService.selectUnitInfoList(unitInfo); + if (list.isEmpty()) { + responseJsonWarn(response, "没有数据可以导出"); + return; + } ExcelUtil util = new ExcelUtil<>(UnitInfo.class); util.exportExcel(response, list, "单位信息管理数据"); } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/WarehouseInfoController.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/WarehouseInfoController.java index 0542e2ff..0324cf83 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/WarehouseInfoController.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/WarehouseInfoController.java @@ -46,6 +46,10 @@ public class WarehouseInfoController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, WarehouseInfo warehouseInfo) { List list = warehouseInfoService.selectWarehouseInfoList(warehouseInfo); + if (list.isEmpty()) { + responseJsonWarn(response, "没有数据可以导出"); + return; + } ExcelUtil util = new ExcelUtil<>(WarehouseInfo.class); util.exportExcel(response, list, "仓库基础信息数据"); } diff --git a/ruoyi-ui/src/assets/icons/svg/box-archive.svg b/ruoyi-ui/src/assets/icons/svg/box-archive.svg new file mode 100644 index 00000000..c342bf71 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/box-archive.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/box.svg b/ruoyi-ui/src/assets/icons/svg/box.svg new file mode 100644 index 00000000..86485464 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/box.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/boxes-stacked.svg b/ruoyi-ui/src/assets/icons/svg/boxes-stacked.svg new file mode 100644 index 00000000..5d2d8c01 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/boxes-stacked.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/circle-info.svg b/ruoyi-ui/src/assets/icons/svg/circle-info.svg new file mode 100644 index 00000000..fe864509 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/circle-info.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/cloud-arrow-down.svg b/ruoyi-ui/src/assets/icons/svg/cloud-arrow-down.svg new file mode 100644 index 00000000..b10bcb6e --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/cloud-arrow-down.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/cloud-arrow-up.svg b/ruoyi-ui/src/assets/icons/svg/cloud-arrow-up.svg new file mode 100644 index 00000000..365b057e --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/cloud-arrow-up.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/cloud.svg b/ruoyi-ui/src/assets/icons/svg/cloud.svg new file mode 100644 index 00000000..73975d44 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/cloud.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/cubes-stacked.svg b/ruoyi-ui/src/assets/icons/svg/cubes-stacked.svg new file mode 100644 index 00000000..6b8e41cb --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/cubes-stacked.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/cubes.svg b/ruoyi-ui/src/assets/icons/svg/cubes.svg new file mode 100644 index 00000000..761622c1 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/cubes.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/database.svg b/ruoyi-ui/src/assets/icons/svg/database.svg new file mode 100644 index 00000000..5c75c53e --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/database.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/folder-open.svg b/ruoyi-ui/src/assets/icons/svg/folder-open.svg new file mode 100644 index 00000000..b80669d0 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/folder-open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/folder-tree.svg b/ruoyi-ui/src/assets/icons/svg/folder-tree.svg new file mode 100644 index 00000000..06f1c0ef --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/folder-tree.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/folder.svg b/ruoyi-ui/src/assets/icons/svg/folder.svg new file mode 100644 index 00000000..8fa84e00 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/folder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/hard-drive.svg b/ruoyi-ui/src/assets/icons/svg/hard-drive.svg new file mode 100644 index 00000000..f0c4207b --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/hard-drive.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/house.svg b/ruoyi-ui/src/assets/icons/svg/house.svg new file mode 100644 index 00000000..574a7583 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/house.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/industry.svg b/ruoyi-ui/src/assets/icons/svg/industry.svg new file mode 100644 index 00000000..2fed2285 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/industry.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/object-group.svg b/ruoyi-ui/src/assets/icons/svg/object-group.svg new file mode 100644 index 00000000..c846b65a --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/object-group.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/object-ungroup.svg b/ruoyi-ui/src/assets/icons/svg/object-ungroup.svg new file mode 100644 index 00000000..31c437ed --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/object-ungroup.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/share-from-square.svg b/ruoyi-ui/src/assets/icons/svg/share-from-square.svg new file mode 100644 index 00000000..70df8c07 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/share-from-square.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/snowflake.svg b/ruoyi-ui/src/assets/icons/svg/snowflake.svg new file mode 100644 index 00000000..f1050745 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/snowflake.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/trash-can.svg b/ruoyi-ui/src/assets/icons/svg/trash-can.svg new file mode 100644 index 00000000..0cfc9a1f --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/trash-can.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/warehouse.svg b/ruoyi-ui/src/assets/icons/svg/warehouse.svg new file mode 100644 index 00000000..a6bd0ad2 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/warehouse.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index da64255d..99c52c70 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -12,7 +12,7 @@
  • Java 8 升级到 Java 21
  • SpringBoot 2.7 升级到 SpringBoot 3.1
    • -
  • SpringCloud 2020.x 升级到 SpringCloud 2023.0.5
    • +
  • SpringCloud 2021.0.8 升级到 SpringCloud 2023.0.5
diff --git a/ruoyi-ui/src/views/wms/ItemInfo/index.vue b/ruoyi-ui/src/views/wms/ItemInfo/index.vue index 91fb0122..19859943 100644 --- a/ruoyi-ui/src/views/wms/ItemInfo/index.vue +++ b/ruoyi-ui/src/views/wms/ItemInfo/index.vue @@ -97,125 +97,257 @@ /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +