Prechádzať zdrojové kódy

叉车导入模板 去掉唯一性校验

huangpeng 9 mesiacov pred
rodič
commit
39b946b912

+ 14 - 14
cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquForkliftRepairRecordServiceImpl.java

@@ -62,22 +62,22 @@ public class EquForkliftRepairRecordServiceImpl extends ServiceImpl<EquForkliftR
         // 解析数据
         List<EquForkliftRepairRecordDo> newForkliftRepairRecord = forkliftRepairRecordListener.getForkliftRepairRecordDoList();
         // 唯一性数据
-        List<EquForkliftRepairRecordDo> oldForkliftRepairRecord = equForkliftRepairRecordService.getUniqueDateByAll();
+    //    List<EquForkliftRepairRecordDo> oldForkliftRepairRecord = equForkliftRepairRecordService.getUniqueDateByAll();
         // 将新旧两组数据拼接为一个stream,再对stream进行分组,找到分组数量大于1的(说明又重复),将重复的数据拿到原始数据中找到源数据返回回来
-        List<EquForkliftRepairRecordDo> forkliftRepairRecordDoList = Stream.concat(newForkliftRepairRecord.stream(), oldForkliftRepairRecord.stream()).collect(Collectors.groupingBy(info ->
-                        info.getEquipmentnumber() + info.getRapairdate() + info.getRapairdetail() , Collectors.counting()))
-                .entrySet().stream()
-                .filter(info -> info.getValue() > 1)
-                .map(Map.Entry::getKey)
-                .map(info -> newForkliftRepairRecord.stream()
-                        .filter(item -> ( item.getEquipmentnumber() + item.getRapairdate() + item.getRapairdetail()).equals(info))
-                        .findFirst().orElse(null))
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
+//        List<EquForkliftRepairRecordDo> forkliftRepairRecordDoList = Stream.concat(newForkliftRepairRecord.stream(), oldForkliftRepairRecord.stream()).collect(Collectors.groupingBy(info ->
+//                        info.getEquipmentnumber() + info.getRapairdate() + info.getRapairdetail() , Collectors.counting()))
+//                .entrySet().stream()
+//                .filter(info -> info.getValue() > 1)
+//                .map(Map.Entry::getKey)
+//                .map(info -> newForkliftRepairRecord.stream()
+//                        .filter(item -> ( item.getEquipmentnumber() + item.getRapairdate() + item.getRapairdetail()).equals(info))
+//                        .findFirst().orElse(null))
+//                .filter(Objects::nonNull)
+//                .collect(Collectors.toList());
         // 拼接返回错误数据
-        if (forkliftRepairRecordDoList.size() != 0) {
-            jointErrorData(forkliftRepairRecordDoList, errorData);
-        }
+//        if (forkliftRepairRecordDoList.size() != 0) {
+//            jointErrorData(forkliftRepairRecordDoList, errorData);
+//        }
         // 判断是否又错误数据
         if (errorData.size() != 0) {
             return R.error(JSON.toJSONString(errorData));