计算完毕通知删除场景v3版本目录

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -2340,7 +2340,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         this.syncIconsFromFileToRedis(num);
 
         String key = String.format(RedisKey.SCENE_HOT_ICONS, num);
-        redisUtil.sSet(key, icons.toArray());
+        if(CollUtil.isNotEmpty(icons)){
+            redisUtil.sSet(key, icons.toArray());
+        }
 
 
 //        Map<String, String> addOrUpdateMap = new HashMap<>();

4dkankan-task/src/main/java/com/fdkankan/task/listener/MqListener.java

@@ -24,8 +24,7 @@ public class MqListener {
      * @throws Exception
      */
     @RabbitListener(
-            queues = "QUEUE_DELETE_S3_FILE",
-            concurrency = "3"
+            queues = "QUEUE_DELETE_S3_FILE", concurrency = "3"
     )
     public void buildScenePreHandler(Channel channel, Message message) throws Exception {
         String num = new String(message.getBody(), StandardCharsets.UTF_8);

4dkankan-task/src/main/java/com/fdkankan/task/mapper/ISceneProMapper.java

@@ -1,7 +1,7 @@
 package com.fdkankan.task.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fdkankan.task.entity.ScenePro;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -11,12 +11,12 @@ import java.util.List;
  * pro场景表 Mapper 接口
  * </p>
  *
- * @author dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2023-03-13
  */
 @Mapper
 public interface ISceneProMapper extends BaseMapper<ScenePro> {
 
-    List<ScenePro> selectDeleteScene();
+    List<ScenePro> selectDeleteScene(Long userId);
 
 }

4dkankan-task/src/main/java/com/fdkankan/task/schedule/ScheduleJob.java

@@ -42,36 +42,36 @@ public class ScheduleJob {
     @Autowired
     private IScenePlusExtService scenePlusExtService;
 
-    @Scheduled(fixedDelay = 2*24*60*60*1000)
-    public void deleteV3Dir(){
-
-        ExecutorService executorService = Executors.newFixedThreadPool(1);
-
-        DateTime date = DateUtil.beginOfDay(DateUtil.offset(Calendar.getInstance().getTime(), DateField.DAY_OF_MONTH, -2));
-
-        LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<ScenePro>();
-        wrapper.select(ScenePro::getNum);
-        wrapper.lt(ScenePro::getCreateTime, date);
-        wrapper.eq(ScenePro::getStatus, -2);
-        wrapper.eq(ScenePro::getIsUpgrade, 1);
-        if(Objects.nonNull(userId)){
-            wrapper.eq(ScenePro::getUserId, userId);
-        }
-        List<ScenePro> list = sceneProService.list(wrapper);
-        if(CollUtil.isEmpty(list)){
-            return;
-        }
-        for (ScenePro scenePro : list) {
-            String num = scenePro.getNum();
-            try {
-                executorService.submit(()->{
-                    scenePlusService.deleteV3DirHandler(num);
-                });
-            }catch (Exception e){
-                log.error("删除v3目录失败，num" + num, e);
-            }
-        }
-    }
+//    @Scheduled(fixedDelay = 2*24*60*60*1000)
+//    public void deleteV3Dir(){
+//
+//        ExecutorService executorService = Executors.newFixedThreadPool(1);
+//
+//        DateTime date = DateUtil.beginOfDay(DateUtil.offset(Calendar.getInstance().getTime(), DateField.DAY_OF_MONTH, -2));
+//
+//        LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<ScenePro>();
+//        wrapper.select(ScenePro::getNum);
+//        wrapper.lt(ScenePro::getCreateTime, date);
+//        wrapper.eq(ScenePro::getStatus, -2);
+//        wrapper.eq(ScenePro::getIsUpgrade, 1);
+//        if(Objects.nonNull(userId)){
+//            wrapper.eq(ScenePro::getUserId, userId);
+//        }
+//        List<ScenePro> list = sceneProService.list(wrapper);
+//        if(CollUtil.isEmpty(list)){
+//            return;
+//        }
+//        for (ScenePro scenePro : list) {
+//            String num = scenePro.getNum();
+//            try {
+//                executorService.submit(()->{
+//                    scenePlusService.deleteV3DirHandler(num);
+//                });
+//            }catch (Exception e){
+//                log.error("删除v3目录失败，num" + num, e);
+//            }
+//        }
+//    }
 
     @Scheduled(fixedDelay = 2*24*60*60*1000)
     public void deleteSceneData(){

4dkankan-task/src/main/resources/bootstrap.yml

@@ -8,7 +8,7 @@ spring:
         password: nacos
         server-addr: 4dmanage-uat.autohome.com.cn
         file-extension: yaml
-        namespace: 4dkankan-qczj
+        namespace: fdkankan-qczj
         extension-configs:
           - data-id: 4dkankan-task.yaml
             group: DEFAULT_GROUP
@@ -37,7 +37,7 @@ spring:
         username: nacos
         password: nacos
         server-addr: ${spring.cloud.nacos.config.server-addr}
-        namespace: 4dkankan-qczj
+        namespace: fdkankan-qczj
 
 
 

4dkankan-task/src/main/resources/mapper.task/SceneProMapper.xml

@@ -3,8 +3,11 @@
 <mapper namespace="com.fdkankan.task.mapper.ISceneProMapper">
 
     <select id="selectDeleteScene" resultType="com.fdkankan.task.entity.ScenePro">
-        select t.num from t_scene_pro t where t.rec_status = 'I';
+        select t.num from t_scene_pro t
+        where t.rec_status = 'I'
+        <if test="userId != null">
+            and t.user_id=#{userId}
+        </if>
     </select>
 
-
 </mapper>