lyhzzz 7 months ago
parent
commit
760fb5c7ef

+ 6 - 0
src/main/java/com/fdkankan/ucenter/controller/SceneController.java

@@ -232,5 +232,11 @@ public class SceneController extends BaseController {
         takeLookService.openRoom(fdRoomVo.getRoomId(),getToken());
         return Result.success(fdRoomVo);
     }
+
+    @GetMapping("/removePortrait")
+    public Result removePortrait(@RequestParam(value = "num") String num){
+        sceneProService.removePortrait(num);
+        return Result.success();
+    }
 }
 

+ 5 - 0
src/main/java/com/fdkankan/ucenter/entity/ScenePlus.java

@@ -96,6 +96,11 @@ public class ScenePlus implements Serializable {
      */
     @TableField("house_type")
     private Integer houseType;
+    /**
+     * (-1-失败,0-执行中,1-成功,2-无)
+     */
+    @TableField("remove_portrait")
+    private Integer removePortrait;
 
     /**
      * 创建时间

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

@@ -95,4 +95,6 @@ public interface ISceneProService extends IService<ScenePro> {
     Long getCountByCameraId(Long cameraId);
 
     Long getSpaceSumByCameraId(Long cameraId);
+
+    void removePortrait(String num);
 }

+ 18 - 0
src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -1334,4 +1334,22 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     public Long getSpaceSumByCameraId(Long cameraId) {
         return this.getBaseMapper().getSpaceSumByCameraId(cameraId);
     }
+
+    /**
+     * 队列名:remove-portrait
+     * 载荷:{"num":"xxx"}
+     * 表:t_scene_plus增加字段remove_portrait
+     */
+    @Override
+    public void removePortrait(String num) {
+        ScenePlus scenePlus = scenePlusService.getByNum(num);
+        if(scenePlus == null){
+            throw new BusinessException(ResultCode.FAILURE_CODE_400002,ResultCode.FAILURE_MSG_400002);
+        }
+        HashMap<String,String> map = new HashMap<>();
+        map.put("num",num);
+        rabbitMqProducer.sendByWorkQueue("remove-portrait",map);
+
+
+    }
 }

+ 1 - 0
src/main/java/com/fdkankan/ucenter/vo/response/SceneVo.java

@@ -52,6 +52,7 @@ public class SceneVo {
     private String recommend;
     private String roamingPointUrl;
     private String updateTime;
+    private Integer removePortrait;
 
     public String getCreateTime() {
         return DateUserUtil.getDayTime(createTime);

+ 2 - 2
src/main/resources/mapper/ucenter/SceneProMapper.xml

@@ -25,7 +25,7 @@
         <include refid="HasFolder"></include>
         SELECT * FROM (
         SELECT  p.id ,null as name ,0 as isFolder,null as type,null as parentId ,p.create_time,num,scene_name,scene_dec,
-        p.status,pay_status,thumb,web_site,0 as is_upgrade,sn_code,view_count,p.build_type
+        p.status,pay_status,thumb,web_site,0 as is_upgrade,sn_code,view_count,p.build_type, null as removePortrait
         FROM t_scene_pro p
         <include refid="sceneJoinCamera"></include>
         WHERE is_upgrade = 0 and  p.rec_status = 'A'
@@ -40,7 +40,7 @@
         </if>
         UNION ALL
         SELECT  p.id as id ,null as name ,0 as isFolder,null as type,null as parentId,e.algorithm_time as createTime ,num,title as scene_name,description as scene_dec,
-        scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,sn_code,view_count,e.build_type
+        scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,sn_code,view_count,e.build_type,s.remove_portrait  as removePortrait
         FROM t_scene_plus p
         LEFT JOIN t_scene_plus_ext e on p.id = e.plus_id
         <include refid="sceneJoinCamera"></include>