增加随机数工具类

src/main/java/com/care/client/service/PinanbaoService.java

@@ -205,23 +205,28 @@ public class PinanbaoService {
         IPage<CareEventOrder> page = new Page<>(current, 10);
         List<DeviceVO> deviceVOS = devList(memberId);
         List<Long> deviceIds = deviceVOS.stream().map(DeviceVO::getDevId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
-
-        QueryWrapper<CareEventOrder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareEventOrder::getMemberId,memberId).in(CareEventOrder::getDevId, deviceIds).orderByDesc(CareEventOrder::getCreateTime);
-        IPage<CareEventOrder> contentPage = this.careEventOrderService.page(page, queryWrapper);
-        IPage<EventOrderVO> results = new Page<>(contentPage.getCurrent(), contentPage.getSize(), contentPage.getTotal());
-        if (CollUtil.isNotEmpty(contentPage.getRecords())) {
-            List<EventOrderVO> list = new ArrayList<>();
-            contentPage.getRecords().forEach(item -> {
-                EventOrderVO resVO = new EventOrderVO();
-                BeanUtils.copyProperties(item, resVO);
-                resVO.setOrderTypeName(OrderTypeEnum.getCodeToName(item.getOrderType()));
-                resVO.setStatusName(OrderStatusEnum.getCodeToName(item.getStatus()));
-                list.add(resVO);
-            });
-            results.setRecords(list);
+        if (CollUtil.isNotEmpty(deviceIds)){
+            QueryWrapper<CareEventOrder> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(CareEventOrder::getMemberId,memberId).in(CareEventOrder::getDevId, deviceIds).orderByDesc(CareEventOrder::getCreateTime);
+            IPage<CareEventOrder> contentPage = this.careEventOrderService.page(page, queryWrapper);
+            IPage<EventOrderVO> results = new Page<>(contentPage.getCurrent(), contentPage.getSize(), contentPage.getTotal());
+            if (CollUtil.isNotEmpty(contentPage.getRecords())) {
+                List<EventOrderVO> list = new ArrayList<>();
+                contentPage.getRecords().forEach(item -> {
+                    EventOrderVO resVO = new EventOrderVO();
+                    BeanUtils.copyProperties(item, resVO);
+                    resVO.setOrderTypeName(OrderTypeEnum.getCodeToName(item.getOrderType()));
+                    resVO.setStatusName(OrderStatusEnum.getCodeToName(item.getStatus()));
+                    list.add(resVO);
+                });
+                results.setRecords(list);
+            }
+            return results;
+        }else{
+            return new Page<>(1, 10, 0);
         }
-        return results;
+
+
     }
 
     /**

src/main/java/com/care/common/service/impl/CareEventOrderServiceImpl.java

@@ -376,6 +376,7 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                             his2.setVoiceCallId(sendStatus.getCallId());
                             his2.setLogResult("语音通知");
                             his2.setOpUserRole(UserRoleEnum.SEAT.getValue());
+                            his2.setVoiceCallStatus(ContactorStatusEnum.YI_LIAN_XI.getValue().toString());
                             his2.setCreateTime(DateUtil.date());
                             his2.setRelationTypeDesc(item.getRelationTypeDesc());
                             if ( sendStatus.isSuccess()){
@@ -413,6 +414,7 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                             his2.setLogObjectName(item.getChambName());
                             his2.setLogResult("语音通知");
                             his2.setVoiceCallId(sendStatus.getCallId());
+                            his2.setVoiceCallStatus(ContactorStatusEnum.YI_LIAN_XI.getValue().toString());
                             his2.setOpUserRole(UserRoleEnum.SEAT.getValue());
                             his2.setCreateTime(DateUtil.date());
                             his2.setRelationTypeDesc("管家");

src/main/java/com/care/common/util/RandomCodeUtil.java

@@ -0,0 +1,27 @@
+package com.care.common.util;
+
+import cn.hutool.core.util.RandomUtil;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @Author: lilt
+ * @Date: 2021/12/9
+ * @Desc:
+ */
+public class RandomCodeUtil {
+    public static String radomNumberCode(int length) {
+        String randomString = RandomUtil.randomString("012356789", length);
+        //0开头的改成8
+        if (randomString.startsWith("0")) {
+            randomString = StringUtils.replace(randomString, "0", "8", 1);
+        }
+        return randomString;
+    }
+
+    public static void main(String[] args) {
+        for (int i=0;i<10;i++){
+            System.out.println(RandomCodeUtil.radomNumberCode(10));
+        }
+
+    }
+}