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

配置文件更新

Browse Source
This commit is contained in:
ludj
2023-03-17 09:05:42 +08:00
parent f1cc1c832d
commit 48e080d2cb
9 changed files with 43 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mes/hd/.gitignore vendored
View File

@@ -40,3 +40,4 @@ spring-*/src/main/java/META-INF/MANIFEST.MF
test-output
atlassian-ide-plugin.xml
.gradletasknamecache
/logPath_IS_UNDEFINED/

35
mes/hd/nladmin-system/pom.xml
View File

@@ -19,7 +19,23 @@
<sa-token.version>1.31.0</sa-token.version>
</properties>
<dependencies>
<!--登入相关-->
<!-- 日志链路追踪 https://tlog.yomahub.com/pages/f62a84/#%E5%90%8C%E6%AD%A5%E6%97%A5%E5%BF%97-->
<dependency>
<groupId>com.yomahub</groupId>
<artifactId>tlog-all-spring-boot-starter</artifactId>
<version>1.5.0</version>
</dependency>
<!-- https://onew.me/logback/2018/09/17/logback_win.html-->
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
<version>1.9</version>
</dependency>
<!--登录相关-->
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-spring-boot-starter</artifactId>
@@ -35,7 +51,7 @@
<artifactId>sa-token-dao-redis</artifactId>
<version>1.31.0</version>
</dependency>
<!--httpclient-->
<!--httpclient-->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
@@ -46,7 +62,7 @@
<artifactId>httpasyncclient</artifactId>
<version>4.1.4</version>
</dependency>
<!--es-->
<!--es-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
@@ -57,7 +73,6 @@
<artifactId>logback-elasticsearch-appender</artifactId>
<version>1.6</version>
</dependency>
<!-- -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
@@ -92,18 +107,6 @@
<version>2.5.14</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency>
<!-- ip地址解析-->
<dependency>
<groupId>net.dreamlu</groupId>
<artifactId>mica-ip2region</artifactId>
<version>2.5.6</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>

98
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/autoTask/AutoAgvStatus.java
View File

@@ -1,98 +0,0 @@
package org.nl.wms.ext.bigScreen.autoTask;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.wql.core.bean.WQLObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Component;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
@Slf4j
@Component
public class AutoAgvStatus {
@Autowired
private MongoTemplate mongoTemplate;
public void run() {
WQLObject agv_status = WQLObject.getWQLObject("DS_AGV_AgvStatus");
WQLObject agv_point = WQLObject.getWQLObject("DS_AGV_PointCoordinateRelate");
for (int i = 1; i <= 7; i++) {
String device_code = String.valueOf(i);
Query query = new Query();
query.addCriteria(Criteria.where("device_code").is(device_code));
List<JSONObject> avg_all = mongoTemplate.find(query, JSONObject.class, "agv_test");
JSONObject jsonAgv = agv_status.query("agv_code = '" + device_code + "'").uniqueResult(0);
String real_x_coor = "";
String real_y_coor = "";
for (JSONObject json : avg_all) {
String key = json.getString("key");
switch (key) {
case "pic_name" :
jsonAgv.put("pic_name",json.getString("value"));
break;
case "agv_power" :
jsonAgv.put("agv_power",json.getString("value"));
break;
case "agv_stateType" :
jsonAgv.put("agv_statetype",json.getString("value"));
break;
case "x_coordinate" :
String value = NumberUtil.div(json.getString("value"), "100").toString();
real_x_coor = NumberUtil.round(value, 0).toString();
break;
case "y_coordinate" :
String value2 = NumberUtil.div(json.getString("value"), "100").toString();
real_y_coor = NumberUtil.round(value2, 0).toString();
break;
case "error_status" :
jsonAgv.put("error_status",json.getString("value"));
break;
case "error_info" :
jsonAgv.put("error_info",json.getString("value"));
break;
case "direction_type" :
jsonAgv.put("direction_type",json.getString("value"));
break;
}
}
JSONObject jsonPoint = agv_point.query("real_x_coor = '" + real_x_coor + "' and real_y_coor = '" + real_y_coor + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonPoint)) {
jsonAgv.put("x_coordinate", jsonPoint.getString("web_x_coor"));
jsonAgv.put("y_coordinate", jsonPoint.getString("web_y_coor"));
}
jsonAgv.put("update_datetime", DateUtil.now());
agv_status.update(jsonAgv);
}
}
public static void main(String[] args) {
ArrayList<Integer> objects = new ArrayList<>();
objects.add(null);
LinkedList<Object> objects1 = new LinkedList<>();
objects1.add(4);
objects1.add(4.4);
objects1.add(null);
ArrayDeque<Object> objects2 = new ArrayDeque<>();
System.out.println(objects1);
}
}

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/AgvBigScreenServiceImpl.java
View File

