diff --git a/mes/hd/.gitignore b/mes/hd/.gitignore index 97427ece..17a0478e 100644 --- a/mes/hd/.gitignore +++ b/mes/hd/.gitignore @@ -40,3 +40,4 @@ spring-*/src/main/java/META-INF/MANIFEST.MF test-output atlassian-ide-plugin.xml .gradletasknamecache +/logPath_IS_UNDEFINED/ diff --git a/mes/hd/nladmin-system/pom.xml b/mes/hd/nladmin-system/pom.xml index 55d2613b..b04ae6d5 100644 --- a/mes/hd/nladmin-system/pom.xml +++ b/mes/hd/nladmin-system/pom.xml @@ -19,7 +19,23 @@ 1.31.0 - + + + + com.yomahub + tlog-all-spring-boot-starter + 1.5.0 + + + + + + org.fusesource.jansi + jansi + 1.9 + + + cn.dev33 sa-token-spring-boot-starter @@ -35,7 +51,7 @@ sa-token-dao-redis 1.31.0 - + org.apache.httpcomponents httpclient @@ -46,7 +62,7 @@ httpasyncclient 4.1.4 - + org.springframework.boot spring-boot-starter-data-elasticsearch @@ -57,7 +73,6 @@ logback-elasticsearch-appender 1.6 - com.github.pagehelper pagehelper-spring-boot-starter @@ -92,18 +107,6 @@ 2.5.14 - - org.springframework.boot - spring-boot-starter-data-mongodb - - - - - net.dreamlu - mica-ip2region - 2.5.6 - - com.squareup.okhttp3 okhttp diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/autoTask/AutoAgvStatus.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/autoTask/AutoAgvStatus.java deleted file mode 100644 index 06dbb94c..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/autoTask/AutoAgvStatus.java +++ /dev/null @@ -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 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 objects = new ArrayList<>(); - objects.add(null); - LinkedList objects1 = new LinkedList<>(); - objects1.add(4); - objects1.add(4.4); - objects1.add(null); - - ArrayDeque objects2 = new ArrayDeque<>(); - System.out.println(objects1); - } -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/AgvBigScreenServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/AgvBigScreenServiceImpl.java index e6383110..98d2aaac 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/AgvBigScreenServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/AgvBigScreenServiceImpl.java @@ -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 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 7ebc6478..c3d14591 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 @@ -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} diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml index 7490b80b..4260954e 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml @@ -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: #数据库索引 diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-test.yml b/mes/hd/nladmin-system/src/main/resources/config/application-test.yml index 5dbcacbc..eb5ed23d 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-test.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-test.yml @@ -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} 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 5a47793e..8564c842 100644 --- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -12,29 +12,29 @@ https://juejin.cn/post/6844903775631572999 nlAdmin + value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/> - + - es-error-logger - 30000 - false - false - false - 104857600 - 3 - 30000 - 250 - false - false - 20000 - + es-logger <!– optional –> + es-error-logger <!– optional –> + 30000 <!– optional (in ms, default 30000) –> + false <!– optional (default false) –> + false <!– optional (default false) –> + false <!– optional (default false) –> + 104857600 <!– optional (default 104857600) –> + 3 <!– optional (default 3) –> + 30000 <!– optional (in ms, default 30000) –> + 250 <!– optional (in ms, default 250) –> + false <!– optional (default false) –> + false <!– optional (default false) –> + 20000 <!– optional (default -1 –> + <!– <!– optional –>–> system @@ -75,10 +75,11 @@ https://juejin.cn/post/6844903775631572999 application/json - + --> - + true + ${log.pattern} @@ -98,14 +99,15 @@ https://juejin.cn/post/6844903775631572999 20GB - + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - + 0 500 diff --git a/mes/hd/新建文本文档.txt b/mes/hd/新建文本文档.txt deleted file mode 100644 index dd1ec209..00000000 --- a/mes/hd/新建文本文档.txt +++ /dev/null @@ -1 +0,0 @@ -132 \ No newline at end of file