添加统计接口，添加站内信参数json

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/maintain/IotMaintainController.java

@@ -1,47 +1,42 @@
 package cn.iocoder.yudao.module.pms.controller.admin.maintain;
 
-import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.failure.vo.IotFailureReportProcessVO;
 import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainRespVO;
-import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainSaveReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainSaveVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainBomDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainDO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.material.IotMaintainMaterialDO;
 import cn.iocoder.yudao.module.pms.service.IotDeviceService;
 import cn.iocoder.yudao.module.pms.service.maintain.IotMaintainBomService;
 import cn.iocoder.yudao.module.pms.service.maintain.IotMaintainService;
 import cn.iocoder.yudao.module.pms.service.maintain.material.IotMaintainMaterialService;
 import cn.iocoder.yudao.module.supplier.dal.dataobject.product.SupplierDO;
 import cn.iocoder.yudao.module.supplier.service.product.SupplierService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.io.IOException;
+import java.util.List;
+import java.util.Objects;
 
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
-
 
 @Tag(name = "管理后台 - 维修工单")
 @RestController
@@ -107,6 +102,16 @@ public class IotMaintainController {
     @PreAuthorize("@ss.hasPermission('rq:iot-maintain:query')")
     public CommonResult<PageResult<IotMaintainRespVO>> getIotMaintainPage(@Valid IotMaintainPageReqVO pageReqVO) {
         PageResult<IotMaintainDO> pageResult = iotMaintainService.getIotMaintainPage(pageReqVO);
+        for (IotMaintainDO iotMaintainDO : pageResult.getList()) {
+            Long deviceId = iotMaintainDO.getDeviceId();
+            if (Objects.nonNull(deviceId)) {
+                IotDeviceDO iotDevice = iotDeviceService.getIotDevice(deviceId);
+                if (Objects.nonNull(iotDevice)) {
+                    iotMaintainDO.setDeviceCode(iotDevice.getDeviceCode());
+                }
+            }
+
+        }
         return success(BeanUtils.toBean(pageResult, IotMaintainRespVO.class));
     }
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/stat/IotStaticController.java

@@ -100,11 +100,11 @@ public class IotStaticController {
     }
 
 
-    public static void main(String[] args) {
-        ImmutableMap<String, LocalDateTime> beginEndDay = DateUtils.getBeginEndDay(1);
-        System.out.println(JSON.toJSONString(beginEndDay));
-        ImmutableMap<String, LocalDateTime> beginEndDay1 = DateUtils.getBeginEndDay(0);
-        System.out.println(JSON.toJSONString(beginEndDay1));
+
+    public static class OrderVo{
+        private String title;
+        private String status;
+        private String person;
     }
 
     @GetMapping("/main/week")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/maintain/IotMaintainDO.java

@@ -138,4 +138,6 @@ public class IotMaintainDO extends BaseDO {
      * 维修工单类型
      */
     private String maintainType;
+
+    private String deviceCode;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/message/PmsMessage.java

@@ -34,7 +34,7 @@ public class PmsMessage {
                 .setUserId(userId).setTemplateCode(businessType).setTemplateParams(templateParams));
         if (StrUtil.isNotBlank(mobile)) {
             //发送钉钉消息
-            String msg = "您有新的巡检工单待处理，请审批。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
+            String msg = "您有新的巡检工单待处理，请处理。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
             if (PmsConstants.MATERIAL_REQUISITION.equals(businessType)) {
                 msg = "物料领用单 " + name + " 已生成，请知悉。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
             }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java

@@ -51,4 +51,6 @@ public class NotifyMessageRespVO {
 
     @Schema(description = "业务id")
     private String businessId;
+
+    private String paramJson;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java

@@ -107,4 +107,6 @@ public class NotifyMessageDO extends BaseDO {
      * 业务id
      */
     private String businessId;
+
+    private String paramJson;
 }