@@ -5,20 +5,13 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.mongodb.MongoClient;
import com.mongodb.client.MongoDatabase;
import lombok.RequiredArgsConstructor;
import org.nl.common.anno.Log;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.ext.bigScreen.service.AgvBigScreenService;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@Service

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

@@ -1,21 +1,8 @@
server:
port: 8011
#海亮sqlserver
erp:
sqlserver:
enabled: false
jdbcurl: jdbc:sqlserver://192.168.81.156;DatabaseName=hllg
username: sa
password: root
#配置数据源
spring:
data:
mongodb:
host: 127.0.0.1
port: 27017
database: nlwms
elasticsearch:
repositories:
enabled: true
@@ -79,7 +66,6 @@ spring:
redis:
#数据库索引
database: ${REDIS_DB:1}
#host: ${REDIS_HOST:127.0.0.1}
host: ${REDIS_HOST:localhost}

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

@@ -2,8 +2,6 @@ server:
port: 8011
#配置数据源
spring:
profiles:
prod
datasource:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
@@ -55,11 +53,6 @@ spring:
wall:
config:
multi-statement-alagvslow: true
data:
mongodb:
host: 127.0.0.1
port: 27017
database: nlacs
redis:
#数据库索引

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

@@ -55,11 +55,6 @@ spring:
wall:
config:
multi-statement-alagvslow: true
data:
mongodb:
host: 127.0.0.1
port: 27017
database: logdb
redis:
#数据库索引
database: ${REDIS_DB:8}

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

@@ -12,29 +12,29 @@ https://juejin.cn/post/6844903775631572999
<contextName>nlAdmin</contextName>
<property name="log.charset" value="utf-8"/>
<property name="log.pattern"
value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
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"/>
<property name="LOG_HOME" value="${logPath}"/>
<!--引入默认的一些设置-->
<!-- <include resource="log/AutoCreateInst.xml"/>-->
<appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
<!-- <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
<url>http://47.96.133.178:8200/_bulk</url>
<index>${esIndex}</index>
<type>mes_log</type>
<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;-->
<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;
<properties>
<property>
<name>system</name>
@@ -75,10 +75,11 @@ https://juejin.cn/post/6844903775631572999
<value>application/json</value>
</header>
</headers>
</appender>
</appender>-->
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<withJansi>true</withJansi>
<encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
<pattern>${log.pattern}</pattern>
<!-- <charset>${log.charset}</charset>-->
</encoder>
@@ -98,14 +99,15 @@ https://juejin.cn/post/6844903775631572999
<!--所有日志最多占多大容量-->
<totalSizeCap>20GB</totalSizeCap>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!-- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">-->
<encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
</encoder>
</appender>
<!--异步到文件-->
<appender name="asyncFileAppender" class="ch.qos.logback.classic.AsyncAppender">
<appender name="asyncFileAppender" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
<discardingThreshold>0</discardingThreshold>
<queueSize>500</queueSize>
<appender-ref ref="FILE"/>

1
mes/hd/新建文本文档.txt
View File

@@ -1 +0,0 @@
132