设备操作，redis队列下发消息

share-admin/src/main/java/share/web/controller/monitor/CacheController.java

@@ -7,7 +7,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+
+import cn.hutool.json.JSONUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.ListOperations;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -17,7 +20,9 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import share.common.constant.CacheConstants;
+import share.common.constant.MqttConstants;
 import share.common.core.domain.AjaxResult;
+import share.common.core.redis.RedisUtil;
 import share.common.utils.StringUtils;
 import share.system.domain.SysCache;
 
@@ -32,6 +37,8 @@ public class CacheController
 {
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
+    @Autowired
+    private RedisUtil redisUtil;
 
     private final static List<SysCache> caches = new ArrayList<SysCache>();
     {
@@ -42,6 +49,8 @@ public class CacheController
         caches.add(new SysCache(CacheConstants.REPEAT_SUBMIT_KEY, "防重提交"));
         caches.add(new SysCache(CacheConstants.RATE_LIMIT_KEY, "限流处理"));
         caches.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "密码错误次数"));
+        caches.add(new SysCache(MqttConstants.MQTT_REDIS_KEY, "设备下发消息队列"));
+
     }
 
     @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@@ -87,7 +96,13 @@ public class CacheController
     @GetMapping("/getValue/{cacheName}/{cacheKey}")
     public AjaxResult getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey)
     {
-        String cacheValue = redisTemplate.opsForValue().get(cacheKey);
+        String cacheValue = "";
+        if (MqttConstants.MQTT_REDIS_KEY.equals(cacheName)) {
+            List<Object> list = redisUtil.lRange(cacheKey, 0, -1);
+            cacheValue = JSONUtil.toJsonStr(list);
+        } else {
+            cacheValue = redisTemplate.opsForValue().get(cacheKey);
+        }
         SysCache sysCache = new SysCache(cacheName, cacheKey, cacheValue);
         return AjaxResult.success(sysCache);
     }

share-admin/src/main/java/share/web/controller/system/DeviceController.java

@@ -2,6 +2,8 @@ package share.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.util.StrUtil;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 import share.common.annotation.Log;
 import share.common.core.controller.BaseController;
 import share.common.core.domain.AjaxResult;
+import share.common.core.domain.entity.SysUser;
 import share.common.enums.BusinessType;
 import share.common.utils.SecurityUtils;
 import share.system.domain.DeviceDto;
@@ -22,11 +25,9 @@ import share.system.mqtt.MqttGatewayComponent;
 import share.system.domain.Device;
 import share.system.domain.vo.DeviceParamVo;
 import share.system.domain.vo.MqttxVo;
-import share.system.service.DeviceLogService;
-import share.system.service.DeviceService;
+import share.system.service.*;
 import share.common.utils.poi.ExcelUtil;
 import share.common.core.page.TableDataInfo;
-import share.system.service.MqttxService;
 
 /**
  * 设备信息Controller
@@ -41,11 +42,9 @@ public class DeviceController extends BaseController
     @Autowired
     private DeviceService deviceService;
     @Autowired
-    private MqttxService mqttxService;
-    @Autowired
-    private DeviceLogService deviceLogService;
+    private DeviceOpService deviceOpService;
     @Autowired
-    private MqttGatewayComponent mqttGatewayComponent;
+    private ISysUserService sysUserService;
 
     /**
      * 查询设备信息列表
@@ -123,14 +122,13 @@ public class DeviceController extends BaseController
     @PostMapping(value = "/openOrClose")
     public AjaxResult openOrClose(@RequestBody DeviceParamVo deviceParam)
     {
-        // 获取mqtt的topic、payload
-        MqttxVo mqttxVo = mqttxService.openOrCloseDevice(deviceParam.getDevId(),
-                SecurityUtils.getUsername(), deviceParam.getOpType());
-        // 发送mqtt消息
-        mqttGatewayComponent.sendToMqtt(mqttxVo.getTopic(), 0, mqttxVo.getPayload());
-        // 写日志记录
-        int result = deviceLogService.addDeviceLog(mqttxVo, SecurityUtils.getUsername());
-        return toAjax(result);
+        Long userId = SecurityUtils.getUserId();
+        if (userId != null) {
+            SysUser sysUser = sysUserService.selectUserById(userId);
+            deviceParam.setPhone(sysUser.getPhonenumber());
+            deviceOpService.openOrCloseDev(deviceParam);
+        }
+        return toAjax(true);
     }
 
     /**

share-common/src/main/java/share/common/constant/MqttConstants.java

@@ -10,6 +10,16 @@ package share.common.constant;
 public class MqttConstants {
 
     /**
+     * 设备消息发送redis缓存前缀
+     */
+    public static final String MQTT_REDIS_KEY = "MQTT_REDIS_KEY:";
+
+    /**
+     * 记录最后设备消息发送时间redis
+     */
+    public static final String MQTT_DEVICE_LAST_TIME_KEY = "MQTT_DEVICE_LAST_TIME_KEY:";
+
+    /**
      * 动作: 请求端为req
      */
     public static final String MQTT_AC_REQ = "req";

