From 1da9aafdf0d7fe00a6a91483cd4bdd5283dff0e1 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 19 三月 2024 11:50:40 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java | 2
springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java | 4
springboot-vue3/src/main/java/com/example/springboot/component/S7control.java | 4 +
Albania_Mes-ui/src/lang/locales/en-US.json | 2
Albania_Mes-ui/src/views/home/index.vue | 7 ++
springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java | 12 +++-
springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java | 1
springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java | 1
springboot-vue3/src/main/java/com/example/springboot/entity/glassinfo.java | 1
springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json | 12 ---
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 6 +-
springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java | 2
/dev/null | 55 ------------------
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 11 +--
springboot-vue3/src/main/java/com/example/springboot/entity/flowcard.java | 1
springboot-vue3/src/main/resources/application.properties | 5 -
springboot-vue3/effective-pom.xml | 20 ++++++
springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java | 8 --
18 files changed, 56 insertions(+), 98 deletions(-)
diff --git a/Albania_Mes-ui/src/lang/locales/en-US.json b/Albania_Mes-ui/src/lang/locales/en-US.json
index cbab583..38a0ed7 100644
--- a/Albania_Mes-ui/src/lang/locales/en-US.json
+++ b/Albania_Mes-ui/src/lang/locales/en-US.json
@@ -1,5 +1,5 @@
{
-
+ "All Out":"All Out",
"Operation failed":"Operation canceled",
"Flowcard":"Flowcard",
"Glasstype":"Glasstype",
diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index e7b3396..fe4231b 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -519,7 +519,7 @@
</el-table-column>
<el-table-column prop="number" :label="$t('Order No')">
</el-table-column>
- <el-table-column prop="" :label="$t('No Of Cage')">
+ <el-table-column prop="cageno" :label="$t('No Of Cage')">
</el-table-column>
<el-table-column prop="finishnumber" :label="$t('Finish No')">
</el-table-column>
@@ -539,6 +539,10 @@
</template>
</el-table-column>
<el-table-column prop="method" :label="$t('Task Method')">
+ <template slot-scope='scope'>
+ {{ scope.row.state >= 0 ? scope.row.method == 0 ? $t('Out') : $t('All Out') : "" }}
+ </template>
+
</el-table-column>
<el-table-column prop="line" :label="$t('Task Line')">
</el-table-column>
@@ -1027,6 +1031,7 @@
},
del() {
+ this.StorageCageAdd = true;
}
diff --git a/springboot-vue3/effective-pom.xml b/springboot-vue3/effective-pom.xml
index a02c22b..ad8b457 100644
--- a/springboot-vue3/effective-pom.xml
+++ b/springboot-vue3/effective-pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
<!-- -->
-<!-- Generated by Maven Help Plugin on 2024-03-07T14:06:55+08:00 -->
+<!-- Generated by Maven Help Plugin on 2024-03-19T08:09:38+08:00 -->
<!-- See: http://maven.apache.org/plugins/maven-help-plugin/ -->
<!-- -->
<!-- ====================================================================== -->
@@ -5574,6 +5574,24 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>4.1.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>4.1.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml-schemas</artifactId>
+ <version>4.1.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>
<version>2.3.2.RELEASE</version>
diff --git a/springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java b/springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java
index f51e7d3..06717bb 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java
@@ -1,5 +1,7 @@
package com.example.springboot;
+
+
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.ConfigurableApplicationContext;
@@ -17,12 +19,6 @@
SpringApplication springApplication = new SpringApplication(AuthorityApplication.class);
ConfigurableApplicationContext configurableApplicationContext = springApplication.run(args);
WebSocketServer.setApplicationContext(configurableApplicationContext);
-
-
-
-
-
-
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/common/MessageReceiver.java b/springboot-vue3/src/main/java/com/example/springboot/common/MessageReceiver.java
deleted file mode 100644
index a3f52db..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/common/MessageReceiver.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.example.springboot.common;
-
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.amqp.support.AmqpHeaders;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.messaging.handler.annotation.Header;
-import org.springframework.stereotype.Component;
-import com.rabbitmq.client.Channel;
-import java.io.IOException;
-
-
-@Component
-public class MessageReceiver {
-
- @RabbitListener(queues = RabbitConfig.QUEUE_NAME)
- public void receiveMessage(String message) {
- System.out.println("Received message: " + message);
-
- // 鎵嬪姩纭娑堟伅
- //channel.basicAck(deliveryTag, false);
- }
-
- @RabbitListener(queues = RabbitConfig.SECOND_QUEUE_NAME)
- public void receiveMessage2(MessageSender.Person person) {
- // 瀵规帴鏀跺埌鐨凱erson瀵硅薄杩涜澶勭悊
- String name = person.getName();
- int age = person.getAge();
-
-
- System.out.println("Received Person message: " + name +age);
- }
-
-
-
-}
-
diff --git a/springboot-vue3/src/main/java/com/example/springboot/common/MessageSender.java b/springboot-vue3/src/main/java/com/example/springboot/common/MessageSender.java
deleted file mode 100644
index 695ef37..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/common/MessageSender.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.example.springboot.common;
-
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.io.Serializable;
-
-@Component
-public class MessageSender {
-
- @Autowired
- private RabbitTemplate rabbitTemplate;
-
- public void sendMessage(String message) {
- rabbitTemplate.convertAndSend(RabbitConfig.DIRECT_EXCHANGE_NAME, RabbitConfig.ROUTING_KEY, message);
- System.out.println("send message: " + message);
- }
-
- public void sendMessage2(Person person) {
- rabbitTemplate.convertAndSend(RabbitConfig.DIRECT_EXCHANGE_NAME, RabbitConfig.SECOND_ROUTING_KEY, person);
- }
-
- public static class Person implements Serializable {
- private String name;
- private int age;
-
- public Person(String name, int age) {
- this.name = name;
- this.age = age;
- }
-
- public String getName() {
- return name;
- }
-
- public int getAge() {
- return age;
- }
-
- // getter鍜宻etter鏂规硶鐪佺暐
- }
-
-}
-
diff --git a/springboot-vue3/src/main/java/com/example/springboot/common/RabbitConfig.java b/springboot-vue3/src/main/java/com/example/springboot/common/RabbitConfig.java
deleted file mode 100644
index 8bbded7..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/common/RabbitConfig.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.example.springboot.common;
-
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.BindingBuilder;
-import org.springframework.amqp.core.DirectExchange;
-import org.springframework.amqp.core.Queue;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class RabbitConfig {
-
- // 瀹氫箟浜ゆ崲鏈哄悕绉�
- public static final String DIRECT_EXCHANGE_NAME = "direct.exchange";
- // 瀹氫箟闃熷垪鍚嶇О
- public static final String QUEUE_NAME = "canadames";
- // 瀹氫箟璺敱閿�
- public static final String ROUTING_KEY = "message.routingKey";
- // 瀹氫箟绗簩涓槦鍒楀悕绉�
- public static final String SECOND_QUEUE_NAME = "anotherQueue";
- // 瀹氫箟绗簩涓矾鐢遍敭
- public static final String SECOND_ROUTING_KEY = "another.routingKey";
-
- // 瀹氫箟浜ゆ崲鏈�
-
- // 鐩磋繛浜ゆ崲鏈猴紙Direct Exchange锛夛細鐩磋繛浜ゆ崲鏈烘槸鏈�绠�鍗曠殑涓�绉嶄氦鎹㈡満绫诲瀷銆傚畠鏍规嵁娑堟伅鐨勮矾鐢遍敭锛圧outing Key锛夊皢娑堟伅鍙戦�佸埌涓庝箣瀹屽叏鍖归厤鐨勯槦鍒椼��
- // 涓婚浜ゆ崲鏈猴紙Topic Exchange锛夛細涓婚浜ゆ崲鏈哄厑璁搁�氳繃浣跨敤閫氶厤绗︾殑鏂瑰紡鏉ヨ繘琛屾秷鎭殑璺敱銆傚畠灏嗘秷鎭牴鎹尮閰嶇殑瑙勫垯锛堥�氶厤绗︼級鍙戦�佸埌涓�涓垨澶氫釜闃熷垪涓�
- //鎵囧舰浜ゆ崲鏈猴紙Fanout Exchange锛夛細鎵囧舰浜ゆ崲鏈轰細灏嗘敹鍒扮殑鎵�鏈夋秷鎭箍鎾埌鎵�鏈夌粦瀹氱殑闃熷垪涓娿�傚畠蹇界暐娑堟伅鐨勮矾鐢遍敭锛屽彧闇�灏嗘秷鎭彂閫佺粰鎵�鏈夌粦瀹氱殑闃熷垪銆�
- @Bean
- public DirectExchange directExchange() {
- return new DirectExchange(DIRECT_EXCHANGE_NAME);
- }
-
- // 瀹氫箟闃熷垪
- @Bean
- public Queue queue() {
- return new Queue(QUEUE_NAME);
- }
-
- // 瀹氫箟绗簩涓槦鍒�
- @Bean
- public Queue secondQueue() {
- return new Queue(SECOND_QUEUE_NAME);
- }
-
-//绗簩涓弬鏁拌〃绀洪槦鍒楁槸鍚︿负鎸佷箙鍖栫殑锛屽鏋滀綘鎯宠鍒涘缓涓�涓寔涔呭寲鐨勯槦鍒楋紝鍙互灏嗚鍙傛暟璁剧疆涓� true銆�
-// 鎸佷箙鍖栭槦鍒楀彲浠ュ湪 RabbitMQ 鏈嶅姟鍣ㄩ噸鍚悗缁х画瀛樺湪锛屼互闃叉娑堟伅涓㈠け銆�
- //绗笁涓弬鏁� exclusive 璁剧疆涓� false锛岃〃绀洪槦鍒楅潪鎺掍粬鎬э紱
- // 灏嗙鍥涗釜鍙傛暟 autoDelete 璁剧疆涓� false锛岃〃绀洪槦鍒椾笉浼氳嚜鍔ㄥ垹闄わ紱
- // 灏嗙浜斾釜鍙傛暟 arguments 璁剧疆涓� null锛岃〃绀轰笉鎸囧畾鍏朵粬鍙傛暟銆�
-// @Bean
-// public Queue queue() {
-// return new Queue(QUEUE_NAME, false, false, false, null);
-// }
-
- // 灏嗛槦鍒楃粦瀹氬埌浜ゆ崲鏈轰笂锛屽苟鎸囧畾璺敱閿�
- @Bean
- public Binding binding() {
- return BindingBuilder.bind(queue()).to(directExchange()).with(ROUTING_KEY);
- }
-
- // 灏嗙浜屼釜闃熷垪缁戝畾鍒颁氦鎹㈡満涓婏紝骞舵寚瀹氱浜屼釜璺敱閿�
- @Bean
- public Binding secondBinding() {
- return BindingBuilder.bind(secondQueue()).to(directExchange()).with(SECOND_ROUTING_KEY);
- }
-}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/MessageQueueReader.java b/springboot-vue3/src/main/java/com/example/springboot/component/MessageQueueReader.java
deleted file mode 100644
index 60b6f47..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/component/MessageQueueReader.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.example.springboot.component;
-
-import com.rabbitmq.client.*;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-public class MessageQueueReader {
-
- private static final String QUEUE_NAME = "hangzhoumes";
-
- public static void main(String[] args) throws Exception {
- ConnectionFactory factory = new ConnectionFactory();
- factory.setHost("localhost");
-
- List<String> messages = new ArrayList<>();
-
- try (Connection connection = factory.newConnection();
- Channel channel = connection.createChannel()) {
- boolean autoAck = false;
- // autoAck 鍙傛暟璁剧疆涓� false锛岀劧鍚庢墜鍔ㄧ‘璁ゆ秷鎭鐞嗗畬鎴�
- // 寰幆鑾峰彇闃熷垪涓殑鎵�鏈夋秷鎭�
-// while (true) {
- GetResponse response = channel.basicGet(QUEUE_NAME, autoAck);
-
- if (response != null) {
- String message = new String(response.getBody(), "UTF-8");
- messages.add(message);
-
- // 鎵嬪姩纭娑堟伅澶勭悊瀹屾垚
- long deliveryTag = response.getEnvelope().getDeliveryTag();
- channel.basicAck(deliveryTag, false);
-// } else {
-// // 濡傛灉闃熷垪涓虹┖锛屽垯閫�鍑哄惊鐜�
-// break;
-// }
- }
- }
-
- // 鎵撳嵃鎵�鏈夋秷鎭唴瀹�
- for (String message : messages) {
- System.out.println("Received message: " + message);
- }
- }
-}
-
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/ModuleA.java b/springboot-vue3/src/main/java/com/example/springboot/component/ModuleA.java
deleted file mode 100644
index 040058b..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/component/ModuleA.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.example.springboot.component;
-
-import com.rabbitmq.client.*;
-
-public class ModuleA {
- private final static String QUEUE_NAME = "hangzhoumes";
-
- public static void main(String[] argv) throws Exception {
- // 鍒涘缓杩炴帴宸ュ巶
- ConnectionFactory factory = new ConnectionFactory();
- factory.setHost("localhost");
-
- try (Connection connection = factory.newConnection();
- //channel 鏄�氳繃 connection 鍒涘缓鐨勪竴涓� AMQP 淇￠亾瀵硅薄
- Channel channel = connection.createChannel()) {
- // `channel.queueDeclare(QUEUE_NAME, false, false, false, null);` 鏄敤鏉ュ０鏄庝竴涓槦鍒楃殑鏂规硶
- //璇ユ柟娉曟湁浜斾釜鍙傛暟锛�
- //1. `QUEUE_NAME`锛氭寚瀹氶槦鍒楃殑鍚嶇О锛岃繖閲屼娇鐢ㄤ簡涔嬪墠澹版槑鐨勫父閲廯"module_queue"`浣滀负闃熷垪鍚嶇О銆�
- //2. `false`锛氭寚瀹氶槦鍒楁槸鍚︿负鎸佷箙鍖栫殑銆傚湪杩欓噷璁剧疆涓篳false`锛岃〃绀轰笉灏嗛槦鍒楁寔涔呭寲鍒扮鐩橈紝涓�鏃abbitMQ鏈嶅姟鍋滄鎴栧穿婧冿紝闃熷垪灏嗕細涓㈠け銆�
- //3. `false`锛氭寚瀹氭槸鍚﹀彧鍏佽褰撳墠杩炴帴澹版槑姝ら槦鍒椼�傚湪杩欓噷璁剧疆涓篳false`锛岃〃绀哄彲鍏佽鍏朵粬杩炴帴涔熷０鏄庡悓鍚嶇殑闃熷垪銆�
- //4. `false`锛氭寚瀹氭槸鍚﹀湪涓嶅啀浣跨敤鏃惰嚜鍔ㄥ垹闄ら槦鍒椼�傚湪杩欓噷璁剧疆涓篳false`锛岃〃绀哄綋娌℃湁娑堣垂鑰呮垨鑰呮墍鏈夋秷璐硅�呮柇寮�杩炴帴鍚庯紝闃熷垪涓嶄細鑷姩鍒犻櫎銆�
- //5. `null`锛氭寚瀹氬叾浠栭槦鍒楀睘鎬х殑鍙傛暟銆傚湪杩欓噷璁剧疆涓篳null`锛岃〃绀烘病鏈夊叾浠栧睘鎬ч渶瑕佽缃��
- //鎵ц`channel.queueDeclare()`鏂规硶鍚庯紝濡傛灉闃熷垪涓嶅瓨鍦紝灏嗕細鍒涘缓涓�涓柊鐨勯槦鍒楋紝濡傛灉闃熷垪宸茬粡瀛樺湪锛屽垯涓嶅仛浠讳綍鎿嶄綔銆�
- channel.queueDeclare(QUEUE_NAME, false, false, false, null);
-
-
-
- String message = "浣犲ソ妯″潡A2";
-
- for ( int i=1;i< 10000;i++)
- {
- message+="浣犲ソ妯″潡A2";
-
- }
-
- message+="b";
-
-
-
- // 灏嗘秷鎭彂甯冨埌鎸囧畾鐨勯槦鍒椾腑銆傜┖瀛楃涓�""琛ㄧず榛樿鐨勪氦鎹㈡満锛孮UEUE_NAME鎸囧畾浜嗙洰鏍囬槦鍒楀悕绉帮紝null琛ㄧず娌℃湁鎸囧畾鍏朵粬灞炴�э紝message.getBytes()灏嗘秷鎭唴瀹硅浆鎹负瀛楄妭鏁扮粍杩涜浼犺緭銆�
- channel.basicPublish("", QUEUE_NAME, null, message.getBytes());
- System.out.println(" [x] Sent '" + message + "'");
- }
- }
-}
-
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/ModuleB.java b/springboot-vue3/src/main/java/com/example/springboot/component/ModuleB.java
deleted file mode 100644
index a4bd9a4..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/component/ModuleB.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.example.springboot.component;
-
-import com.rabbitmq.client.*;
-
-public class ModuleB {
- private final static String QUEUE_NAME = "hangzhoumes";
-
- public static void main(String[] argv) throws Exception {
- // 鍒涘缓杩炴帴宸ュ巶
- ConnectionFactory factory = new ConnectionFactory();
- factory.setHost("localhost");
- try (Connection connection = factory.newConnection();
- Channel channel = connection.createChannel()) {
- // 澹版槑闃熷垪
- channel.queueDeclare(QUEUE_NAME, false, false, false, null);
- // 鍒涘缓娑堣垂鑰�
- DeliverCallback deliverCallback = (consumerTag, delivery) -> {
- String receivedMessage = new String(delivery.getBody(), "UTF-8");
- System.out.println(" [x] Received '" + receivedMessage + "'");
- };
- // 寮�濮嬫秷璐规秷鎭�
- channel.basicConsume(QUEUE_NAME, true, deliverCallback, consumerTag -> {
- });
- }
- }
-}
-
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
index 17fbf5a..13c2640 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
@@ -33,15 +33,21 @@
// \\ TODO Auto-generated catch block
e.printStackTrace();
}
-
+ // List<Short> ss= S7control.getinstance().ReadWord("DB14.0", 1);
+ // System.out.println(ss);
+ // System.out.println(111111);
+ // List<Short> E0sss1id = S7control.getinstance().ReadWord("DB14.0",1);
+ // String E01id = S7control.getinstance().readStrings("DB14.38");
+ // System.out.println(E01id);
// if (S7control.getinstance().CheckConnected() == false) {
+ byte[] E0sss1id = S7control.getinstance().ReadByte("DB14.208",1);
spianService = WebSocketServer.applicationContext.getBean(SpianServiceNew.class);
albaniaMapper = WebSocketServer.applicationContext.getBean(AlbaniaMapper.class);
- spianService.selectAll(albaniaMapper.SelectGlass());
+ //spianService.selectAll(albaniaMapper.SelectGlass());
//璇诲彇DB14鍖烘枃浠�
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
-
+
String ExportTOMES1=plcmes.getPlcParameter("ExportTOMES1").getValue();//鍑虹墖璇锋眰涓�绾�
String ExportToMES2=plcmes.getPlcParameter("ExportToMES2").getValue();//鍑虹墖璇锋眰浜岀嚎
String PLCToMES=plcmes.getPlcParameter("PLCToMES").getValue();//杩涚墖璇锋眰
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/RabbitMQUtils.java b/springboot-vue3/src/main/java/com/example/springboot/component/RabbitMQUtils.java
deleted file mode 100644
index b3b049f..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/component/RabbitMQUtils.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.example.springboot.component;
-
-import com.rabbitmq.client.*;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-public class RabbitMQUtils {
- // ObjectMapper瀵硅薄锛岀敤浜庡簭鍒楀寲鍜屽弽搴忓垪鍖朖SON
- private static ObjectMapper objectMapper = new ObjectMapper();
-
- // 鍙戦�佹秷鎭埌 RabbitMQ 闃熷垪涓�
- public static void sendMessage(String message, String queueName) throws Exception {
- // 鍒涘缓杩炴帴宸ュ巶骞惰缃富鏈哄悕
- ConnectionFactory factory = new ConnectionFactory();
- factory.setHost("localhost");
-
- // 浣跨敤 try-with-resources 璇彞鍒涘缓杩炴帴鍜岄�氶亾锛屽苟鍙戦�佹秷鎭�
- try (Connection connection = factory.newConnection();
- Channel channel = connection.createChannel()) {
- // 澹版槑闃熷垪
- channel.queueDeclare(queueName, false, false, false, null);
-
- // 鍙戝竷娑堟伅鍒伴槦鍒�
- channel.basicPublish("", queueName, null, message.getBytes());
- System.out.println(" [x] Sent '" + message + "' to queue '" + queueName + "'");
- }
- }
-
- // 浠� RabbitMQ 闃熷垪涓帴鏀舵秷鎭�
- public static void receiveMessage(String queueName) throws Exception {
- // 鍒涘缓杩炴帴宸ュ巶骞惰缃富鏈哄悕
- ConnectionFactory factory = new ConnectionFactory();
- factory.setHost("localhost");
-
- // 浣跨敤 try-with-resources 璇彞鍒涘缓杩炴帴鍜岄�氶亾锛屽苟鎺ユ敹娑堟伅
- try (Connection connection = factory.newConnection();
- Channel channel = connection.createChannel()) {
- // 澹版槑闃熷垪
- channel.queueDeclare(queueName, false, false, false, null);
-
- // 璁剧疆娑堟伅鎺ユ敹鍥炶皟
- DeliverCallback deliverCallback = (consumerTag, delivery) -> {
- String receivedMessage = new String(delivery.getBody(), "UTF-8");
- System.out.println(" [x] Received '" + receivedMessage + "'");
- };
-
- // 娑堣垂闃熷垪涓殑娑堟伅
- channel.basicConsume(queueName, true, deliverCallback, consumerTag -> {
- });
- }
- }
-
- // 鍙戦�� JSON 娑堟伅鍒伴槦鍒�
- public static void sendJsonMessage(Object message, String queueName) throws Exception {
- // 鍒涘缓杩炴帴宸ュ巶骞惰缃富鏈哄悕
- ConnectionFactory factory = new ConnectionFactory();
- factory.setHost("localhost");
-
- // 浣跨敤 try-with-resources 璇彞鍒涘缓杩炴帴鍜岄�氶亾锛屽苟鍙戦�� JSON 娑堟伅
- try (Connection connection = factory.newConnection();
- Channel channel = connection.createChannel()) {
- // 澹版槑闃熷垪
- channel.queueDeclare(queueName, false, false, false, null);
-
- // 灏嗗璞¤浆鎹负 JSON 瀛楃涓�
- String jsonMessage = objectMapper.writeValueAsString(message);
-
- // 鍙戝竷 JSON 娑堟伅鍒伴槦鍒�
- channel.basicPublish("", queueName, null, jsonMessage.getBytes());
- System.out.println(" [x] Sent JSON message: '" + jsonMessage + "' to queue '" + queueName + "'");
- }
- }
-
- // 鎺ユ敹 JSON 娑堟伅骞惰浆鎹负瀵硅薄
- public static <T> T receiveJsonMessage(Class<T> valueType, String queueName) throws Exception {
- // 鍒涘缓杩炴帴宸ュ巶骞惰缃富鏈哄悕
- ConnectionFactory factory = new ConnectionFactory();
- factory.setHost("localhost");
-
- // 浣跨敤 try-with-resources 璇彞鍒涘缓杩炴帴鍜岄�氶亾锛屽苟鎺ユ敹 JSON 娑堟伅
- try (Connection connection = factory.newConnection();
- Channel channel = connection.createChannel()) {
- // 澹版槑闃熷垪
- channel.queueDeclare(queueName, false, false, false, null);
-
- // 鑾峰彇闃熷垪涓殑娑堟伅
- GetResponse response = channel.basicGet(queueName, true);
- if (response != null) {
- byte[] body = response.getBody();
- String jsonMessage = new String(body, "UTF-8");
- System.out.println(" [x] Received JSON message: '" + jsonMessage + "' from queue '" + queueName + "'");
-
- // 灏� JSON 娑堟伅杞崲涓哄璞�
- return objectMapper.readValue(jsonMessage, valueType);
- } else {
- return null;
- }
- }
- }
-}
-
-
-// RabbitMQUtils.sendMessage("Hello, world!", "module_queue");
-//RabbitMQUtils.receiveMessage("module_queue");
-//RabbitMQUtils.sendJsonMessage(someObject, "another_queue");
-//RabbitMQUtils.receiveJsonMessage(SomeClass.class, "another_queue");
-// 闇�瑕佸皢 someObject 鏇挎崲涓轰綘瑕佸彂閫佺殑瀵硅薄锛屽苟灏� SomeClass 鏇挎崲涓轰綘瑕佹帴鏀跺苟杞崲鐨勫璞＄被鍨嬨��
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
index f069ca9..44a6805 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
@@ -465,4 +465,8 @@
}
return addresslist;
}
+
+ public String readStrings(String addr) {
+ return s7PLC.readString(addr);
+ }
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index a95fab6..bf310e4 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -16,20 +16,17 @@
// TODO Auto-generated method stub
//
System.out.println("鍚姩瀹屾垚");
-
- // new PlcHold().start();
- // new PlcHoldNew().start();
// new PLCAutoMes().start();
+ // new PlcHold().start();
+ // new PlcHoldNew().start();
+
- new Plchome().start();
+ new Plchome().start();
// new PlcLayout().start();
// new Plcalarm().start();
-
// new Plcsign().start();
-
// new Plcstate().start();
// new PlcPositioning1().start();
-
// new PlcParameter2().start();
// new PLCAutomaticParameterSetting().start();
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/MessageController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/MessageController.java
deleted file mode 100644
index 540d377..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/MessageController.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.example.springboot.controller;
-
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-import com.example.springboot.common.MessageSender;
-import com.example.springboot.component.RabbitMQUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.example.springboot.common.MessageSender.Person;
-
-@RestController
-public class MessageController {
-
- @Autowired
- private MessageSender messageSender;
-
- @GetMapping("/send/{message}")
- public String sendMessage(@PathVariable("message") String message) {
- messageSender.sendMessage(message);
- return "Message sent: " + message;
- }
-
- @GetMapping("/sendPerson/{name}/{age}")
- public String sendPersonMessage(@PathVariable("name") String name, @PathVariable("age") int age) {
- Person person = new Person(name, age);
- messageSender.sendMessage2(person);
- return "Person message sent: " + person;
- }
-
- @GetMapping("/sendJson")
- public String sendJsonMessage() {
- // 鍒涘缓瑕佸彂閫佺殑瀵硅薄
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("key1", "value1");
- jsonObject.put("key2", 123);
- JSONArray jsonArray = new JSONArray();
- jsonArray.add("item1");
- jsonArray.add("item2");
- jsonObject.put("key3", jsonArray);
-
-
- try {
- // 璋冪敤 RabbitMQUtils 鍙戦�� JSON 娑堟伅鐨勬柟娉�
- RabbitMQUtils.sendJsonMessage(jsonObject, "yourQueueName");
- return "JSON message sent: " + jsonObject;
- } catch (Exception e) {
- return "Failed to send JSON message: " + e.getMessage();
- }
-
- }
-
-}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java b/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java
index fbb9979..5e62d7f 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java
@@ -17,6 +17,7 @@
private Integer state;// 鐘舵��
private Integer method;// 鍑虹墖鏂瑰紡
private Date starttime;// 浠诲姟棰嗗彇鏃堕棿
+
public List<GlassInfo> glassinfo;// 鐜荤拑淇℃伅
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java b/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java
index 137e8c5..0a886d5 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java
@@ -21,4 +21,5 @@
private Integer number;// 鏁伴噺
private Integer finishnumber;// 瀹屾垚鏁伴噺
private Integer measurenumber;// 娴嬮噺瀹屾垚鏁伴噺
+ private Integer cageno;//绗煎唴鏁伴噺
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/flowcard.java b/springboot-vue3/src/main/java/com/example/springboot/entity/flowcard.java
index fbb9979..5e62d7f 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/flowcard.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/flowcard.java
@@ -17,6 +17,7 @@
private Integer state;// 鐘舵��
private Integer method;// 鍑虹墖鏂瑰紡
private Date starttime;// 浠诲姟棰嗗彇鏃堕棿
+
public List<GlassInfo> glassinfo;// 鐜荤拑淇℃伅
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/glassinfo.java b/springboot-vue3/src/main/java/com/example/springboot/entity/glassinfo.java
index 137e8c5..0a886d5 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/glassinfo.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/glassinfo.java
@@ -21,4 +21,5 @@
private Integer number;// 鏁伴噺
private Integer finishnumber;// 瀹屾垚鏁伴噺
private Integer measurenumber;// 娴嬮噺瀹屾垚鏁伴噺
+ private Integer cageno;//绗煎唴鏁伴噺
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java b/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
index 05d8c24..642c8a9 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
@@ -25,8 +25,6 @@
public StorageCage storageCage;
-
-
public void setstorageCage(StorageCage storageCage) {
this.storageCage = storageCage;
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java
index 8814052..676c604 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java
@@ -2,14 +2,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.springboot.entity.GlassInfo;
-import com.example.springboot.entity.RolePermission;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
import java.util.List;
-import java.util.Map;
@Mapper
@Repository
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
index 243c024..105307a 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -239,7 +239,7 @@
void DeleteStroageCageByCell(Integer cell);
//淇敼鏍煎瓙鐜荤拑鏁伴噺
- @Update("update storage_cage set number=number+#{num} where cell=#{cell}")
+ @Update("update storage_cage set number=ifnull(number,0)+#{num} where cell=#{cell}")
void updateStroageCageByCell(Integer cell, Integer num);
//璁＄畻鏍煎瓙鍐呭墿浣欏搴�
@@ -271,7 +271,7 @@
@Select("select * from flowcard where state!=2")
List<FlowCard> SelectOrderTask();
- @Select("select * from glassinfo where flowcard=#{flowcard} order by mateid,tier")
+ @Select("select gi.*,sum(sc.number) as cageno from glassinfo gi left join storage_cage sc on gi.glasstype=sc.glasstype where gi.flowcard=#{flowcard} group by gi.id order by gi.mateid,gi.tier")
List<GlassInfo> SelectOrderView(String flowcard);
@Update("update flowcard set state=#{state} where flowcard=#{flowcard}")
@@ -280,7 +280,7 @@
@Update("update flowcard set method=#{method} where flowcard=#{flowcard}")
void ModeChange(String flowcard, int method);
- @Update("update queue set flowcard=#{flowcard},glasswidth=#{width},glassheight=#{height},glasstype=#{glasstype},state=1 where state=0")
+ @Update("update queue set flowcard=#{flowcard},glasswidth=#{width},glassheight=#{height},glasstype=#{glasstype},state=1 where state<=0")
void UpdateQueue(String flowcard,double width,double height,Integer glasstype);
@Update("update glassinfo set finishnumber=finishnumber+1 where flowcard=#{flowcard} and mateid=#{mateid} and tier=#{geTier}")
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java b/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
index 1688d29..d600266 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
@@ -19,7 +19,7 @@
* driver,url,username,password
*/
private static final String DRIVER = "com.mysql.jdbc.Driver";
- private static final String URL = "jdbc:mysql://localhost:3306/canadames";
+ private static final String URL = "jdbc:mysql://10.153.19.150:3306/canadames";
private static final String USERNAME = "root";
private static final String PASSWORD = "beibo.123/";
@@ -256,7 +256,7 @@
*/
public static Connection getConn() throws SQLException {
Connection conn = null;
- conn = DriverManager.getConnection("jdbc:mysql://localhost:3306/canadames?serverTimezone=GMT%2B8&characterEncoding=utf-8", "root", "beibo.123/");
+ conn = DriverManager.getConnection("jdbc:mysql://10.153.19.150:3306/canadames?serverTimezone=GMT%2B8&characterEncoding=utf-8", "root", "beibo.123/");
return conn;
}
diff --git a/springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json b/springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json
index bfde5fe..ab65b19 100644
--- a/springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json
+++ b/springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json
@@ -1,6 +1,6 @@
{
"plcAddressBegin":"DB14.0",
- "plcAddressLenght":"210",
+ "plcAddressLenght":"208",
"dataType":"word",
"parameteInfor":[
{
@@ -409,16 +409,6 @@
"addressLenght":"2",
"ratio":"1",
"unit":"mm/S"
- },{
- "codeId": "MainControl",
- "addressIndex":"208",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
}
-
-
-
-
]
}
diff --git a/springboot-vue3/src/main/resources/application.properties b/springboot-vue3/src/main/resources/application.properties
index c29dabf..5f6b5f7 100644
--- a/springboot-vue3/src/main/resources/application.properties
+++ b/springboot-vue3/src/main/resources/application.properties
@@ -23,9 +23,6 @@
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8
-spring.rabbitmq.host=10.153.19.150
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=guest
-spring.rabbitmq.password=guest
+
--
Gitblit v1.8.0