From f09fa1e8b65ad2e0a4a35057a0ffad184953f009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=86=E6=98=9F=E9=9C=96?= <729219176@qq.com> Date: Sun, 29 Sep 2024 07:47:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A3=B0=E9=9F=B3=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=90=8E=E5=8F=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/SysGlobalConfigController.java | 7 +- .../order/OrderDetailController.java | 2 + .../order/OrderMasterController.java | 2 + .../web/pojo/vo/SysGlobalConfigRequestVO.java | 2 +- .../pojo/vo/SysGlobalConfigResponseVO.java | 2 +- .../templates/config/globalConfig/edit.html | 187 +++++++++--------- .../resources/templates/order/master.html | 89 +++++++++ .../templates/order/orderManager.html | 90 +++++++++ .../quartz/OrderDetailsStatisticsTask.java | 38 ++++ .../quartz/OrderMasterStatisticsTask.java | 10 +- .../ghy/system/domain/SysGlobalConfig.java | 2 +- .../mapper/system/SysGlobalConfigMapper.xml | 11 +- 12 files changed, 336 insertions(+), 106 deletions(-) create mode 100644 ghy-order/src/main/java/com/ghy/order/quartz/OrderDetailsStatisticsTask.java diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/config/SysGlobalConfigController.java b/ghy-admin/src/main/java/com/ghy/web/controller/config/SysGlobalConfigController.java index 7f5add09..12c62b89 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/config/SysGlobalConfigController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/config/SysGlobalConfigController.java @@ -13,6 +13,7 @@ import lombok.RequiredArgsConstructor; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; +import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; /** @@ -21,8 +22,8 @@ import org.springframework.web.bind.annotation.*; * @Version: 1.0 * @Description: web-系统配置控制层 */ -@RestController -@RequestMapping("/web/sys/global/config") +@Controller +@RequestMapping("/config/globalConfig") @Tag(name = "web-系统配置控制层") @RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SysGlobalConfigController { @@ -38,6 +39,7 @@ public class SysGlobalConfigController { private final ISysGlobalConfigService service; + @ResponseBody @Operation(summary = "系统配置查询接口(根据类型查询)", method = "GET") @Parameters({ @Parameter(name = "typeId", description = "配置类型Code", required = true, in = ParameterIn.PATH) @@ -47,6 +49,7 @@ public class SysGlobalConfigController { return AjaxResult.success(SysGlobalConfigResponseVO.toVo(service.loadByConfigType(typeId))); } + @ResponseBody @RequiresPermissions("sys:order:audio:config:update") @Operation(summary = "系统配置修改", method = "PUT") @PutMapping(path = "/update", produces = MediaType.APPLICATION_JSON_VALUE) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index ae2ccbae..ac6e9115 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -1299,12 +1299,14 @@ public class OrderDetailController extends BaseController { return AjaxResult.success(orderDetailService.afterDetailOrderCount(orderDetail)); } + @ResponseBody @Operation(summary = "获取当天订单统计数据", method = "GET") @GetMapping(path = "/statistics/now", produces = MediaType.APPLICATION_JSON_VALUE) public AjaxResult statisticsNow() { return AjaxResult.success(orderDetailService.orderStatisticsReturnByNow()); } + @ResponseBody @Operation(summary = "获取全部订单统计数据", method = "GET") @GetMapping(path = "/statistics", produces = MediaType.APPLICATION_JSON_VALUE) public AjaxResult statistics() { diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index aded6116..c4cca5a9 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -1616,12 +1616,14 @@ public class OrderMasterController extends BaseController { return AjaxResult.success(orderMasterService.countOrderMasterList(orderMaster)); } + @ResponseBody @Operation(summary = "获取当天订单统计数据", method = "GET") @GetMapping(path = "/statistics/now", produces = MediaType.APPLICATION_JSON_VALUE) public AjaxResult statisticsNow() { return AjaxResult.success(orderMasterService.orderStatisticsReturnByNow()); } + @ResponseBody @Operation(summary = "获取全部订单统计数据", method = "GET") @GetMapping(path = "/statistics", produces = MediaType.APPLICATION_JSON_VALUE) public AjaxResult statistics() { diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/SysGlobalConfigRequestVO.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/SysGlobalConfigRequestVO.java index 604455e0..d446b9c6 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/SysGlobalConfigRequestVO.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/SysGlobalConfigRequestVO.java @@ -44,7 +44,7 @@ public class SysGlobalConfigRequestVO { private Integer dataType; @Schema(description = "单位") - private String unit; + private String configUnit; public static SysGlobalConfig toModel(SysGlobalConfigRequestVO vo){ SysGlobalConfig sysConfig = new SysGlobalConfig(); diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/SysGlobalConfigResponseVO.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/SysGlobalConfigResponseVO.java index 60e9886d..d94799a8 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/SysGlobalConfigResponseVO.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/SysGlobalConfigResponseVO.java @@ -66,7 +66,7 @@ public class SysGlobalConfigResponseVO { private String dataTypeEnumDesc; @Schema(description = "单位") - private String unit; + private String configUnit; @JsonInclude(value = JsonInclude.Include.NON_NULL) @JsonFormat(pattern = SysConstants.DATE_TIME_FORMAT, locale = "zh", timezone = "GMT+8") diff --git a/ghy-admin/src/main/resources/templates/config/globalConfig/edit.html b/ghy-admin/src/main/resources/templates/config/globalConfig/edit.html index 96bee0a0..3938ad18 100644 --- a/ghy-admin/src/main/resources/templates/config/globalConfig/edit.html +++ b/ghy-admin/src/main/resources/templates/config/globalConfig/edit.html @@ -1,134 +1,139 @@ -
-