share-common/src/main/java/share/common/core/redis/RedisUtil.java

@@ -227,6 +227,18 @@ public class RedisUtil {
     }
 
     /**
+     * 列表添加右边添加
+     * @param k string key
+     * @param v Object v
+     * @author Mr.Zhang
+     * @since 2020-04-13
+     */
+    public void rPush(String k, Object v) {
+        ListOperations<String, Object> list = redisTemplate.opsForList();
+        list.rightPush(k, v);
+    }
+
+    /**
      * 从右边拿出来一个
      * @param k string key
      * @param t Long 超时秒数
@@ -236,6 +248,28 @@ public class RedisUtil {
     }
 
     /**
+     * 某一个信息获取
+     * @param k string key
+     * @param l long l
+     * @return List<Object>
+     */
+    public Object getIndex(String k, long l) {
+        ListOperations<String, Object> list = redisTemplate.opsForList();
+        return list.index(k, l);
+    }
+
+    /**
+     * 设置list中指定下标的值，采用干的是替换规则, 最左边的下标为0；-1表示最右边的一个
+     *
+     * @param k 主键
+     * @param index 下标
+     * @param v 值
+     */
+    public void set(String k, Integer index, Object v) {
+        redisTemplate.opsForList().set(k, index, v);
+    }
+
+    /**
      * 列表获取数量
      * @param k string key
      * @return Long

share-system/src/main/java/share/system/domain/DeviceLog.java

@@ -57,6 +57,9 @@ public class DeviceLog extends BaseEntity
     @Excel(name = "描述")
     private String description;
 
+    @Excel(name = "重新发送次数")
+    private Integer afreshNum;
+
     /**
      * 房间名称
      */

share-system/src/main/java/share/system/domain/vo/MqttxVo.java

@@ -35,4 +35,19 @@ public class MqttxVo extends BaseEntity {
     /** 消息描述：开门、开灯、网关设备绑定等 */
     private String mqttDescribe;
 
+    /** 消息操作类型 */
+    private String opType;
+
+    /**
+     * 重新发送次数
+     */
+    private Integer refreshNum;
+
+    /**
+     * 是否需要发送短信及结果：0-不需要，1-需要，2-发送成功，4-发送失败
+     */
+    private Integer sendSmsResult;
+
+    private String phone;
+
 }

share-system/src/main/java/share/system/mapper/DeviceLogMapper.java

@@ -71,4 +71,7 @@ public interface DeviceLogMapper extends BaseMapper<DeviceLog>
      */
     List<DeviceLog> selectListByMaxId(@Param("devIds") List<String> devIds, @Param("startDate") Date startDate);
 
+    DeviceLog selectDeviceLogOneBySeqMax(String seq);
+
+    int updateDeviceById(DeviceLog deviceLog);
 }

share-system/src/main/java/share/system/service/DeviceOpService.java

@@ -12,6 +12,12 @@ import share.system.domain.vo.MqttxVo;
 public interface DeviceOpService {
 
     /**
+     * 管理系统开门、通电、断电
+     * @param deviceParam
+     */
+    void openOrCloseDev(DeviceParamVo deviceParam);
+
+    /**
      * 小程序订单开门、通电
      * @param deviceParam
      */
@@ -98,4 +104,10 @@ public interface DeviceOpService {
      */
     void deleteDevicePassword(Long roomId, String param, String phone, String opType);
 
+    /**
+     * mqtt 消息发送
+     * @param mqttxVo 消息内容
+     */
+    void sendMqtt(MqttxVo mqttxVo);
+
 }

share-system/src/main/java/share/system/service/DeviceService.java

@@ -73,4 +73,12 @@ public interface DeviceService extends IService<Device>
     List<Device> selectDeviceListByIds(List<Long> collect);
 
     List<Device> selectDeviceByRoomId(Long roomId);
+
+    /**
+     * 查询设备信息
+     *
+     * @param devId 设备devId
+     * @return 设备信息
+     */
+    Device selectDeviceByDevId(String devId);
 }

share-system/src/main/java/share/system/service/impl/DeviceLogServiceImpl.java

