From 4ce7a290115c02d933390b2cabdd3c644f1d76aa Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 21 十二月 2023 16:22:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 54 ++++++++++++++++++
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java | 21 ++++--
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 60 +++----------------
3 files changed, 77 insertions(+), 58 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
index 73192ce..9d37a13 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
@@ -3,8 +3,10 @@
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.example.springboot.controller.HomeController;
+import com.example.springboot.mapper.HomeMapper;
import org.apache.commons.io.FileUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import com.example.springboot.service.StorageCageService;
import java.io.*;
import java.util.ArrayList;
@@ -18,6 +20,9 @@
public class PlcParameter2 extends Thread {
+ @Autowired
+ StorageCageService StorageCageService ;
+
// 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
private Configuration config;
@@ -39,7 +44,7 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
-
+ StorageCageService = WebSocketServer.applicationContext.getBean(StorageCageService .class);
// id
List<String> addressList1 = Arrays.asList(config.getProperty("Parameter2.id").split(","));
@@ -127,7 +132,7 @@
// jsonObject.set("message", "Hello, Parameter2!");
// sendwServer.sendMessage(jsonObject.toString());
// }
- HomeController controller = new HomeController();
+// HomeController controller = new HomeController();
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Parameter2");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
@@ -182,19 +187,19 @@
}
}
}
-
+//瀹屾垚鍑虹墖
for (int i = 1; i <= 5; i++) {
boolean value = sValue.get(i);
if (value) {
switch (i) {
case 1:
- controller.UpdateTask(0, 0, paramlist.get(i));
+ StorageCageService.UpdateTask(2, 0, paramlist.get(i));
break;
case 2:
case 3:
case 4:
case 5:
- controller.UpdateTask(1, 0, paramlist.get(i));
+ StorageCageService.UpdateTask(3, 0, paramlist.get(i));
break;
default:
// 澶勭悊绱㈠紩鍊间笉鍦ㄨ寖鍥村唴鐨勬儏鍐�
@@ -251,16 +256,16 @@
}
}
}
-
+// 缁堟杩涚墖浠诲姟
boolean Value1 = sValue.get(0);
boolean Value2 = sValue.get(1);
if (Value1) {
- controller.EndTask(0);
+ StorageCageService.EndTask(0);
}
if (Value2) {
- controller.EndTask(0);
+ StorageCageService.EndTask(1);
}
// 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
index ff2c6d6..001c6f7 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -5,64 +5,50 @@
import java.util.List;
import java.util.Map;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
import com.example.springboot.mapper.HomeMapper;
import com.example.springboot.mapper.SpianMapper;
-import com.example.springboot.security.constant.SystemConstant;
-import com.example.springboot.security.util.JwtUtil;
-import com.example.springboot.security.util.SecurityUtil;
import com.example.springboot.service.HomeService;
import com.example.springboot.service.JdbcConnections;
import com.example.springboot.service.North_Glass_Buffer1Service;
import com.example.springboot.service.OutSliceServive;
-import com.example.springboot.service.PermissionService;
import com.example.springboot.service.SpianService;
-
-import cn.hutool.core.util.StrUtil;
+import com.example.springboot.service.StorageCageService;
import com.example.springboot.common.Result;
import com.example.springboot.component.Plchome;
-import com.example.springboot.component.S7control;
import com.example.springboot.entity.CarPosition;
import com.example.springboot.entity.StorageCage;
-import com.example.springboot.entity.StorageTask;
-import com.example.springboot.entity.User;
import com.example.springboot.entity.alarmmg;
import com.example.springboot.entity.north_glass_buffer1;
import com.example.springboot.entity.Out_slice;
-import com.example.springboot.entity.Permission;
import com.example.springboot.entity.Queue;
import com.example.springboot.entity.RolePermission;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
@RestController
@RequestMapping("/home")
public class HomeController {
@Autowired
-
+
HomeMapper homeMapper;
@Autowired
HomeService storageRackService;
@Autowired
-
SpianService spianService;
@Autowired
SpianMapper spianMapper;
@Autowired
-
OutSliceServive outSliceServive;
+
+ @Autowired
+ StorageCageService StorageCageService;
@Autowired
North_Glass_Buffer1Service north_Glass_Buffer1Service;
@@ -142,44 +128,18 @@
// 鎵嬪姩瀹屾垚杩�/鍑虹墖浠诲姟 缁堟杩涚墖/鍑虹墖浠诲姟
@GetMapping("/UpdateTask")
- public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
+ public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
+ StorageCageService.UpdateTask(types, shelfrack, glassid);
Map<String, Object> map = new HashMap<>();
- if (types == 0) {// 瀹屾垚杩涚墖
- spianService.overtask(glassid);
- } else if (types == 1) {// 瀹屾垚鍑虹墖
- spianService.overtask(glassid);
- } else if (types == 2) {// 缁堟杩涚墖浠诲姟
- outSliceServive.StopTask(glassid, 0);
- // 鍙戦�佺粓姝㈣繘鐗囦换鍔′俊鍙�
- } else {// 缁堟鍑虹墖浠诲姟
- outSliceServive.StopTask(glassid, 1);
- }
map.put("message3", "200");
return Result.success(map);
}
//缁堟杩涚墖/鍑虹墖浠诲姟
@GetMapping("/EndTask")
- public Result EndTask(int types) {
- if (types == 0) {// 缁堟杩涚墖浠诲姟
- List<StorageTask> cageList = homeMapper.SelectTaskByState(types);
- for (StorageTask storageTask : cageList) {
- outSliceServive.StopTask(storageTask.getGlassId(), types);
- }
- // 鍙戦�佺粓姝㈣繘鐗囦换鍔′俊鍙�
- } else {// 缁堟鍑虹墖浠诲姟
- List<StorageCage> storageCages =homeMapper.selectinout(types);
- for (StorageCage storageCage : storageCages) {
- List<StorageCage> storageCagess=homeMapper.SelectStoragesGlassById(storageCage.getGlassId());
- for (StorageCage storageCagez : storageCagess) {
- if (storageCagez.getState().equals("2")) {//璋冩嫧杩涚墖
- outSliceServive.StopTask(storageCagez.getGlassId(), 0);
- }else{//鍑虹墖
- outSliceServive.StopTask(storageCagez.getGlassId(), types);
- }
- }
- }
- }
+ public Result EndTask(int types) {
+ StorageCageService.EndTask(types);
+
Map<String, Object> map = new HashMap<>();
map.put("message3", "200");
return Result.success(map);
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
new file mode 100644
index 0000000..d7ffc4e
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
@@ -0,0 +1,54 @@
+package com.example.springboot.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.example.springboot.entity.StorageCage;
+import com.example.springboot.entity.StorageTask;
+import com.example.springboot.mapper.HomeMapper;
+import org.springframework.stereotype.Service;
+
+@Service
+public class StorageCageService {
+ @Autowired
+ private HomeMapper homeMapper;
+ private OutSliceServive outSliceServive;
+ private SpianService spianService;
+
+ public void EndTask(int types) {
+ if (types == 0) {// 缁堟杩涚墖浠诲姟
+ List<StorageTask> cageList = homeMapper.SelectTaskByState(types);
+ for (StorageTask storageTask : cageList) {
+ outSliceServive.StopTask(storageTask.getGlassId(), types);
+ }
+ // 鍙戦�佺粓姝㈣繘鐗囦换鍔′俊鍙�
+ } else {// 缁堟鍑虹墖浠诲姟
+ List<StorageCage> storageCages =homeMapper.selectinout(types);
+ for (StorageCage storageCage : storageCages) {
+ List<StorageCage> storageCagess=homeMapper.SelectStoragesGlassById(storageCage.getGlassId());
+ for (StorageCage storageCagez : storageCagess) {
+ if (storageCagez.getState().equals("2")) {//璋冩嫧杩涚墖
+ outSliceServive.StopTask(storageCagez.getGlassId(), 0);
+ }else{//鍑虹墖
+ outSliceServive.StopTask(storageCagez.getGlassId(), types);
+ }
+ }
+ }
+ }
+ }
+
+ public void UpdateTask(Integer types, Integer shelfrack, String glassid) {
+ if (types == 0) {// 瀹屾垚杩涚墖
+ spianService.overtask(glassid);
+ } else if (types == 1) {// 瀹屾垚鍑虹墖
+ spianService.overtask(glassid);
+ } else if (types == 2) {// 缁堟杩涚墖浠诲姟
+ outSliceServive.StopTask(glassid, 0);
+ // 鍙戦�佺粓姝㈣繘鐗囦换鍔′俊鍙�
+ } else {// 缁堟鍑虹墖浠诲姟
+ outSliceServive.StopTask(glassid, 1);
+ }
+ }
+
+}
--
Gitblit v1.8.0