维修主管指派维修人员时发送短信给维修人员

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

@@ -23,6 +23,7 @@ import org.springblade.modules.business.service.IMaintenancePlanService;
 import org.springblade.modules.business.service.IMaintenanceTaskDetailService;
 import org.springblade.modules.business.service.IMaintenanceTaskService;
 import org.springblade.modules.business.sms.SmsService;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDate;
@@ -45,6 +46,8 @@ public class MaintenanceController extends BladeController {
     private final IMaintenanceTaskService taskService;
     private final IMaintenanceTaskDetailService taskDetailService;
 
+    private final SmsService smsService;
+
     /*---------- 维修计划开始 ----------*/
 
     @GetMapping("/plan-page")
@@ -89,14 +92,14 @@ public class MaintenanceController extends BladeController {
 
     /*---------- 维修任务开始 ----------*/
 
-	@PostMapping("/task-create")
+    @PostMapping("/task-create")
-	@Operation(summary = "定时任务-根据维保计划生成维保任务", description = "定时任务-根据维保计划生成维保任务")
+    @Operation(summary = "定时任务-根据维保计划生成维保任务", description = "定时任务-根据维保计划生成维保任务")
-	public R taskCreate() {
+    public R taskCreate() {
-		// 提前五天生成
+        // 提前五天生成
-		LocalDate now = LocalDate.now().minusDays(-5);
+        LocalDate now = LocalDate.now().minusDays(-5);
-		// 注意要查询上一次巡检计划中发现但未维修的
+        // 注意要查询上一次巡检计划中发现但未维修的
-		return R.status(planService.createTask(now));
+        return R.status(planService.createTask(now));
-	}
+    }
 
     @GetMapping("/task-page")
     @Operation(summary = "维保任务列表", description = "维保任务列表")
@@ -123,13 +126,14 @@ public class MaintenanceController extends BladeController {
 
     @PostMapping("/task-supervisor-confirm")
     @Operation(summary = "主管审核并指定维修人员", description = "主管审核并指定维修人员")
+    @Transactional(rollbackFor = Exception.class)
     public R taskSupervisorConfirm(@RequestBody MaintenanceTask task) throws ClientException {
         MaintenanceTask taskOld = taskService.getById(task.getId());
         taskOld.setServicemanId(task.getServicemanId());
         taskOld.setServicemanName(task.getServicemanName());
         taskOld.setTaskStatus(MaintenanceStatusEnum.TASK_SUPERVISOR_CONFIRM.getValue());
         taskService.updateById(taskOld);
-        SmsService.sendSms("13553032083", "阿祥");
+        smsService.sendSms("17852327323", "靳娜");
         return R.success();
     }
 

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

@@ -358,6 +358,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     @Override
     public List<MaintenancePersonnel> searchMaintenancePersonnel(Long id) {
+        //获取维修人员列表
         User maintenanceSupervisor = userService.getById(id);
         String deptId = maintenanceSupervisor.getDeptId();
         List<Dept> deptChild = deptService.getDeptChild(Long.parseLong(deptId));
@@ -370,11 +371,14 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         }
         List<User> maintenancePersonnelList = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getDeptId, requiredDept.getId()));
         List<MaintenancePersonnel> list = new ArrayList<>();
+        //查询每个维修人员的工单数量及满意度
         for (User user : maintenancePersonnelList) {
             MaintenancePersonnel maintenancePersonnel = new MaintenancePersonnel();
             maintenancePersonnel.setName(user.getName());
+            //查询每个维修人员的工单数量
             Long count = this.count(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getRepairPerson, user.getId()));
             maintenancePersonnel.setCount(count);
+            //查询每个维修人员的满意度
             List<WorkOrder> workOrderList = this.list(Wrappers.lambdaQuery(WorkOrder.class)
                     .eq(WorkOrder::getRepairPerson, user.getId()));
             int num = workOrderList.size() * 3;

src/main/java/org/springblade/modules/business/sms/SmsService.java

@@ -59,6 +59,7 @@ public class SmsService {
                 System.out.println(String.format("向 手机号：%s 用户发送短信成功！", phoneNumber));
             } else {
                 System.out.println(String.format("向 手机号：%s 用户发送短信失败！", phoneNumber));
+                throw new RuntimeException();
             }
         } catch (Exception e) {
             throw new RuntimeException(e);