test

VB_DSM_V2.1/Scripts/Cmds/7085_gov.run.xml

@@ -1,5 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="7085_gov" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <module name="vbdsm-gov-new" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="cn.vbdsm.VbdsmGovNewApplication" />
     <method v="2">

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

@@ -218,13 +218,29 @@ services:
     networks:
       - vbdsm-net
 
-  vber-server-acquis-ws:
+  vber-server-acquis-ws1:
     build: ../../vbdsm-data-upload/vbdsm-acquis-ws
-    image: vbdsm-acquis-ws:2.1.0
-    container_name: vbdsm-acquis-ws
+    image: vbdsm-acquis-ws:13306
+    container_name: vbdsm-acquis-ws-13306
     restart: always
     ports:
-      - "7100:8080"
+      - "7101:8080"
+    environment:
+      - TZ
+      - SERVER_PORT
+    volumes:
+      # 日志文件
+      - /home/iwb/vbdsm/server-logs/acquis-ws/:/vbdsm/logs/
+    privileged: true
+    networks:
+      - vbdsm-net
+  vber-server-acquis-ws2:
+    build: ../../vbdsm-data-upload/vbdsm-acquis-ws
+    image: vbdsm-acquis-ws:23306
+    container_name: vbdsm-acquis-ws-23306
+    restart: always
+    ports:
+      - "7102:8080"
     environment:
       - TZ
       - SERVER_PORT
@@ -281,7 +297,7 @@ services:
       - "18888:7110"
     environment:
       TZ: Asia/Shanghai
-      PARAMS: --server.port=7110 --vbdsm.ws.url=http://vbdsm-acquis-ws:8080/services/UploadData?wsdl
+      PARAMS: --server.port=7110 --vbdsm.ws.url=http://192.168.0.81:7101/services/UploadData?wsdl;http://192.168.0.81:7102/services/UploadData?wsdl --vbdsm.monitor.terminals=3@YC0001,YC0002&7@YD001_01,YD001_02&9@YD002_01,YD002_02&10@YD003_01
     volumes:
       # 日志文件
       - /home/iwb/vbdsm/server-logs/hj212-upload-mockdata/:/vbdsm/logs/

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-acquis-ws/src/main/java/cn/vbdsm/acquis/http/mvc/action/UploadDataAction.java

@@ -46,8 +46,6 @@ public class UploadDataAction extends BaseAction{
 
 	@RequestMapping("baksql.json")
 	public ModelAndView bakSql(HttpServletRequest request,HttpServletResponse response){
-
-		timer.rebuildTable("t_test_01");
 		return super.callBackForJsonp(request, response,"");
 	}
 }

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-acquis-ws/src/main/resources/local/db.properties

@@ -1,20 +1,20 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 #curr database mysql config
 mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
+mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 mysql.jdbc.username=root
 mysql.jdbc.password=123456
 #business database config
 db2023.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2023.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
+db2023.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2023.mysql.jdbc.username=root
 db2023.mysql.jdbc.password=123456
 db2024.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_2024?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
+db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2024?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2024.mysql.jdbc.username=root
 db2024.mysql.jdbc.password=123456
 #alibaba druid config

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-iot/pom.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>cn.vbdsm</groupId>
+    <artifactId>vbdsm-hj212-iot</artifactId>
+    <version>2.1.0</version>
+    <name>vbdsm-hj212-iot</name>
+
+    <properties>
+        <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <spring-boot.version>2.6.13</spring-boot.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.mybatis-flex</groupId>
+            <artifactId>mybatis-flex-spring-boot-starter</artifactId>
+            <version>1.6.7</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>1.2.16</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.20</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+<!--    <dependencyManagement>-->
+<!--        <dependencies>-->
+<!--            <dependency>-->
+<!--                <groupId>org.springframework.boot</groupId>-->
+<!--                <artifactId>spring-boot-dependencies</artifactId>-->
+<!--                <version>${spring-boot.version}</version>-->
+<!--                <type>pom</type>-->
+<!--                <scope>import</scope>-->
+<!--            </dependency>-->
+<!--        </dependencies>-->
+<!--    </dependencyManagement>-->
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>2.6.13</version>
+        <relativePath/>
+    </parent>
+
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+<!--                <version>${spring-boot.version}</version>-->
+                <configuration>
+                    <mainClass>cn.vbdsm.iot.VbdsmIotApplication</mainClass>
+                    <fork>true</fork>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>repackage</id>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-iot/src/main/java/cn/vbdsm/iot/VbdsmIotApplication.java

@@ -0,0 +1,13 @@
+package cn.vbdsm.iot;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class VbdsmIotApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(VbdsmIotApplication.class, args);
+    }
+
+}

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-iot/src/main/java/cn/vbdsm/iot/common/Constant.java

@@ -0,0 +1,10 @@
+package cn.vbdsm.iot.common;
+
+public class Constant {
+
+
+    public static final Integer USER_STATUS_ACTIVE = 0;
+    public static final Integer USER_STATUS_FORBID = 1;
+
+
+}

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-iot/src/main/java/cn/vbdsm/iot/entity/User.java

