锁MQ调整：返回相关内容

appapi/src/main/java/tech/glinfo/enbao/modules/mq/SmartLockParse.java

@@ -180,9 +180,12 @@ public class SmartLockParse implements IParse {
             //将时间调整为yyyy-MM-dd HH:mm:ss时间样式
 
             res = simpleDateFormat.format(date);*/
+            //推送到手机端
+            ws.put("tips", DateUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " " + recordEntity.getRemark());
 
         }
-
+        ws.put("cmd", datas.get("cmd"));
+        ws.put("content", datas.get("content"));
         return ws;
     }
 

appapi/src/main/java/tech/glinfo/enbao/modules/sh/controller/ShDeviceController.java

@@ -308,13 +308,13 @@ public class ShDeviceController {
         PageUtils page = otherShDeviceRecordService.queryPage(params);
         ShDeviceEntity device = otherShDeviceService.getById(deviceId);
         //临时密码
-        Integer count = shDevicePasswordService.count(new QueryWrapper<ShDevicePasswordEntity>().eq("device_id", deviceId).eq("type", 2).eq("status", 1));
+//        Integer count = shDevicePasswordService.count(new QueryWrapper<ShDevicePasswordEntity>().eq("device_id", deviceId).eq("type", 2).eq("status", 1));
         ShDevicePasswordEntity passwordEntity = shDevicePasswordService.getOne(new QueryWrapper<ShDevicePasswordEntity>().eq("device_id", deviceId).eq("type", 1).orderByDesc("id").last("LIMIT 1"));
         ShDeviceDataEntity dataEntity = shDeviceDataService.getOne(new QueryWrapper<ShDeviceDataEntity>().eq("device_id", deviceId));
         Map<String, Object> map = new HashMap<>();
         map.put("page", page);
         map.put("device", device);
-        map.put("count", count);
+//        map.put("count", count);
         if(passwordEntity != null) {
             map.put("password", passwordEntity.getPassword());
             map.put("status", passwordEntity.getStatus());