1

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

@@ -504,7 +504,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         Page<SceneVo> sceneVoPage = getBaseMapper().pageListAndFolder(new Page<>(param.getPageNum(),param.getPageSize()),param);
 
         List<SceneVo> folderList = sceneVoPage.getRecords().parallelStream().filter(entity -> entity.getIsFolder() == 1).collect(Collectors.toList());
-        Long totalSceneNum = 0L;
+        Long totalSceneNum = sceneVoPage.getTotal();
         if(folderList.size() >0){
             List<Long> folderIds = folderList.parallelStream().map(SceneVo::getId).collect(Collectors.toList());
             List<Folder> allFolderIds = folderService.getAllFolderIds(folderIds);
@@ -568,6 +568,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 totalSceneNum = this.getCountByLaserAndIsObj(param.getUserId());
             }
         }
+        if(totalSceneNum == 0 && sceneVoPage.getTotal() !=0){
+            totalSceneNum = sceneVoPage.getTotal();
+        }
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("pageInfo",PageInfo.PageInfo(sceneVoPage));
         jsonObject.put("sceneNum",totalSceneNum);

src/main/java/com/fdkankan/ucenter/task/TaskService.java

@@ -38,7 +38,7 @@ public class TaskService {
     private ISceneCleanService sceneCleanService;
 
 
-    @Scheduled(cron = "0 */10 * * * ?")
+    @Scheduled(cron = "${task.cron.del_qrCode:0 */10 * * * ?}")
     public void delLoginQrCode(){
         if("local".equals(NacosProperty.uploadType)){
             AuthLicenseUtil.checkAuthLicense();
@@ -101,8 +101,7 @@ public class TaskService {
     @Autowired
     IUserIncrementService userIncrementService;
 
-    @Scheduled(cron = "0 0 12 * * ?")
-//    @Scheduled(cron = "0 */30 * * * ?")
+    @Scheduled(cron = "${task.cron.increment_sendMsg:0 0 12 * * ?}")
     public void job11() {
         if("local".equals(NacosProperty.uploadType)){
             return;
@@ -118,8 +117,8 @@ public class TaskService {
 
 
 
-    @Scheduled(cron = "0 0 0 * * ?")
-    public void job1() {
+    @Scheduled(cron = "${task.cron.update_order_status:0 0 0 * * ?}")
+    public void checkIncrementExpire() {
         if("local".equals(NacosProperty.uploadType)){
             return;
         }
@@ -135,8 +134,8 @@ public class TaskService {
     @Autowired
     IOrderService orderService;
 
-    @Scheduled(cron = "0 0 1 * * ?")
-    public void job2() {
+    @Scheduled(cron = "${task.cron.update_order_status:0 0 1 * * ?}")
+    public void updateOrderStatus() {
         if("local".equals(NacosProperty.uploadType)){
             return;
         }
@@ -152,8 +151,8 @@ public class TaskService {
 
     @Autowired
     ISceneStatisticsService sceneStatisticsService;
-    @Scheduled(cron = "0 0 2 * * ?")
-    public void job3() {
+    @Scheduled(cron = "${task.cron.add_baidu_data:0 0 2 * * ?}")
+    public void addBaiduData() {
         if("local".equals(NacosProperty.uploadType)){
             return;
         }
@@ -173,7 +172,7 @@ public class TaskService {
      * 执行时间：每天凌晨
      * 删除条件：场景计算时间大于6个月且未删除过资源
      */
-    @Scheduled(cron = "0 0 0/2 * * ?")
+    @Scheduled(cron = "${task.cron.scene_clean_resource:0 0 0/2 * * ?}")
     public void sceneCleanResource() {
         log.info("每天凌晨12:00开始执行定时任务：清除场景计算目录");
         try {

src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: test
+    active: dev
 server:
   port: 8082
   servlet: