公共分页和list查询修改,设备字段修改

src/main/java/com/aps/controller/ScheduleResultController1.java

-package com.aps.controller;
-
-import com.aps.common.util.R;
-import com.aps.entity.Gantt.PlanResourceTaskGanttVO1;
-import com.aps.entity.Gantt.SimpleEquipinfo1;
-import com.aps.entity.Mpsplannedorder;
-import com.aps.entity.RoutingDetail;
-import com.aps.entity.RoutingDetailEquip;
-import com.aps.entity.RoutingHeader;
-import com.aps.entity.ScheduledTask;
-import com.aps.entity.Equipinfo;
-import com.aps.service.ScheduleService;
-import com.aps.service.MpsplannedorderService;
-import com.aps.service.RoutingHeaderService;
-import com.aps.service.RoutingDetailService;
-import com.aps.service.RoutingDetailEquipService;
-import com.aps.service.EquipinfoService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-@RestController
-@RequestMapping("/ganttest")
-@Tag(name = "甘特图", description = "甘特图相关API")
-public class ScheduleResultController1 {
-
-    @Autowired
-    private ScheduleService schedulerService;
-
-    @Autowired
-    private MpsplannedorderService orderService;
-
-    @Autowired
-    private RoutingHeaderService processService;
-
-    @Autowired
-    private RoutingDetailService operationService;
-
-    @Autowired
-    private RoutingDetailEquipService operationEquipService;
-
-    @Autowired
-    private EquipinfoService equipmentService;
-    
-    @GetMapping("/resourcetest")
-    @Operation(summary = "资源甘特图", description = "获取资源甘特图数据")
-    @ApiResponses({
-        @ApiResponse(responseCode = "200", description = "成功返回甘特图数据"),
-        @ApiResponse(responseCode = "500", description = "内部服务器错误")
-    })
-    public R<PlanResourceTaskGanttVO1> runScheduling() {
-        try {
-            // 获取routingid为'SY1102507-0056202车间-21号线'和'SY1102507-0060202车间-21号线'的待调度工单
-            List<Mpsplannedorder> orders = orderService.lambdaQuery()
-                    .in(Mpsplannedorder::getRoutingid, "SY1102507-0056202车间-21号线", "SY1102507-0060202车间-21号线")
-                    .list();
-
-            if (orders.isEmpty()) {
-                // 当没有订单时，返回空的甘特图VO
-                PlanResourceTaskGanttVO1 ganttVO = new PlanResourceTaskGanttVO1()
-                        .setResources(new ArrayList<>())
-                        .setEarliestTaskStartTime(LocalDateTime.of(2025, 6, 1, 0, 0, 0))
-                        .setLastTaskAssignmentTime(LocalDateTime.of(2025, 12, 1, 0, 0, 0));
-                return R.ok(ganttVO);
-            }
-
-            // 提取所需的工艺ID列表
-            Set<String> routingIds = orders.stream()
-                    .map(Mpsplannedorder::getRoutingid)
-                    .collect(Collectors.toSet());
-
-            // 根据工单获取相关工艺
-            List<RoutingHeader> processes = processService.lambdaQuery()
-                    .in(RoutingHeader::getCode, routingIds)
-                    .list();
-
-            if (processes.isEmpty()) {
-                return R.failed("未找到相关工艺信息");
-            }
-
-            // 提取工艺ID用于后续查询
-            Set<Integer> processIds = processes.stream()
-                    .map(RoutingHeader::getId)
-                    .collect(Collectors.toSet());
-
-            // 根据工艺获取相关工序
-            List<RoutingDetail> operations = operationService.lambdaQuery()
-                    .in(RoutingDetail::getRoutingHeaderId, processIds)
-                    .orderByAsc(RoutingDetail::getTaskSeq)
-                    .list();
-
-            if (operations.isEmpty()) {
-                return R.failed("未找到相关工序信息");
-            }
-
-            // 提取工序ID用于后续查询
-            Set<Long> operationIds = operations.stream()
-                    .map(RoutingDetail::getId)
-                    .collect(Collectors.toSet());
-
-            // 获取相关工序设备关系
-            List<RoutingDetailEquip> operationEquipments = operationEquipService.lambdaQuery()
-                    .in(RoutingDetailEquip::getRoutingDetailId, operationIds)
-                    .list();
-
-            if (operationEquipments.isEmpty()) {
-                return R.failed("未找到工序设备关系信息");
-            }
-
-            // 提取设备ID用于后续查询
-            Set<Long> equipmentIds = operationEquipments.stream()
-                    .map(RoutingDetailEquip::getEquipId)
-                    .collect(Collectors.toSet());
-
-            // 获取相关设备
-            List<Equipinfo> equipments = equipmentService.lambdaQuery()
-                    .in(Equipinfo::getId, equipmentIds)
-                    .list();
-
-            // 添加空值检查
-            if (orders == null || processes == null || operations == null || operationEquipments == null || equipments == null) {
-                return R.failed("获取调度数据失败，存在空数据");
-            }
-
-            List<ScheduledTask> result = schedulerService.scheduleOrders(
-                    orders, processes, operations, operationEquipments, equipments);
-
-            // 转换设备信息为简要信息，并关联相关任务
-            List<SimpleEquipinfo1> simpleEquipinfos = equipments.stream()
-                    .map(equip -> {
-                        // 查找与该设备关联的任务
-                        List<ScheduledTask> equipTasks = result.stream()
-                                .filter(task -> task.getEquipId() != null && task.getEquipId().equals(equip.getId()))
-                                .collect(Collectors.toList());
-
-                        return new SimpleEquipinfo1()
-                                .setId(equip.getId())
-                                .setEquipId(equip.getEquipId())
-                                .setEquipName(equip.getEquipName())
-                                .setTasks(equipTasks);
-                    })
-                    .collect(Collectors.toList());
-
-            // 设置甘特图VO的最早时间为2025年6月1日，最晚时间为2025年12月1日
-            PlanResourceTaskGanttVO1 ganttVO = new PlanResourceTaskGanttVO1()
-                    .setResources(simpleEquipinfos)
-                    .setEarliestTaskStartTime(LocalDateTime.of(2025, 6, 1, 0, 0, 0))
-                    .setLastTaskAssignmentTime(LocalDateTime.of(2025, 12, 1, 0, 0, 0));
-
-            return R.ok(ganttVO);
-        } catch (Exception e) {
-            return R.failed("调度执行失败: " + e.getMessage());
-        }
-    }
-}
\ No newline at end of file

