BJ_ZTEITS-Developers / parking-cloud-yudao

Commit bf720882127b9b26a7b49c87968a8e5061742f2c

Authored by YunaiV
1 parent 32a7d14d

✨ feat(home): 新增 MES 首页统计功能及相关数据结构

Inline Side-by-side
Showing 8 changed files with 22 additions and 22 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/statistics/MesHomeStatisticsController.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/home/MesHomeStatisticsController.java
  View file @bf72088
1 -package cn.iocoder.yudao.module.mes.controller.admin.statistics; 1 +package cn.iocoder.yudao.module.mes.controller.admin.home;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 -import cn.iocoder.yudao.module.mes.controller.admin.statistics.vo.MesHomeProductionTrendRespVO;  
5 -import cn.iocoder.yudao.module.mes.controller.admin.statistics.vo.MesHomeSummaryRespVO;  
6 -import cn.iocoder.yudao.module.mes.controller.admin.statistics.vo.MesHomeWorkOrderStatusRespVO;  
7 -import cn.iocoder.yudao.module.mes.service.statistics.MesHomeStatisticsService; 4 +import cn.iocoder.yudao.module.mes.controller.admin.home.vo.MesHomeProductionTrendRespVO;
  5 +import cn.iocoder.yudao.module.mes.controller.admin.home.vo.MesHomeSummaryRespVO;
  6 +import cn.iocoder.yudao.module.mes.controller.admin.home.vo.MesHomeWorkOrderStatusRespVO;
  7 +import cn.iocoder.yudao.module.mes.service.home.MesHomeStatisticsService;
