upload-test

VB_DSM_V2.1/Scripts/Dockers/docker-compose-iwb.yml

@@ -278,13 +278,14 @@ services:
     restart: always
     ports:
       # 内部使用了7221端口
-      - "18888:8080"
+      - "18888:7110"
     environment:
-      - TZ
-      - SERVER_PORT
+      TZ: Asia/Shanghai
+      PARAMS: --server.port=7110 --vbdsm.ws.url=http://vbdsm-acquis-ws:8080/services/UploadData?wsdl
     volumes:
       # 日志文件
       - /home/iwb/vbdsm/server-logs/hj212-upload-mockdata/:/vbdsm/logs/
+      - /home/iwb/vbdsm/hj212-upload-mockdata/mock/:/vbdsm/mock/
     privileged: true
     networks:
       - vbdsm-net

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-modbus/Dockerfile

@@ -4,12 +4,12 @@ MAINTAINER Vber
 
 ENV PARAMS="--server.port=8080"
 
-RUN mkdir -p /vbdsm/logs
+RUN mkdir -p /vbdsm
 
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ADD ./target/vbdsm-hj212-modbus-*.jar /app.jar
-WORKDIR /vbdsm/logs
+WORKDIR /vbdsm
 
 ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /app.jar $PARAMS"]

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-modbus/src/main/java/cn/vbdsm/hj212/modbus/VbdsmHj212ModbusApplication.java

@@ -24,7 +24,7 @@ public class VbdsmHj212ModbusApplication implements CommandLineRunner {
 
     @Override
     public void run(String... args) throws Exception {
-      uploadDataService.loadTerminals();
+      //uploadDataService.loadTerminals();
 //        tcpSocketServer.run();
 //        Runtime.getRuntime().addShutdownHook(new Thread(){
 //            @Override

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-modbus/src/main/java/cn/vbdsm/hj212/modbus/task/UploadDataTask.java

@@ -17,7 +17,7 @@ public class UploadDataTask {
 
     @Scheduled(cron = "0 0/5 * * * ?")
     public void uploadData() throws Exception {
-        //uploadWsService.loadTerminals();
+        uploadWsService.loadTerminals();
         //System.out.println(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
     }
 }