Default Changelist

src/main/java/com/xkrs/controller/CameraController.java

@@ -33,6 +33,7 @@ public class CameraController {
     @Resource
     private DeviceManagementDao deviceManagementDao;
 
+
     @GetMapping("/getCameraInformation")
     public List<CameraInformation> getCameraInformation(){
 
@@ -49,8 +50,48 @@ public class CameraController {
         return  false;
 
     }
+
     }
 
+    /**
+     * 返回全部信息
+     * @param
+     * @return
+     */
+    @GetMapping("/findEquipment1")
+    public String Selectequipment(){
+
+        try
+        {
+            return  cameraService.Selectequipment();
+        }
+
+         catch (Exception E)
+         {
+            return  E.getMessage();
+
+         }
+    }
+    /**
+     * 查询实时视频连接
+     * @return
+     */
+    @GetMapping("/findVideoPath1")
+    public String selectVideotape(){
+        try {
+           return cameraService.Videotape();
+        }
+
+        catch (Exception e){
+         return  e.getMessage();
+        }
+
+    }
+
+    /**
+     * 添加设备信息
+     * @return
+     */
     @GetMapping("/SelectDeviceManagement")
     public  String SelectDeviceManagement()
     {
@@ -63,32 +104,31 @@ public class CameraController {
                 contnetTotal+=s;
             }
             br.close();
-            System.out.println(contnetTotal);
-
             DA tempBran = JSON.parseObject(contnetTotal, DA.class);
-
             List<DA.DataDTO.PageDataDTO> pageData = tempBran.getData().getPageData();
-            List<ADD> list1=new ArrayList<>();
             for (DA.DataDTO.PageDataDTO  item: pageData) {
-                ADD add=new ADD();
-                add.deviceName=item.getDeviceName();
-                add.deviCevode=item.getDeviceCode();
-                add.deviceSn=item.getDeviceSn();
-                add.deviceCategory=item.getDeviceCategory();
-                add.deviceManufacture=item.getDeviceManufacturer();
-                add.deviceType=item.getDeviceType();
-                add.deviceModel=item.getDeviceModel();
-                add.deviceLp=item.getDeviceIp();
-                add.devicePort=item.getDevicePort();
-                add.ownerCode=item.getOwnerCode();
-                list1.add(add);
+                DeviceManagement add=new DeviceManagement();
+                add.setDeviceName(item.getDeviceName());
+                add.setDeviceCode(item.getDeviceCode());
+                add.setDeviceSn(item.getDeviceSn());
+                add.setDeviceCategory(item.getDeviceCategory());
+                add.setDeviceManufacturer(item.getDeviceManufacturer());
+                add.setDeviceType(item.getDeviceType());
+                add.setDeviceModel(item.getDeviceModel());
+                add.setDeviceIp(item.getDeviceIp());
+                add.setDevicePort(item.getDevicePort());
+                add.setOwnerCode(item.getOwnerCode());
+                add.setLiveVideo("http://111.53.13.180:7086/live/cameraid/"+item.getDeviceCode()+ "%240/substream/1.m3u8");
+                add.setIsOnline(item.getIsOnline());
+                add.setUpdateTime(item.getOnlineUpdateTime());
+                deviceManagementDao.save(add);
             }
-            cameraService.InsertPaging(list1);
+            System.out.println("111");
         } catch (FileNotFoundException e) {
             e.printStackTrace();
         } catch (IOException e) {
             e.printStackTrace();
         }
-        return  "over";
+        return "1";
     }
 }