@@ -0,0 +1,16 @@
+package cn.vbdsm.iot.entity;
+
+import lombok.Data;
+
+@Data
+public class User {
+
+    private Long id;
+
+    private String username;
+
+    private String password;
+
+    private Integer status;
+
+}

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-iot/src/main/java/cn/vbdsm/iot/model/ClientLoginDto.java

@@ -0,0 +1,16 @@
+package cn.vbdsm.iot.model;
+
+
+import lombok.Data;
+
+@Data
+public class ClientLoginDto {
+
+    private String username;
+
+    private String password;
+
+    private String clientId;
+
+
+}

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-iot/src/main/java/cn/vbdsm/iot/web/MqttController.java

@@ -0,0 +1,32 @@
+package cn.vbdsm.iot.web;
+
+import cn.vbdsm.iot.model.ClientLoginDto;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.PostConstruct;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/mqtt")
+public class MqttController {
+
+
+//    @PostConstruct
+//    public void init(){
+//
+//    }
+
+    @PostMapping("/login")
+    public ResponseEntity authentication(@RequestBody ClientLoginDto client){
+        System.out.println("clientId:"+client.getClientId());
+        System.out.println("username:"+client.getUsername());
+        System.out.println("password:"+client.getPassword());
+
+        return ResponseEntity.badRequest().build();
+    }
+}

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-iot/src/main/resources/application-dev.yml

@@ -0,0 +1,12 @@
+#mybatis:
+#    mapper-locations: classpath:mappers/*xml
+#    type-aliases-package: cn.vbdsm.vbdsmhj212iot.mybatis.entity
+server:
+  port: 5080
+# DataSource Config
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    url: jdbc:mysql://47.112.30.247:43308/iot_com?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    username: root
+    password: 123456

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-iot/src/main/resources/application.yml

@@ -0,0 +1,3 @@
+spring:
+    profiles:
+        active: dev

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-iot/src/main/resources/static/index.html

@@ -0,0 +1,6 @@
+<html>
+<body>
+<h1>hello word!!!</h1>
+<p>this is a html page</p>
+</body>
+</html>

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-iot/src/test/java/cn/vbdsm/iot/VbdsmHj212IotApplicationTests.java

@@ -0,0 +1,13 @@
+package cn.vbdsm.iot;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class VbdsmHj212IotApplicationTests {
+
+    @Test
+    void contextLoads() {
+    }
+
+}

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

@@ -0,0 +1,39 @@
+package cn.vbdsm.hj212.modbus.controller;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.PostConstruct;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/mqtt")
+public class MqttAuthController {
+
+    private Map<String,String> users = null;
+
+    @PostConstruct
+    public void init(){
+       users = new HashMap<>();
+       users.put("admin","123456");
+       users.put("user","123456");
+       users.put("guest","123456");
+       users.put("test","123456");
+       users.put("test2","123456");
+    }
+
+    @PostMapping("/login")
+    public ResponseEntity authentication(String username,String password,String clientId){
+        System.out.println("clientId:"+clientId);
+        System.out.println("username:"+username);
+        System.out.println("password:"+password);
+        if(users.containsKey(username) && users.get(username).equals(password)){
+            return ResponseEntity.ok(clientId);
+        }
+        return ResponseEntity.badRequest().build();
+    }
+}

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

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

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

@@ -105,10 +105,10 @@ public class MockUploadWsService {
 
 
 
-    public void uploadData( TerminalData td,RandomPower power) throws Exception {
+    public void uploadData(TerminalData td,RandomPower power) throws Exception {
         String nowStr = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
         long now = Long.parseLong(nowStr);
-        now = now - now % 500;
+        now = now - (now - (now / 10000) * 10000) % 1500;
         sendData("01",td,now,power);
         sendData("02",td,now,power);
         sendData("03",td,now,power);
@@ -151,8 +151,11 @@ public class MockUploadWsService {
         String content = null;
         try {
             content = AESUtil.Encrypt(data, wsProperties.getKey());
-            String result = WsClientUtil.callWebSV(wsProperties.getUrl(), wsProperties.getMethod(), content);
-            log.info("企业编号：{},设备号信息：{},上传结果：{}",td.getCompanyId(),terminalId,result);
+            String[] urls = wsProperties.getUrl().split(";");
+            for (String url : urls) {
+                String result = WsClientUtil.callWebSV(url, wsProperties.getMethod(), content);
+                log.info("地址：{},企业编号：{},设备号信息：{},上传结果：{}",url,td.getCompanyId(),terminalId,result);
+            }
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-modbus/src/main/resources/application.yml

@@ -9,10 +9,10 @@ vbdsm:
             bossThreadNum: 1 #netty boss线程数 默认为1
             workThreadNum: 4 #netty work线程数，默认为4
     ws:
-        url: http://192.168.0.104:7100/services/UploadData?wsdl
+        url: http://192.168.0.104:7100/services/UploadData?wsdl;http://192.168.0.104:7100/services/UploadData?wsdl
         method: UploadAllData
         key: WOSHI123456MIYAO
     monitor:
-        terminals: 3@YC0001,YC0002
+        terminals: 3@YC0001,YC0002&7@YD001_01,YD001_02&9@YD002_01,YD002_02&10@YD003_01