src/main/java/com/aps/service/Algorithm/RoutingDataService.java

@@ -304,7 +304,6 @@ public class RoutingDataService {
 
             machine.setCode("");
             machine.setName("");
-
             machines.add(machine);
 
         }
@@ -360,7 +359,7 @@ public class RoutingDataService {
                     Equipinfo equipinfo= equipinfoList.stream()
                             .filter(t->t.getId().equals(PlanResource.getReferenceId()))
                             .findFirst().orElse(null);
-
+                    machine.setDepartment(PlanResource.getDepartTitle());
                     if(equipinfo!=null)
                     {
                         machine.setCode(equipinfo.getEquipId());
@@ -408,6 +407,30 @@ public class RoutingDataService {
             }
         } else {
             for (Machine machine : machines) {
+
+                PlanResource PlanResource = PlanResources.stream()
+                        .filter(t -> t.getId() == machine.getId())
+                        .findFirst().orElse(null);
+
+                if (PlanResource != null) {
+                    Equipinfo equipinfo= equipinfoList.stream()
+                            .filter(t->t.getId().equals(PlanResource.getReferenceId()))
+                            .findFirst().orElse(null);
+
+                    machine.setDepartment(PlanResource.getDepartTitle());
+                    if(equipinfo!=null)
+                    {
+                        machine.setCode(equipinfo.getEquipId());
+                        machine.setName(equipinfo.getEquipName());
+                    }else {
+                        machine.setCode(PlanResource.getReferenceCode());
+                        machine.setName(PlanResource.getTitle());
+                    }
+                }
+
+
+
+
                 List<Shift> shifts1 = new ArrayList<>();
                 Shift shift=new Shift();
                 shift.setMachineId(machine.getId());
@@ -488,7 +511,7 @@ public class RoutingDataService {
             Equipinfo equipinfo= equipinfoList.stream()
                         .filter(t->t.getId().equals(resource.getReferenceId()))
                         .findFirst().orElse(null);
-
+            machine.setDepartment(resource.getDepartTitle());
             if(equipinfo!=null)
             {
                 machine.setCode(equipinfo.getEquipId());