删除多余接口

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/controller/StorageBillController.java

@@ -1425,27 +1425,6 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 		return Result.OK(result);
 	}
 
-	@ApiOperation(value="当班所有装运起垛支数信息-车辆运行看板", notes="当班所有装运轧钢接收信息-车辆运行看板")
-	@GetMapping(value = "/queryOnDutyStackingUp")
-	public Result<SteelDetailsVo> queryOnDutyStackingUp(@RequestParam(name="ccmNo") String ccmNo) {
-		SteelDetailsVo result = storageBillService.queryOnDutyStackingUp(ccmNo);
-		return Result.OK(result);
-	}
-
-	@ApiOperation(value="当班所有装运热送支数信息-车辆运行看板", notes="当班所有装运热送支数信息-车辆运行看板")
-	@GetMapping(value = "/queryOnDutyHotSendInfo")
-	public Result<SteelDetailsVo> queryOnDutyHotSendInfo(@RequestParam(name="ccmNo") String ccmNo) {
-		SteelDetailsVo result = storageBillService.queryOnDutyHotSendInfo(ccmNo);
-		return Result.OK(result);
-	}
-
-	@ApiOperation(value="当班所有装运热装支数信息-车辆运行看板", notes="当班所有装运热装支数信息-车辆运行看板")
-	@GetMapping(value = "/queryOnDutyHotChargeInfo")
-	public Result<SteelDetailsVo> queryOnDutyHotChargeInfo(@RequestParam(name="ccmNo") String ccmNo) {
-		SteelDetailsVo result = storageBillService.queryOnDutyHotChargeInfo(ccmNo);
-		return Result.OK(result);
-	}
-
 	/**
 	 * 计算 本车车次
 	 * @param ccmNo

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/service/IStorageBillService.java

@@ -82,9 +82,5 @@ public interface IStorageBillService extends IService<StorageBill> {
 
     SteelDetailsVo queryOnDutySteelReceive(String ccmNo);
 
-    SteelDetailsVo queryOnDutyStackingUp(String ccmNo);
 
-    SteelDetailsVo queryOnDutyHotSendInfo(String ccmNo);
-
-    SteelDetailsVo queryOnDutyHotChargeInfo(String ccmNo);
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/service/impl/StorageBillServiceImpl.java

@@ -3050,7 +3050,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
         List<StackingUpLog> stackingUpLogList = stackingUpLogService.list(stackingUpLogQueryWrapper);
         if (oConvertUtils.listIsNotEmpty(stackingUpLogList)) {
 
-            steelDetailsVo.setStackingDownLogList(stackingUpLogList);
+            steelDetailsVo.setStackingUpLogList(stackingUpLogList);
         }
 
         // 根据铸机号、班组、班别、时间范围。查询棒一明细表
@@ -3068,8 +3068,12 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
 
         // 根据铸机号、班组、班别、时间范围。查询棒二明细表
         LambdaQueryWrapper<RollClubTwoDetails> queryWrapper2 = new LambdaQueryWrapper<>();
-        queryWrapper2.eq(RollClubTwoDetails::getCcmNo, ccmNo)
-                .in(RollClubTwoDetails::getStorageBillId, idList);
+        if (idList != null && !idList.isEmpty()) {
+            queryWrapper2.eq(RollClubTwoDetails::getCcmNo, ccmNo)
+                    .in(RollClubTwoDetails::getStorageBillId, idList);
+        } else {
+            queryWrapper2.eq(RollClubTwoDetails::getCcmNo, ccmNo);
+        }
 
         List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(queryWrapper2);
         if (oConvertUtils.listIsNotEmpty(rollClubTwoDetailsList)) {
@@ -3080,8 +3084,13 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
 
         // 根据铸机号、班组、班别、时间范围。查询棒三明细表
         LambdaQueryWrapper<RollClubThreeDetails> queryWrapper3 = new LambdaQueryWrapper<>();
-        queryWrapper3.eq(RollClubThreeDetails::getCcmNo, ccmNo)
-                .in(RollClubThreeDetails::getStorageBillId, idList);
+        if (idList != null && !idList.isEmpty()) {
+            queryWrapper3.eq(RollClubThreeDetails::getCcmNo, ccmNo)
+                    .in(RollClubThreeDetails::getStorageBillId, idList);
+        } else {
+            queryWrapper3.eq(RollClubThreeDetails::getCcmNo, ccmNo);
+        }
+
 
         List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(queryWrapper3);
         if (oConvertUtils.listIsNotEmpty(rollClubThreeDetailsList)) {
@@ -3104,189 +3113,13 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
 
         // 根据铸机号、班组、班别、时间范围。查询上若明细表
         LambdaQueryWrapper<RollOutShippDetails> queryWrapper5 = new LambdaQueryWrapper<>();
-        queryWrapper5.eq(RollOutShippDetails::getCcmNo, ccmNo)
-                .in(RollOutShippDetails::getStorageBillId, idList);
-
-        List<RollOutShippDetails> rollOutShippDetailsList = rollOutShippDetailsService.list(queryWrapper5);
-        if (oConvertUtils.listIsNotEmpty(rollOutShippDetailsList)) {
-
-            steelDetailsVo.setRollOutShippDetailsList(rollOutShippDetailsList);
-        }
-
-        return steelDetailsVo;
-    }
-
-    @Override
-    public SteelDetailsVo queryOnDutyStackingUp(String ccmNo) {
-        SteelDetailsVo steelDetailsVo = new SteelDetailsVo();
-
-        String shiftGroup = "";
-        String shift = "";
-        BilletHotsendChangeShift billetHotsendChangeShift;
-
-        // 从 Redis 获取班次信息
-        shiftGroup = getShiftInfo(ccmNo, "class:shift:group:%s");
-        shift = getShiftInfo(ccmNo, "class:shift:%s");
-        // 根据铸机号、缓存中的当前班次，倒序最新一条，获取交班记录中的创建时间
-        LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo)
-                .eq(BilletHotsendChangeShift::getShift, shift)
-                .eq(BilletHotsendChangeShift::getShiftGroup, shiftGroup)
-                .isNull(BilletHotsendChangeShift::getChangeShiftTime)
-                .orderByDesc(BilletHotsendChangeShift::getCreateTime)
-                .last("limit 1");
-        billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
-        if (billetHotsendChangeShift == null) {
-            log.info("{}{}", "查询当班装运单信息失败，交班记录为空！", ccmNo + "失败时间：" + new Date());
-            return steelDetailsVo;
-        }
-
-        // 根据铸机号、班组、班别、创建时间 查询垛位起剁明细表
-        LambdaQueryWrapper<StackingUpLog> stackingUpLogQueryWrapper = new LambdaQueryWrapper<>();
-        stackingUpLogQueryWrapper.eq(StackingUpLog::getCcmNo, ccmNo);
-
-        stackingUpLogQueryWrapper.between(StackingUpLog::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
-
-        List<StackingUpLog> stackingUpLogList = stackingUpLogService.list(stackingUpLogQueryWrapper);
-        if (oConvertUtils.listIsNotEmpty(stackingUpLogList)) {
-
-            steelDetailsVo.setStackingDownLogList(stackingUpLogList);
-        }
-
-        return steelDetailsVo;
-    }
-
-    @Override
-    public SteelDetailsVo queryOnDutyHotSendInfo(String ccmNo) {
-        SteelDetailsVo steelDetailsVo = new SteelDetailsVo();
-
-        String shiftGroup = "";
-        String shift = "";
-        BilletHotsendChangeShift billetHotsendChangeShift;
-
-        // 从 Redis 获取班次信息
-        shiftGroup = getShiftInfo(ccmNo, "class:shift:group:%s");
-        shift = getShiftInfo(ccmNo, "class:shift:%s");
-        // 根据铸机号、缓存中的当前班次，倒序最新一条，获取交班记录中的创建时间
-        LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo)
-                .eq(BilletHotsendChangeShift::getShift, shift)
-                .eq(BilletHotsendChangeShift::getShiftGroup, shiftGroup)
-                .isNull(BilletHotsendChangeShift::getChangeShiftTime)
-                .orderByDesc(BilletHotsendChangeShift::getCreateTime)
-                .last("limit 1");
-        billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
-        if (billetHotsendChangeShift == null) {
-            log.info("{}{}", "查询当班装运单信息失败，交班记录为空！", ccmNo + "失败时间：" + new Date());
-            return steelDetailsVo;
-        }
-
-        // 根据铸机号、班组、班别、时间范围。查询棒一明细表
-        LambdaQueryWrapper<RollClubOneDetails> queryWrapper1 = new LambdaQueryWrapper<>();
-        queryWrapper1.eq(RollClubOneDetails::getCcmNo, ccmNo)
-                .eq(RollClubOneDetails::getShift, shift)
-                .eq(RollClubOneDetails::getShiftGroup, shiftGroup)
-                .between(RollClubOneDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
-
-        List<RollClubOneDetails> rollClubOneDetailsList = rollClubOneDetailsService.list(queryWrapper1);
-        if (oConvertUtils.listIsNotEmpty(rollClubOneDetailsList)) {
-
-            steelDetailsVo.setRollClubOneDetailsList(rollClubOneDetailsList);
-        }
-
-        // 根据铸机号、班组、班别、时间范围。查询高线明细表
-        LambdaQueryWrapper<RollHeightDetails> queryWrapper4 = new LambdaQueryWrapper<>();
-        queryWrapper4.eq(RollHeightDetails::getCcmNo, ccmNo)
-                .eq(RollHeightDetails::getShift, shift)
-                .eq(RollHeightDetails::getShiftGroup, shiftGroup)
-                .between(RollHeightDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
-
-        List<RollHeightDetails> rollHeightDetailsList = rollHeightDetailsService.list(queryWrapper4);
-        if (oConvertUtils.listIsNotEmpty(rollHeightDetailsList)) {
-
-            steelDetailsVo.setRollHeightDetails(rollHeightDetailsList);
-        }
-
-        return steelDetailsVo;
-    }
-
-    @Override
-    public SteelDetailsVo queryOnDutyHotChargeInfo(String ccmNo) {
-        SteelDetailsVo steelDetailsVo = new SteelDetailsVo();
-
-        String shiftGroup = "";
-        String shift = "";
-        BilletHotsendChangeShift billetHotsendChangeShift;
-
-        // 从 Redis 获取班次信息
-        shiftGroup = getShiftInfo(ccmNo, "class:shift:group:%s");
-        shift = getShiftInfo(ccmNo, "class:shift:%s");
-        // 根据铸机号、缓存中的当前班次，倒序最新一条，获取交班记录中的创建时间
-        LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo)
-                .eq(BilletHotsendChangeShift::getShift, shift)
-                .eq(BilletHotsendChangeShift::getShiftGroup, shiftGroup)
-                .isNull(BilletHotsendChangeShift::getChangeShiftTime)
-                .orderByDesc(BilletHotsendChangeShift::getCreateTime)
-                .last("limit 1");
-        billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
-        if (billetHotsendChangeShift == null) {
-            log.info("{}{}", "查询当班装运单信息失败，交班记录为空！", ccmNo + "失败时间：" + new Date());
-            return steelDetailsVo;
-        }
-
-
-        // 根据铸机号、班组、班别，amountTotal不等于0 ，查询当班装运单信息
-        LambdaQueryWrapper<StorageBill> billQueryWrapper = new LambdaQueryWrapper<>();
-        billQueryWrapper.eq(StorageBill::getCcmNo, ccmNo)
-                .gt(StorageBill::getAmountTotal, 0);
-
-        //时间范围从 createTime 到当前时间
-        billQueryWrapper.between(StorageBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
-
-        List<StorageBill> storageBillList = baseMapper.selectList(billQueryWrapper);
-
-        // 提取 id 集合
-        List<String> idList = storageBillList.stream()
-                .map(StorageBill::getId)
-                .filter(Objects::nonNull) // 过滤掉 null 值，避免 NPE
-                .collect(Collectors.toList());
-
-        if (oConvertUtils.listIsEmpty(storageBillList)) {
-            log.info("{}{}", "查询当班装运单信息为空！", ccmNo);
-            return steelDetailsVo;
-        }
-
-
-        // 根据铸机号、班组、班别、时间范围。查询棒二明细表
-        LambdaQueryWrapper<RollClubTwoDetails> queryWrapper2 = new LambdaQueryWrapper<>();
-        queryWrapper2.eq(RollClubTwoDetails::getCcmNo, ccmNo)
-                .in(RollClubTwoDetails::getStorageBillId, idList);
-
-        List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(queryWrapper2);
-        if (oConvertUtils.listIsNotEmpty(rollClubTwoDetailsList)) {
-
-            steelDetailsVo.setRollClubTwoDetailsList(rollClubTwoDetailsList);
-
-        }
-
-        // 根据铸机号、班组、班别、时间范围。查询棒三明细表
-        LambdaQueryWrapper<RollClubThreeDetails> queryWrapper3 = new LambdaQueryWrapper<>();
-        queryWrapper3.eq(RollClubThreeDetails::getCcmNo, ccmNo)
-                .in(RollClubThreeDetails::getStorageBillId, idList);
-
-        List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(queryWrapper3);
-        if (oConvertUtils.listIsNotEmpty(rollClubThreeDetailsList)) {
-
-            steelDetailsVo.setRollClubThreeDetailsList(rollClubThreeDetailsList);
+        if (idList != null && !idList.isEmpty()) {
+            queryWrapper5.eq(RollOutShippDetails::getCcmNo, ccmNo)
+                    .in(RollOutShippDetails::getStorageBillId, idList);
+        } else {
+            queryWrapper5.eq(RollOutShippDetails::getCcmNo, ccmNo);
         }
 
-
-        // 根据铸机号、班组、班别、时间范围。查询上若明细表
-        LambdaQueryWrapper<RollOutShippDetails> queryWrapper5 = new LambdaQueryWrapper<>();
-        queryWrapper5.eq(RollOutShippDetails::getCcmNo, ccmNo)
-                .in(RollOutShippDetails::getStorageBillId, idList);
-
         List<RollOutShippDetails> rollOutShippDetailsList = rollOutShippDetailsService.list(queryWrapper5);
         if (oConvertUtils.listIsNotEmpty(rollOutShippDetailsList)) {
 
@@ -3747,6 +3580,10 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
         // 从 Redis 获取班次信息
         shiftGroup = getShiftInfo(ccmNo, "class:shift:group:%s");
         shift = getShiftInfo(ccmNo, "class:shift:%s");
+
+        onDutyStorageBillStatistics.setShift(shift);
+        onDutyStorageBillStatistics.setShiftGroup(shiftGroup);
+
         // 根据铸机号、缓存中的当前班次，倒序最新一条，获取交班记录中的创建时间
         LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo)
@@ -4054,8 +3891,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
 
         onDutyStorageBillStatistics.setAllCarNum(allCarNum);
         onDutyStorageBillStatistics.setCounts(finalAmountTotal);
-        onDutyStorageBillStatistics.setShift(shift);
-        onDutyStorageBillStatistics.setShiftGroup(shiftGroup);
+
         return onDutyStorageBillStatistics;
     }
 

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/vo/SteelDetailsVo.java

@@ -23,5 +23,5 @@ public class SteelDetailsVo {
 
     private List<RollHeightDetails> rollHeightDetails;
 
-    private List<StackingUpLog> stackingDownLogList;
+    private List<StackingUpLog> stackingUpLogList;
 }