巡检任务生成短信通知维修主管

src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java

@@ -250,7 +250,6 @@ public class MaintenanceController extends BladeController {
         MaintenanceTask taskOld = taskService.getById(task.getId());
         taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_SERVICEMAN_CREATE.getValue());
         taskService.updateById(taskOld);
-
         List<MaintenanceTaskDetail> detailList = taskDto.getDetailList();
         taskDetailService.saveOrUpdateBatch(detailList);
 
@@ -263,7 +262,6 @@ public class MaintenanceController extends BladeController {
         MaintenanceTask taskOld = taskService.getById(task.getId());
         taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_SERVICEMAN_SUBMIT.getValue());
         taskService.updateById(taskOld);
-
         return R.success();
     }
 

src/main/java/org/springblade/modules/business/contraller/MessageController.java

@@ -6,14 +6,9 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
 import org.springblade.modules.business.pojo.dto.MessageUpdateDTO;
-import org.springblade.modules.business.pojo.entity.Message;
-import org.springblade.modules.business.pojo.vo.MessageVO;
 import org.springblade.modules.business.service.IMessageService;
 import org.springframework.web.bind.annotation.*;
-
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
 
 @RestController
 @AllArgsConstructor
@@ -77,14 +72,5 @@ public class MessageController extends BladeController {
         return R.success();
     }
 
-    @PostMapping("/saveMessage")
-    public void saveMessage(@RequestBody Message message) {
-        String content = message.getContent();
-        String title = message.getTitle();
-        String systemType = message.getSystemType();
-        Long messageUser = message.getMessageUser();
-        Integer messageType = message.getMessageType();
-        messageService.saveMessage(systemType, title, content, messageUser, messageType);
-    }
 
 }

src/main/java/org/springblade/modules/business/service/IMessageService.java

@@ -11,7 +11,7 @@ import java.util.List;
 
 public interface IMessageService extends BaseService<Message> {
 
-    void saveMessage(String systemType, String title, String content, Long messageUser, Integer messageType);
+    void saveMessage(String title, String content, Long messageUser, Integer messageType);
 
 
     PageVO getMessageList(Integer current, Integer size, LocalDate start, LocalDate end, Integer status);

src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java

@@ -4,6 +4,7 @@ package org.springblade.modules.business.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
+import org.springblade.common.cache.UserCache;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.DateUtil;
@@ -15,6 +16,8 @@ import org.springblade.modules.business.pojo.entity.maintenance.MaintenancePlanD
 import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTask;
 import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTaskDetail;
 import org.springblade.modules.business.service.*;
+import org.springblade.modules.business.sms.SmsService;
+import org.springblade.modules.resource.pojo.entity.Sms;
 import org.springblade.modules.system.pojo.entity.User;
 import org.springblade.modules.system.service.IUserService;
 import org.springframework.stereotype.Service;
@@ -46,6 +49,7 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl<MaintenancePlanM
     private final IMaintenanceTaskDetailService taskDetailService;
     private final IDeviceAttachService deviceAttachService;
     private final IUserService userService;
+    private final SmsService smsService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -239,6 +243,7 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl<MaintenancePlanM
         SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
         String todayStr = format.format(new Date());
         int count = 1;
+        int taskCount = 0;
         for (Map.Entry<Long, List<MaintenancePlanDetail>> longListEntry : listMap.entrySet()) {
             Long planId = longListEntry.getKey();
             List<MaintenancePlanDetail> details = longListEntry.getValue();
@@ -274,12 +279,24 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl<MaintenancePlanM
                         // 修改计划详情
                         planDetailService.updateBatchById(newDetails);
                         count++;
+                        taskCount++;
                     } catch (Exception e) {
                         log.error(e.toString());
                     }
                 }
             }
         }
+        if (taskCount > 0) {
+            String roleId = "1839537055389515777";
+            List<User> maintenanceSupervisorList = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, roleId));
+            try {
+                for (User maintenanceSupervisor : maintenanceSupervisorList) {
+                    smsService.sendSms(maintenanceSupervisor.getPhone(), maintenanceSupervisor.getRealName());
+                }
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
         return true;
     }
 

src/main/java/org/springblade/modules/business/service/impl/MessageServiceImpl.java

@@ -22,16 +22,15 @@ public class MessageServiceImpl extends BaseServiceImpl<MessageMapper, Message>
     /**
      * 保存消息
      *
-     * @param systemType
      * @param title
      * @param content
      * @param messageUser
      * @param messageType
      */
     @Override
-    public void saveMessage(String systemType, String title, String content, Long messageUser, Integer messageType) {
+    public void saveMessage(String title, String content, Long messageUser, Integer messageType) {
         Message saveInformation = new Message();
-        saveInformation.setSystemType(systemType);
+        saveInformation.setSystemType("1");
         saveInformation.setTitle(title);
         saveInformation.setContent(content);
         saveInformation.setMessageUser(messageUser);

src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java

@@ -60,6 +60,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     private final IWorkOrderApprovalService approvalService;
 
+    private final IMessageService messageService;
+
     private final IDeptService deptService;
 
     private final IDeviceService deviceService;
@@ -129,12 +131,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             // 查询今天已提报数量
             String hz = count < 9 ? "0" + (count + 1) : count + 1 + "";
             String code = "WX-" + todayStr + "-" + hz;
-
             workOrder.setFillingTime(now);
             workOrder.setRequirementCode(code);
             // 待接单
             workOrder.setStatus(WorkOrderStatusEnum.KH_ORDER_SUBMIT.getValue());
-
             if (user != null) {
                 workOrder.setInformant(user.getId());
                 workOrder.setInformantPhone(user.getPhone());
@@ -143,7 +143,6 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             }
             save = this.saveOrUpdate(workOrder);
             count++;
-
             // 保存附件
             saveFiles(workOrder.getVideoAttaches(), workOrder.getPicAttaches(), workOrder.getId());
         }