lyhzzz 1 vuosi sitten
vanhempi
commit
546f6b2cde

+ 2 - 0
src/main/java/com/fdkankan/manage_jp/entity/ScenePlus.java

@@ -121,4 +121,6 @@ public class ScenePlus implements Serializable {
     private String recStatus;
 
 
+    @TableField("laser_title")
+    private String laserTitle;
 }

+ 2 - 1
src/main/java/com/fdkankan/manage_jp/entity/ScenePro.java

@@ -233,5 +233,6 @@ public class ScenePro implements Serializable {
     @TableField("is_obj")
     private Integer isObj;
 
-
+    @TableField("laser_title")
+    private String laserTitle;
 }

+ 58 - 0
src/main/java/com/fdkankan/manage_jp/mq/consumer/LaserSceneTitleConsumer.java

@@ -0,0 +1,58 @@
+package com.fdkankan.manage_jp.mq.consumer;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.manage_jp.mq.vo.LaserSceneTitleVo;
+import com.fdkankan.manage_jp.service.IScenePlusService;
+import com.fdkankan.manage_jp.service.ISceneProService;
+import com.rabbitmq.client.Channel;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+
+/**
+ * 场景封存解封 mq
+ */
+@Slf4j
+@Component
+public class LaserSceneTitleConsumer {
+
+
+    @Autowired
+    ISceneProService sceneProService;
+
+    @Autowired
+    IScenePlusService scenePlusService;
+    @RabbitListener(
+            queuesToDeclare = @Queue("${queue.laser.update-scene.title:laser-update-scene-title}")
+    )
+    public void consumerQueue(Channel channel, Message message)  {
+        try {
+            String messageId = message.getMessageProperties().getMessageId();
+            String msg = new String(message.getBody(), StandardCharsets.UTF_8);
+            log.info("laser-update-scene-title-mq--messageId:{},msg:{}",messageId,msg);
+
+            channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
+
+            LaserSceneTitleVo vo = JSONObject.parseObject(msg, LaserSceneTitleVo.class);
+            if(vo == null || StringUtils.isBlank(vo.getSceneNum()) || StringUtils.isBlank(vo.getSceneNewTitle())){
+                return;
+            }
+            sceneProService.updateTitleByNum(vo.getSceneNum(),vo.getSceneNewTitle());
+            scenePlusService.updateTitleByNum(vo.getSceneNum(),vo.getSceneNewTitle());
+
+        }catch (Exception e){
+            log.info("laser-scene-title-----消费失败",e);
+        }finally {
+
+        }
+
+    }
+
+}

+ 12 - 0
src/main/java/com/fdkankan/manage_jp/mq/vo/LaserSceneTitleVo.java

@@ -0,0 +1,12 @@
+package com.fdkankan.manage_jp.mq.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class LaserSceneTitleVo implements Serializable {
+    private String sceneNum;
+    private String sceneNewTitle;
+
+}

+ 2 - 0
src/main/java/com/fdkankan/manage_jp/service/IScenePlusService.java

@@ -22,4 +22,6 @@ public interface IScenePlusService extends IService<ScenePlus> {
     ScenePlus copyScene(ScenePlus scenePlus);
 
     void updatePayStatus(String num, String version, Integer sceneSource, Integer payStatus, CameraDetail cameraDetail, User user);
+
+    void updateTitleByNum(String sceneNum, String sceneNewTitle);
 }

+ 2 - 0
src/main/java/com/fdkankan/manage_jp/service/ISceneProService.java

@@ -32,4 +32,6 @@ public interface ISceneProService extends IService<ScenePro> {
     void unbind(Long cameraId,Long userId);
 
     ScenePro copyScene(ScenePro scenePro);
+
+    void updateTitleByNum(String sceneNum, String sceneNewTitle);
 }

+ 8 - 0
src/main/java/com/fdkankan/manage_jp/service/impl/ScenePlusServiceImpl.java

@@ -179,4 +179,12 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
             FileUtil.del(OssPath.localStatusPath);
         }
     }
+
+    @Override
+    public void updateTitleByNum(String sceneNum, String sceneNewTitle) {
+        LambdaUpdateWrapper<ScenePlus> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(ScenePlus::getNum,sceneNum);
+        updateWrapper.set(ScenePlus::getLaserTitle,sceneNewTitle);
+        this.update(updateWrapper);
+    }
 }

+ 7 - 1
src/main/java/com/fdkankan/manage_jp/service/impl/SceneProServiceImpl.java

@@ -274,5 +274,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         return scenePro;
     }
 
-
+    @Override
+    public void updateTitleByNum(String sceneNum, String sceneNewTitle) {
+        LambdaUpdateWrapper<ScenePro> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(ScenePro::getNum,sceneNum);
+        updateWrapper.set(ScenePro::getLaserTitle,sceneNewTitle);
+        this.update(updateWrapper);
+    }
 }

+ 3 - 3
src/main/resources/mapper/manage_jp/SceneProMapper.xml

@@ -7,11 +7,11 @@
         SELECT * FROM(
         select s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize
         ,u.user_name,s.view_count,s.status,s.pay_status,'v3' as scene_version ,s.web_site as webSite,thumb
-        ,null as algorithmTime,c.child_name,s.camera_id
+        ,null as algorithmTime,c.child_name,s.camera_id,s.laser_title
         from t_scene_pro s
         <include refid="commonWhere"></include>
         <if test="param.sceneName != null and param.sceneName!='' ">
-            and s.scene_name like concat ('%',#{param.sceneName},'%')
+            and (s.scene_name like concat ('%',#{param.sceneName},'%') or s.laser_title like concat ('%',#{param.sceneName},'%') )
         </if>
         and is_upgrade = 0
         UNION
@@ -22,7 +22,7 @@
         left join t_scene_plus_ext e on s.id = e.plus_id
         <include refid="commonWhere"></include>
         <if test="param.sceneName != null and param.sceneName!='' ">
-            and s.title like concat ('%',#{param.sceneName},'%')
+            and (s.scene_name like concat ('%',#{param.sceneName},'%') or s.laser_title like concat ('%',#{param.sceneName},'%') )
         </if>
         ) as tb
         order by create_time desc