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

hotcoffie

2021-12-01 a16b4f71ec5a4d3d526c9c35a1e1f7843a49e921

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

@@ -33,6 +33,7 @@
                "createTime," +
                "updateTime," +
                "charset," +
                "subscribeCycleForCatalog," +
                "online" +
            ") VALUES (" +
                "#{deviceId}," +
@@ -51,6 +52,7 @@
                "#{createTime}," +
                "#{updateTime}," +
                "#{charset}," +
                "#{subscribeCycleForCatalog}," +
                "#{online}" +
            ")")
    int add(Device device);
@@ -72,6 +74,7 @@
                "<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);