Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

sc.dm

2022-03-10 4abbf4df07f02c0c94baa2787fdcf4a14dcb3463

 src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java

@@ -32,6 +32,8 @@
                "keepaliveTime," +
                "createTime," +
                "updateTime," +
                "charset," +
                "subscribeCycleForCatalog," +
                "online" +
            ") VALUES (" +
                "#{deviceId}," +
@@ -49,6 +51,8 @@
                "#{keepaliveTime}," +
                "#{createTime}," +
                "#{updateTime}," +
                "#{charset}," +
                "#{subscribeCycleForCatalog}," +
                "#{online}" +
            ")")
    int add(Device device);
@@ -69,6 +73,8 @@
                "<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>" +
                "WHERE deviceId='${deviceId}'"+
            " </script>"})
    int update(Device device);