diff --git a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java b/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java index caceedc..6be8a53 100644 --- a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java +++ b/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 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(); } diff --git a/src/main/java/org/springblade/modules/business/contraller/MessageController.java b/src/main/java/org/springblade/modules/business/contraller/MessageController.java index 1f0ad8f..d7baaf7 100644 --- a/src/main/java/org/springblade/modules/business/contraller/MessageController.java +++ b/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); - } } diff --git a/src/main/java/org/springblade/modules/business/service/IMessageService.java b/src/main/java/org/springblade/modules/business/service/IMessageService.java index 2437229..2d18ccd 100644 --- a/src/main/java/org/springblade/modules/business/service/IMessageService.java +++ b/src/main/java/org/springblade/modules/business/service/IMessageService.java @@ -11,7 +11,7 @@ import java.util.List; public interface IMessageService extends BaseService { - 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); diff --git a/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java index ca15912..be89c8e 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java +++ b/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> longListEntry : listMap.entrySet()) { Long planId = longListEntry.getKey(); List details = longListEntry.getValue(); @@ -274,12 +279,24 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl 0) { + String roleId = "1839537055389515777"; + List 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; } diff --git a/src/main/java/org/springblade/modules/business/service/impl/MessageServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/MessageServiceImpl.java index 798f589..0f75b99 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/MessageServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/MessageServiceImpl.java @@ -22,16 +22,15 @@ public class MessageServiceImpl extends BaseServiceImpl /** * 保存消息 * - * @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); diff --git a/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java index 3f55964..29db514 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java @@ -60,6 +60,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl