From 73033f1d691ef89f39b175ffb96f800076975d5c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 10 四月 2024 09:11:03 +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 | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 5 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 0a52ee2..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
@@ -1,6 +1,7 @@
package com.example.springboot.controller;
import java.sql.SQLException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -16,6 +17,11 @@
import com.example.springboot.service.OutSliceServive;
import com.example.springboot.service.SpianService;
import com.example.springboot.service.StorageCageService;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+
+import cn.hutool.core.lang.Console;
import com.example.springboot.common.Result;
import com.example.springboot.component.Plchome;
@@ -54,6 +60,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")
@@ -455,8 +494,8 @@
//鎵嬪姩瀹屾垚浠诲姟
@PostMapping("/FinishTask")
- public Result FinishTask(Integer tasktype,Integer id) {
- return storageCageService.FinishTask(tasktype,id);
+ public Result FinishTask(Integer id) {
+ return storageCageService.FinishTask(id);
}
//鏌ヨ鐜荤拑淇℃伅
@@ -473,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);
}
//淇敼鍑虹墖鏂瑰紡
@@ -482,10 +521,25 @@
public Result ModeChange(String flowcard,Integer method) {
return storageCageService.ModeChange(flowcard,method);
}
-
+
//娣诲姞鐜荤拑淇℃伅鍒版祴閲忎俊鎭�
@PostMapping("/UpdateQueue")
public Result UpdateQueue(@RequestBody GlassInfo glassInfo) {
return storageCageService.UpdateQueue(glassInfo);
}
+ //浜哄伐鎷胯蛋
+ @PostMapping("/ManualTake")
+ public Result ManualTake(@RequestBody String glassInfo) {
+ return storageCageService.ManualTake(glassInfo);
+ }
+ //閲嶆柊娴嬮噺
+ @PostMapping("/AnewMeasure")
+ public Result AnewMeasure(@RequestBody String glassInfo) {
+ return storageCageService.AnewMeasure(glassInfo);
+ }
+ //瀵煎叆鏁版嵁 锛氭坊鍔犵幓鐠冧俊鎭�
+ @PostMapping("/importData")
+ public Result importData(@RequestBody List<Map> IportDataStr) {
+ return storageCageService.AddGlassinfo(IportDataStr);
+ }
}
--
Gitblit v1.8.0