From 5465a833a00ee1ab59774398ced083d88bc0027d Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 17 六月 2024 16:58:41 +0800
Subject: [PATCH] 添加中英文显示
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 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..d80bf8e 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,45 @@
@Autowired
private JdbcConnections jdbcConnections;
+ @GetMapping("/WriteWord")
+ public Result WriteWord(String address,float value,String type) {
+
+ if("0".equals(type)){
+ System.err.println("鍐欏叆word"+address+"+"+value);
+ S7control.getinstance().WriteWord(address, (short)value);
+
+ }
+ else if("3".equals(type)){
+ System.err.println("鍐欏叆time"+address+"+"+value);
+ S7control.getinstance().writetime(address, (long)value);
+ }
+ else{
+ System.err.println("鍐欏叆float"+address+"+"+value);
+ 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 +518,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);
}
//淇敼鍑虹墖鏂瑰紡
@@ -499,6 +538,12 @@
public Result ManualTake(@RequestBody String glassInfo) {
return storageCageService.ManualTake(glassInfo);
}
+
+ //寮�濮嬪伐绋�
+ @PostMapping("/StartChange")
+ public Result StartChange(String flowcard) {
+ return storageCageService.StartChange(flowcard);
+ }
//閲嶆柊娴嬮噺
@PostMapping("/AnewMeasure")
public Result AnewMeasure(@RequestBody String glassInfo) {
--
Gitblit v1.8.0