From d1bd20f33173a250015130bbe68fd47f37fd9160 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 29 八月 2025 16:12:33 +0800
Subject: [PATCH] 修改点胶页面
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java | 293 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 170 insertions(+), 123 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java
index b882c87..fb1ab1d 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java
@@ -21,6 +21,7 @@
/**
* 鑷姩鎵撴爣鏈�
+ *
* @Author : yanzhxiin
* @Date: 2024/8/20 11:19
* @Description:
@@ -63,184 +64,230 @@
//鏈烘鎵�
@Scheduled(fixedDelay = 500)
public void MarkingTasks() {
- machineListLoad =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"涓婄墖"));
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sessionMapName", "loadTask");
- for (Machine machine : machineListLoad) {
- JSONObject jsonObjectItem = new JSONObject();
- //鏍囧噯妯″紡 鎵惧凡棰嗗彇鏈畬鎴愮殑绗竴鏉′换鍔�
- LineConfiguration lineConfiguration=lineConfigurationService.machineLineConfiguration(machine);
- //姝ょ嚎璺凡棰嗗彇鐨勪换鍔�
- List<PrimitiveTask> findPrimitiveTasking=primitiveTaskService.findPrimitiveTasking(machine,lineConfiguration.getLineId());
- //姝ょ嚎璺湭棰嗗彇鐨勪换鍔� 鏈湴
- //List<PrimitiveTask> findPrimitiveTask=primitiveTaskService.findPrimitiveTaskNotFinish();
- //姝ょ嚎璺湭棰嗗彇鐨勪换鍔� 瀹㈡埛鏁版嵁搴�
- List<KBBTJPDrawingBP> list =kBBTJPDrawingBPService.notReceiveKBBTJPDrawingBP();
- jsonObjectItem.append("findPrimitiveTask", list);
- jsonObjectItem.append("findPrimitiveTasking", findPrimitiveTasking);
- //jsonObject.append("findPrimitiveTask", findPrimitiveTask);
- jsonObjectItem.append("machine", machine);
- jsonObjectItem.append("sendRecords", sendRecords);
- jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ try {
+ machineListLoad = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "涓婄墖"));
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sessionMapName", "loadTask");
+ for (Machine machine : machineListLoad) {
+ JSONObject jsonObjectItem = new JSONObject();
+ //鏍囧噯妯″紡 鎵惧凡棰嗗彇鏈畬鎴愮殑绗竴鏉′换鍔�
+ LineConfiguration lineConfiguration = lineConfigurationService.machineLineConfiguration(machine);
+ //姝ょ嚎璺凡棰嗗彇鐨勪换鍔�
+ List<PrimitiveTask> findPrimitiveTasking = primitiveTaskService.findPrimitiveTasking(machine, lineConfiguration.getLineId());
+ //姝ょ嚎璺湭棰嗗彇鐨勪换鍔� 鏈湴
+ //List<PrimitiveTask> findPrimitiveTask=primitiveTaskService.findPrimitiveTaskNotFinish();
+ //姝ょ嚎璺湭棰嗗彇鐨勪换鍔� 瀹㈡埛鏁版嵁搴�
+ List<KBBTJPDrawingBP> list = kBBTJPDrawingBPService.notReceiveKBBTJPDrawingBP();
+ jsonObjectItem.append("findPrimitiveTask", list);
+ jsonObjectItem.append("findPrimitiveTasking", findPrimitiveTasking);
+ //jsonObject.append("findPrimitiveTask", findPrimitiveTask);
+ jsonObjectItem.append("machine", machine);
+ jsonObjectItem.append("sendRecords", sendRecords);
+ jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ }
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("MarkingTasks:{}", exception.getMessage());
}
- this.webSocketServer(jsonObject);
}
+
//纾ㄨ竟鏈�
@Scheduled(fixedDelay = 500)
public void edgingTasks() {
- machineListEdging =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"纾ㄨ竟"));
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sessionMapName", "edgingTask");
- for (Machine machine : machineListEdging) {
- JSONObject jsonObjectItem = new JSONObject();
- List<Tasking> taskingList=taskingService.findMachineTask(machine);
- jsonObjectItem.append("taskingList", taskingList);
- jsonObjectItem.append("machine", machine);
- jsonObjectItem.append("sendRecords", sendRecords);
- jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ try {
+ machineListEdging = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "纾ㄨ竟"));
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sessionMapName", "edgingTask");
+ for (Machine machine : machineListEdging) {
+ JSONObject jsonObjectItem = new JSONObject();
+ List<Tasking> taskingList = taskingService.findMachineTask(machine);
+ jsonObjectItem.append("taskingList", taskingList);
+ jsonObjectItem.append("machine", machine);
+ jsonObjectItem.append("sendRecords", sendRecords);
+ jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ }
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("edgingTasks:{}", exception.getMessage());
}
- this.webSocketServer(jsonObject);
}
//缈荤墖鍙�
@Scheduled(fixedDelay = 500)
public void flipSliceTasks() {
- machineListFlipSlice =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"缈荤墖"));
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sessionMapName", "flipSlice");
- for (Machine machine : machineListFlipSlice) {
- JSONObject jsonObjectItem = new JSONObject();
- List<Tasking> taskingList=taskingService.findMachineTask(machine);
- jsonObjectItem.append("taskingList", taskingList);
- jsonObjectItem.append("machine", machine);
- jsonObjectItem.append("sendRecords", sendRecords);
- jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ try {
+ machineListFlipSlice = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "缈荤墖"));
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sessionMapName", "flipSlice");
+ for (Machine machine : machineListFlipSlice) {
+ JSONObject jsonObjectItem = new JSONObject();
+ List<Tasking> taskingList = taskingService.findMachineTask(machine);
+ jsonObjectItem.append("taskingList", taskingList);
+ jsonObjectItem.append("machine", machine);
+ jsonObjectItem.append("sendRecords", sendRecords);
+ jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ }
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("flipSliceTasks:{}", exception.getMessage());
}
- this.webSocketServer(jsonObject);
+
}
//鎵撴爣鏈�
@Scheduled(fixedDelay = 500)
public void markingTasks() {
- machineListMarking =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"鑷姩鎵撴爣鏈�"));
+ try {
+ machineListMarking = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "鑷姩鎵撴爣鏈�"));
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sessionMapName", "marking");
- for (Machine machine : machineListMarking) {
- JSONObject jsonObjectItem = new JSONObject();
- List<Tasking> taskingList=taskingService.findMachineTask(machine);
- jsonObjectItem.append("taskingList", taskingList);
- jsonObjectItem.append("machine", machine);
- jsonObjectItem.append("sendRecords", sendRecords);
- jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sessionMapName", "marking");
+ for (Machine machine : machineListMarking) {
+ JSONObject jsonObjectItem = new JSONObject();
+ List<Tasking> taskingList = taskingService.findMachineTask(machine);
+ jsonObjectItem.append("taskingList", taskingList);
+ jsonObjectItem.append("machine", machine);
+ jsonObjectItem.append("sendRecords", sendRecords);
+ jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ }
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("markingTasks:{}", exception.getMessage());
}
- this.webSocketServer(jsonObject);
}
//涓濆嵃鏈�
@Scheduled(fixedDelay = 500)
public void silkScreenTasks() {
- machineListSilkScreen =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"鑷姩涓濆嵃鏈�"));
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sessionMapName", "silkScreenTask");
- for (Machine machine : machineListSilkScreen) {
- JSONObject jsonObjectItem = new JSONObject();
- List<Tasking> taskingList=taskingService.findMachineTask(machine);
- jsonObjectItem.append("taskingList", taskingList);
- jsonObjectItem.append("machine", machine);
- jsonObjectItem.append("sendRecords", sendRecords);
- jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ try {
+ machineListSilkScreen = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "鑷姩涓濆嵃鏈�"));
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sessionMapName", "silkScreenTask");
+ for (Machine machine : machineListSilkScreen) {
+ JSONObject jsonObjectItem = new JSONObject();
+ List<Tasking> taskingList = taskingService.findMachineTask(machine);
+ jsonObjectItem.append("taskingList", taskingList);
+ jsonObjectItem.append("machine", machine);
+ jsonObjectItem.append("sendRecords", sendRecords);
+ jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ }
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("silkScreenTasks:{}", exception.getMessage());
}
- this.webSocketServer(jsonObject);
}
+
//鐐硅兌鏈�
- //@Scheduled(fixedDelay = 500)
+ @Scheduled(fixedDelay = 500)
public void glueDispenserTasks() {
- machineListGlueDispenser =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"鑷姩鐐硅兌鏈�"));
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sessionMapName", "glueDispenser");
- for (Machine machine : machineListGlueDispenser) {
- JSONObject jsonObjectItem = new JSONObject();
- List<Tasking> taskingList=taskingService.findMachineTask(machine);
- jsonObjectItem.append("taskingList", taskingList);
- jsonObjectItem.append("machine", machine);
- jsonObjectItem.append("sendRecords", sendRecords);
- jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ try {
+ machineListGlueDispenser = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "鑷姩鐐硅兌鏈�"));
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sessionMapName", "glueDispenser");
+ for (Machine machine : machineListGlueDispenser) {
+ JSONObject jsonObjectItem = new JSONObject();
+ List<Tasking> taskingList = taskingService.findMachineTask(machine);
+ jsonObjectItem.append("taskingList", taskingList);
+ jsonObjectItem.append("machine", machine);
+ jsonObjectItem.append("sendRecords", sendRecords);
+ jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ }
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("glueDispenserTasks:{}", exception.getMessage());
}
- this.webSocketServer(jsonObject);
}
+
//鏃嬭浆鍙�
@Scheduled(fixedDelay = 500)
public void rotateTasks() {
- machineListRotate =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"鏃嬭浆鍙�"));
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sessionMapName", "rotate");
- for (Machine machine : machineListRotate) {
- JSONObject jsonObjectItem = new JSONObject();
- List<Tasking> taskingList=taskingService.findMachineTask(machine);
- jsonObjectItem.append("taskingList", taskingList);
- jsonObjectItem.append("machine", machine);
- jsonObjectItem.append("sendRecords", sendRecords);
- jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ try {
+ machineListRotate = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "鏃嬭浆鍙�"));
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sessionMapName", "rotate");
+ for (Machine machine : machineListRotate) {
+ JSONObject jsonObjectItem = new JSONObject();
+ List<Tasking> taskingList = taskingService.findMachineTask(machine);
+ jsonObjectItem.append("taskingList", taskingList);
+ jsonObjectItem.append("machine", machine);
+ jsonObjectItem.append("sendRecords", sendRecords);
+ jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ }
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("rotateTasks:{}", exception.getMessage());
}
- this.webSocketServer(jsonObject);
}
+
//璐磋啘鏈�
@Scheduled(fixedDelay = 500)
public void laminationTasks() {
- machineListLamination =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"鑷姩璐磋啘鏈�"));
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sessionMapName", "lamination");
- for (Machine machine : machineListLamination) {
- JSONObject jsonObjectItem = new JSONObject();
- List<Tasking> taskingList=taskingService.findMachineTask(machine);
- jsonObjectItem.append("taskingList", taskingList);
- jsonObjectItem.append("machine", machine);
- jsonObjectItem.append("sendRecords", sendRecords);
- jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ try {
+ machineListLamination = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "鑷姩璐磋啘鏈�"));
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sessionMapName", "lamination");
+ for (Machine machine : machineListLamination) {
+ JSONObject jsonObjectItem = new JSONObject();
+ List<Tasking> taskingList = taskingService.findMachineTask(machine);
+ jsonObjectItem.append("taskingList", taskingList);
+ jsonObjectItem.append("machine", machine);
+ jsonObjectItem.append("sendRecords", sendRecords);
+ jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ }
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("laminationTasks:{}", exception.getMessage());
}
- this.webSocketServer(jsonObject);
}
//鎶ュ伐椤甸潰鏌ヨ
@Scheduled(fixedDelay = 1000)
public void manualReporting() {
+ try {
+ machineListScanQrCode = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "璇嗗埆鎶ュ伐"));
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sessionMapName", "manualReporting");
+ for (Machine machine : machineListScanQrCode) {
+ JSONObject jsonObjectItem = new JSONObject();
+ List<Tasking> taskingList = taskingMapper.selectJoinList(Tasking.class, new MPJLambdaWrapper<Tasking>()
+ .selectAll(Tasking.class)
+ .innerJoin(LineConfiguration.class, LineConfiguration::getId, Tasking::getLineConfigurationId)
+ .innerJoin(Machine.class, Machine::getId, LineConfiguration::getMachineId)
+ .eq(LineConfiguration::getMachineId, machine.getId())
+ .eq(Tasking::getGlassState, "姝ｅ父")
+ .eq(Tasking::getState, "绾夸笂")
+ .ne(Tasking::getWorkState, "瀹屽伐")
+ .orderByDesc(Tasking::getOperationRecordTime));
+ jsonObjectItem.append("taskingList", taskingList);
+ jsonObjectItem.append("machine", machine);
+ jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ }
- machineListScanQrCode =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"璇嗗埆鎶ュ伐"));
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sessionMapName", "manualReporting");
- for (Machine machine : machineListScanQrCode) {
- JSONObject jsonObjectItem = new JSONObject();
- List<Tasking> taskingList=taskingMapper.selectJoinList(Tasking.class,new MPJLambdaWrapper<Tasking>()
- .selectAll(Tasking.class)
- .innerJoin(LineConfiguration.class,LineConfiguration::getId,Tasking::getLineConfigurationId)
- .innerJoin(Machine.class,Machine::getId,LineConfiguration::getMachineId)
- .eq(LineConfiguration::getMachineId,machine.getId())
- .eq(Tasking::getGlassState,"姝ｅ父")
- .eq(Tasking::getState,"绾夸笂")
- .ne(Tasking::getWorkState,"瀹屽伐")
- .orderByDesc(Tasking::getOperationRecordTime));
- jsonObjectItem.append("taskingList", taskingList);
- jsonObjectItem.append("machine", machine);
- jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("manualReporting:{}", exception.getMessage());
}
-
- this.webSocketServer(jsonObject);
}
+
//绾夸笅鐜荤拑鏌ヨ
@Scheduled(fixedDelay = 1000)
public void downLineTask() {
- JSONObject jsonObject = new JSONObject();
- List<Tasking> downLineTask=taskingService.findDownLineTask();
- jsonObject.append("sessionMapName", "downLineTask");
- jsonObject.append("downLineTask", downLineTask);
- this.webSocketServer(jsonObject);
+ try {
+ JSONObject jsonObject = new JSONObject();
+ List<Tasking> downLineTask = taskingService.findDownLineTask();
+ jsonObject.append("sessionMapName", "downLineTask");
+ jsonObject.append("downLineTask", downLineTask);
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("downLineTask:{}", exception.getMessage());
+ }
}
public void webSocketServer(JSONObject jsonObject) {
try {
- String sessionMapName=jsonObject.getJSONArray("sessionMapName").get(0).toString();
+ log.info("鍙戦�佹暟鎹細{}", jsonObject.getJSONArray("sessionMapName").get(0).toString());
+ String sessionMapName = jsonObject.getJSONArray("sessionMapName").get(0).toString();
webSocketServer.sendToWeb(sessionMapName, jsonObject.toString());
} catch (Exception ex) {
log.info("{}鍙戦�佹暟鎹け璐ワ細{}", "rawGlassStorage", ex.getMessage());
--
Gitblit v1.8.0