添加设备版本查询接口文档

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java

@@ -675,17 +675,9 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
         }
 
         //判断当前站点与修改的站点不一致时候 更新设备站点关联信息
-        DeviceEntity temp = this.get(entity.getId(), null);
-        if (!entity.getSiteId().equals(temp.getSiteId())) {
-            Rest<SitePdu> info = siteFeign.info(entity.getSiteId());
-            if (info.getCode() == YesNoEnum.YES.getValue()) {
-                entity.setLeadingOfficial(info.getData().getLeadingOfficial());
-                entity.setLeadingOfficialTelephone(info.getData().getLeadingOfficialTelephone());
-                entity.setSiteCode(info.getData().getSiteCode());
-                entity.setSiteName(info.getData().getSiteName());
-            }
-        } else {
-            if (ObjectUtils.isEmpty(entity.getSiteCode()) || ObjectUtils.isEmpty(entity.getSiteName())) {
+        if (!ObjectUtils.isEmpty(entity.getId())) {
+            DeviceEntity temp = this.get(entity.getId(), null);
+            if (!entity.getSiteId().equals(temp.getSiteId())) {
                 Rest<SitePdu> info = siteFeign.info(entity.getSiteId());
                 if (info.getCode() == YesNoEnum.YES.getValue()) {
                     entity.setLeadingOfficial(info.getData().getLeadingOfficial());
@@ -693,6 +685,16 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
                     entity.setSiteCode(info.getData().getSiteCode());
                     entity.setSiteName(info.getData().getSiteName());
                 }
+            } else {
+                if (ObjectUtils.isEmpty(entity.getSiteCode()) || ObjectUtils.isEmpty(entity.getSiteName())) {
+                    Rest<SitePdu> info = siteFeign.info(entity.getSiteId());
+                    if (info.getCode() == YesNoEnum.YES.getValue()) {
+                        entity.setLeadingOfficial(info.getData().getLeadingOfficial());
+                        entity.setLeadingOfficialTelephone(info.getData().getLeadingOfficialTelephone());
+                        entity.setSiteCode(info.getData().getSiteCode());
+                        entity.setSiteName(info.getData().getSiteName());
+                    }
+                }
             }
         }
     }

device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http

@@ -17,7 +17,6 @@ Content-Type: application/json
 {
   "id": 60,
   "enabled": 0
-
 }
 
 ###设备更新与保存
@@ -106,21 +105,21 @@ POST {{baseUrl}}/api/deviceUpdate
 Content-Type: application/json
 
 {
-  "deviceName":"测试设备2",
-  "deviceCode":"a109",
-  "siteId":2,
-  "siteCode":"513400000000-0001",
-  "siteName":"凉山州行政审批局",
-  "productId":1,
-  "deviceFirmId":1,
-  "lon":"33",
-  "lati":"44",
-  "deviceInBuilding":13,
-  "deviceInFloor":22,
-  "defectsLiabilityPeriod":"2022-06-30 15:00:01",
-  "leadingOfficial":"张三",
-  "leadingOfficialTelephone":"13281114856",
-  "source":1
+  "deviceName": "测试设备2",
+  "deviceCode": "a109",
+  "siteId": 2,
+  "siteCode": "513400000000-0001",
+  "siteName": "凉山州行政审批局",
+  "productId": 1,
+  "deviceFirmId": 1,
+  "lon": "33",
+  "lati": "44",
+  "deviceInBuilding": 13,
+  "deviceInFloor": 22,
+  "defectsLiabilityPeriod": "2022-06-30 15:00:01",
+  "leadingOfficial": "张三",
+  "leadingOfficialTelephone": "13281114856",
+  "source": 1
 }
 
 ###设备新增
@@ -129,15 +128,17 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
+  "deviceCode": "1",
+  "deviceMac": "1",
+  "deviceName": "1",
+  "deviceRemark": "",
+  "ip": "",
+  "port": "",
+  "productCode": "ledtp",
   "receiveMethod": 1,
-  "deviceName": "测试接口创建设备3",
-  "deviceCode": "a1234567899",
-  "siteId": 123,
-  "siteCode": "adfasfdasfdasf",
-  "siteName": "测试站点",
-  "platformCode": "phxt",
-  "productCode": "pdj",
-  "deviceRemark": "车是是是打发斯蒂芬"
+  "siteCode": "513426000000-0001",
+  "siteId": 3,
+  "siteName": "会东县行政审批局"
 }
 
 
@@ -168,16 +169,16 @@ Content-Type: application/json
 
 [
   {
-    "data":"{xxxx}",
-    "deviceCode":"a102",
-    "messageType":"aaaa",
-    "timestamp":1654656951795
+    "data": "{xxxx}",
+    "deviceCode": "a102",
+    "messageType": "aaaa",
+    "timestamp": 1654656951795
   },
   {
-    "data":"{bbbbbb}",
-    "deviceCode":"a102",
-    "messageType":"bbbb",
-    "timestamp":1654656951795
+    "data": "{bbbbbb}",
+    "deviceCode": "a102",
+    "messageType": "bbbb",
+    "timestamp": 1654656951795
   }
 ]
 

doc/api.md

@@ -656,6 +656,7 @@ key|String|消息唯一标识|是|-
             "messageType":"UPGREAD",
             "deviceCode":"A1:A2:A3:A4:A5:A6",
             "sign":"abcd1234",
+            "downloadUrl":"http://xxxxx",
             "timestamp":"2022-04-15 09:48:05"
         }
     },
@@ -677,6 +678,9 @@ key|String|消息唯一标识|是|-
 1006|当前设备所属产品平台未配置，请在后台配置后再激活|-
 1007|站点ID为空|-
 1008|设备已创建，请完善设备配置信息|-
+1009|当前设备不存在|-
+1010|token认证失败|-
+1011|未找到设备版本信息|-
 -1|系统内部异常|-