Merge branch 'zyj' of usky-cloud-paas/data-agbox-java into master

agbox-topsail/pom.xml

@@ -91,6 +91,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.2.6.RELEASE</version>
                 <executions>
                     <execution>
                         <goals>

agbox-topsail/src/main/java/com/usky/topsail/service/impl/SpSj2017ServiceImpl.java

@@ -16,9 +16,17 @@ import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.topsail.service.config.mqtt.MqttOutConfig;
 import com.usky.topsail.service.util.HttpClientUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
+import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -118,10 +126,84 @@ public class SpSj2017ServiceImpl extends AbstractCrudService<SpSj2017Mapper, SpS
                         device_status = "WP1";
                         dbMap3.put("value","1");
                         payloadVO1.put("type","ALARM");
+                        SpSj2017 spSj2017 = new SpSj2017();
+                        spSj2017.setPort("TSM-10P");
+                        spSj2017.setDeviceCode(device_code);
+                        spSj2017.setStatus("17");
+                        spSj2017.setAddress("127.0.0.1");
+                        spSj2017.setNcmd("");
+                        spSj2017.setTime(LocalDateTime.now());
+                        spSj2017.setData1(device_status);
+                        spSj2017.setData2(bat_level.toString());
+                        spSj2017.setData3(CSQ.toString());
+                        spSj2017.setData4(device_value);
+                        spSj2017.setData5("11111111111");
+                        spSj2017.setCllxr("");
+                        spSj2017.setClsj(LocalDateTime.now());
+                        spSj2017.setClr("");
+                        spSj2017.setClnr("");
+                        spSj2017.setClwb("");
+                        spSj2017.setCldh("");
+                        spSj2017.setClzt(0);
+                        spSj2017.setCllx("");
+                        spSj2017.setVideo("");
+                        this.save(spSj2017);
+                        Long insertid1 = spSj2017.getId();
+                        HashMap map = new HashMap();
+                        map.put("IMEI", device_code);
+                        map.put("insert_id", String.valueOf(insertid1));
+                        map.put("phone", "17630065224");
+                        map.put("time", samp_time);
+                        map.put("evt", device_status);
+                        String httpurl = "https://iot.usky.cn/jdxf/wxapp2.php/Home/Waterwarn/message_water";
+                        String httpOrgCreateTestRtn = HttpClientUtil.doPost(httpurl, map, "utf-8");
+
+                        //增加水表数据推送总队逻辑
+                        String data = "SubType=2&DeviceId="+device_code+"&InsertId="+String.valueOf(insertid1)+"&Confirmed="+"false";
+
+                        String response = HttpClientUtil.doPost1("47.98.201.187", 55335, "/report", data, "utf-8");
+                        System.out.println("http://47.98.201.187:55335/report response:"+response);
                     }else if (alarm.equals("262144")){
                         device_status = "WP2";
                         dbMap3.put("value","2");
                         payloadVO1.put("type","ALARM");
+                        SpSj2017 spSj2017 = new SpSj2017();
+                        spSj2017.setPort("TSM-10P");
+                        spSj2017.setDeviceCode(device_code);
+                        spSj2017.setStatus("17");
+                        spSj2017.setAddress("127.0.0.1");
+                        spSj2017.setNcmd("");
+                        spSj2017.setTime(LocalDateTime.now());
+                        spSj2017.setData1(device_status);
+                        spSj2017.setData2(bat_level.toString());
+                        spSj2017.setData3(CSQ.toString());
+                        spSj2017.setData4(device_value);
+                        spSj2017.setData5("11111111111");
+                        spSj2017.setCllxr("");
+                        spSj2017.setClsj(LocalDateTime.now());
+                        spSj2017.setClr("");
+                        spSj2017.setClnr("");
+                        spSj2017.setClwb("");
+                        spSj2017.setCldh("");
+                        spSj2017.setClzt(0);
+                        spSj2017.setCllx("");
+                        spSj2017.setVideo("");
+                        this.save(spSj2017);
+                        Long insertid1 = spSj2017.getId();
+                        HashMap map = new HashMap();
+                        map.put("IMEI", device_code);
+                        map.put("insert_id", String.valueOf(insertid1));
+                        map.put("phone", "17630065224");
+                        map.put("time", samp_time);
+                        map.put("evt", device_status);
+                        String httpurl = "https://iot.usky.cn/jdxf/wxapp2.php/Home/Waterwarn/message_water";
+                        String httpOrgCreateTestRtn = HttpClientUtil.doPost(httpurl, map, "utf-8");
+
+                        //增加水表数据推送总队逻辑
+                        String data = "SubType=2&DeviceId="+device_code+"&InsertId="+String.valueOf(insertid1)+"&Confirmed="+"false";
+
+                        String response = HttpClientUtil.doPost1("47.98.201.187", 55335, "/report", data, "utf-8");
+                        System.out.println("http://47.98.201.187:55335/report response:"+response);
                     }
                     db.add(dbMap3);
                 }else if (dev_type.equals(2)){
@@ -173,6 +255,12 @@ public class SpSj2017ServiceImpl extends AbstractCrudService<SpSj2017Mapper, SpS
                         map.put("evt", device_status);
                         String httpurl = "https://iot.usky.cn/jdxf/wxapp2.php/Home/Waterwarn/message_water";
                         String httpOrgCreateTestRtn = HttpClientUtil.doPost(httpurl, map, "utf-8");
+
+                        //增加水表数据推送总队逻辑
+                        String data = "SubType=5&DeviceId="+device_code+"&InsertId="+String.valueOf(insertid1)+"&Confirmed="+"false";
+
+                        String response = HttpClientUtil.doPost1("47.98.201.187", 55335, "/report", data, "utf-8");
+                        System.out.println("http://47.98.201.187:55335/report response:"+response);
                     }else if (alarm.equals("262144")){
                         payloadVO1.put("type","ALARM");
                         dbMap3.put("value","2");
@@ -208,6 +296,12 @@ public class SpSj2017ServiceImpl extends AbstractCrudService<SpSj2017Mapper, SpS
                         map.put("evt", device_status);
                         String httpurl = "https://iot.usky.cn/jdxf/wxapp2.php/Home/Waterwarn/message_water";
                         String httpOrgCreateTestRtn = HttpClientUtil.doPost(httpurl, map, "utf-8");
+
+                        //增加水表数据推送总队逻辑
+                        String data = "SubType=5&DeviceId="+device_code+"&InsertId="+String.valueOf(insertid1)+"&Confirmed="+"false";
+
+                        String response = HttpClientUtil.doPost1("47.98.201.187", 55335, "/report", data, "utf-8");
+                        System.out.println("http://47.98.201.187:55335/report response:"+response);
                     }
                     db.add(dbMap3);
                 }
