topic列表接口返回数据调整

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceInfoServiceImpl.java

@@ -154,68 +154,59 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
         pageNum = (pageNum != null) ? pageNum : 1;
         pageSize = (pageSize != null) ? pageSize : 10;
 
-        if (StringUtils.isBlank(productCode)) {
-            throw new BusinessException("产品编码“productCode”不能为空！");
-        } else if (StringUtils.isBlank(deviceId)) {
-            throw new BusinessException("设备编号“deviceId”不能为空！");
-        } else if (StringUtils.isBlank(deviceUuid)) {
-            throw new BusinessException("设备唯一标识“deviceUuid”不能为空！");
-        } else if (StringUtils.isBlank(deviceName)) {
-            throw new BusinessException("设备名“deviceName“不能为空！");
-        } else if (StringUtils.isBlank(simCode)) {
-            throw new BusinessException("sim卡号“simCode“不能为空！");
-        } else if (StringUtils.isBlank(installAddress)) {
-            throw new BusinessException("安装位置”installAddress“不能为空！");
-        } else if (productId == null) {
-            throw new BusinessException("产品ID“productId“不能为空！");
-        }
-
         List<DmpTopicResponseVO> responseVOList = new ArrayList<>();
         String topicType = requestVO.getTopicType();
 
         if (topicType == null) {
+
+            if (StringUtils.isBlank(productCode)) {
+                throw new BusinessException("产品编码“productCode”不能为空！");
+            } else if (StringUtils.isBlank(deviceId)) {
+                throw new BusinessException("设备编号“deviceId”不能为空！");
+            }
+/*            else if (StringUtils.isBlank(deviceUuid)) {
+                throw new BusinessException("设备uuid“deviceUuid“不能为空！");
+            }*/
+
             DmpTopicResponseVO add = new DmpTopicResponseVO();
             add.setTopic("/" + productCode + "/" + deviceId + "/" + TopicInfo.ADD_REMARKS.getLetter());
             add.setPublisher(TopicInfo.GATEWAY_DEVICE.getValue());
             add.setSubscriber(TopicInfo.IOT_PLATFORM.getValue());
             add.setRemarks(TopicInfo.ADD_REMARKS.getValue());
+            responseVOList.add(add);
 
-            // 组装topicPayload
-            JSONObject topicPayloadJson = new JSONObject();
-            topicPayloadJson.put("productCode", productCode);
-            topicPayloadJson.put("deviceId", deviceId);
-            topicPayloadJson.put("deviceName", deviceName);
-            topicPayloadJson.put("simCode", simCode);
-            topicPayloadJson.put("installAddress", installAddress);
-            String topicPayload = topicPayloadJson.toString();
-            add.setTopicPayload(topicPayload);
-
-            // 组装topicPayload
             DmpTopicResponseVO info = new DmpTopicResponseVO();
             info.setTopic("/" + productCode + "/" + deviceId + "/" + TopicInfo.INFO_REMARKS.getLetter());
             info.setPublisher(TopicInfo.GATEWAY_DEVICE.getValue());
             info.setSubscriber(TopicInfo.IOT_PLATFORM.getValue());
             info.setRemarks(TopicInfo.INFO_REMARKS.getValue());
+            responseVOList.add(info);
 
-            JSONObject infoPayloadJson = new JSONObject();
-            infoPayloadJson.put("productCode", productCode);
-            Long timestamp = System.currentTimeMillis();
-            infoPayloadJson.put("timestamp", timestamp);
+            /*        DmpTopicResponseVO control = new DmpTopicResponseVO();
+        control.setTopic("/" + deviceUuid + "/" + TopicInfo.CONTROL_REMARKS.getLetter());
+        control.setSubscriber(TopicInfo.GATEWAY_DEVICE.getValue());
+        control.setPublisher(TopicInfo.IOT_PLATFORM.getValue());
+        control.setRemarks(TopicInfo.CONTROL_REMARKS.getValue());
+        responseVOList.add(control);
 
-            JSONObject metricsJson = new JSONObject();
-            List<DmpProductAttribute> productAttributeList = getProductAttributeList(productId);
-            for (DmpProductAttribute productAttribute : productAttributeList) {
-                metricsJson.put(productAttribute.getAttributeCode(), productAttribute.getMaximum());
+        DmpTopicResponseVO controlResponse = new DmpTopicResponseVO();
+        controlResponse.setTopic("/" + deviceUuid + "/" + TopicInfo.CONTROL_RESPONSE_REMARKS.getLetter());
+        controlResponse.setPublisher(TopicInfo.GATEWAY_DEVICE.getValue());
+        controlResponse.setSubscriber(TopicInfo.IOT_PLATFORM.getValue());
+        controlResponse.setRemarks(TopicInfo.CONTROL_RESPONSE_REMARKS.getValue());
+        responseVOList.add(controlResponse);*/
+
+        }
+/*        else if ("add".equals(topicType)) {
+
+            if (StringUtils.isBlank(productCode)) {
+                throw new BusinessException("产品编码“productCode”不能为空！");
+            } else if (StringUtils.isBlank(deviceId)) {
+                throw new BusinessException("设备编号“deviceId”不能为空！");
+            } else if (StringUtils.isBlank(deviceName)) {
+                throw new BusinessException("设备名“deviceName“不能为空！");
             }
-            infoPayloadJson.put("metrics", metricsJson);
 
-            JSONObject tagsJson = new JSONObject();
-            tagsJson.put("device_id", deviceId);
-            infoPayloadJson.put("tags", tagsJson);
-            String infoPayload = infoPayloadJson.toString();
-            info.setTopicPayload(infoPayload);
-            responseVOList.add(info);
-        } else if ("add".equals(topicType)) {
             DmpTopicResponseVO add = new DmpTopicResponseVO();
             add.setTopic("/" + productCode + "/" + deviceId + "/" + TopicInfo.ADD_REMARKS.getLetter());
             add.setPublisher(TopicInfo.GATEWAY_DEVICE.getValue());
@@ -227,11 +218,27 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
             topicPayloadJson.put("productCode", productCode);
             topicPayloadJson.put("deviceId", deviceId);
             topicPayloadJson.put("deviceName", deviceName);
-            topicPayloadJson.put("simCode", simCode);
-            topicPayloadJson.put("installAddress", installAddress);
+            if (!StringUtils.isBlank(simCode)) {
+                topicPayloadJson.put("simCode", simCode);
+            }
+            if (!StringUtils.isBlank(installAddress)) {
+                topicPayloadJson.put("installAddress", installAddress);
+            }
             String topicPayload = topicPayloadJson.toString();
             add.setTopicPayload(topicPayload);
-        } else if ("info".equals(topicType)) {
+
+        }*/
+
+        else if ("info".equals(topicType)) {
+
+            if (StringUtils.isBlank(productCode)) {
+                throw new BusinessException("产品编码“productCode”不能为空！");
+            } else if (productId == null) {
+                throw new BusinessException("产品ID“productId“不能为空！");
+            } else if (StringUtils.isBlank(deviceId)) {
+                throw new BusinessException("设备编号“deviceId”不能为空！");
+            }
+
             DmpTopicResponseVO info = new DmpTopicResponseVO();
             info.setTopic("/" + productCode + "/" + deviceId + "/" + TopicInfo.INFO_REMARKS.getLetter());
             info.setPublisher(TopicInfo.GATEWAY_DEVICE.getValue());
@@ -259,20 +266,6 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
             responseVOList.add(info);
         }
 
