消息统计接口

hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/annotation/OperationAnnotation.java

@@ -16,6 +16,13 @@ import java.lang.annotation.*;
 @Target({ ElementType.PARAMETER, ElementType.METHOD })
 public @interface OperationAnnotation {
 
+
+	/**
+	 * 功能模块
+	 */
+	String moduleName() default  "";
+
+
 	/**
 	 * 操作模块
 	 * @return

hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java

@@ -195,6 +195,7 @@ public class SysLogAspect {
         String action;
         String businessType;
         String operatorType;
+        String moduleName;
         Class<?>[] clazzs;
         for (Method method : methods) {
             if (method.getName().equals(methodName)) {
@@ -210,6 +211,7 @@ public class SysLogAspect {
                     action = annotation.action();
                     businessType = annotation.businessType().getValue();
                     operatorType = annotation.operatorType().getValue();
+                    moduleName = annotation.moduleName();
                     // 获取当前用户信息
                     userName = AuthUtil.getUserAccount(request);
                     userId = AuthUtil.getUserId(request);
@@ -217,6 +219,7 @@ public class SysLogAspect {
                     if (StringUtils.isBlank(userName) && userId == -1) {
                         userName = "当前用户未登录";
                     }
+                    sysLog.setModuleName(moduleName);
                     sysLog.setOperationUserName(userName);
                     sysLog.setOperationUserId(userId);
                     sysLog.setTenantId(Func.toStr(AuthUtil.getTenantId(), BladeConstant.ADMIN_TENANT_ID));

hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/consumer/SysLogConsumer.java

@@ -55,6 +55,7 @@ public class SysLogConsumer implements Runnable {
     public void init() {
         thread = new Thread(this);
         thread.start();
+        thread.setName("SysLogConsumer");
     }
 
     /**

hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/to/SysLogTo.java

@@ -142,4 +142,10 @@ public class SysLogTo {
      */
     private Integer status;
 
+
+    /**
+     * 功能模块
+     */
+    private String moduleName;
+
 }

hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/enums/PushStatEnum.java

