From efc8ade0efd1d597cef23d729ba6a146b44b7a37 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Wed, 31 May 2023 11:04:33 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=88=86=E9=85=8D=E9=80=BB=E8=BE=91=20rev:=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=B0=83=E5=BA=A6=E7=BA=BF=E8=B7=AF=E6=96=87=E4=BB=B6=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/config/ConventConfig.java | 6 ++- .../ext/acs/service/impl/AgvInstService.java | 2 +- .../sch/tasks/SpeMachinery/SpeEmpTask.java | 34 +++------------- .../service/scheduler/SchedulerService.java | 17 ++++++-- .../notice/impl/NoticeServiceImpl.java | 7 ++-- .../main/resources/config/application-dev.yml | 15 +++---- .../resources/config/application-dev3.yml | 27 ++++++------- .../src/main/resources/config/application.yml | 3 +- .../src/main/resources/logback-spring.xml | 39 ++++++++++--------- mes/qd/src/views/wms/pdm/device/index.vue | 35 +++++++++++------ 10 files changed, 93 insertions(+), 92 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/ConventConfig.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/ConventConfig.java index f5fd7990..805b9aab 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/config/ConventConfig.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/ConventConfig.java @@ -1,5 +1,6 @@ package org.nl.config; +import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.nl.common.enums.AcsTaskEnum; import org.nl.modules.wql.util.SpringContextHolder; @@ -10,14 +11,15 @@ import org.nl.wms.product_manage.sch.tasks.WashMachineryTask; import org.nl.wms.product_manage.sch.tasks.callMaterial.WrapCallMaterialTask; import org.nl.wms.product_manage.sch.tasks.sendEmpty.WrapSendEmptyTask; import org.nl.wms.product_manage.sch.tasks.sendMaterial.PlotterSendMaterialTask; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.SmartLifecycle; import org.springframework.context.annotation.Configuration; @Configuration @Slf4j +@Data public class ConventConfig implements SmartLifecycle { - @Override public void start() { AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_CALLTYPE_FULL, SpringContextHolder.getBean(SpeFullTask.class)); @@ -26,7 +28,7 @@ public class ConventConfig implements SmartLifecycle { AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_PLOTTER_SEND_FULL, SpringContextHolder.getBean(PlotterSendMaterialTask.class)); AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_WARP_CALL_FULL, SpringContextHolder.getBean(WrapCallMaterialTask.class)); AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_WARP_SEND_EMP, SpringContextHolder.getBean(WrapSendEmptyTask.class)); - System.out.println("初始化Task_Collent完成"+AcsToWmsServiceImpl.Task_Collent.size()); + System.out.println("初始化Task_Collent完成777"+AcsToWmsServiceImpl.Task_Collent.size()); } @Override diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java index fa14fc08..50b5c3cd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java @@ -181,7 +181,7 @@ public class AgvInstService { schBaseTask.setBarcodeArr(cacheVehile); schBaseTask.setPoint_code1(startPoint); schBaseTask.setIs_send(true); - schBaseTask.setAcs_task_type(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK.getCode()); + schBaseTask.setAcs_task_type(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_TASK.getCode()); schBaseTask.setPoint_code3(startPoint); schBaseTask.setTask_status(StatusEnum.TASK_START_END_P.getCode()); schBaseTask.setUpdate_time(new Date()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java index fb325516..2d985e25 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java @@ -270,38 +270,14 @@ public class SpeEmpTask extends AbstractAcsTask { }); Merge.addAll(notMerge); } - Map> collect = Merge.stream().collect(Collectors.groupingBy(SchBaseTask::getTask_group_id)); - ArrayList result = new ArrayList<>(); - for (List value : collect.values()) { - updateAcsTaskType(value); - result.addAll(value); - } - return result; + updateAcsTaskType(Merge); + return Merge; } private void updateAcsTaskType(List value) { - if (value.size() > 1){ - boolean tag = true; - for (SchBaseTask task : value) { - if (task.getAcs_task_type().equals(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK.getCode())){ - task.setAcs_task_type(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK.getCode()); - } - if (task.getAcs_task_type().equals(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_TASK.getCode())){ - task.setAcs_task_type(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_DOUBLE_TASK.getCode()); - } - if (tag){task.setIs_send(true);tag = false;}else {task.setIs_send(false); } - } - } - if (value.size() == 1){ - for (SchBaseTask task : value) { - if (task.getAcs_task_type().equals(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK.getCode())){ - task.setAcs_task_type(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK.getCode()); - } - if (task.getAcs_task_type().equals(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_DOUBLE_TASK.getCode())){ - task.setAcs_task_type(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_TASK.getCode()); - } - task.setIs_send(true); - } + for (SchBaseTask task : value) { + task.setAcs_task_type(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_TASK.getCode()); + task.setIs_send(true); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/SchedulerService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/SchedulerService.java index 1fd04bbe..952cbd0e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/SchedulerService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/SchedulerService.java @@ -1,5 +1,6 @@ package org.nl.wms.scheduler_manage.service.scheduler; +import lombok.Data; import lombok.SneakyThrows; import org.apache.poi.ss.formula.functions.T; import org.jetbrains.annotations.NotNull; @@ -10,6 +11,7 @@ import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.BaseElement; import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.impl.FlowElement; import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.impl.ProcessElement; import org.springframework.beans.BeansException; +import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.core.io.FileSystemResourceLoader; import org.springframework.core.io.Resource; @@ -19,6 +21,7 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; +import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStreamReader; @@ -35,8 +38,14 @@ import java.util.function.Function; @Service public class SchedulerService implements BeanPostProcessor { + private static String schedulerFile; + private static Map converterMap =new HashMap<>(); + @Value(("${schedulerFile}")) + public void setSchedulerFile(String schedulerFile) { + SchedulerService.schedulerFile = schedulerFile; + } public List all(){ List readall = XmlReadUtil.readall(); @@ -78,7 +87,7 @@ public class SchedulerService implements BeanPostProcessor { } return null; }; - ProcessElement processElement = readXml("classpath:/scheduler.xml", function); + ProcessElement processElement = readXml(schedulerFile, function); return processElement; } @@ -102,15 +111,15 @@ public class SchedulerService implements BeanPostProcessor { } return list; }; - List baseElements = readXml("classpath:/scheduler.xml", function); + List baseElements = readXml(schedulerFile, function); return baseElements; } private static T readXml(String path, Function function) throws IOException, XMLStreamException { FileInputStream inputStream = null; InputStreamReader streamReader = null; - Resource resource = loader.getResource(path); try { - inputStream = new FileInputStream(resource.getFile()); + File file = new File(path); + inputStream = new FileInputStream(file); streamReader = new InputStreamReader(inputStream, "UTF-8"); //TODO:schama校验 XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(streamReader); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/notice/impl/NoticeServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/notice/impl/NoticeServiceImpl.java index a600f9aa..aadbdef0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/notice/impl/NoticeServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/notice/impl/NoticeServiceImpl.java @@ -144,9 +144,10 @@ public class NoticeServiceImpl implements NoticeService { @Override public Integer countByReceiveNotRead() { - WQLObject sysNotice = WQLObject.getWQLObject("sys_notice"); - JSONArray objects = sysNotice.query("have_read = '1'").getResultJSONArray(0); - return ObjectUtil.isEmpty(objects) ? 0 : objects.size(); +// WQLObject sysNotice = WQLObject.getWQLObject("sys_notice"); +// JSONArray objects = sysNotice.query("have_read = '1'").getResultJSONArray(0); + //ObjectUtil.isEmpty(objects) ? 0 : objects.size(); + return 0; } @Override diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml index 2af7e079..1dee4cc4 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml @@ -10,23 +10,23 @@ spring: reactive: #endpoints: 172.31.185.110:8200,172.31.154.9:8200 #内网 # endpoints: 47.96.133.178:8200 #外网 - endpoints: http://47.96.133.178:8200 #外网 + endpoints: http://192.168.46.225:9200 #外网 elasticsearch: rest: #uris: 172.31.185.110:8200,172.31.154.9:8200 #内网 # uris: 47.96.133.178:8200 #外网 - uris: http://47.96.133.178:8200 #外网 - username: elastic - password: 123456 + uris: http://192.168.46.225:9200 #外网 +# username: elastic +# password: 123456 datasource: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy -# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false - url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false + url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false +# url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false username: ${DB_USER:root} # password: ${DB_PWD:123456} - password: ${DB_PWD:root} + password: ${DB_PWD:123456} # 初始连接数 initial-size: 5 @@ -199,3 +199,4 @@ sa-token: # - redis://127.0.0.1:6379 es: index: mes_log +schedulerFile: D:\hlProject\mes\scheduler.xml diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml index 513e292f..13eff24c 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml @@ -9,26 +9,25 @@ spring: client: reactive: #endpoints: 172.31.185.110:8200,172.31.154.9:8200 #内网 - # endpoints: 47.96.133.1785:8200 #外网 - endpoints: http://47.96.133.1785:8200 #外网 + # endpoints: 47.96.133.178:8200 #外网 + endpoints: http://192.168.46.225:9200 #外网 elasticsearch: rest: #uris: 172.31.185.110:8200,172.31.154.9:8200 #内网 - # uris: 47.96.133.1785:8200 #外网 - uris: http://47.96.133.1785:8200 #外网 - username: elastic - password: 123456 + # uris: 47.96.133.178:8200 #外网 + uris: http://192.168.46.225:9200 #外网 + # username: elastic + # password: 123456 datasource: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false - #url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false - username: ${DB_USER:shenhua} - #password: ${DB_PWD:P@ssw0rd} - #password: ${DB_PWD:root} - #password: ${DB_PWD:Root.123456} - password: ${DB_PWD:123456789} + url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false + # url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false + username: ${DB_USER:root} + # password: ${DB_PWD:123456} + password: ${DB_PWD:123456} + # 初始连接数 initial-size: 5 # 最小连接数 @@ -173,6 +172,7 @@ sa-token: cookie: # 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com domain: + is-read-cookie: false #jetcache: # defaultCacheType: LOCAL @@ -199,3 +199,4 @@ sa-token: # - redis://127.0.0.1:6379 es: index: mes_log +schedulerFile: /Users/mima0000/Desktop/scheduler.xml diff --git a/mes/hd/nladmin-system/src/main/resources/config/application.yml b/mes/hd/nladmin-system/src/main/resources/config/application.yml index 2774a8e9..29361ef8 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application.yml @@ -2,7 +2,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: dev3 jackson: time-zone: GMT+8 data: @@ -92,4 +92,3 @@ mybatis-plus: db-config: id-type: INPUT banner: false -schedulerFile: classpath:/scheduler.xml diff --git a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml index 62780f2f..b72175f0 100644 --- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -14,27 +14,28 @@ https://juejin.cn/post/6844903775631572999 + - + es-error-logger + 30000 + false + false + false + 104857600 + 3 + 30000 + 250 + false + false + 20000 + system @@ -75,7 +76,7 @@ https://juejin.cn/post/6844903775631572999 application/json - --> + true @@ -117,9 +118,9 @@ https://juejin.cn/post/6844903775631572999 - + - + diff --git a/mes/qd/src/views/wms/pdm/device/index.vue b/mes/qd/src/views/wms/pdm/device/index.vue index 89586485..4993f350 100644 --- a/mes/qd/src/views/wms/pdm/device/index.vue +++ b/mes/qd/src/views/wms/pdm/device/index.vue @@ -145,14 +145,17 @@ + + + + + - {{ item.label }} - + + +
@@ -174,11 +177,8 @@ - - - + + @@ -267,6 +267,8 @@ export default { return { permission: { }, + trueorfalse: [ { value: true, label: '是' }, { value: false, label: '否' }], + workList: [], tableLabel: [], rules: { @@ -354,6 +356,15 @@ export default { this.workList = res }) }, + formatBoolean: function(row, column) { + var ret = '' + if (row[column.property] === true) { + ret = '是' // 根据自己的需求设定 + } else { + ret = '否' + } + return ret + }, deviceInfo(data) { this.$refs.child1.setForm(data) },