-/*        DmpTopicResponseVO control = new DmpTopicResponseVO();
-        control.setTopic("/" + deviceUuid + "/" + TopicInfo.CONTROL_REMARKS.getLetter());
-        control.setSubscriber(TopicInfo.GATEWAY_DEVICE.getValue());
-        control.setPublisher(TopicInfo.IOT_PLATFORM.getValue());
-        control.setRemarks(TopicInfo.CONTROL_REMARKS.getValue());
-        responseVOList.add(control);
-
-        DmpTopicResponseVO controlResponse = new DmpTopicResponseVO();
-        controlResponse.setTopic("/" + deviceUuid + "/" + TopicInfo.CONTROL_RESPONSE_REMARKS.getLetter());
-        controlResponse.setPublisher(TopicInfo.GATEWAY_DEVICE.getValue());
-        controlResponse.setSubscriber(TopicInfo.IOT_PLATFORM.getValue());
-        controlResponse.setRemarks(TopicInfo.CONTROL_RESPONSE_REMARKS.getValue());
-        responseVOList.add(controlResponse);*/
-
         int fromIndex = (pageNum - 1) * pageSize;
         int toIndex = Math.min(fromIndex + pageSize, responseVOList.size());
         List<DmpTopicResponseVO> paginatedList = responseVOList.subList(fromIndex, toIndex);