@@ -232,4 +326,6 @@ public class SpSj2017ServiceImpl extends AbstractCrudService<SpSj2017Mapper, SpS
         aaService.save(aa);
         return true;
     }
+
+
 }

agbox-topsail/src/main/java/com/usky/topsail/service/util/HttpClientUtil.java

@@ -1,5 +1,6 @@
 package com.usky.topsail.service.util;
 
+import org.apache.http.Consts;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
@@ -10,6 +11,8 @@ import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 import org.springframework.stereotype.Repository;
 
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -48,4 +51,56 @@ public class HttpClientUtil {
         }
         return result;
     }
+
+    public static String doPost1(String destIp, int destPort, String destPath, String data,  String charset) {
+        HttpClient httpClient = null;
+        HttpPost httpPost = null;
+        String result = null;
+        String httpUrl = String.format("http://%s:%d%s", destIp, destPort, destPath);
+        try {
+            httpClient = new SSLClient();
+            httpPost = new HttpPost(httpUrl);
+
+            httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded");
+            httpPost.addHeader("Accept", "*/*");
+            httpPost.addHeader("Connection", "keep-alive");
+            httpPost.addHeader("Cache-Control", "no-cache");
+            httpPost.addHeader("Accept-Encoding", "gzip");
+            httpPost.addHeader("Accept-Language", "zh-CN,en,*");
+            httpPost.addHeader("User-Agent", "Mozilla/5.0");
+            httpPost.addHeader("Host", String.format("%s:%d", destIp, destPort));
+            // 手动设置 Content-Length（和 Qt 的 arg(data.length()) 完全一致）
+            httpPost.addHeader("Content-Length", String.valueOf(data.getBytes(StandardCharsets.UTF_8).length));
+            //设置参数
+            // 3. 解析表单参数（对应 Qt 的 %5 占位符）
+            if (data != null && !data.isEmpty()) {
+                List<BasicNameValuePair> params = new ArrayList<>();
+                String[] keyValuePairs = data.split("&");
+                for (String pair : keyValuePairs) {
+                    String[] keyValue = pair.split("=");
+                    if (keyValue.length == 2) {
+                        // URL 解码（处理中文/特殊字符，和 Qt 编码逻辑一致）
+                        String key = URLDecoder.decode(keyValue[0], charset);
+                        String value = URLDecoder.decode(keyValue[1], charset);
+                        params.add(new BasicNameValuePair(key, value));
+                    }
+                }
+                // 封装表单参数（application/x-www-form-urlencoded 格式）
+                httpPost.setEntity(new UrlEncodedFormEntity(params, Consts.UTF_8));
+            }
+            HttpResponse response = httpClient.execute(httpPost);
+            System.out.println("HttpPost1 +++++++++++++++ " + httpUrl);
+            if (response != null) {
+                HttpEntity resEntity = response.getEntity();
+                if (resEntity != null) {
+                    result = EntityUtils.toString(resEntity, charset);
+                }
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return result;
+    }
+
+
 }