From 7952e1dd458d4a8dbb69a591b30f0088252c6a6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?= =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com> Date: Tue, 23 Jul 2024 17:46:55 +0800 Subject: [PATCH] =?UTF-8?q?mqtt=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/apiservice/mqtt/PcnMqttCallback.java | 4 +-- .../serviceimpl/base/MesEquipmentLogService.java | 5 +++- .../serviceimpl/mqtt/MqttServiceImpl.java | 33 +++++++++++++++++++--- .../serviceimpl/test/TestServiceImpl.java | 2 +- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/mqtt/PcnMqttCallback.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/mqtt/PcnMqttCallback.java index 862cb92..cf17d76 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/mqtt/PcnMqttCallback.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/mqtt/PcnMqttCallback.java @@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit; @Slf4j public class PcnMqttCallback implements MqttCallbackExtended { - private static ExecutorService executorService = new ThreadPoolExecutor(1, 20, + private static ExecutorService executorService = new ThreadPoolExecutor(100, 100, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(10000), r -> { Thread thread = new Thread(r); @@ -33,7 +33,7 @@ public class PcnMqttCallback implements MqttCallbackExtended { return thread; },new ThreadPoolExecutor.DiscardPolicy()); - private static ExecutorService executorServiceTwo = new ThreadPoolExecutor(1, 20, + private static ExecutorService executorServiceTwo = new ThreadPoolExecutor(100, 100, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(10000), r -> { Thread thread = new Thread(r); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentLogService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentLogService.java index 543c89a..8f8c94e 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentLogService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentLogService.java @@ -193,6 +193,7 @@ public class MesEquipmentLogService implements IMesEquipmentLogService { MesEquipmentLogDetail mesEquipmentLogDetail = new MesEquipmentLogDetail(); BeanUtils.copyProperties(equipmentLog, mesEquipmentLogDetail); ConvertBean.serviceModelInitialize(mesEquipmentLogDetail, "mqtt"); + mesEquipmentLogDetail.setEquipVariableValue(equipLogMqttMsg.getValue()); log.info("== mesEquipmentLogDetail新增开始"); saveLogDetail(mesEquipmentLogDetail); //mesEquipmentLogDetailRepository.insert(mesEquipmentLogDetail); @@ -293,7 +294,9 @@ public class MesEquipmentLogService implements IMesEquipmentLogService { } private String getSql(Integer equipId) { - String sql = "insert INTO mes_equipment_log_detail_" + equipId + + // String sql = "insert INTO mes_equipment_log_detail_" + equipId + + String sql = "insert INTO mes_equipment_log_detail" + + "( id, equip_variable_id, equip_variable_name, equip_variable_desc, read_write_flag, data_type, equip_variable_value," + " equip_id, equipment_code, work_center_code, work_cell_code, process_code, craft_code, mould_record_id, extend, quality, " + "create_date_time, create_user, is_deleted, is_valid, modify_date_time, modify_user, organize_code, system_sync_status, remark," + diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/mqtt/MqttServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/mqtt/MqttServiceImpl.java index d2b46af..79f2864 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/mqtt/MqttServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/mqtt/MqttServiceImpl.java @@ -110,6 +110,7 @@ public class MqttServiceImpl implements MqttService { mesEquipmentLogNew.setEquipId(variable.getEquipId()); mesEquipmentLogNew.setEquipmentCode(variable.getEquipmentCode()); mesEquipmentLogNew.setEquipVariableStatus(0); + mesEquipmentLogNew.setDataType(0); mesEquipmentLogNew.setEquipVariableValue("1"); arrayEquip.add(mesEquipmentLogNew); @@ -153,17 +154,41 @@ public class MqttServiceImpl implements MqttService { @Override public void testSendList() { - String start ="["; + String a = "1"; + String start ="["; + String end ="]"; + String aa = ""; + for (int i=1; i<10001 ; i++) { + aa += "{\"PTCode\":\"300\",\"key\":\"aa499" + i + + "\",\"value\":\"A" + i + + "\", \"time\":\"2024-07-17 16:18:13\"}"; + + //start += aa; + if (i%50== 0) { + aa = start + aa + end; + myMqttClient.publish(aa, "EEE"); + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + aa = ""; + } + } + + + /*String start ="["; for (int i=0; i<10000 ; i++) { String aa = "{\"PTCode\":\"300\",\"key\":\"aa499" + i + - "\",\"value\":5,\"time\":\"2024-07-17 16:18:13\"}"; + "\",\"value\":4,\"time\":\"2024-07-17 16:18:13\"}"; start += aa; } String end ="]"; start += end; - myMqttClient.publish(start, "ABC"); - + myMqttClient.publish(start, "DDD");*/ + } + } \ No newline at end of file diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/test/TestServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/test/TestServiceImpl.java index e8b921c..fe47561 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/test/TestServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/test/TestServiceImpl.java @@ -74,7 +74,7 @@ public class TestServiceImpl implements TestService{ equipmentLogDetail.setEquipVariableId(123123l); equipmentLogDetail.setEquipVariableName("aaa"); equipmentLogDetail.setReadWriteFlag(1); - equipmentLogDetail.setDataType(40); + //equipmentLogDetail.setDataType(40); equipmentLogDetail.setEquipId(7); equipmentLogDetail.setEquipmentCode("Foaming5#"); list.add(equipmentLogDetail);