diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml index 1afc4c9..6fa63f8 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml @@ -207,7 +207,7 @@ false - 192.168.43.43 + 192.168.43.95 false diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/utils/DhDeviceUtil.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/utils/DhDeviceUtil.java index f734a3b..cb11422 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/utils/DhDeviceUtil.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/utils/DhDeviceUtil.java @@ -583,7 +583,7 @@ public class DhDeviceUtil { Map paramsMap = new HashMap<>(4); DhChannelFormDTO dto = new DhChannelFormDTO(); dto.setInterfaceId("admin_001_006"); - dto.setJsonParam("{\"param\":{\"unitType\":1}}"); + dto.setJsonParam("{\"param\":{\"unitType\":1 ,\"category\":1,\"type\":6}}"); String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData(); @@ -612,8 +612,12 @@ public class DhDeviceUtil { list.add(channel); String channelId = jsonItem.get("channelId").toString(); String[] channelIds = channelId.split("\\$"); - String videoUrl = "http://112.6.213.175:7086/live/cameraid/" + jsonItem.get("deviceId").toString() + "%24" + channelIds[channelIds.length - 1] + "/substream/1.m3u8"; - System.out.println("INSERT INTO epv_monitor_details (url,customer_id,create_time) VALUES ('" + videoUrl + "','1550309684576591874',NOW());"); + String videoUrl = "http://112.6.213.175:7086/live/cameraid/" + channelIds[0] + "%24" + channelIds[channelIds.length - 1] + "/substream/1.m3u8"; + if (jsonItem.get("deviceName").toString().contains("顺德")) { +// System.out.println(jsonItem.get("channelId").toString()); + System.out.println("INSERT INTO epv_monitor_details (url,customer_id,create_time) VALUES ('" + videoUrl + "','1550309684576591874',NOW());"); + } +// System.out.println(jsonItem.get("channelId").toString() + "//" + jsonItem.get("deviceName").toString()); } return list;