8 import io.swagger.v3.oas.annotations.Operation; 8 import io.swagger.v3.oas.annotations.Operation;
9 import io.swagger.v3.oas.annotations.Parameter; 9 import io.swagger.v3.oas.annotations.Parameter;
10 import io.swagger.v3.oas.annotations.tags.Tag; 10 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -31,14 +31,14 @@ public class MesHomeStatisticsController { @@ -31,14 +31,14 @@ public class MesHomeStatisticsController {
31 31
32 @GetMapping("/summary") 32 @GetMapping("/summary")
33 @Operation(summary = "获得首页汇总统计") 33 @Operation(summary = "获得首页汇总统计")
34 - @PreAuthorize("@ss.hasPermission('mes:statistics:query')") 34 + @PreAuthorize("@ss.hasPermission('mes:home:query')")
35 public CommonResult<MesHomeSummaryRespVO> getHomeSummary() { 35 public CommonResult<MesHomeSummaryRespVO> getHomeSummary() {
36 return success(homeStatisticsService.getHomeSummary()); 36 return success(homeStatisticsService.getHomeSummary());
37 } 37 }
38 38
39 @GetMapping("/work-order-status") 39 @GetMapping("/work-order-status")
40 @Operation(summary = "获得工单状态分布") 40 @Operation(summary = "获得工单状态分布")
41 - @PreAuthorize("@ss.hasPermission('mes:statistics:query')") 41 + @PreAuthorize("@ss.hasPermission('mes:home:query')")
42 public CommonResult<List<MesHomeWorkOrderStatusRespVO>> getWorkOrderStatusDistribution() { 42 public CommonResult<List<MesHomeWorkOrderStatusRespVO>> getWorkOrderStatusDistribution() {
43 return success(homeStatisticsService.getWorkOrderStatusDistribution()); 43 return success(homeStatisticsService.getWorkOrderStatusDistribution());
44 } 44 }
@@ -46,7 +46,7 @@ public class MesHomeStatisticsController { @@ -46,7 +46,7 @@ public class MesHomeStatisticsController {
46 @GetMapping("/production-trend") 46 @GetMapping("/production-trend")
47 @Operation(summary = "获得生产趋势") 47 @Operation(summary = "获得生产趋势")
48 @Parameter(name = "days", description = "天数", example = "7") 48 @Parameter(name = "days", description = "天数", example = "7")
49 - @PreAuthorize("@ss.hasPermission('mes:statistics:query')") 49 + @PreAuthorize("@ss.hasPermission('mes:home:query')")
50 public CommonResult<List<MesHomeProductionTrendRespVO>> getProductionTrend( 50 public CommonResult<List<MesHomeProductionTrendRespVO>> getProductionTrend(
51 @RequestParam(value = "days", defaultValue = "7") Integer days) { 51 @RequestParam(value = "days", defaultValue = "7") Integer days) {
52 return success(homeStatisticsService.getProductionTrend(days)); 52 return success(homeStatisticsService.getProductionTrend(days));
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/statistics/vo/MesHomeProductionTrendRespVO.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/home/vo/MesHomeProductionTrendRespVO.java
  View file @bf72088
1 -package cn.iocoder.yudao.module.mes.controller.admin.statistics.vo; 1 +package cn.iocoder.yudao.module.mes.controller.admin.home.vo;
2 2
3 import io.swagger.v3.oas.annotations.media.Schema; 3 import io.swagger.v3.oas.annotations.media.Schema;
4 import lombok.AllArgsConstructor; 4 import lombok.AllArgsConstructor;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/statistics/vo/MesHomeSummaryRespVO.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/home/vo/MesHomeSummaryRespVO.java
  View file @bf72088
1 -package cn.iocoder.yudao.module.mes.controller.admin.statistics.vo; 1 +package cn.iocoder.yudao.module.mes.controller.admin.home.vo;
2 2
3 import io.swagger.v3.oas.annotations.media.Schema; 3 import io.swagger.v3.oas.annotations.media.Schema;
4 import lombok.Data; 4 import lombok.Data;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/statistics/vo/MesHomeWorkOrderStatusRespVO.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/home/vo/MesHomeWorkOrderStatusRespVO.java
  View file @bf72088
1 -package cn.iocoder.yudao.module.mes.controller.admin.statistics.vo; 1 +package cn.iocoder.yudao.module.mes.controller.admin.home.vo;
2 2
3 import io.swagger.v3.oas.annotations.media.Schema; 3 import io.swagger.v3.oas.annotations.media.Schema;
4 import lombok.AllArgsConstructor; 4 import lombok.AllArgsConstructor;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/statistics/MesHomeStatisticsMapper.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/home/MesHomeStatisticsMapper.java
  View file @bf72088
1 -package cn.iocoder.yudao.module.mes.dal.mysql.statistics; 1 +package cn.iocoder.yudao.module.mes.dal.mysql.home;
2 2
3 import org.apache.ibatis.annotations.Mapper; 3 import org.apache.ibatis.annotations.Mapper;
4 import org.apache.ibatis.annotations.Param; 4 import org.apache.ibatis.annotations.Param;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/statistics/MesHomeStatisticsService.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/home/MesHomeStatisticsService.java
  View file @bf72088
1 -package cn.iocoder.yudao.module.mes.service.statistics; 1 +package cn.iocoder.yudao.module.mes.service.home;
2 2
3 -import cn.iocoder.yudao.module.mes.controller.admin.statistics.vo.MesHomeProductionTrendRespVO;  
4 -import cn.iocoder.yudao.module.mes.controller.admin.statistics.vo.MesHomeSummaryRespVO;  
5 -import cn.iocoder.yudao.module.mes.controller.admin.statistics.vo.MesHomeWorkOrderStatusRespVO; 3 +import cn.iocoder.yudao.module.mes.controller.admin.home.vo.MesHomeProductionTrendRespVO;
  4 +import cn.iocoder.yudao.module.mes.controller.admin.home.vo.MesHomeSummaryRespVO;
  5 +import cn.iocoder.yudao.module.mes.controller.admin.home.vo.MesHomeWorkOrderStatusRespVO;
6 6
7 import java.util.List; 7 import java.util.List;
8 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/statistics/MesHomeStatisticsServiceImpl.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/home/MesHomeStatisticsServiceImpl.java
  View file @bf72088
1 -package cn.iocoder.yudao.module.mes.service.statistics; 1 +package cn.iocoder.yudao.module.mes.service.home;
2 2
3 import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils; 3 import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
4 -import cn.iocoder.yudao.module.mes.controller.admin.statistics.vo.MesHomeProductionTrendRespVO;  
5 -import cn.iocoder.yudao.module.mes.controller.admin.statistics.vo.MesHomeSummaryRespVO;  
6 -import cn.iocoder.yudao.module.mes.controller.admin.statistics.vo.MesHomeWorkOrderStatusRespVO;  
7 -import cn.iocoder.yudao.module.mes.dal.mysql.statistics.MesHomeStatisticsMapper; 4 +import cn.iocoder.yudao.module.mes.controller.admin.home.vo.MesHomeProductionTrendRespVO;
  5 +import cn.iocoder.yudao.module.mes.controller.admin.home.vo.MesHomeSummaryRespVO;
  6 +import cn.iocoder.yudao.module.mes.controller.admin.home.vo.MesHomeWorkOrderStatusRespVO;
  7 +import cn.iocoder.yudao.module.mes.dal.mysql.home.MesHomeStatisticsMapper;
8 import cn.iocoder.yudao.module.mes.enums.dv.MesDvMachineryStatusEnum; 8 import cn.iocoder.yudao.module.mes.enums.dv.MesDvMachineryStatusEnum;
9 import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderStatusEnum; 9 import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderStatusEnum;
10 import jakarta.annotation.Resource; 10 import jakarta.annotation.Resource;
yudao-module-mes/src/main/resources/mapper/statistics/MesHomeStatisticsMapper.xml renamed to yudao-module-mes/src/main/resources/mapper/home/MesHomeStatisticsMapper.xml
  View file @bf72088
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 -<mapper namespace="cn.iocoder.yudao.module.mes.dal.mysql.statistics.MesHomeStatisticsMapper"> 3 +<mapper namespace="cn.iocoder.yudao.module.mes.dal.mysql.home.MesHomeStatisticsMapper">
4 4
5 <!-- 按状态统计工单数量 --> 5 <!-- 按状态统计工单数量 -->
6 <select id="selectWorkOrderCountGroupByStatus" resultType="java.util.Map"> 6 <select id="selectWorkOrderCountGroupByStatus" resultType="java.util.Map">