视频设备、单位管理接口

bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/DeviceVo.java

@@ -80,13 +80,13 @@ public class DeviceVo {
      * 创建时间
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
     /**
      * 修改时间
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
     /**
      * 备注

bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/DevMapper.xml

@@ -94,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             AND td.is_active = '1'
         </where>
+        ORDER BY td.update_time DESC
     </select>
     <!--查询数据是否重复-共用同一个puid的视频设备-->
     <select id="queryValueIsExist2" resultType="java.lang.Integer">

bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/UnitMapper.xml

@@ -84,6 +84,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     INSTR(suff_phone,#{keyWord}) > 0
                 )
             </if>
+            <if test="unitType!=null and unitType!=''">
+                AND unit_type =#{unitType}
+            </if>
             AND is_active = '1'
         </where>
     </select>