1；table分页

ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java

@@ -70,7 +70,7 @@ public class BusAgentInfoController extends BaseController {
             busAgentInfo.setSuperiorAgentCode(user.getUserId());
         }
         List<BusAgentInfo> list = busAgentInfoService.selectBusAgentInfoList(busAgentInfo);
-        List<BusAgentInfo> listData = list.stream().map(bean -> {
+        list = list.stream().map(bean -> {
             BusStoreInfo busStoreInfo = new BusStoreInfo();
             busStoreInfo.setBindUser(bean.getAgentAccount());
             List<BusStoreInfo> ll = iBusStoreInfoService.selectBusStoreInfoList(busStoreInfo);
@@ -101,7 +101,7 @@ public class BusAgentInfoController extends BaseController {
             bean.setLoginNum(llll.size());
             return bean;
         }).collect(Collectors.toList());
-        return getDataTable(listData);
+        return getDataTable(list);
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusSaleInfoController.java

@@ -60,8 +60,7 @@ public class BusSaleInfoController extends BaseController
             busSaleInfo.setCreateId(SecurityUtils.getUserId());
         }
         List<BusSaleInfo> list = busSaleInfoService.selectBusSaleInfoList(busSaleInfo);
-        List<BusSaleInfo> tableList = list.stream()
-                .map(info -> {
+        list = list.stream().map(info -> {
             BusStoreInfo busStoreInfo = new BusStoreInfo();
             busStoreInfo.setSaleBindId(info.getId());
             int lastFiveNum = 0;
@@ -83,10 +82,9 @@ public class BusSaleInfoController extends BaseController
             info.setFiveStarReviewsNum(lastFiveNum);
             info.setReturnVisitNum(lastReturnVisitNum);
             return info;
-                })
-                .collect(Collectors.toList());
+        }).collect(Collectors.toList());
 //        tableList.forEach(System.out::println);
-        return getDataTable(tableList);
+        return getDataTable(list);
 //        return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java

@@ -117,6 +117,7 @@ public class BusStoreInfoController extends BaseController {
             busStoreInfo.setBindUser(user.getUsername());
         }
         List<BusStoreInfo> list = busStoreInfoService.selectBusStoreInfoList(busStoreInfo);
+        TableDataInfo rspData = getDataTable(list);
         List<RespBusStoreInfo> tableList = list.stream()
             .map(busStoreInfo1 -> {
                 RespBusStoreInfo info = new RespBusStoreInfo(busStoreInfo1);
@@ -151,7 +152,8 @@ public class BusStoreInfoController extends BaseController {
             })
             .collect(Collectors.toList());
 //        tableList.forEach(System.out::println);
-        return getDataTable(tableList);
+        rspData.setRows(tableList);
+        return rspData;
     }
 
     @ApiOperation("查询店铺信息列表")

ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java

@@ -156,7 +156,7 @@ public class AiServiceImpl implements IAiService {
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = RuntimeException.class)
     public void queryAiTask() {
         String url = "https://ai002.ciopaas.com/api/login";
         String userName = "zw982210";
@@ -210,6 +210,7 @@ public class AiServiceImpl implements IAiService {
 //                    }
                     } catch (Exception e) {
                         System.out.println(id + "duplicate");
+                        throw new RuntimeException();
                     }
                 }
             } else {
@@ -316,12 +317,24 @@ public class AiServiceImpl implements IAiService {
                 LocalTime time3 = LocalTime.of(14, 00, 00);
                 LocalTime time4 = LocalTime.of(17, 00, 00);
                 if (time1.isBefore(orderTime) && orderTime.isBefore(time2)) {
+                    if(busStoreConfigInfo.getContent1()==null){
+                        continue;
+                    }
                     content = busStoreConfigInfo.getContent1();
                 } else if (time2.isBefore(orderTime) && orderTime.isBefore(time3)) {
+                    if(busStoreConfigInfo.getContent2()==null){
+                        continue;
+                    }
                     content = busStoreConfigInfo.getContent2();
                 } else if (time3.isBefore(orderTime) && orderTime.isBefore(time4)) {
+                    if(busStoreConfigInfo.getContent3()==null){
+                        continue;
+                    }
                     content = busStoreConfigInfo.getContent3();
                 } else {
+                    if(busStoreConfigInfo.getContent4()==null){
+                        continue;
+                    }
                     content = busStoreConfigInfo.getContent4();
                 }
 
@@ -352,7 +365,6 @@ public class AiServiceImpl implements IAiService {
                     int a = 1;
                     int reduce = busAgentInfo.getAiDurationBalance() - a;
                     busAgentInfo.setAiDurationBalance(reduce);
-                    busAgentInfo.setAiRealTimeNum(0);
                     agentInfoService.updateBusAgentInfo(busAgentInfo);
 
                     BusIntegralRecord record = new BusIntegralRecord();

ruoyi-ui/src/views/statistics/visit/index.vue

@@ -19,7 +19,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="仅当前账号" prop="isUser">
+      <!-- <el-form-item label="仅当前账号" prop="isUser">
         <el-select
           v-model="queryParams.isUser"
           placeholder="请选择"
@@ -34,7 +34,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item label="订单完成时间" prop="time">
         <el-date-picker