From 958474c64691557a3348cbbe7c33a42272f09639 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 24 十月 2022 18:14:31 +0800
Subject: [PATCH] 首页改造完成,添加系统信息

---
 src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java |   49 ++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
index 278392b..b1210c6 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
@@ -1,6 +1,7 @@
 package com.genersoft.iot.vmp.storager.dao;
 
 import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
@@ -16,6 +17,7 @@
     @Select("SELECT " +
             "deviceId, " +
             "coalesce(custom_name, name) as name, " +
+            "password, " +
             "manufacturer, " +
             "model, " +
             "firmware, " +
@@ -102,7 +104,6 @@
                 "<if test=\"model != null\">, model='${model}'</if>" +
                 "<if test=\"firmware != null\">, firmware='${firmware}'</if>" +
                 "<if test=\"transport != null\">, transport='${transport}'</if>" +
-                "<if test=\"streamMode != null\">, streamMode='${streamMode}'</if>" +
                 "<if test=\"ip != null\">, ip='${ip}'</if>" +
                 "<if test=\"port != null\">, port=${port}</if>" +
                 "<if test=\"hostAddress != null\">, hostAddress='${hostAddress}'</if>" +
@@ -110,15 +111,6 @@
                 "<if test=\"registerTime != null\">, registerTime='${registerTime}'</if>" +
                 "<if test=\"keepaliveTime != null\">, keepaliveTime='${keepaliveTime}'</if>" +
                 "<if test=\"expires != null\">, expires=${expires}</if>" +
-                "<if test=\"charset != null\">, charset='${charset}'</if>" +
-                "<if test=\"subscribeCycleForCatalog != null\">, subscribeCycleForCatalog=${subscribeCycleForCatalog}</if>" +
-                "<if test=\"subscribeCycleForMobilePosition != null\">, subscribeCycleForMobilePosition=${subscribeCycleForMobilePosition}</if>" +
-                "<if test=\"mobilePositionSubmissionInterval != null\">, mobilePositionSubmissionInterval=${mobilePositionSubmissionInterval}</if>" +
-                "<if test=\"subscribeCycleForAlarm != null\">, subscribeCycleForAlarm=${subscribeCycleForAlarm}</if>" +
-                "<if test=\"ssrcCheck != null\">, ssrcCheck=${ssrcCheck}</if>" +
-                "<if test=\"geoCoordSys != null\">, geoCoordSys=#{geoCoordSys}</if>" +
-                "<if test=\"treeType != null\">, treeType=#{treeType}</if>" +
-                "<if test=\"mediaServerId != null\">, mediaServerId=#{mediaServerId}</if>" +
                 "WHERE deviceId='${deviceId}'"+
             " </script>"})
     int update(Device device);
@@ -126,6 +118,7 @@
     @Select("SELECT " +
             "deviceId, " +
             "coalesce(custom_name, name) as name, " +
+            "password, " +
             "manufacturer, " +
             "model, " +
             "firmware, " +
@@ -160,6 +153,7 @@
     @Select("SELECT " +
             "deviceId, " +
             "coalesce(custom_name, name) as name, " +
+            "password, " +
             "manufacturer, " +
             "model, " +
             "firmware, " +
@@ -181,12 +175,13 @@
             "ssrcCheck," +
             "geoCoordSys," +
             "treeType," +
-            "online" +
+            "online " +
             " FROM device WHERE online = 1")
     List<Device> getOnlineDevices();
     @Select("SELECT " +
             "deviceId, " +
             "coalesce(custom_name, name) as name, " +
+            "password, " +
             "manufacturer, " +
             "model, " +
             "firmware, " +
@@ -216,11 +211,10 @@
             "UPDATE device " +
             "SET updateTime='${updateTime}'" +
             "<if test=\"name != null\">, custom_name='${name}'</if>" +
+            "<if test=\"password != null\">, password='${password}'</if>" +
             "<if test=\"streamMode != null\">, streamMode='${streamMode}'</if>" +
             "<if test=\"ip != null\">, ip='${ip}'</if>" +
             "<if test=\"port != null\">, port=${port}</if>" +
-            "<if test=\"hostAddress != null\">, hostAddress='${hostAddress}'</if>" +
-            "<if test=\"online != null\">, online=${online}</if>" +
             "<if test=\"charset != null\">, charset='${charset}'</if>" +
             "<if test=\"subscribeCycleForCatalog != null\">, subscribeCycleForCatalog=${subscribeCycleForCatalog}</if>" +
             "<if test=\"subscribeCycleForMobilePosition != null\">, subscribeCycleForMobilePosition=${subscribeCycleForMobilePosition}</if>" +
@@ -233,4 +227,33 @@
             "WHERE deviceId='${deviceId}'"+
             " </script>"})
     int updateCustom(Device device);
+
+    @Insert("INSERT INTO device (" +
+            "deviceId, " +
+            "custom_name, " +
+            "password, " +
+            "createTime," +
+            "updateTime," +
+            "charset," +
+            "ssrcCheck," +
+            "geoCoordSys," +
+            "treeType," +
+            "online" +
+            ") VALUES (" +
+            "#{deviceId}," +
+            "#{name}," +
+            "#{password}," +
+            "#{createTime}," +
+            "#{updateTime}," +
+            "#{charset}," +
+            "#{ssrcCheck}," +
+            "#{geoCoordSys}," +
+            "#{treeType}," +
+            "#{online}" +
+            ")")
+    void addCustomDevice(Device device);
+
+    @Select("select count(1) as total, sum(online) as online from device")
+    ResourceBaceInfo getOverview();
+
 }

--
Gitblit v1.8.0