From 0f428020c42ea6518686b131931bbf3da4bf0398 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: Thu, 25 Jul 2024 22:22:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=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 | 2 +- .../src/main/resources/application-72.properties | 33 +++++++++++++++++----- 3 files changed, 29 insertions(+), 10 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 72ca8da..a3807b2 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(200, 200, + 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(200,200, + 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 8f8c94e..298a72e 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 @@ -152,7 +152,7 @@ public class MesEquipmentLogService implements IMesEquipmentLogService { mesEquipmentLogDetail.setId(null); mesEquipmentLogDetail.setCreateDatetime(null); mesEquipmentLogDetail.setCreateUser(null); - + mesEquipmentLogDetail.setOrgEquipId(mesEquipmentLogDetail.getOrganizeCode()+"_"+mesEquipmentLogDetail.getEquipId()); String jsonStr = mesEquipmentRecord.getProduceSnJson(); if (!StringUtils.isEmpty(jsonStr)) { diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-72.properties b/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-72.properties index dff0204..279701f 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-72.properties +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-72.properties @@ -1,7 +1,7 @@ #\u9879\u76EE\u7AEF\u53E3 server.port=8350 #\u672C\u673Aip -impp.server.ip=10.196.77.248 +impp.server.ip=localhost #impp.server.ip=192.168.0.105 #andon ip impp.andon.url=http://10.195.88.71:8750 @@ -24,7 +24,7 @@ impp.cluster.regist.center=http://10.195.88.71:8000/eureka/ logging.config=classpath:log4j2-spring.xml mes.ws=ws://10.197.190.121:8300/ws/pcn-regist/ #mes-pcn.ws.path=ws://10.197.176.77:8350 -mes-pcn.ws.path=ws://10.196.77.248:8350 +mes-pcn.ws.path=ws://localhost:8350 pcn.code=PCN-U7 ########\u5E73\u53F0\u76F8\u5173\u53C2\u6570########## #\u662F\u5426\u5F00\u5x42Fredis\u7F13\u5B58 @@ -186,12 +186,19 @@ spring.shardingsphere.sharding.master-slave-rules.ds0.slave-data-source-names=sl #\u7CFB\u7EDF\u5C5E\u6027\uFF0C\u663E\u793A\u6B63\u5E38\u7684sql\u8BED\u53E5 spring.shardingsphere.props.sql.show=false -spring.shardingsphere.sharding.tables.mes_equipment_log.actual-data-nodes=ds0.mes_equipment_log_$->{1..100} -spring.shardingsphere.sharding.tables.mes_equipment_log.table-strategy.inline.sharding-column=equip_id -spring.shardingsphere.sharding.tables.mes_equipment_log.table-strategy.inline.algorithm-expression=mes_equipment_log_$->{equip_id} +#spring.shardingsphere.sharding.tables.mes_equipment_log.actual-data-nodes=ds0.mes_equipment_log_$->{[152,156,300]} +spring.shardingsphere.sharding.tables.mes_equipment_log.actual-data-nodes=ds0.mes_equipment_log_$->{[CK01_5,CK01_6,CK01_7,CK01_8,CK01_9,CK01_10,CK01_11,CK01_12,CK01_13,CK01_14,CK01_15,CK01_16,CK01_17,CK01_21,CK01_22,CK01_23,CK01_24,CK01_28,CK01_29,CK01_31,CK01_56,CK01_62,CK01_143,CK01_151,CK01_152,CK01_153,CK01_154,CK01_155,CK01_156,CK01_157,CK01_158,CK01_161,CK01_164,CK01_179,CK01_180,CK01_181,CK01_182,CK01_184,CK01_186,CK01_191,CK01_210]} + +spring.shardingsphere.sharding.tables.mes_equipment_log.table-strategy.inline.sharding-column=org_equip_id +spring.shardingsphere.sharding.tables.mes_equipment_log.table-strategy.inline.algorithm-expression=mes_equipment_log_$->{org_equip_id} + +#spring.shardingsphere.sharding.tables.mes_equipment_log_detail.actual-data-nodes=ds0.mes_equipment_log_detail_$->{[152,156,300]} +spring.shardingsphere.sharding.tables.mes_equipment_log_detail.actual-data-nodes=ds0.mes_equipment_log_detail_$->{[CK01_5,CK01_6,CK01_7,CK01_8,CK01_9,CK01_10,CK01_11,CK01_12,CK01_13,CK01_14,CK01_15,CK01_16,CK01_17,CK01_21,CK01_22,CK01_23,CK01_24,CK01_28,CK01_29,CK01_31,CK01_56,CK01_62,CK01_143,CK01_151,CK01_152,CK01_153,CK01_154,CK01_155,CK01_156,CK01_157,CK01_158,CK01_161,CK01_164,CK01_179,CK01_180,CK01_181,CK01_182,CK01_184,CK01_186,CK01_191,CK01_210]} +spring.shardingsphere.sharding.tables.mes_equipment_log_detail.table-strategy.inline.sharding-column=org_equip_id +spring.shardingsphere.sharding.tables.mes_equipment_log_detail.table-strategy.inline.algorithm-expression=mes_equipment_log_detail_$->{org_equip_id} #\u7ED1\u5B9A\u8868 -spring.shardingsphere.sharding.binding-tables[0]=mes_equipment_log +spring.shardingsphere.sharding.binding-tables[0]=mes_equipment_log,mes_equipment_log_detail #\u4E2D\u822A\u6570\u636E\u6E90 ##############\u5B9A\u65F6\u4EFB\u52A1\u6301\u4E45\u5316############## @@ -270,4 +277,16 @@ xxl.job.executor.port=9999 xxl.job.executor.logpath= ### xxl-job executor log-retention-days xxl.job.executor.logretentiondays=10 -xxl.job.basePackage=cn.estsh.i3plus.lac.scheduler.schedulejob \ No newline at end of file +xxl.job.basePackage=cn.estsh.i3plus.lac.scheduler.schedulejob + + +mqtt.host=tcp://10.195.88.71:1883 +mqtt.userName=estsh +mqtt.passWord=estsh123 +mqtt.qos=1 +mqtt.clientId=pcn +mqtt.timeout=10 +mqtt.keepalive=30 +mqtt.clearSession=true +pcn.mqtt.flag = true +mqtt.topic.list=ABC,ABD,ADE