@@ -0,0 +1,33 @@
+package com.hnac.hzims.message.enums;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/4/7 15:45
+ */
+public enum PushStatEnum {
+
+    UNPUSHED(0, "未推送"),
+
+    SUCCESS(1, "推送成功"),
+    FAIL(2, "推送失败"),
+    CONFIRMED(3, "已确认");
+
+
+    @Setter
+    private Integer code;
+
+    @Getter
+    private String value;
+
+    PushStatEnum(Integer code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+}

hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/vo/msgpushrecord/BusinessTypeStatVo.java

@@ -0,0 +1,30 @@
+package com.hnac.hzims.message.vo.msgpushrecord;
+
+import lombok.Data;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/4/7 16:41
+ */
+@Data
+public class BusinessTypeStatVo {
+
+    /**
+     * 业务类型
+     */
+    private  String businessClassify;
+
+
+    /**
+     * 业务类型 名称
+     */
+    private  String businessClassifyName;
+
+    /**
+     * 统计数量
+     */
+    private Long power;
+
+}

hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/vo/msgpushrecord/MessagePushRecordTypeVo.java

@@ -0,0 +1,22 @@
+package com.hnac.hzims.message.vo.msgpushrecord;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/4/7 14:41
+ */
+@Data
+public class MessagePushRecordTypeVo {
+
+    /**
+     * 消息类型
+     */
+    private String type;
+
+    private List<MessagePushRecordVo> messagePushRecordList;
+}

hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/vo/msgpushrecord/MessagePushRecordVo.java

@@ -0,0 +1,39 @@
+package com.hnac.hzims.message.vo.msgpushrecord;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/4/7 9:02
+ */
+@Data
+public class MessagePushRecordVo implements Serializable {
+
+
+    /**
+     * 月份
+     */
+    private Integer month;
+
+
+    /**
+     * 实现推送时间
+     */
+    private String strMonth;
+
+    /**
+     * 消息类型
+     */
+    private String type;
+
+    /**
+     * 统计数量
+     */
+    private Long power;
+}

hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/vo/msgpushrecord/PushStatTypeVo.java

@@ -0,0 +1,35 @@
+package com.hnac.hzims.message.vo.msgpushrecord;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 推送成功失败 Vo
+ *
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/4/7 15:35
+ */
+@Data
+public class PushStatTypeVo {
+
+
+    /**
+     * 业务分类
+     */
+    private String businessClassify;
+
+
+    /**
+     * 业务名称
+     */
+    private String businessClassifyName;
+
+
+    /**
+     * 业务分类统计
+     */
+    private List<PushStatVo> pushStatList;
+}

hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/vo/msgpushrecord/PushStatVo.java

@@ -0,0 +1,45 @@
+package com.hnac.hzims.message.vo.msgpushrecord;
+
+import com.hnac.hzims.message.enums.PushStatEnum;
+import lombok.Data;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/4/7 15:36
+ */
+@Data
+public class PushStatVo {
+
+    /**
+     * 业务分类
+     */
+    private String businessClassify;
+
+
+    /**
+     * 业务分类
+     */
+    private String businessClassifyName;
+
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+
+
+    /**
+     * 状态名称
+     */
+    private String statusName;
+
+
+
+    /**
+     * 统计数量
+     */
+    private Long power;
+}

hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/vo/msgpushrecord/UserPushStatTypeVo.java

@@ -0,0 +1,25 @@
+package com.hnac.hzims.message.vo.msgpushrecord;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/4/7 15:05
+ */
+@Data
+public class UserPushStatTypeVo {
+
+    /**
+     * 推送人名称
+     */
+    private String pusherName;
+
+    /**
+     * 推送业务分类数组
+     */
+    private List<UserPushStatVo> pushStatList;
+}

hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/vo/msgpushrecord/UserPushStatVo.java

@@ -0,0 +1,35 @@
+package com.hnac.hzims.message.vo.msgpushrecord;
+
+import lombok.Data;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/4/7 15:06
+ */
+@Data
+public class UserPushStatVo {
+
+
+    /**
+     * 推送人名称
+     */
+    private String pusherName;
+
+    /**
+     * 业务分类
+     */
+    private String businessClassify;
+
+
+    /**
+     * 业务分类 名称
+     */
+    private String businessClassifyName;
+
+    /**
+     * 统计数量
+     */
+    private Long power;
+}

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpBasicController.java

@@ -100,7 +100,8 @@ public class WtSpBasicController extends BladeController {
 	@GetMapping("/pageList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入SP_BASIC")
-	@OperationAnnotation(title = "物资库存台账",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "资产管理",title = "物资库存台账",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页条件")
 	public R<IPage<WtSpBasicVO>> pageList(WtSpBasicEntity SP_BASIC, Query query, Long warehouseId, String sign) {
 		IPage<WtSpBasicVO> pages = SP_BASICService.selectPage(SP_BASIC, query,warehouseId,sign);

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpManagementController.java

@@ -82,8 +82,8 @@ public class WtSpManagementController extends BladeController {
 	})
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "懒加载列表", notes = "传入parentId")
-	@OperationAnnotation(title = "物资类型",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "资产管理",title = "物资类别",operatorType = OperatorType.MOBILE,businessType =
-			action = "分页条件")
+			BusinessType.GENCODE, action = "分页条件")
 	public R<List<WtSpManagementVO>> lazyList(Long parentId, @ApiIgnore @RequestParam Map<String, Object> managent) {
 		List<WtSpManagementVO> list = SP_MANAGEMENTService.lazyList(parentId, managent);
 		return R.data(WtSpManagementWrapper.build().listNodeLazyVO(list));

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpProviderController.java

@@ -70,7 +70,8 @@ public class WtSpProviderController extends BladeController {
     @GetMapping("/list")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "分页", notes = "传入SP_PROVIDER")
-    @OperationAnnotation(title = "供应商管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+    @OperationAnnotation(moduleName = "资产管理",title = "供应商管理",operatorType = OperatorType.MOBILE
+            ,businessType = BusinessType.GENCODE,
             action = "分页查询")
     public R<IPage<WtSpProviderEntity>> list(WtSpProviderEntity providerEntity, Query query) {
         QueryWrapper<WtSpProviderEntity> queryWrapper = Condition.getQueryWrapper(providerEntity);

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpToolBasicController.java

@@ -67,7 +67,8 @@ public class WtSpToolBasicController extends BladeController {
 	@GetMapping("/pageList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入toolBasicEntity")
-	@OperationAnnotation(title = "工具台账",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "资产管理",title = "工具台账",operatorType = OperatorType.MOBILE,
+			businessType = BusinessType.GENCODE,
 			action = "分页条件")
 	public R<IPage<WtSpToolBasicVO>> pageList(WtSpToolBasicVO toolBasicVO, Query query) {
 		IPage<WtSpToolBasicVO> pages = SP_TOOL_BASICService.selectPageList(Condition.getPage(query), toolBasicVO);

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpWarehouseController.java

@@ -58,7 +58,7 @@ public class WtSpWarehouseController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入SP_WAREHOUSE")
-	@OperationAnnotation(title = "库存管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "资产管理",title = "库存管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "分页查询")
 	public R<IPage<WtSpWarehouseVO>> list(WtSpWarehouseEntity wtSpWarehouseEntity, Query query) {
 		IPage<WtSpWarehouseVO> pages = SP_WAREHOUSEService.selectPage(wtSpWarehouseEntity, query);

hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java

@@ -86,7 +86,8 @@ public class EmInfoController extends BladeController {
 	@ApiOperation(value = "设备分页", notes = "传入em_info")
 	@ApiImplicitParams({
 	})
-	@OperationAnnotation(title = "设备信息",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "设备管理",title = "设备信息",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页条件")
 	public R<IPage<EmInfoEntity>> list(@ApiIgnore @RequestParam Map<String, Object> em_info, Query query) {
 		QueryWrapper<EmInfoEntity> queryWrapper = Condition.getQueryWrapper(em_info, EmInfoEntity.class);

hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/PlanGenertionController.java

@@ -52,7 +52,8 @@ public class PlanGenertionController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
-	@OperationAnnotation(title = "计划发电量填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "数据填报",title = "计划发电量填报",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页条件")
 	@ApiOperation(value = "分页", notes = "传入entity")
 	public R<IPage<PlanGenerationVo>> list(PlanGenerationVo vo, Query query) {

hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/WorkshopInfoController.java

@@ -63,7 +63,8 @@ public class WorkshopInfoController extends BladeController {
 	@RequestMapping(value = "/listPage",method = RequestMethod.GET)
 	@ApiOperation("列表分页查询")
 	@ApiOperationSupport(order = 3)
-	@OperationAnnotation(title = "产房管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "厂房管理",title = "厂房管理",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "列表分页查询")
 	public R<IPage> listPage(WorkshopInfoDTO req, Query query) {
 		return R.data(service.page(Condition.getPage(query),service.getLambdaQuery(req)));

hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpFaultController.java

@@ -102,7 +102,7 @@ public class FdpFaultController extends BladeController {
 	@ApiLog
 	@GetMapping("/queryFaultListOrd")
 	@ApiOperationSupport(order = 60)
-	@OperationAnnotation(title = "智能诊断",operatorType = OperatorType.APPSYSTEMS,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "智能诊断",title = "智能诊断",operatorType = OperatorType.APPSYSTEMS,businessType = BusinessType.GENCODE,
 			action = "分页查询")
 	@ApiOperation(value = "分页 查询参数:name,fdpId,emId,detectability,severity,fdpDeviceId,fdpDeviceName")
 	public R queryFaultListOrd(FdpFaultDTO req, Query query) {

hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpMonitorController.java

@@ -152,7 +152,8 @@ public class FdpMonitorController extends BladeController {
 	@GetMapping("/listPage")
 	@ApiOperationSupport(order = 110)
 	@ApiOperation(value = "查询监测点列表")
-	@OperationAnnotation(title = "监测点绑定",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "智能诊断",title = "监测点绑定",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页查询")
 	public R<IPage<FdpMonitorEntity>> listPage(FdpMonitorEntity entity, Query query) {
 		return service.listPage(Condition.getPage(query), entity);

hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpTaskController.java

@@ -92,7 +92,8 @@ public class FdpTaskController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:name,emId,faultId,reasonId,satisfaction")
-	@OperationAnnotation(title = "智能诊断任务",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "智能诊断",title = "智能诊断任务",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页查询")
 	public R<IPage<FdpTaskVO>> list(FdpTaskDTO req, Query query) {
 		return service.list(req, query);

hzims-service/hzims-middle/.gitignore

@@ -0,0 +1,38 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/entity/SysLog.java

@@ -31,6 +31,13 @@ public class SysLog implements Serializable {
     @TableField("id")
     private Long id;
 
+
+    /**
+     * 功能模块
+     */
+    @TableField("module_name")
+    private String moduleName;
+
     /**
      * 租户ID
      */

hzims-service/message/src/main/java/com/hnac/hzims/message/controller/web/MessageStatisticsController.java

@@ -0,0 +1,81 @@
+package com.hnac.hzims.message.controller.web;
+
+import com.hnac.hzims.message.service.IMessagePushRecordService;
+import com.hnac.hzims.message.vo.msgpushrecord.BusinessTypeStatVo;
+import com.hnac.hzims.message.vo.msgpushrecord.MessagePushRecordTypeVo;
+import com.hnac.hzims.message.vo.msgpushrecord.PushStatTypeVo;
+import com.hnac.hzims.message.vo.msgpushrecord.UserPushStatTypeVo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
+/**
+ * 消息统计页面
+ * @Author dfy
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/4/7 8:41
+ */
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/message/statistics")
+public class MessageStatisticsController {
+
+
+    private  final IMessagePushRecordService messagePushRecordService;
+
+
+    /**
+     * 短信推送统计
+     * @return
+     */
+    @GetMapping("/smsPushStat")
+    public R smsPushStat() {
+        log.info("短信推送统计");
+        List<MessagePushRecordTypeVo> messagePushRecordVos = messagePushRecordService.smsPushStat();
+        log.info("短信推送统计 返回的数据: {}",messagePushRecordVos);
+        return R.data(messagePushRecordVos);
+    }
+
+
+
+    /**
+     * 业务类型统计
+     */
+    @GetMapping("/businessTypeStat")
+    public R businessTypeStat() {
+        log.info("业务类型统计");
+        List<BusinessTypeStatVo> messagePushRecordVos = messagePushRecordService.businessTypeStat();
+        log.info("业务类型统计 返回的数据: {}",messagePushRecordVos);
+        return R.data(messagePushRecordVos);
+    }
+
+
+    /**
+     * 人员发送统计
+     */
+    @GetMapping("/userPushStat")
+    public R userPushStat() {
+        log.info("人员发送统计");
+        List<UserPushStatTypeVo> messagePushRecordVos = messagePushRecordService.userPushStat();
+        log.info("人员发送统计 返回的数据: {}",messagePushRecordVos);
+        return R.data(messagePushRecordVos);
+    }
+
+
+    /**
+     * 推送成功失败统计
+     */
+    @GetMapping("/pushStat")
+    public R pushStat() {
+        List<PushStatTypeVo> messagePushRecordVos = messagePushRecordService.pushStat();
+        log.info("推送成功失败统计 返回的数据: {}",messagePushRecordVos);
+        return R.data(messagePushRecordVos);
+    }
+
+}

hzims-service/message/src/main/java/com/hnac/hzims/message/mapper/MessagePushRecordMapper.java

@@ -1,8 +1,42 @@
 package com.hnac.hzims.message.mapper;
 
 import com.hnac.hzims.message.entity.MessagePushRecordEntity;
+import com.hnac.hzims.message.vo.msgpushrecord.BusinessTypeStatVo;
+import com.hnac.hzims.message.vo.msgpushrecord.MessagePushRecordVo;
+import com.hnac.hzims.message.vo.msgpushrecord.PushStatTypeVo;
+import com.hnac.hzims.message.vo.msgpushrecord.UserPushStatTypeVo;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 public interface MessagePushRecordMapper extends UserDataScopeBaseMapper<MessagePushRecordEntity> {
 
+    /**
+     * 根据type统计数量
+     * @return
+     */
+    List<MessagePushRecordVo> smsPushStat();
+
+
+    /**
+     * 业务类型统计
+     * @return
+     */
+    List<BusinessTypeStatVo> businessTypeStat();
+
+
+    /**
+     * 人员发送统计
+     * @return
+     */
+    List<UserPushStatTypeVo> userPushStat();
+
+
+    /**
+     * 推送成功失败统计
+     * @return
+     */
+    List<PushStatTypeVo> pushStat();
+
 }

hzims-service/message/src/main/java/com/hnac/hzims/message/mapper/MessagePushRecordMapper.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hnac.hzims.message.mapper.MessagePushRecordMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hnac.hzims.message.vo.msgpushrecord.UserPushStatTypeVo">
+         <result column="pusherName" property="pusherName"/>
+        <collection property="pushStatList" ofType="com.hnac.hzims.message.vo.msgpushrecord.UserPushStatVo" >
+             <result column="pusherName" property="pusherName"/>
+             <result column="businessClassify" property="businessClassify"/>
+             <result column="count" property="power"/>
+        </collection>
+    </resultMap>
+
+
+
+
+    <!--    根据type统计数量-->
+    <select id="smsPushStat" resultType="com.hnac.hzims.message.vo.msgpushrecord.MessagePushRecordVo">
+        select count(1) power,
+               date_format(PLAN_TIME, '%Y-%m') strMonth,
+               type
+        from hzims_message_push_record
+        where IS_DELETED = 0
+        group by strMonth, TYPE
+    </select>
+
+    <!--    业务类型统计-->
+    <select id="businessTypeStat" resultType="com.hnac.hzims.message.vo.msgpushrecord.BusinessTypeStatVo">
+        select BUSINESS_CLASSIFY businessClassify,
+               count(1)          power
+        from hzims_message_push_record
+        where IS_DELETED = 0
+        group by businessClassify
+    </select>
+
+    <!--    人员发送统计-->
+    <select id="userPushStat" resultMap="BaseResultMap">
+        select PUSHER_NAME       pusherName,
+               BUSINESS_CLASSIFY businessClassify,
+               count(1)          count
+        from hzims_message_push_record
+        where IS_DELETED = 0
+        group by businessClassify, pusherName
+    </select>
+
+
+
+    <!-- 推送成功失败统计-->
+    <resultMap id="PushStatResultMap" type="com.hnac.hzims.message.vo.msgpushrecord.PushStatTypeVo">
+        <result column="businessClassify" property="businessClassify"/>
+        <collection property="pushStatList" ofType="com.hnac.hzims.message.vo.msgpushrecord.PushStatVo" >
+            <result column="businessClassify" property="businessClassify"/>
+            <result column="status" property="status"/>
+            <result column="count" property="power"/>
+        </collection>
+    </resultMap>
+
+
+    <select id="pushStat" resultMap="PushStatResultMap">
+        select  BUSINESS_CLASSIFY businessClassify,STATUS status,count(1) count
+        from hzims_message_push_record
+        group by  businessClassify,status
+    </select>
+</mapper>

hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMessagePushRecordService.java

@@ -2,10 +2,15 @@ package com.hnac.hzims.message.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.message.entity.MessagePushRecordEntity;
+import com.hnac.hzims.message.vo.msgpushrecord.BusinessTypeStatVo;
+import com.hnac.hzims.message.vo.msgpushrecord.MessagePushRecordTypeVo;
+import com.hnac.hzims.message.vo.msgpushrecord.PushStatTypeVo;
+import com.hnac.hzims.message.vo.msgpushrecord.UserPushStatTypeVo;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 
 import java.util.List;
+import java.util.Map;
 
 public interface IMessagePushRecordService extends BaseService<MessagePushRecordEntity> {
 
@@ -32,4 +37,34 @@ public interface IMessagePushRecordService extends BaseService<MessagePushRecord
 	 **/
 	Boolean send(String id);
 
+
+	/**
+	 * 短信推送统计
+	 */
+	List<MessagePushRecordTypeVo>  smsPushStat();
+
+
+	/**
+	 * 业务类型统计
+	 * @return
+	 */
+	List<BusinessTypeStatVo> businessTypeStat();
+
+
+	/**
+	 * 人员发送统计
+	 * @return
+	 */
+	List<UserPushStatTypeVo> userPushStat();
+
+
+	/**
+	 * 推送成功失败统计
+	 * @return
+	 */
+	List<PushStatTypeVo> pushStat();
+
+
+
+
 }

hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java

@@ -2,12 +2,13 @@ package com.hnac.hzims.message.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hnac.hzims.message.config.MessageFactory;
 import com.hnac.hzims.message.entity.MessagePushRecordEntity;
+import com.hnac.hzims.message.enums.PushStatEnum;
 import com.hnac.hzims.message.mapper.MessagePushRecordMapper;
 import com.hnac.hzims.message.service.IMessagePushRecordService;
 import com.hnac.hzims.message.service.IMessageService;
+import com.hnac.hzims.message.vo.msgpushrecord.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -16,40 +17,212 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Service;
 
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 @AllArgsConstructor
 @Slf4j
 public class MessagePushRecordServiceImpl extends BaseServiceImpl<MessagePushRecordMapper, MessagePushRecordEntity> implements IMessagePushRecordService {
 
-	@Override
+    @Override
-	public List<MessagePushRecordEntity> list(MessagePushRecordEntity request) {
+    public List<MessagePushRecordEntity> list(MessagePushRecordEntity request) {
-		return this.list(this.getQueryWrapper(request));
+        return this.list(this.getQueryWrapper(request));
-	}
+    }
-
+
-	@Override
+    @Override
-	public IPage<MessagePushRecordEntity> listPage(MessagePushRecordEntity request, Query query) {
+    public IPage<MessagePushRecordEntity> listPage(MessagePushRecordEntity request, Query query) {
-		return this.page(Condition.getPage(query),this.getQueryWrapper(request));
+        return this.page(Condition.getPage(query), this.getQueryWrapper(request));
-	}
+    }
-
+
-	@Override
+    @Override
-	public Boolean send(String id) {
+    public Boolean send(String id) {
-		MessagePushRecordEntity record = this.getById(id);
+        MessagePushRecordEntity record = this.getById(id);
-		IMessageService messageSend = MessageFactory.getMessageSend(record.getType());
+        IMessageService messageSend = MessageFactory.getMessageSend(record.getType());
-		return messageSend.send(record);
+        return messageSend.send(record);
-	}
+    }
-
+
-	/**
+    /**
-	 * 获取 QueryWrapper
+     * 短信推送统计
-	 * @param request 查询条件
+     */
-	 * @return QueryWrapper
+    @Override
-	 */
+    public List<MessagePushRecordTypeVo> smsPushStat() {
-	private LambdaQueryWrapper<MessagePushRecordEntity> getQueryWrapper(MessagePushRecordEntity request) {
+        //根据type统计数量
-		LambdaQueryWrapper<MessagePushRecordEntity> lambda = Condition.getQueryWrapper(request).lambda();
+        List<MessagePushRecordVo> messagePushRecordVos = baseMapper.smsPushStat();
-		if(Func.isNotEmpty(request.getStatus())) {
+        messagePushRecordVos.forEach(item -> {
-			lambda.eq(MessagePushRecordEntity::getStatus,request.getStatus());
+            String strMonth = item.getStrMonth();
-		}
+            // 字符串转localDate 获取月份
-		return lambda;
+            int month = this.getCurrentMonth(strMonth);
-	}
+            item.setMonth(month);
+        });
+
+        //按类型分组
+        Map<String, List<MessagePushRecordVo>> collect =
+                messagePushRecordVos.stream().collect(Collectors.groupingBy(MessagePushRecordVo::getType));
+
+        List<MessagePushRecordTypeVo> messagePushRecordTypeVos = new ArrayList<>();
+        //封装数据
+        collect.forEach((key, value) -> {
+            MessagePushRecordTypeVo messagePushRecordTypeVo = new MessagePushRecordTypeVo();
+            messagePushRecordTypeVo.setType(key);
+            messagePushRecordTypeVo.setMessagePushRecordList(value);
+            messagePushRecordTypeVos.add(messagePushRecordTypeVo);
+        });
+        return messagePushRecordTypeVos;
+    }
+
+    /**
+     * 业务类型统计
+     *
+     * @return
+     */
+    @Override
+    public List<BusinessTypeStatVo> businessTypeStat() {
+        List<BusinessTypeStatVo> businessTypeStatVos = baseMapper.businessTypeStat();
+        businessTypeStatVos.forEach(item -> {
+            String businessClassifyByName = this.getBusinessClassifyByName(item.getBusinessClassify());
+            item.setBusinessClassifyName(businessClassifyByName);
+        });
+        return businessTypeStatVos;
+    }
+
+    /**
+     * 人员发送统计
+     *
+     * @return
+     */
+    @Override
+    public List<UserPushStatTypeVo> userPushStat() {
+        List<UserPushStatTypeVo> userPushStatTypeVos = baseMapper.userPushStat();
+        //添加业务类型名称
+        userPushStatTypeVos.forEach(item -> {
+            List<UserPushStatVo> pushStatList = item.getPushStatList();
+            pushStatList.forEach(pushStat -> {
+                String businessClassify = pushStat.getBusinessClassify();
+                String businessTypeName = this.getBusinessClassifyByName(businessClassify);
+                pushStat.setBusinessClassifyName(businessTypeName);
+            });
+
+        });
+        return userPushStatTypeVos;
+    }
+
+    /**
+     * 推送成功失败统计
+     *
+     * @return
+     */
+    @Override
+    public List<PushStatTypeVo> pushStat() {
+        List<PushStatTypeVo> pushStatTypeVos = baseMapper.pushStat();
+        pushStatTypeVos.forEach(item -> {
+            //业务类型名称
+            String businessClassify = item.getBusinessClassify();
+            String businessTypeName = this.getBusinessClassifyByName(businessClassify);
+            item.setBusinessClassifyName(businessTypeName);
+            List<PushStatVo> pushStatList = item.getPushStatList();
+            pushStatList.forEach(pushStat -> {
+                Integer status = pushStat.getStatus();
+                //状态名称
+                String name = this.getStatusByName(status);
+                pushStat.setStatusName(name);
+                //业务类型名称
+                String businessClassifyPushStat = pushStat.getBusinessClassify();
+                String businessTypeNamePushStat = this.getBusinessClassifyByName(businessClassifyPushStat);
+                pushStat.setBusinessClassifyName(businessTypeNamePushStat);
+            });
+        });
+        return pushStatTypeVos;
+    }
+
+
+    /**
+     * 获取 QueryWrapper
+     *
+     * @param request 查询条件
+     * @return QueryWrapper
+     */
+    private LambdaQueryWrapper<MessagePushRecordEntity> getQueryWrapper(MessagePushRecordEntity request) {
+        LambdaQueryWrapper<MessagePushRecordEntity> lambda = Condition.getQueryWrapper(request).lambda();
+        if (Func.isNotEmpty(request.getStatus())) {
+            lambda.eq(MessagePushRecordEntity::getStatus, request.getStatus());
+        }
+        return lambda;
+    }
+
+
+    /**
+     * 状态  ===> 状态名称
+     *
+     * @param key 状态
+     */
+    private String getStatusByName(Integer key) {
+        String value = null;
+        switch (key) {
+            case 0:
+                value = PushStatEnum.UNPUSHED.getValue();
+                break;
+            case 1:
+                value = PushStatEnum.SUCCESS.getValue();
+                break;
+            case 2:
+                value = PushStatEnum.FAIL.getValue();
+                break;
+            case 3:
+                value = PushStatEnum.CONFIRMED.getValue();
+                break;
+            case 4:
+                log.error("状态异常,没有这状态");
+                break;
+        }
+        return value;
+    }
+
+
+    /**
+     * 业务分类  ===> 业务分类名称
+     *
+     * @param key 状态
+     */
+    private String getBusinessClassifyByName(String key) {
+        key = key == null ? "" : key;
+        String value = null;
+        switch (key) {
+            case "system":
+                value = "系统通知";
+                break;
+            case "business":
+                value = "事务消息";
+                break;
+            case "dailyRemind":
+                value = "日常提醒";
+                break;
+            case "inspect":
+                value = "巡检消息";
+                break;
+            case "":
+                log.error("状态业务分类,没有这状态");
+                break;
+        }
+        return value;
+    }
+
+
+    /**
+     * 现在的月份减去3个  按当前时间推12个月
+     */
+    private int getCurrentMonth(String strMonth) {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM");
+        //获取年月
+        YearMonth yearMonth = YearMonth.parse(strMonth, dateTimeFormatter);
+        //减去3个月
+        YearMonth month = yearMonth.minusMonths(3);
+        return month.getMonthValue();
+    }
+
+
 }

hzims-service/message/src/main/resources/application.yml

@@ -7,6 +7,8 @@ mybatis-plus:
   mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml
   #实体扫描，多个package用逗号或者分号分隔
   typeAliasesPackage: com.hnac.hzims.**.entity
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 #swagger扫描路径配置
 swagger:

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessPlanController.java

@@ -124,7 +124,8 @@ public class OperAccessPlanController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
-	@OperationAnnotation(title = "检修计划",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "检修管理",title = "检修计划",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页 查询参数:code,name,gradeCode,manager,techLead,handleStatus,status")
 	@ApiOperation(value = "分页 查询参数:code,name,gradeCode,manager,techLead,handleStatus,status")
 	public R<IPage<OperAccessPlanVO>> list(OperAccessPlanListDTO req, Query query) {

hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StAlamRecordController.java

@@ -50,7 +50,7 @@ public class StAlamRecordController {
 	 * <option value="5">遥测越限</option>
 	 * <option value="6">遥信变位</option>
 	 */
-	@OperationAnnotation(title = "集中监控", operatorType = OperatorType.MOBILE,
+	@OperationAnnotation(moduleName = "集中监控",title = "集中监控", operatorType = OperatorType.MOBILE,
 			businessType = BusinessType.GENCODE,action = "获取当天的告警列表")
 	@ApiOperation("获取当天的告警列表")
 	@RequestMapping(value = "/getDaySoeList", method = {RequestMethod.GET, RequestMethod.POST})
@@ -65,7 +65,7 @@ public class StAlamRecordController {
 		}
 		return stAlamRecordService.getDaySoeList(AuthUtil.getUser(), date, type,current,size,code);
 	}
-	@OperationAnnotation(title = "集中监控", operatorType = OperatorType.MOBILE,
+	@OperationAnnotation(moduleName = "集中监控",title = "集中监控", operatorType = OperatorType.MOBILE,
 			businessType = BusinessType.GENCODE,action = "获取故障列表数据")
 	@ApiOperation("获取故障列表数据")
 	@RequestMapping(value = "/getFaultList", method = {RequestMethod.GET, RequestMethod.POST})

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectController.java

@@ -65,7 +65,8 @@ public class OperDefectController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入defect")
 	@ApiImplicitParams({
 	})
-	@OperationAnnotation(title = "缺陷库",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+	@OperationAnnotation(moduleName = "缺陷管理",
+			 title = "缺陷库",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
 			= "分页")
 	public R<IPage<OperDefectVO>> list(OperDefectEntity defect, Query query) {
 		LambdaQueryWrapper<OperDefectEntity> queryWrapper = Condition.getQueryWrapper(new OperDefectEntity(), defect);
@@ -155,7 +156,7 @@ public class OperDefectController extends BladeController {
 	@GetMapping("/getDefectStatistics")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "获取缺陷的统计月报", notes = " month 格式：2021-01")
-	@OperationAnnotation(title = "缺陷月报表",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "缺陷管理",title = "缺陷月报表",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "获取缺陷的统计月报")
 	public R<Map<String, Object>> getDefectStatistics(@ApiParam(value = "month 格式：2021-01", required = true) @RequestParam String month) {
 		Map<String, Object> defectStatistics = defectService.getDefectStatistics(month);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectStatisticsController.java

@@ -69,7 +69,7 @@ public class OperDefectStatisticsController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入statistics")
 	@ApiImplicitParams({
 	})
-	@OperationAnnotation(title = "缺陷记录",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+	@OperationAnnotation(moduleName = "缺陷管理",title = "缺陷记录",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
 			= "分页")
 	public R<IPage<OperDefectStatisticsVO>> list(  OperDefectStatisticsEntity entity, Query query) {
 		LambdaQueryWrapper<OperDefectStatisticsEntity> queryWrapper = Condition.getQueryWrapper(new OperDefectStatisticsEntity(),entity);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperPhenomenonController.java

@@ -69,7 +69,8 @@ public class OperPhenomenonController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入phenomenon")
 	@ApiImplicitParams({
 	})
-	@OperationAnnotation(title = "现象库",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+	@OperationAnnotation(moduleName = "缺陷管理",title = "现象库",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,action
 			= "分页")
 	public R<IPage<OperPhenomenonVO>> list(OperPhenomenonEntity entity,String taskIds, Query query, Date findTimeEnd) {
 		LambdaQueryWrapper<OperPhenomenonEntity> queryWrapper = Condition.getQueryWrapper(new OperPhenomenonEntity(), entity);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassController.java

@@ -67,7 +67,8 @@ public class ImsDutyClassController extends BladeController {
 	 */
 	@GetMapping("/getlist")
 	@ApiOperationSupport(order = 2)
-	@OperationAnnotation(title = "班次设置",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+	@OperationAnnotation(moduleName = "值班管理",title = "班次设置",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,action
 			= "列表(不分页)")
 	@ApiOperation(value = "列表(不分页)", notes = "传入imsDutyClass")
 	public R<List<ImsDutyClassEntity>> getlist(ImsDutyClassEntity imsDutyClass) {

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassTypeController.java

@@ -104,7 +104,8 @@ public class ImsDutyClassTypeController extends BladeController {
 	 */
 	@GetMapping("/classTypeList")
 	@ApiOperationSupport(order = 9)
-	@OperationAnnotation(title = "班次类型设置",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+	@OperationAnnotation(moduleName = "值班管理",title = "班次类型设置",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,action
 			= "获取不存在班次中的班次类型")
 	@ApiOperation(value = "获取不存在班次中的班次类型", notes = "传入ids")
 	public R<List<ImsDutyClassTypeEntity>> classTypeList(@ApiParam(value = "机构ID", required = true) @RequestParam Long createDept,@ApiParam(value = "班次类型ID", required = true) @RequestParam(required = false) Long classTypeId) {

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyGroupController.java

@@ -54,7 +54,7 @@ public class ImsDutyGroupController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
-	@OperationAnnotation(title = "班组管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+	@OperationAnnotation(moduleName = "值班管理",title = "班组管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
 			= "分页")
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
@@ -146,7 +146,7 @@ public class ImsDutyGroupController extends BladeController {
 	 */
 	@PostMapping("/personGroupAll")
 	@ApiOperationSupport(order = 9)
-	@OperationAnnotation(title = "人员分组",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+	@OperationAnnotation(moduleName = "值班管理",title = "人员分组",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
 			= "人员分组查询")
 	@ApiOperation(value = "人员分组查询", notes = "传入imsDutyGroup")
 	public R<List<ImsDutyGroupPersonVO>> personGroupAll(@RequestParam(required = false) Long createDept) {

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/AreaMonthReportController.java

@@ -47,7 +47,9 @@ public class AreaMonthReportController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation("获取区域月报")
 	@GetMapping("/getAreaMonthReport")
-	@OperationAnnotation(title = "水电生产运行月报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(
+			moduleName = "生产月报",
+			title = "水电生产运行月报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "获取区域月报")
 	public R<List<AreaMonthReportVo>> getAreaMonthReport(@ApiParam(value = "日期-年月", required = true) String date) {
 		return service.getReport(date);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HydropowerController.java

@@ -79,7 +79,7 @@ public class HydropowerController extends BladeController {
 	@ApiLog
 	@ApiOperation("年计划发电完成趋势")
 	@GetMapping("/planAactualTrend")
-	@OperationAnnotation(title = "演示大屏", operatorType = OperatorType.MOBILE,
+	@OperationAnnotation(moduleName = "演示大屏",title = "演示大屏", operatorType = OperatorType.MOBILE,
 			businessType = BusinessType.GENCODE,action = "年计划发电完成趋势")
 	@ApiOperationSupport(order = 6)
 	public R<List<PowerMonthVo>> planActualTrend(@ApiParam(value = "区域机构ID") Long deptId) {

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainReportController.java

@@ -61,7 +61,7 @@ public class MainReportController extends BladeController {
 	@ApiOperationSupport(order = 10)
 	@ApiOperation("缺陷报表")
 	@GetMapping("/defect")
-	@OperationAnnotation(title = "缺陷统计",
+	@OperationAnnotation(moduleName = "缺陷管理",title = "缺陷统计",
 			operatorType = OperatorType.APPSYSTEMS,businessType = BusinessType.GENCODE,
 			action = "缺陷报表")
 	public R<Map<String, DefectReportVO>> defect(@RequestParam String startDate, @RequestParam String endDate) {

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainSystemMonitoringController.java

@@ -37,8 +37,6 @@ public class MainSystemMonitoringController {
 	 *
 	 * @return
 	 */
-	@OperationAnnotation(title = "首页工作台", operatorType = OperatorType.MOBILE,
-			businessType = BusinessType.GENCODE,action = "获取当时历史数据 （日发电量，月发电量，年发电量，有功功率）")
 	@ApiLog
 	@ApiOperationSupport(order = 20)
 	@ApiOperation("获取当时历史数据 （日发电量，月发电量，年发电量，有功功率）")
@@ -57,8 +55,6 @@ public class MainSystemMonitoringController {
 	@ApiLog
 	@ApiOperationSupport(order = 20)
 	@ApiOperation("获取当时历史数据 （日发电量，月发电量，年发电量，有功功率）")
-	@OperationAnnotation(title = "首页工作台", operatorType = OperatorType.MOBILE,
-			businessType = BusinessType.GENCODE,action = "获取当时历史数据 （日发电量，月发电量，年发电量，有功功率）")
 	@PostMapping("/getHisDataByDeptNew")
 	public R<StationVo> getHisDataByDeptNew(@Valid @RequestBody RoutingParamVo vo) {
 		return mainSystemMonitoringService.getRedisHisDataByDeptNew(vo.getCycle(),vo.getDeptIds(),"0");
@@ -70,8 +66,6 @@ public class MainSystemMonitoringController {
 	 *
 	 * @return
 	 */
-	@OperationAnnotation(title = "首页工作台", operatorType = OperatorType.MOBILE,
-			businessType = BusinessType.GENCODE,action = "获取折线图-新版")
 	@ApiLog
 	@ApiOperationSupport(order = 20)
 	@ApiOperation("获取折线图")
@@ -86,8 +80,6 @@ public class MainSystemMonitoringController {
 	 *
 	 * @return
 	 */
-	@OperationAnnotation(title = "首页工作台", operatorType = OperatorType.MOBILE,
-			businessType = BusinessType.GENCODE,action = "获取折线图-旧版")
 	@ApiOperationSupport(order = 20)
 	@ApiOperation("获取折线图")
 	@PostMapping("/getTheDayHydrograph")
@@ -104,8 +96,6 @@ public class MainSystemMonitoringController {
 	 */
 	@ApiOperationSupport(order = 50)
 	@ApiOperation("获取路由")
-	@OperationAnnotation(title = "首页工作台", operatorType = OperatorType.MOBILE,
-			businessType = BusinessType.GENCODE,action = "根据用户权限获取路由")
 	@PostMapping("/toGetTheRouting")
 	public R<InDustryVo> toGetTheRouting(@Valid @RequestBody RoutingParamVo vo) {
 		return R.data(mainSystemMonitoringService.getUserDataScopeHomePage(vo.getBusinessType(), vo.getStationType(), vo.getDeptIds(), vo.getRefTerminal()));
@@ -121,8 +111,6 @@ public class MainSystemMonitoringController {
 	@ApiOperationSupport(order = 50)
 	@ApiOperation("机构")
 	@GetMapping("/dept/list")
-	@OperationAnnotation(title = "首页工作台", operatorType = OperatorType.MOBILE,
-			businessType = BusinessType.GENCODE,action = "机构")
 	public R<List<Dept>> deptList() {
 		return mainSystemMonitoringService.doDeptList();
 
@@ -131,8 +119,6 @@ public class MainSystemMonitoringController {
 	@ApiLog
 	@GetMapping("/listByAuth")
 	@ApiOperationSupport(order = 100)
-	@OperationAnnotation(title = "首页工作台", operatorType = OperatorType.MOBILE,
-			businessType = BusinessType.GENCODE,action = "根据用户权限查询站点")
 	@ApiOperation(value = "根据用户权限查询站点", notes = "")
 	public R<List<StationEntity>> listByAuth(StationEntity entity) {
 		return R.data(mainSystemMonitoringService.doListByAuth(entity));
@@ -141,7 +127,8 @@ public class MainSystemMonitoringController {
 	@ApiLog
 
 	@GetMapping("/listByAuthDept")
-	@OperationAnnotation(title = "排班计划",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+	@OperationAnnotation(moduleName = "值班管理",
+			title = "排班计划",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
 			= "根据用户权限查询站点及部门")
 	@ApiOperationSupport(order = 100)
 	@ApiOperation(value = "根据用户权限查询站点及部门", notes = "")
@@ -150,8 +137,6 @@ public class MainSystemMonitoringController {
 	}
 
 	@ApiLog
-	@OperationAnnotation(title = "首页工作台", operatorType = OperatorType.MOBILE,
-			businessType = BusinessType.GENCODE,action = "根据用户权限获取机构")
 	@GetMapping("/deptByAuthUser")
 	@ApiOperationSupport(order = 100)
 	@ApiOperation(value = "根据用户权限获取机构", notes = "")

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainWorkBenchController.java

@@ -88,8 +88,6 @@ public class MainWorkBenchController extends BladeController {
 	@ApiOperationSupport(order = 50)
 	@ApiOperation("获取路由")
 	@PostMapping("/getHomePageWorkBench")
-	@OperationAnnotation(title = "首页工作台",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
-			action = "获取路由")
 	public R<InDustryVo> getHomePageWorkBench(@Valid @RequestBody RoutingParamVo vo) {
 		return R.data(workBenchService.getHomePageWorkBench(vo));
 	}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/RunMonthReportController.java

@@ -239,7 +239,9 @@ public class RunMonthReportController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation("根据站点获取运行月报-新版")
 	@GetMapping("/new/getByStation")
-	@OperationAnnotation(title = "运行月报告",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(
+			moduleName = "生产月报",
+			title = "运行月报告",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "根据站点获取运行月报-新版")
 	public R getNewByStation(@ApiParam(value = "日期-年月", required = true) String date,
 							 @ApiParam(value = "站点ID", required = true) String stationId) {

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/SideHustleController.java

@@ -50,7 +50,7 @@ public class SideHustleController extends BladeController {
 	@ApiOperation("集团/区域发电占比")
 	@GetMapping("/areaPowerScale")
 	@ApiOperationSupport(order = 3)
-	@OperationAnnotation(title = "演示大屏", operatorType = OperatorType.MOBILE,
+	@OperationAnnotation(moduleName = "演示大屏",title = "演示大屏", operatorType = OperatorType.MOBILE,
 			businessType = BusinessType.GENCODE,action = "区域发电占比")
 	public R<List<AreaPowerScaleVo>> areaPowerScale(@ApiParam(value = "区域机构ID") Long deptId) {
 		return R.data(regionService.areaPowerScale(deptId));
@@ -58,7 +58,7 @@ public class SideHustleController extends BladeController {
 	@ApiLog
 	@ApiOperation("集团/区域占比")
 	@GetMapping("/areaScale")
-	@OperationAnnotation(title = "演示大屏", operatorType = OperatorType.MOBILE,
+	@OperationAnnotation(moduleName = "演示大屏",title = "演示大屏", operatorType = OperatorType.MOBILE,
 			businessType = BusinessType.GENCODE,action = "区域占比")
 	@ApiOperationSupport(order = 4)
 	public R<List<AreaScaleVo>> areaScale(@ApiParam(value = "区域机构ID") Long deptId) {
@@ -76,7 +76,7 @@ public class SideHustleController extends BladeController {
 	@ApiOperation("获取地图标记")
 	@GetMapping("/getMapMarker")
 	@ApiOperationSupport(order = 6)
-	@OperationAnnotation(title = "演示大屏", operatorType = OperatorType.MOBILE,
+	@OperationAnnotation(moduleName = "演示大屏",title = "演示大屏", operatorType = OperatorType.MOBILE,
 			businessType = BusinessType.GENCODE,action = "获取地图标记")
 	public R<List<MapMarkerVo>> getMapMarker(@ApiParam(value = "区域机构ID") Long deptId,@RequestParam(value ="types") List<Integer> types) {
 		return R.data(regionService.getMapMarker(deptId,types));

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceMonitorController.java

@@ -41,7 +41,8 @@ public class OperMaintenanceMonitorController extends BladeController {
 	@GetMapping("/report/month")
 	@ApiOperationSupport(order = 40)
 	@ApiOperation(value = "监控月报表")
-	@OperationAnnotation(title = "日常维护计划",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName ="日常维护" ,title = "日常维护计划",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "监控月报表")
 	public R<Map<String, List<OperMaintenancePlanVO>>> reportMonth(OperMaintenanceMonitorReportMonthDTO req) {
 		return monitorService.reportMonth(req);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceTaskController.java

@@ -104,7 +104,7 @@ public class OperMaintenanceTaskController extends BladeController {
 	@ApiOperation(value = "分页 查询参数:refLibraryId,processInstanceId,disposer,content,status")
 	@ApiImplicitParams({
 	})
-	@OperationAnnotation(title = "日常维护记录",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName ="日常维护" ,title = "日常维护记录",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "分页 查询参数:refLibraryId,processInstanceId,disposer,content,status")
 	public R<IPage<OperMaintenanceTaskVO>> list(OperMaintenanceTaskDTO req, Query query) {
 		return taskService.list(req, query);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/DeptController.java

@@ -30,7 +30,7 @@ public class DeptController extends BladeController {
 	}
 
 	@ApiLog
-	@OperationAnnotation(title = "集中监控", operatorType = OperatorType.MOBILE,
+	@OperationAnnotation(moduleName ="集中监控" ,title = "集中监控", operatorType = OperatorType.MOBILE,
 			businessType = BusinessType.GENCODE,action = "getCurrentUserDept")
 	@GetMapping("/getCurrentUserDept")
 	public R<List<Dept>> getCurrentUserDept(@RequestParam(required = false) String name,@RequestParam(required = false) String type){

hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/MonthReportController.java

@@ -63,7 +63,8 @@ public class MonthReportController {
 	@GetMapping("/getStationMonthReportByStationCode")
 	@ApiOperation(value = "根据站点编码获取站点月报",notes = "根据站点编码获取站点月报")
 	@ApiOperationSupport(order = 1)
-	@OperationAnnotation(title = "统计月报(对内 对外)",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "生产月报",
+			title = "统计月报(对内 对外)",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "根据站点编码获取站点月报")
 	public R<StationReportAllVO> getStationMonthReportByStationCode(@RequestParam("deptId") Long deptId,@RequestParam("month") String month) throws Exception {
 //		LocalDate startDate = DateUtil.getFirstDayByYearMonth(month);
@@ -77,7 +78,7 @@ public class MonthReportController {
 	@GetMapping("/getPersonalMonthReport")
 	@ApiOperation(value = "获取当前登录人个人月报",notes = "获取当前登录人个人月报")
 	@ApiOperationSupport(order = 2)
-	@OperationAnnotation(title = "统计月报-个人",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "生产月报",title = "统计月报-个人",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "获取当前登录人个人月报")
 	public R<PersonalMonthReportVO> getPersonalMonthReport(@RequestParam("month") String month) throws Exception {
 		PersonalMonthReportVO personalMonthReportVO = monthReportService.getPersonalMonthReport(month);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationController.java

@@ -60,7 +60,9 @@ public class StationController extends BladeController {
 	@RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST})
 	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "分页", notes = "传入StationEntity")
-	@OperationAnnotation(title = "智能诊断",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(
+			moduleName = "安全管理",
+			title = "智能诊断",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "分页查询")
 	public R<IPage<StationVO>> list(StationEntity entity, Query query) {
 		IPage<StationVO> vos = stationService.list(entity,query);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java

@@ -141,7 +141,8 @@ public class StationVideoTypeController extends BladeController {
 	@RequestMapping(value = "/getVideoMonitor", method = {RequestMethod.GET, RequestMethod.POST})
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "获取视频监测列表", notes = "获取视频监测列表")
-	@OperationAnnotation(title = "视频监控",operatorType = OperatorType.APPSYSTEMS,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "视频监控",title = "视频监控",operatorType = OperatorType.APPSYSTEMS,businessType =
+			BusinessType.GENCODE,
 			action = "获取视频监测列表")
 	public R<List<VideoMonitorVO>> getVideoMonitor(){
 		List<VideoMonitorVO> result = stationVideoTypeService.getVideoMonitor();
@@ -151,7 +152,7 @@ public class StationVideoTypeController extends BladeController {
 	@ApiLog
 	@RequestMapping(value = "/getById", method = {RequestMethod.GET, RequestMethod.POST})
 	@ApiOperationSupport(order = 60)
-	@OperationAnnotation(title = "视频监控",operatorType = OperatorType.APPSYSTEMS,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "视频监控",title = "视频监控",operatorType = OperatorType.APPSYSTEMS,businessType = BusinessType.GENCODE,
 			action = "获取视频监测对象")
 	@ApiOperation(value = "获取视频监测对象", notes = "获取视频监测对象")
 	public R<StationVideoTypeEntity> getById(@RequestParam Long id,@RequestParam int streamType){

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/AccidentController.java

@@ -115,7 +115,8 @@ public class AccidentController extends BladeController {
 	@GetMapping("/pageList")
 	@ApiOperation("分页查询")
 	@ApiOperationSupport(order = 5)
-	@OperationAnnotation(title = "事故管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "安全管理",
+			title = "事故管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "分页条件")
 	public R<IPage> pageList(AccidentDTO req, Query query){
 		AccidentEntity accidentEntity = BeanUtil.copy(req,AccidentEntity.class);

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ReviewController.java

@@ -136,7 +136,7 @@ public class ReviewController extends BladeController {
 	@GetMapping("/listPage")
 	@ApiOperation("分页查询")
 	@ApiOperationSupport(order = 4)
-	@OperationAnnotation(title = "电站安全标准",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "电站安全标准",title = "电站安全标准",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "分页查询")
 	public R<IPage> listPage(ReviewDto req, Query query) {
 		LambdaQueryWrapper<ReviewEntity> queryWrapper = Condition.getQueryWrapper(new ReviewEntity(),BeanUtil.copy(req,ReviewEntity.class));

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolController.java

@@ -97,7 +97,8 @@ public class SafetyToolController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
-	@OperationAnnotation(title = "安全工具器",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "安全管理",title = "安全工具器",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页条件")
 	@ApiOperation(value = "分页", notes = "查询条件：typeId,toolName,toolCode")
 	public R<IPage<SafetyToolVO>> list(SafetyToolDTO req, Query query) {

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolTypeController.java

@@ -97,7 +97,7 @@ public class SafetyToolTypeController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 60)
-	@OperationAnnotation(title = "安全工器具类型",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "安全管理",title = "安全工器具类型",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "分页条件")
 	@ApiOperation(value = "分页", notes = "查询条件：sendType,name,startSendTime,endSendTime")
 	public R<IPage<SafetyToolTypeVO>> list(SafetyToolTypeListDTO req, Query query) {

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/library/controller/TicketMatterGroupController.java

@@ -85,7 +85,8 @@ public class TicketMatterGroupController extends BladeController {
 	@GetMapping("/queryList")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页")
-	@OperationAnnotation(title = "两票管理(票据管理)",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "两票管理",
+			title = "票据管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "分页")
 	public R<IPage<TicketMatterGroupVO>> queryList(TicketMatterGroupDTO req, Query query) {
 		return service.queryList(req,query);

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java

@@ -70,7 +70,8 @@ public class StandardTicketInfoController extends BladeController {
 	@PostMapping("/queryList")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页")
-	@OperationAnnotation(title = "两票管理(操作票)",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "两票管理",title = "操作票",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页")
 	public R<IPage<StandardTicketInfoVO>> queryList(StandardTicketInfoDto req, Query query) {
 		return standardTicketInfoService.queryList(req, query);

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java

@@ -92,7 +92,9 @@ public class WorkTicketInfoController {
 	@PostMapping("/queryList")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页")
-	@OperationAnnotation(title = "两票管理(工作票)",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "两票管理",title = "工作票"
+			,operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页")
 	public R<IPage<WorkTicketInfoVO>> queryList(WorkTicketInfoDto req, Query query) {
 		return workTicketInfoService.queryList(req, query);
@@ -146,7 +148,8 @@ public class WorkTicketInfoController {
 	@ApiLog
 	@GetMapping("/userListByRoleAlias")
 	@ApiOperationSupport(order = 100)
-	@OperationAnnotation(title = "两票管理(工作票)",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "两票管理",
+			title = "两票管理(工作票)",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "获取某机构下角色的人员列表")
 	@ApiOperation(value = "获取某机构下角色的人员列表")
 	public R userListByRoleAlias(@RequestParam("roleAlias")  @ApiParam("角色别称") String roleAlias) {

hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/controller/ImsTopvisionUserController.java

@@ -57,7 +57,8 @@ public class ImsTopvisionUserController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入topvisionUser")
-	@OperationAnnotation(title = "远程协作",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName ="远程协作",
+			title = "远程协作",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "分页查询")
 	public R<IPage<ImsTopvisionUserEntity>> list(ImsTopvisionUserEntity topvisionUser, Query query) {
 		IPage<ImsTopvisionUserEntity> pages = topvisionUserService.page(Condition.getPage(query), Condition.getQueryWrapper(topvisionUser));