From 557aaaac3832a634b7ecec55a5327dfb9f8c7dff Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 10 四月 2024 09:11:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
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 f4c9d3e..b2fa075 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
@@ -61,6 +61,39 @@
@Autowired
private JdbcConnections jdbcConnections;
+ // 鍐欏叆word
+ @GetMapping("/WriteWord")
+ public Result WriteWord(String address,float value) {
+ System.err.println("鍐欏叆word"+address+"+"+value);
+ if(address.equals("DB10.224")||address.equals("DB10.226")||address.equals("DB10.228")||address.equals("DB10.230")){
+
+ S7control.getinstance().WriteWord(address, (short)value);
+ }else{
+ S7control.getinstance().writeFloat32(address, value);
+ }
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 鍐欏叆bit
+ @GetMapping("/WriteBit")
+ public Result WriteBit(String address,short value) {
+
+ boolean values;
+ if (value == 0) {
+ values=false;
+ }else{
+ values=true;
+ }
+ S7control.getinstance().WriteBit(address, values);
+ System.err.println("鍐欏叆bit"+address+"+"+values);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鏉冮檺
@GetMapping("/SelectPermissionByUserName")
public Result SelectPermissionByUserName(String username) throws SQLException {
@@ -479,8 +512,8 @@
//棰嗗彇/鏆傚仠浠诲姟
@PostMapping("/ClaimTasks")
- public Result ClaimTasks(String flowcard,Integer state) {
- return storageCageService.ClaimTasks(flowcard,state);
+ public Result ClaimTasks(String flowcard,Integer state, Integer line) {
+ return storageCageService.ClaimTasks(flowcard,state,line);
}
//淇敼鍑虹墖鏂瑰紡
--
Gitblit v1.8.0