root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:添加设备分配逻辑 rev:修改调度线路文件位置

Browse Source
This commit is contained in:
zhangzhiqiang
2023-05-31 11:04:33 +08:00
parent 85b5367584
commit efc8ade0ef
10 changed files with 93 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/config/ConventConfig.java
View File

@@ -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

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java
View File

@@ -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());

34
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
View File

@@ -270,38 +270,14 @@ public class SpeEmpTask extends AbstractAcsTask {
});
Merge.addAll(notMerge);
}
Map<String, List<SchBaseTask>> collect = Merge.stream().collect(Collectors.groupingBy(SchBaseTask::getTask_group_id));
ArrayList<SchBaseTask> result = new ArrayList<>();
for (List<SchBaseTask> value : collect.values()) {
updateAcsTaskType(value);
result.addAll(value);
}
return result;
updateAcsTaskType(Merge);
return Merge;
}
private void updateAcsTaskType(List<SchBaseTask> 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);
}
}

17
mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/SchedulerService.java
View File

@@ -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<String,BaseConverter> converterMap =new HashMap<>();
@Value(("${schedulerFile}"))
public void setSchedulerFile(String schedulerFile) {
SchedulerService.schedulerFile = schedulerFile;
}
public List<BaseElement> all(){
List<BaseElement> 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<BaseElement> baseElements = readXml("classpath:/scheduler.xml", function);
List<BaseElement> baseElements = readXml(schedulerFile, function);
return baseElements;
}
private static<T> T readXml(String path, Function<XMLStreamReader, T> 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);

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/notice/impl/NoticeServiceImpl.java
View File

@@ -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

15
mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -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

27
mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml
View File

@@ -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

3
mes/hd/nladmin-system/src/main/resources/config/application.yml
View File

@@ -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

39
mes/hd/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -14,27 +14,28 @@ https://juejin.cn/post/6844903775631572999
<property name="log.pattern"
value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
<springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
<springProperty scope="context" name="esIndex" source="es.index"/>
<property name="LOG_HOME" value="${logPath}"/>
<!--引入默认的一些设置-->
<!-- <include resource="log/AutoCreateInst.xml"/>-->
<!-- <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
<url>http://47.96.133.1785:8200/_bulk</url>
<appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
<url>http://192.168.46.225:9200/_bulk</url>
<index>${esIndex}</index>
<type>mes_log</type>
<loggerName>es-logger</loggerName> &lt;!&ndash; optional &ndash;&gt;
<errorLoggerName>es-error-logger</errorLoggerName> &lt;!&ndash; optional &ndash;&gt;
<connectTimeout>30000</connectTimeout> &lt;!&ndash; optional (in ms, default 30000) &ndash;&gt;
<errorsToStderr>false</errorsToStderr> &lt;!&ndash; optional (default false) &ndash;&gt;
<includeCallerData>false</includeCallerData> &lt;!&ndash; optional (default false) &ndash;&gt;
<logsToStderr>false</logsToStderr> &lt;!&ndash; optional (default false) &ndash;&gt;
<maxQueueSize>104857600</maxQueueSize> &lt;!&ndash; optional (default 104857600) &ndash;&gt;
<maxRetries>3</maxRetries> &lt;!&ndash; optional (default 3) &ndash;&gt;
<readTimeout>30000</readTimeout> &lt;!&ndash; optional (in ms, default 30000) &ndash;&gt;
<sleepTime>250</sleepTime> &lt;!&ndash; optional (in ms, default 250) &ndash;&gt;
<rawJsonMessage>false</rawJsonMessage> &lt;!&ndash; optional (default false) &ndash;&gt;
<includeMdc>false</includeMdc> &lt;!&ndash; optional (default false) &ndash;&gt;
<maxMessageSize>20000</maxMessageSize> &lt;!&ndash; optional (default -1 &ndash;&gt;
&lt;!&ndash; <authentication class="com.internetitem.logback.elasticsearch.config.BasicAuthentication" /> &lt;!&ndash; optional &ndash;&gt;&ndash;&gt;
<loggerName>es-logger</loggerName> <!-- optional -->
<errorLoggerName>es-error-logger</errorLoggerName> <!-- optional -->
<connectTimeout>30000</connectTimeout> <!-- optional (in ms, default 30000) -->
<errorsToStderr>false</errorsToStderr> <!-- optional (default false) -->
<includeCallerData>false</includeCallerData> <!-- optional (default false) -->
<logsToStderr>false</logsToStderr> <!-- optional (default false) -->
<maxQueueSize>104857600</maxQueueSize> <!-- optional (default 104857600) -->
<maxRetries>3</maxRetries> <!-- optional (default 3) -->
<readTimeout>30000</readTimeout> <!-- optional (in ms, default 30000) -->
<sleepTime>250</sleepTime> <!-- optional (in ms, default 250) -->
<rawJsonMessage>false</rawJsonMessage> <!-- optional (default false) -->
<includeMdc>false</includeMdc> <!-- optional (default false) -->
<maxMessageSize>20000</maxMessageSize> <!-- optional (default -1 -->
<!-- <authentication class="com.internetitem.logback.elasticsearch.config.BasicAuthentication" /> &lt;!&ndash; optional &ndash;&gt;-->
<properties>
<property>
<name>system</name>
@@ -75,7 +76,7 @@ https://juejin.cn/post/6844903775631572999
<value>application/json</value>
</header>
</headers>
</appender>-->
</appender>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<withJansi>true</withJansi>
@@ -117,9 +118,9 @@ https://juejin.cn/post/6844903775631572999
<!--开发环境:打印控制台-->
<springProfile name="dev">
<root level="debug">
<root level="info">
<appender-ref ref="CONSOLE"/>
<!-- <appender-ref ref="esLogAppender"/>-->
<appender-ref ref="esLogAppender"/>
</root>
<logger name="jdbc.audit" level="ERROR" additivity="false">