feat: 新增鑫米兰设备同步功能

杨鸣坤
1 parent ef8d2812
Showing 4 changed files with 288 additions and 13 deletions
src/main/java/com/iot/scheduler/service/chizhou/CzDeviceReportService.java
src/main/java/com/iot/scheduler/service/chizhou/XmlDevicePullService.java
src/main/java/com/iot/scheduler/zone/ChiZoneScheduler.java
src/main/resources/application.yml
--- a/src/main/java/com/iot/scheduler/service/chizhou/CzDeviceReportService.java
View file @cca313a
+++ b/src/main/java/com/iot/scheduler/service/chizhou/CzDeviceReportService.java
View file @cca313a
@@ -29,8 +29,8 @@ public class CzDeviceReportService {
     String jdbcUserName = "postgres";
     String jdbcPassword = "postgres";
     String selectSql = "SELECT\n" +
-            "dc.credentials_id AS sn,\n" +
-            "CASE\n" +
+            "  dc.credentials_id AS sn,\n" +
+            "  CASE\n" +
             "    WHEN ak2.long_v IS NULL OR (ak.bool_v = FALSE AND ak2.long_v IS NOT NULL) THEN 'OFF'\n" +
             "    WHEN tkl.long_v = 1 THEN 'ERROR'\n" +
             "    WHEN tkl2.long_v = 1 THEN 'STAND'\n" +
@@ -38,19 +38,21 @@ public class CzDeviceReportService {
             "    ELSE 'OFF'\n" +
             "  END AS status,\n" +
             "  de.organization_id\n" +
-            "  FROM device de \n" +
-            "LEFT JOIN ts_kv_latest tkl on de.id = tkl.entity_id AND tkl.key = '64'\n" +
-            "LEFT JOIN ts_kv_latest tkl2 on de.id = tkl2.entity_id AND tkl2.key = '535'\n" +
-            "LEFT JOIN ts_kv_latest tkl3 on de.id = tkl3.entity_id AND tkl3.key = '534'\n" +
+            "FROM device de \n" +
+            "LEFT JOIN ts_kv_latest tkl ON de.id = tkl.entity_id AND tkl.key = '64'\n" +
+            "LEFT JOIN ts_kv_latest tkl2 ON de.id = tkl2.entity_id AND tkl2.key = '535'\n" +
+            "LEFT JOIN ts_kv_latest tkl3 ON de.id = tkl3.entity_id AND tkl3.key = '534'\n" +
             "LEFT JOIN attribute_kv ak ON de.id = ak.entity_id AND ak.entity_type = 'DEVICE' AND ak.attribute_key = 'active'\n" +
             "LEFT JOIN attribute_kv ak2 ON de.id = ak2.entity_id AND ak2.entity_type = 'DEVICE' AND ak2.attribute_key = 'lastActivityTime'\n" +
             "LEFT JOIN device_credentials dc ON de.id = dc.device_id\n" +
-            "WHERE (de.organization_id = '63934b6f-1e02-4d29-ac14-1a64649e2231' or de.organization_id = '35bcdb94-31ec-4750-9ee9-cc855aa66e17')\n" +
-            "AND (de.device_profile_id = 'b2071bd0-df0b-11f0-9cb8-e3376d1e7978' or de.device_profile_id = 'b058dfb0-3246-11f1-9cb8-e3376d1e7978')\n" +
-            "union ALL\n" +
+            "WHERE (de.organization_id = '63934b6f-1e02-4d29-ac14-1a64649e2231' OR de.organization_id = '35bcdb94-31ec-4750-9ee9-cc855aa66e17')\n" +
+            "AND (de.device_profile_id = 'b2071bd0-df0b-11f0-9cb8-e3376d1e7978' OR de.device_profile_id = 'b058dfb0-3246-11f1-9cb8-e3376d1e7978')\n" +
+            "\n" +
+            "UNION ALL\n" +
+            "\n" +
             "SELECT \n" +
-            "dc.credentials_id AS sn,\n" +
-            "CASE\n" +
+            "  dc.credentials_id AS sn,\n" +
+            "  CASE\n" +
             "    WHEN ak2.long_v IS NULL OR (ak.bool_v = FALSE AND ak2.long_v IS NOT NULL) THEN 'OFF'\n" +
             "    ELSE 'RUN'\n" +
             "  END AS status,\n" +
@@ -59,8 +61,20 @@ public class CzDeviceReportService {
             "LEFT JOIN attribute_kv ak ON de.id = ak.entity_id AND ak.entity_type = 'DEVICE' AND ak.attribute_key = 'active'\n" +
             "LEFT JOIN attribute_kv ak2 ON de.id = ak2.entity_id AND ak2.entity_type = 'DEVICE' AND ak2.attribute_key = 'lastActivityTime'\n" +
             "LEFT JOIN device_credentials dc ON de.id = dc.device_id\n" +
-            "WHERE (de.organization_id = '63934b6f-1e02-4d29-ac14-1a64649e2231' or de.organization_id = '35bcdb94-31ec-4750-9ee9-cc855aa66e17')\n" +
-            "AND (de.device_profile_id = 'fdf70e30-0272-11f1-9cb8-e3376d1e7978' OR de.device_profile_id = '6c1f9650-0298-11f1-9cb8-e3376d1e7978')\n";
+            "WHERE (de.organization_id = '63934b6f-1e02-4d29-ac14-1a64649e2231' OR de.organization_id = '35bcdb94-31ec-4750-9ee9-cc855aa66e17')\n" +
+            "AND (de.device_profile_id = 'fdf70e30-0272-11f1-9cb8-e3376d1e7978' OR de.device_profile_id = '6c1f9650-0298-11f1-9cb8-e3376d1e7978')\n" +
+            "UNION ALL\n" +
+            "SELECT\n" +
+            "  dc.credentials_id AS sn,\n" +
+            "  tkl.str_v AS status,\n" +
+            "  de.organization_id\n" +
+            "FROM\n" +
+            "  device de\n" +
+            "  LEFT JOIN ts_kv_latest tkl ON de.id = tkl.entity_id AND tkl.\"key\" = 61\n" +
+            "  LEFT JOIN device_credentials dc ON dc.device_id = de.id\n" +
+            "WHERE\n" +
+            "  de.device_profile_id = '39b1d900-5264-11f1-9cb8-e3376d1e7978' \n" +
+            "  AND (de.organization_id = '3f2cefad-1b04-4839-a591-8eb9df591f47' OR de.organization_id = 'eef879b9-45cd-41ec-a069-47ae6c511ca5')";
     public void deviceReport() {
 //        List<String> deviceIdList = Arrays.asList("TCKJ-001", "TCKJ-002", "TCKJ-003", "TCKJ-004", "TCKJ-005", "TCKJ-006",
@@ -96,7 +110,9 @@ public class CzDeviceReportService {
         Map<String, String> organizeIdAndClientIdMap = new HashMap<>(3);
         organizeIdAndClientIdMap.put("63934b6f-1e02-4d29-ac14-1a64649e2231", "2020672119054331904"); // 安徽鑫米兰电子科技有限公司
+        organizeIdAndClientIdMap.put("3f2cefad-1b04-4839-a591-8eb9df591f47", "2020672119054331904"); // 安徽鑫米兰电子科技有限公司
         organizeIdAndClientIdMap.put("35bcdb94-31ec-4750-9ee9-cc855aa66e17", "2020672015207559169"); // 安徽同池科技有限公司
+        organizeIdAndClientIdMap.put("eef879b9-45cd-41ec-a069-47ae6c511ca5", "2020672015207559169"); // 安徽同池科技有限公司
         organizeIdAndClientIdMap.put("365c477a-3e7b-4c4d-b80d-3c05379d5fda", "2020672228886376448"); // 凯盛信息显示材料（池州）有限公司
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
--- a/src/main/java/com/iot/scheduler/service/chizhou/XmlDevicePullService.java 0 → 100644
View file @cca313a
+++ b/src/main/java/com/iot/scheduler/service/chizhou/XmlDevicePullService.java 0 → 100644
View file @cca313a
+package com.iot.scheduler.service.chizhou;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.iot.scheduler.model.DeviceToken;
+import com.iot.scheduler.model.QxDeviceInfo;
+import com.iot.scheduler.model.QxDeviceInfoDetail;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.Consts;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicHeader;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+
+/**
+ * 鑫米兰设备同步
+ */
+@Slf4j
+@Service
+public class XmlDevicePullService {
+
+    @Value("${xml.iot.organizeId:}")
+    private String iotOrganizeId;
+    @Value("${xml.iot.profileId}")
+    private String iotProfileId;
+    @Value("${xml.iot.deviceProfileId}")
+    private String iotDeviceProfileId;
+    @Value("${xml.iot.userName:}")
+    private String iotUserName;
+    @Value("${xml.iot.password:}")
+    private String iotPassword;
+    @Value("${xml.iot.tokenUrl}")
+    private String iotTokenUrl;
+    @Value("${xml.iot.infoUrl}")
+    private String iotDeviceInfoUrl;
+    @Value("${xml.iot.detailUrl}")
+    private String iotDeviceDetailUrl;
+
+    public void pullCreateDeviceInfo() {
+        List<String> deviceNameList = Arrays.asList(
+                "空压机1",
+                "空压机2", "空压机3", "空压机4",
+                "热水系统1",
+                "地磅1",
+                "充电桩1",
+                "污水在线监测系统1",
+                "压泥机1",
+                "磅房系统1",
+                "消防控制系统1",
+                "监控系统1",
+                "收放板机1", "收放板机2", "收放板机3", "收放板机4", "收放板机5", "收放板机6", "收放板机7", "收放板机8", "收放板机9", "收放板机10", "收放板机11", "收放板机12", "收放板机13", "收放板机14", "收放板机15", "收放板机16", "收放板机17", "收放板机18",
+                "提铜线1",
+                "纯水机1",
+                "环境抽风系统1", "环境抽风系统2", "环境抽风系统3", "环境抽风系统4", "环境抽风系统5", "环境抽风系统6", "环境抽风系统7",
+                "成品清洗线1",
+                "冰水机1", "冰水机2", "冰水机3",
+                "提锡线1",
+                "沉铜自动药水添加1",
+                "披峰机1",
+                "脱水机1",
+                "喷锡前处理线1",
+                "喷锡后处理线1",
+                "喷锡机1",
+                "智能电表1",
+                "气体报警仪1", "气体报警仪2", "气体报警仪3",
+                "阻焊LDI1",
+                "移载机1",
+                "烘箱1", "烘箱2", "烘箱3", "烘箱4", "烘箱5", "烘箱6", "烘箱7",
+                "薄膜压缩机1",
+                "手动压膜机1",
+                "中央空调主机1",
+                "丝印机1", "丝印机2", "丝印机3", "丝印机4", "丝印机5", "丝印机6", "丝印机7",
+                "光绘机1", "光绘机2",
+                "覆膜机1",
+                "打孔机1",
+                "压板翘机1",
+                "打包机1",
+                "真空包装机1",
+                "补线机1",
+                "数控钻机1",
+                "数控锣机1",
+                "销钉机1",
+                "除尘器1", "除尘器2",
+                "烘箱8", "烘箱9", "烘箱10", "烘箱11", "烘箱12",
+                "丝印机8", "丝印机9", "丝印机10", "丝印机11",
+                "收放板机19", "收放板机20", "收放板机21", "收放板机22", "收放板机23",
+                "环境抽风系统8", "环境抽风系统9", "环境抽风系统10",
+                "空压机5", "空压机6",
+                "冰水机4",
+                "气体报警仪4",
+                "光绘机3",
+                "打包机2",
+                "真空包装机2",
+                "补线机2",
+                "数控钻机2",
+                "数控锣机2",
+                "销钉机2",
+                "除尘器3",
+                "纯水机2",
+                "成品清洗线2",
+                "空压机8", "空压机9", "空压机10",
+                "冰水机7", "冰水机8",
+                "烘箱16", "烘箱17", "烘箱18", "烘箱19", "烘箱20",
+                "丝印机15", "丝印机16", "丝印机17", "丝印机18",
+                "收放板机27", "收放板机28", "收放板机29", "收放板机30",
+                "气体报警仪7", "气体报警仪8", "气体报警仪9",
+                "除尘器6", "除尘器7",
+                "数控钻机4", "数控钻机5",
+                "数控锣机4", "数控锣机5"
+        );
+
+        List<QxDeviceInfo> qxDeviceInfos = new ArrayList<>();
+        List<QxDeviceInfoDetail> qxAddDeviceInfoDetails = new ArrayList<>();
+        Random random = new Random();
+        for (int index = 0; index < deviceNameList.size(); index++) {
+            QxDeviceInfo qxDeviceInfo = new QxDeviceInfo();
+            qxDeviceInfo.setDeviceType("DIRECT_CONNECTION");
+            qxDeviceInfo.setTransportType("DEFAULT");
+            qxDeviceInfo.setOrganizationId(iotOrganizeId);
+            qxDeviceInfo.setDeviceProfileId(iotDeviceProfileId);
+            qxDeviceInfo.setProfileId(iotProfileId);
+            qxDeviceInfo.setLabel("生产设备");
+            String deviceName = deviceNameList.get(index);
+            qxDeviceInfo.setName(deviceName);
+            qxDeviceInfo.setBrand(deviceName);
+            String dtuSn = "AXM26518123" + String.format("%03d", index);
+            qxDeviceInfo.setSn(dtuSn);
+            DeviceToken deviceToken = new DeviceToken();
+            deviceToken.setCredentialsType("ACCESS_TOKEN");
+            deviceToken.setCredentialsId(dtuSn);
+            deviceToken.setCredentialsValue(dtuSn);
+            qxDeviceInfo.setDeviceToken(deviceToken);
+            qxDeviceInfos.add(qxDeviceInfo);
+            //有序列号直接获取灯信息
+            QxDeviceInfoDetail qxDeviceInfoDetail = new QxDeviceInfoDetail();
+            qxDeviceInfoDetail.setAlarm(false);
+            //灯状态(0:灭灯，1：红，2：黄，3：绿，4：蓝)
+//            Integer lampState = isWithinRange ? 3 : 0;
+            double r = random.nextDouble();
+            if (r < 0.05) {
+                qxDeviceInfoDetail.setStatus("OFF");     // 5% 状态0
+            } else if (r < 0.10) {
+                qxDeviceInfoDetail.setStatus("STAND");     // 5% 状态2（跳过状态1）
+            } else {
+                qxDeviceInfoDetail.setStatus("RUN");  // 90% 状态3
+            }
+//            switch (lampState) {
+//                case 0:
+//                    qxDeviceInfoDetail.setStatus("OFF");
+//                    break;
+////                case 1:
+////                    qxDeviceInfoDetail.setStatus("ERROR");
+////                    qxDeviceInfoDetail.setAlarm(true);
+//                    break;
+//                case 2:
+//                    qxDeviceInfoDetail.setStatus("STAND");
+//                    break;
+//                case 3:
+//                    qxDeviceInfoDetail.setStatus("RUN");
+//                    break;
+//                default:
+//                    continue;
+//            }
+
+            qxDeviceInfoDetail.setStartTime(new Date());
+            qxDeviceInfoDetail.setDtuSn(dtuSn);
+            qxAddDeviceInfoDetails.add(qxDeviceInfoDetail);
+        }
+
+        //将数据同步到IOT平台
+        Map<String, String> qxParam = new HashMap<>(2);
+        qxParam.put("username", iotUserName);
+        qxParam.put("password", iotPassword);
+
+        HttpPost qxHttpPost = new HttpPost(iotTokenUrl);
+        String qxResult = sendPost(qxHttpPost, JSON.toJSONString(qxParam));
+        if (StringUtils.isBlank(qxResult)) {
+            return;
+        }
+        Map<String, Object> qxRes = JSON.parseObject(qxResult, new TypeReference<Map<String, Object>>() {
+        });
+
+        String qxAccessToken = (String) qxRes.get("token");
+        if (StringUtils.isBlank(qxAccessToken)) {
+            return;
+        }
+
+        BasicHeader qxAuthorization = new BasicHeader("X-Authorization", "Bearer " + qxAccessToken);
+        if (!CollectionUtils.isEmpty(qxDeviceInfos)) {
+            HttpPost qxDeviceInfoPost = new HttpPost(iotDeviceInfoUrl);
+            qxDeviceInfoPost.addHeader(qxAuthorization);
+            for (QxDeviceInfo qxDeviceInfo : qxDeviceInfos) {
+                // todo
+                String syncDeviceInfo = sendPost(qxDeviceInfoPost, JSON.toJSONString(qxDeviceInfo));
+                //log.info("同步设备信息 syncDeviceInfo:{}", syncDeviceInfo);
+            }
+        }
+
+        if (!CollectionUtils.isEmpty(qxAddDeviceInfoDetails)) {
+            for (QxDeviceInfoDetail qxDeviceInfoDetail : qxAddDeviceInfoDetails) {
+                String qxDeviceInfoDetailUrlStr = iotDeviceDetailUrl + qxDeviceInfoDetail.getDtuSn() + "/telemetry";
+                HttpPost qxDeviceInfoDetailPost = new HttpPost(qxDeviceInfoDetailUrlStr);
+                qxDeviceInfoDetailPost.addHeader(qxAuthorization);
+                String syncDeviceInfoDetail = sendPost(qxDeviceInfoDetailPost, JSON.toJSONString(qxDeviceInfoDetail));
+            }
+        }
+    }
+
+    private String sendPost(HttpPost httpPost, String jsonData) {
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        StringEntity entity = new StringEntity(jsonData, ContentType.create("application/json", Consts.UTF_8));
+        httpPost.setEntity(entity);
+        String result = null;
+        try {
+            CloseableHttpResponse execute = httpClient.execute(httpPost);
+            HttpEntity res = execute.getEntity();
+            InputStream is = res.getContent();
+            int len;
+            byte[] buf = new byte[128];
+            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+            while ((len = is.read(buf)) != -1) {
+                byteArrayOutputStream.write(buf, 0, len);
+            }
+            result = byteArrayOutputStream.toString();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+}
--- a/src/main/java/com/iot/scheduler/zone/ChiZoneScheduler.java
View file @cca313a
+++ b/src/main/java/com/iot/scheduler/zone/ChiZoneScheduler.java
View file @cca313a
@@ -2,6 +2,7 @@ package com.iot.scheduler.zone;
 import com.iot.scheduler.service.chizhou.CzDeviceReportService;
 import com.iot.scheduler.service.chizhou.TongChiDevicePullService;
+import com.iot.scheduler.service.chizhou.XmlDevicePullService;
 import com.iot.scheduler.task.AbstractZoneScheduler;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -19,6 +20,8 @@ public class ChiZoneScheduler extends AbstractZoneScheduler {
     private CzDeviceReportService czDeviceReportService;
     @Resource
     private TongChiDevicePullService tongChiDevicePullService;
+    @Resource
+    private XmlDevicePullService xmlDevicePullService;
     @Override
     protected String getZoneName() {
@@ -33,6 +36,7 @@ public class ChiZoneScheduler extends AbstractZoneScheduler {
             // TODO: Implement actual logic
             log.info("[{}] Simulating pulling devices...", getZoneName());
             tongChiDevicePullService.pullCreateDeviceInfo();
+            xmlDevicePullService.pullCreateDeviceInfo();
             Thread.sleep(1000);
         } catch (Exception e) {
             logError(taskName, e);
--- a/src/main/resources/application.yml
View file @cca313a
+++ b/src/main/resources/application.yml
View file @cca313a
@@ -346,6 +346,17 @@ tc:
     infoUrl: "https://iot.hzzlyun.com/api/yt/device"
     detailUrl: "https://iot.hzzlyun.com/api/v1/"
+xml:
+  iot:
+    organizeId: "3f2cefad-1b04-4839-a591-8eb9df591f47"
+    profileId: "39b1d900-5264-11f1-9cb8-e3376d1e7978"
+    deviceProfileId: "39b1d900-5264-11f1-9cb8-e3376d1e7978"
+    userName: "xml"
+    password: "Xml@123.com"
+    tokenUrl: "https://iot.hzzlyun.com/api/auth/login"
+    infoUrl: "https://iot.hzzlyun.com/api/yt/device"
+    detailUrl: "https://iot.hzzlyun.com/api/v1/"
+
 xp:
   third:
     domain: "http://220.180.204.38:1803/report-property"