From 61628da16f36226265dc95765ef25d5757b18787 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 15 七月 2024 16:21:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 1 -
hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java | 4 ++--
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java | 10 ++++++----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java
index 9836cf1..2384256 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java
@@ -26,9 +26,9 @@
@Autowired
private WorkAssignmentService workAssignmentService;
- @ApiOperation("鎶ュ伐鏁版嵁鏌ヨ")
+ @ApiOperation("鍊肩彮鏁版嵁鏌ヨ")
@GetMapping("/selectWorkAssignment")
- public Result selectDamage(int line,String workingProcedure) {
+ public Result selectWorkAssignment(int line,String workingProcedure) {
return Result.build(200,"鏌ヨ鎴愬姛",workAssignmentService.selectWorkAssignment(line,workingProcedure));
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
index c3aae6d..e200106 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
@@ -33,7 +33,7 @@
private TemperingGlassInfoService temperingGlassInfoService;
private JSONObject jsonObject = new JSONObject();
- public void dataBase1() throws InterruptedException {
+ public void queryDataSource1() throws InterruptedException {
List<Double> carPostion=new ArrayList<>();
carPostion.add(0.25);
carPostion.add(0.5);
@@ -58,7 +58,7 @@
}
- public void dataBase2() throws InterruptedException {
+ public void queryDataSource2() throws InterruptedException {
//鍑虹墖闃熷垪
List<TemperingGlassInfo> temperingGlassInfoList= temperingGlassInfoService.list();
jsonObject.append("temperingGlassInfoList", temperingGlassInfoList);
@@ -72,8 +72,10 @@
public void plcStorageCageTask() throws InterruptedException {
jsonObject = new JSONObject();
try {
- dataBase1();
- dataBase2();
+ //鏌ヨ浣跨敤鏁版嵁婧�1鏌ヨ鏁版嵁
+ queryDataSource1();
+ //鏌ヨ浣跨敤鏁版嵁婧�2鏌ヨ鏁版嵁
+ queryDataSource2();
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("slicecage");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
index 3aba6ca..65bf9c0 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
@@ -95,6 +95,5 @@
damage.setRemark("");
damage.setStatus(2);
damageService.insertDamage(damage);
-
}
}
--
Gitblit v1.8.0