Merge branch 'lyh-pay-status-mq' into test

src/main/java/com/fdkankan/ucenter/mq/consumer/ScenePayStatusConsumer.java

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 
 /**
  * 场景封存解封 mq
@@ -36,21 +37,25 @@ public class ScenePayStatusConsumer {
         try {
             String messageId = message.getMessageProperties().getMessageId();
             String msg = new String(message.getBody(), StandardCharsets.UTF_8);
-            log.info("接受下单结果mq--messageId:{},msg:{}",messageId,msg);
+            log.info("接受mq--messageId:{},msg:{}",messageId,msg);
 
             channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
             msg = msg.substring(1, msg.length() - 1);
 
             msg = StringEscapeUtils.unescapeJava(msg);
 
-            ScenePayStatusVo order = JSONObject.parseObject(msg, ScenePayStatusVo.class);
-            if(order == null){
+            ScenePayStatusVo vo = JSONObject.parseObject(msg, ScenePayStatusVo.class);
+            if(vo == null){
                 return;
             }
-            sceneProService.lockOrUnLockBySpace(order.getCameraId());
+            if(vo.getSceneId() != null && vo.getPayStatus() != null){
+                sceneProService.lockOrUnLockScenes(Arrays.asList(vo.getSceneId()),vo.getPayStatus());
+            }else if(vo.getCameraId() != null){
+                sceneProService.lockOrUnLockBySpace(vo.getCameraId());
+            }
 
         }catch (Exception e){
-            log.error("order-payResult----消费失败",e);
+            log.error("scene-pay-status----消费失败",e);
         }finally {
 
         }

src/main/java/com/fdkankan/ucenter/mq/vo/ScenePayStatusVo.java

@@ -7,4 +7,7 @@ import java.io.Serializable;
 @Data
 public class ScenePayStatusVo implements Serializable {
     private Long cameraId;
+    private Long sceneId;
+    private Integer payStatus;
+
 }

src/main/java/com/fdkankan/ucenter/service/ISceneProService.java

@@ -35,6 +35,8 @@ public interface ISceneProService extends IService<ScenePro> {
 
     void lockOrUnLockBySpace(Long cameraId);
 
+    void lockOrUnLockScenes(List<Long> lockedIds,Integer payStatus);
+
     List<ScenePro> getListByCameraId(Long cameraId);
 
     void bindOrUnCamera(List<Long> cameraIds, Long id);

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -314,7 +314,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
 
     // payStatus 为 -2 封存，为 1 解封
-    private void lockOrUnLockScenes(List<Long> lockedIds,Integer payStatus) {
+    public void lockOrUnLockScenes(List<Long> lockedIds,Integer payStatus) {
         if (lockedIds == null || lockedIds.size() == 0){
             return;
         }