@@ -151,6 +151,7 @@ public class DeviceLogServiceImpl extends ServiceImpl<DeviceLogMapper, DeviceLog
         deviceLog.setMqttDescribe(mqttxVo.getMqttDescribe());
         deviceLog.setCreateTime(DateUtils.getNowDate());
         deviceLog.setCreateBy(userNmae);
+        deviceLog.setAfreshNum(mqttxVo.getRefreshNum());
         return deviceLogMapper.insertDeviceLog(deviceLog);
     }
 }

share-system/src/main/java/share/system/service/impl/DeviceServiceImpl.java

@@ -125,6 +125,13 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
     }
 
     @Override
+    public Device selectDeviceByDevId(String devId) {
+        LambdaQueryWrapper<Device> queryWrapper = new LambdaQueryWrapper();
+        queryWrapper.eq(Device::getDevId, devId);
+        return deviceMapper.selectOne(queryWrapper);
+    }
+
+    @Override
     public List<Device> notRoomIdList(Device device) {
         SRoom room = roomMapper.selectSRoomById(device.getRoomId());
         if (room != null) {

share-system/src/main/resources/mapper/system/DeviceLogMapper.xml

@@ -20,12 +20,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
         <result property="result"    column="result"    />
         <result property="description"    column="description"    />
+        <result property="afreshNum"    column="afresh_num"    />
     </resultMap>
 
     <sql id="selectDeviceLogVo">
         select s1.id, s1.dev_mac, s1.dev_id, s1.seq, s1.mqtt_type, s1.mqtt_describe, s1.payload, s1.topic,
                s1.create_by, s1.create_time,
-               s1.update_by, s1.update_time, s1.remark, s1.`result`, s1.description
+               s1.update_by, s1.update_time, s1.remark, s1.`result`, s1.description, s1.afresh_num
         from s_device_log s1
         left join s_device s2 on s1.dev_id = s2.dev_id
         left join s_room s3 on s2.room_id = s3.id
@@ -48,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         t1.update_time,
         t1.remark,
         t1.`result`,
-        t1.description
+        t1.description, t1.afresh_num
         from s_device_log t1
         join s_device t2 on t1.dev_id = t2.dev_id
         join s_room t3 on t2.room_id = t3.id
@@ -66,6 +67,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time desc
     </select>
+
+    <select id="selectDeviceLogOneBySeqMax" parameterType="String" resultMap="DeviceLogResult">
+        select
+            t1.id,
+            t1.dev_mac,
+            t1.dev_id,
+            t1.seq,
+            t1.mqtt_type,
+            t1.mqtt_describe,
+            t1.payload,
+            t1.topic,
+            t1.create_by,
+            t1.create_time,
+            t1.update_by,
+            t1.update_time,
+            t1.remark,
+            t1.`result`,
+            t1.description, t1.afresh_num
+        from s_device_log t1 where seq = #{seq} order by t1.afresh_num desc limit 0,1
+    </select>
     
     <select id="selectDeviceLogById" parameterType="Long" resultMap="DeviceLogResult">
         <include refid="selectDeviceLogVo"/>
@@ -74,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectListByMaxId" resultMap="DeviceLogResult">
         SELECT t1.id, t1.dev_mac, t1.dev_id, t1.seq, t1.mqtt_type, t1.mqtt_describe, t1.payload, t1.topic,
                t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.remark,
-                t1.`result`, t1.description
+                t1.`result`, t1.description, t1.afresh_num
         FROM s_device_log t1
                  JOIN (
             SELECT MAX(id) AS max_id
@@ -106,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
             <if test="result != null">`result`,</if>
             <if test="description != null">description,</if>
+            <if test="afreshNum != null">afresh_num,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="devMac != null">#{devMac},</if>
@@ -122,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">#{remark},</if>
             <if test="result != null">#{result},</if>
             <if test="description != null">#{description},</if>
+            <if test="afreshNum != null">#{afreshNum},</if>
          </trim>
     </insert>
 
@@ -142,6 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark = #{remark},</if>
             <if test="result != null">`result` = #{result},</if>
             <if test="description != null">description = #{description},</if>
+            <if test="afreshNum != null">afresh_num = #{afreshNum},</if>
         </trim>
         where id = #{id}
     </update>
@@ -151,6 +175,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where seq = #{seq}
     </update>
 
+    <update id="updateDeviceById" parameterType="DeviceLog">
+        update s_device_log
+        set remark = #{remark},`result` = #{result}, update_time = #{updateTime}
+        where id = #{id}
+    </update>
+
     <delete id="deleteDeviceLogById" parameterType="Long">
         delete from s_device_log where id = #{id}
     </delete>