diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/entity/CasesImport.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/entity/CasesImport.java index 880c121..2d82008 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/entity/CasesImport.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/entity/CasesImport.java @@ -120,6 +120,9 @@ public class CasesImport implements Serializable { @Alias("eventCreatorTel") private String creatorTel; + @TableField(exist = false) + private String resourceTypeName; + /** * 主键 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/RemoteCallsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/RemoteCallsServiceImpl.java index e93dc1d..23e3239 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/RemoteCallsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/RemoteCallsServiceImpl.java @@ -111,11 +111,7 @@ public class RemoteCallsServiceImpl implements RemoteCallsService { String eventTime = DateUtil.offsetHour(DateUtil.date(), -1).toString("yyyy-MM-dd HH"); queryWrapper.and(wrapper -> wrapper.gt("eventTime", eventTime)); } - queryWrapper.and(wrapper -> - wrapper.isNotNull("innerEventId") - .ne("innerEventId", "") - ) - .isNull("state"); + queryWrapper.and(wrapper -> wrapper.isNotNull("innerEventId").ne("innerEventId", "")).isNull("state"); // 创建SimpleDateFormat对象,指定日期格式为yyyy-MM-dd HH:mm:ss SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // 循环获取所有数据 @@ -335,7 +331,12 @@ public class RemoteCallsServiceImpl implements RemoteCallsService { log.info("======================================="); log.info("一共获取" + list.size() + "条数据"); if (CollectionUtil.isNotEmpty(list)) { - casesImportService.saveBatch(list); + // 过滤数据 + List filteredList = list.stream().filter(casesImport -> + !"咨询".equals(casesImport.getResourceTypeName())).collect(Collectors.toList()); + log.info("======================================="); + log.info("过滤后剩下" + filteredList.size() + "条数据"); + casesImportService.saveBatch(filteredList); id = casesImportService.findIdDesc(); saveDate(id); } @@ -371,10 +372,7 @@ public class RemoteCallsServiceImpl implements RemoteCallsService { if (CollectionUtil.isNotEmpty(list)) { Events events = new Events(); if (state == 1) { - List notPassed = list.stream() - .filter(x -> x.getIfInstruct().equals("2")) - .map(PassEventRequest::getInnerEventId) - .collect(Collectors.toList()); + List notPassed = list.stream().filter(x -> x.getIfInstruct().equals("2")).map(PassEventRequest::getInnerEventId).collect(Collectors.toList()); log.info("IfInstruct=2的数据条数=====================" + notPassed.size() + "========================="); if (CollectionUtil.isNotEmpty(notPassed)) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -383,10 +381,7 @@ public class RemoteCallsServiceImpl implements RemoteCallsService { events.setState(state); eventsService.update(events, wrapper); } - List disuse = list.stream() - .filter(x -> x.getIfInstruct().equals("4")) - .map(PassEventRequest::getInnerEventId) - .collect(Collectors.toList()); + List disuse = list.stream().filter(x -> x.getIfInstruct().equals("4")).map(PassEventRequest::getInnerEventId).collect(Collectors.toList()); log.info("IfInstruct=4的数据条数=====================" + disuse.size() + "========================="); if (CollectionUtil.isNotEmpty(disuse)) { QueryWrapper wrapper = new QueryWrapper<>();