diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/DeviceErrorVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/DeviceErrorVo.java deleted file mode 100644 index 61f0105..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/DeviceErrorVo.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.nl.wms.cockpit.service.dao; - -import lombok.Data; - -/** - * @author Administrator - * @description 30天故障 - */ -@Data -public class DeviceErrorVo { - private String deviceName; - private String errorNum; -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/MixingRelativeVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/PointInfoVo.java similarity index 74% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/MixingRelativeVo.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/PointInfoVo.java index 46ac0ba..724a549 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/MixingRelativeVo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/PointInfoVo.java @@ -4,10 +4,10 @@ import lombok.Data; /** * @author Administrator - * 混碾机对接位 + * 点位信息（对接位、货架） */ @Data -public class MixingRelativeVo { +public class PointInfoVo { private String pointStatus; private String pointName; private String pointCode; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/klInfoVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/klInfoVo.java new file mode 100644 index 0000000..6bc06c7 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/klInfoVo.java @@ -0,0 +1,13 @@ +package org.nl.wms.cockpit.service.dao; + +import lombok.Data; + +/** + * @author Administrator + * @description 困料货架泥料库（吨） + */ +@Data +public class klInfoVo { + private String materialCode; + private String weight; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/enums/ColorEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/enums/ColorEnum.java index 485001a..494d0fa 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/enums/ColorEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/enums/ColorEnum.java @@ -7,9 +7,10 @@ import lombok.Getter; @AllArgsConstructor public enum ColorEnum { GREY(0, "灰色"), + YELLOW(1, "黄色"), GREEN(2, "绿色"), - RED(3, "红色"), - YELLOW(1, "黄色"); + RED(3, "红色"); + private final Integer index; private final String colorName; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java index 2281d88..adef066 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java @@ -8,13 +8,9 @@ import org.nl.config.thread.ThreadPoolExecutorUtil; import org.nl.wms.cockpit.service.CockpitService; import org.nl.wms.cockpit.service.dao.*; import org.nl.wms.cockpit.service.enums.ColorEnum; -import org.nl.wms.cockpit.service.enums.DeviceEnum; import org.nl.wms.cockpit.service.mapper.CockPitMapper; -import org.nl.wms.das.device.record.service.IDasDeviceErrorRecordService; -import org.nl.wms.das.device.record.service.dao.DasDeviceErrorRecord; import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.ext.acs.service.dto.to.wms.AcsResponse; -import org.nl.wms.sch.point.service.ISchBasePointService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -37,9 +33,6 @@ public class CockpitServiceImpl implements CockpitService { @Autowired private WmsToAcsService wmsToAcsService; - @Autowired - private IDasDeviceErrorRecordService dasDeviceErrorRecordService; - @Override public ConcurrentHashMap pressedMonitor() { ThreadPoolExecutor pool = ThreadPoolExecutorUtil.getPoll(); @@ -203,8 +196,8 @@ public class CockpitServiceImpl implements CockpitService { // 遍历判断 for (int i = 0; i < data.size(); i++) { JSONObject device = data.getJSONObject(i); - int status = ObjectUtil.isNotEmpty(device.getInteger("status")) - ? device.getInteger("status") + int status = ObjectUtil.isNotEmpty(device.getString("device_status")) + ? Integer.parseInt(device.getString("device_status")) : 0; if (status == 0) { unProducedNum++; @@ -236,14 +229,14 @@ public class CockpitServiceImpl implements CockpitService { return null; }); - //30天故障top10 - CompletableFuture> errorCompletableFuture = CompletableFuture.supplyAsync( - () -> dasDeviceErrorRecordService.queryErrorVo(), pool); - errorCompletableFuture.thenAccept(result -> { - resultMap.put("deviceErrorList", result); + //困料货架泥料库（吨） + CompletableFuture> klInfoCompletableFuture = CompletableFuture.supplyAsync( + () -> cockPitMapper.queryKlInfoList(), pool); + klInfoCompletableFuture.thenAccept(result -> { + resultMap.put("klInfoList", result); }).exceptionally((e) -> { - log.error("30天故障top10: {}", e.getMessage(), e); - resultMap.put("deviceErrorList", null); + log.error("困料货架泥料库（吨）: {}", e.getMessage(), e); + resultMap.put("klInfoList", null); return null; }); @@ -263,7 +256,7 @@ public class CockpitServiceImpl implements CockpitService { productCompletableFuture, historyCompletableFuture, deviceRunStatCompletableFuture, - errorCompletableFuture, + klInfoCompletableFuture, errorRecordCompletableFuture); CompletableFuture> future = allQuery.thenApply((result) -> resultMap).exceptionally((e) -> { @@ -279,6 +272,24 @@ public class CockpitServiceImpl implements CockpitService { ThreadPoolExecutor pool = ThreadPoolExecutorUtil.getPoll(); ConcurrentHashMap map = new ConcurrentHashMap<>(); + //压制上料位 + CompletableFuture yzslwPositionTask = CompletableFuture.supplyAsync(() -> { + List points = cockPitMapper.selectYzslwPoint(); + if (points.isEmpty()) { + return null; + } + JSONArray param = new JSONArray(Collections.singletonList(points)); + AcsResponse deviceStatus = wmsToAcsService.getDeviceStatus(param); + return ObjectUtil.isNotEmpty(deviceStatus) ? deviceStatus.getData() : param; + }, pool); + yzslwPositionTask.thenAccept(result -> { + map.put("YzslwPositionList", result); + }).exceptionally((e) -> { + log.error("压制上料位情况显示: {}", e.getMessage(), e); + map.put("YzslwPositionList", e); + return null; + }); + //压制码垛位情况显示 CompletableFuture stackingPositionTask = CompletableFuture.supplyAsync(() -> { List points = cockPitMapper.selectYzPoint(); @@ -366,20 +377,8 @@ public class CockpitServiceImpl implements CockpitService { map.put("MixMachineList", null); return null; }); - // 困料货架的信息显示 TODO - CompletableFuture trappedMaterialShelfTask = CompletableFuture.supplyAsync(() -> { -// return cockPitMapper.selectKlhwInfo(); - return null; - }, pool); - trappedMaterialShelfTask.thenAccept(result -> { - map.put("TrappedMaterialShelfList", result); - }).exceptionally((e) -> { - log.error("困料货架 - 40 货位的信息显示: {}", e.getMessage(), e); - map.put("TrappedMaterialShelfList", null); - return null; - }); // 混碾机对接位 - CompletableFuture> mixBlankingTask = CompletableFuture.supplyAsync(() -> { + CompletableFuture> mixBlankingTask = CompletableFuture.supplyAsync(() -> { return cockPitMapper.selectMixingRelativeInfo(); }, pool); mixBlankingTask.thenAccept(result -> { @@ -389,6 +388,18 @@ public class CockpitServiceImpl implements CockpitService { map.put("MixBlankingList", null); return null; }); + // 困料货架的信息显示 + CompletableFuture> trappedMaterialShelfTask = CompletableFuture.supplyAsync(() -> { + return cockPitMapper.selectKlhwInfo(); + }, pool); + trappedMaterialShelfTask.thenAccept(result -> { + map.put("TrappedMaterialShelfList", result); + }).exceptionally((e) -> { + log.error("困料货架货位的信息显示: {}", e.getMessage(), e); + map.put("TrappedMaterialShelfList", null); + return null; + }); + //压制、分拣机械手 CompletableFuture manipulatorInfoTask = CompletableFuture.supplyAsync(() -> { List jxsPoints = cockPitMapper.selectJxsPoints(); @@ -451,7 +462,7 @@ public class CockpitServiceImpl implements CockpitService { }); // 出窑缓存货架 - CompletableFuture> outKilnHchjTask = CompletableFuture.supplyAsync(() -> { + CompletableFuture> outKilnHchjTask = CompletableFuture.supplyAsync(() -> { return cockPitMapper.selectHchjList(); }, pool); outKilnHchjTask.thenAccept(result -> { @@ -462,7 +473,7 @@ public class CockpitServiceImpl implements CockpitService { return null; }); // 人工分拣拆垛 - CompletableFuture> manualSortingTask = CompletableFuture.supplyAsync(() -> { + CompletableFuture> manualSortingTask = CompletableFuture.supplyAsync(() -> { return cockPitMapper.selecManualSortingList(); }, pool); manualSortingTask.thenAccept(result -> { @@ -473,6 +484,7 @@ public class CockpitServiceImpl implements CockpitService { return null; }); CompletableFuture allQuery = CompletableFuture.allOf( + yzslwPositionTask, stackingPositionTask, pressMachineTask, trappedMaterialShelfTask, diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java index 642699b..47c6743 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java @@ -46,13 +46,19 @@ public interface CockPitMapper { List selectHnjPoints(); - List selectMixingRelativeInfo(); + List selectMixingRelativeInfo(); List selectJxsPoints(); List queryRecord(); - List selectHchjList(); + List selectHchjList(); - List selecManualSortingList(); + List selecManualSortingList(); + + List queryKlInfoList(); + + List selectKlhwInfo(); + + List selectYzslwPoint(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml index b2cac94..8b0a18a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml @@ -122,28 +122,28 @@ - SELECT p.point_code as pointCode, p.point_name as pointName, p.point_status as pointStatus @@ -264,7 +264,7 @@ LEFT JOIN sch_base_point p ON r.device_code = p.point_code ORDER BY r.record_time desc limit 100 - SELECT p.point_code as pointCode, p.point_name as pointName, p.point_status as pointStatus @@ -272,7 +272,7 @@ WHERE p.region_code ='HCHJ' ORDER BY p.point_code - SELECT p.point_code as pointCode, p.point_name as pointName, p.point_status as pointStatus @@ -280,5 +280,35 @@ WHERE p.region_code ='RGFJ' ORDER BY p.point_code + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/IDasDeviceErrorRecordService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/IDasDeviceErrorRecordService.java index bdda9bb..e971c85 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/IDasDeviceErrorRecordService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/IDasDeviceErrorRecordService.java @@ -3,15 +3,10 @@ package org.nl.wms.das.device.record.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.cockpit.service.dao.DeviceErrorVo; -import org.nl.wms.cockpit.service.dao.ErrorRecordVo; -import org.nl.wms.das.device.check.service.dao.DasDeviceCheckRecord; +import org.nl.wms.cockpit.service.dao.klInfoVo; import org.nl.wms.das.device.record.service.dao.DasDeviceErrorRecord; -import org.nl.wms.pda.service.dao.vo.PdaResponseVo; import java.util.List; -import java.util.Map; -import java.util.Set; /** * @description 服务接口 @@ -28,6 +23,6 @@ public interface IDasDeviceErrorRecordService extends IService queryErrorVo(); + List queryErrorVo(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/dao/mapper/DasDeviceErrorRecordMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/dao/mapper/DasDeviceErrorRecordMapper.java index 7ca21c8..86f28e4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/dao/mapper/DasDeviceErrorRecordMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/dao/mapper/DasDeviceErrorRecordMapper.java @@ -1,7 +1,7 @@ package org.nl.wms.das.device.record.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.wms.cockpit.service.dao.DeviceErrorVo; +import org.nl.wms.cockpit.service.dao.klInfoVo; import org.nl.wms.das.device.record.service.dao.DasDeviceErrorRecord; import java.util.List; @@ -12,6 +12,6 @@ import java.util.List; */ public interface DasDeviceErrorRecordMapper extends BaseMapper { - List queryErrorVo(); + List queryErrorVo(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/dao/mapper/DasDeviceErrorRecordMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/dao/mapper/DasDeviceErrorRecordMapper.xml index 5ac1802..9a5e096 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/dao/mapper/DasDeviceErrorRecordMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/dao/mapper/DasDeviceErrorRecordMapper.xml @@ -2,7 +2,7 @@ - select if(LENGTH(p.point_name) ]]> 0, p.point_name, r.device_code) as deviceName, count(*) as errorNum from das_device_error_record r diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/impl/IDasDeviceErrorRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/impl/IDasDeviceErrorRecordServiceImpl.java index 613c998..76f01d8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/impl/IDasDeviceErrorRecordServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/impl/IDasDeviceErrorRecordServiceImpl.java @@ -8,18 +8,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.cockpit.service.dao.DeviceErrorVo; -import org.nl.wms.das.device.check.service.dao.DasDeviceCheckRecord; -import org.nl.wms.das.device.check.service.dao.mapper.DasDeviceCheckRecordMapper; +import org.nl.wms.cockpit.service.dao.klInfoVo; import org.nl.wms.das.device.record.service.IDasDeviceErrorRecordService; import org.nl.wms.das.device.record.service.dao.DasDeviceErrorRecord; import org.nl.wms.das.device.record.service.dao.mapper.DasDeviceErrorRecordMapper; -import org.nl.wms.pda.service.dao.vo.PdaResponseVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Map; /** * @author Administrator @@ -47,7 +43,7 @@ public class IDasDeviceErrorRecordServiceImpl extends ServiceImpl queryErrorVo() { + public List queryErrorVo() { return dasDeviceCheckRecordMapper.queryErrorVo(); }