From 66f67a2062462fc9ac670d73c0012acfd3d00990 Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Thu, 19 Dec 2024 15:48:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=8D=E4=BD=8E=E7=A9=BA=E9=97=B4=E5=8D=A0?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/ApplicationEvent.java | 1 - .../service/impl/GBaseSHRWFRServiceImpl.java | 7 +- .../service/impl/PersonalServiceImpl.java | 88 ++++++++++--------- .../service/impl/PointServiceImpl.java | 14 +-- .../impl/RiskModelTaskClueServiceImpl.java | 10 +-- .../service/impl/RiskPersonalServiceImpl.java | 6 +- 6 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index f9f3f97..0204e3a 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -98,7 +98,6 @@ public class ApplicationEvent { @Resource SupExternalDepartRepository departRepository; - @EventListener(ApplicationReadyEvent.class) public void serviceReady() { RedisDao.getInstance().init(redisTemplate); diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java index 2820e95..6ba87e8 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java @@ -5,7 +5,6 @@ import com.biutag.supervisiondata.common.interfaces.CompletableFutureUtil; import com.biutag.supervisiondata.common.utils.StreamUtil; import com.biutag.supervisiondata.pojo.ClueData; import com.biutag.supervisiondata.pojo.constants.Default; -import com.biutag.supervisiondata.pojo.database.PointOrg; import com.biutag.supervisiondata.pojo.database.SecurityMan; import com.biutag.supervisiondata.pojo.domain.Drug; import com.biutag.supervisiondata.pojo.domain.TaskParamDomain; @@ -472,12 +471,12 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService { } List createInsertData(String tag, List list, Map tmpMap, Map idCodeMap) { - Map exist = new WeakHashMap<>(); + HashSet exist = new HashSet<>(); List toInsert = new ArrayList<>(); Map hope = new WeakHashMap<>(); for (WFSHPerson person : list) { - if (exist.get(person.getIdCode()) != null) { + if (exist.contains(person.getIdCode())) { continue; } WFSHPerson result = tmpMap.get(person.getIdCode()); @@ -507,7 +506,7 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService { hope.put(departId, depart); } toInsert.add(personal); - exist.put(person.getIdCode(), new Byte[0]); + exist.add(person.getIdCode()); } return toInsert; } diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java index 712f151..5e71832 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java @@ -119,14 +119,14 @@ public class PersonalServiceImpl implements PersonalService { List personals = new ArrayList<>(); // 已出现的份证 - Map cache = new WeakHashMap<>(); + HashSet cache = new HashSet<>(); LocalDate now = LocalDate.now(); for (GBaseJJD item : jjdList) { GBaseSYRKXX syrkxx; // 接警单证件号不为空并没入过库 - if (item.getBjrzjhm() != null && cache.get(item.getBjrzjhm()) == null) { + if (item.getBjrzjhm() != null && !cache.contains(item.getBjrzjhm())) { syrkxx = idCodeMap.get(item.getBjrzjhm()); - cache.put(item.getBjrzjhm(), new Byte[0]); + cache.add(item.getBjrzjhm()); if (syrkxx != null) { RiskPersonal personal = createPerson(syrkxx, item.getBjsj(), now, end, Default.BIG_TAG_JJD); if (personal != null) { @@ -139,14 +139,14 @@ public class PersonalServiceImpl implements PersonalService { if (!idCards.isEmpty()) { String[] arr = idCards.split(","); for (String s : arr) { - if (cache.get(s) != null) { + if (cache.contains(s)) { continue; } GBaseSYRKXX xx = idCodeMap.get(s); if (xx == null) { continue; } - cache.put(xx.getGmsfhm(), new Byte[0]); + cache.add(xx.getGmsfhm()); RiskPersonal personal = createPerson(xx, item.getBjsj(), now, end, Default.BIG_TAG_JJD); if (personal == null) { continue; @@ -158,7 +158,7 @@ public class PersonalServiceImpl implements PersonalService { List xxList = Optional.ofNullable(mobileMap.get(item.getBjdh())).orElse(new ArrayList<>()); syrkxx = compare(xxList, item.getBjrxm()); if (syrkxx != null) { - cache.put(syrkxx.getGmsfhm(), new Byte[0]); + cache.add(syrkxx.getGmsfhm()); RiskPersonal personal = createPerson(syrkxx, item.getBjsj(), now, end, Default.BIG_TAG_JJD); if (personal == null) { continue; @@ -175,14 +175,14 @@ public class PersonalServiceImpl implements PersonalService { public void pullPointPersonalInfo() { List list = zdryRepository.getBaseMapper().syncPointPeople(); LocalDate now = LocalDate.now(); - Map exist = new WeakHashMap<>(); + HashSet exist = new HashSet<>(); List personals = new ArrayList<>(); for (GBaseZDRY ry : list) { - if (exist.get(ry.getSfzh()) != null) { + if (exist.contains(ry.getSfzh())) { continue; } - exist.put(ry.getSfzh(), new Byte[0]); + exist.add(ry.getSfzh()); RiskPersonal personal = new RiskPersonal(); personal.setTags(Default.POINT_POEPLE); personal.setCreateTime(LocalDateTime.now()); @@ -234,13 +234,13 @@ public class PersonalServiceImpl implements PersonalService { Map map = list.stream().collect(Collectors.toMap(Contradiction::getGmsfhm, Function.identity(), (val, old) -> val)); List xxList = getByIdCode(idCodes); - Map exist = new WeakHashMap<>(); + HashSet exist = new HashSet<>(); List personals = new ArrayList<>(); for (GBaseSYRKXX syrkxx : xxList) { - if (exist.get(syrkxx.getGmsfhm()) != null) { + if (exist.contains(syrkxx.getGmsfhm())) { continue; } - exist.put(syrkxx.getGmsfhm(), new Byte[0]); + exist.add(syrkxx.getGmsfhm()); Contradiction contradiction = map.get(syrkxx.getGmsfhm()); RiskPersonal personal = createPerson(syrkxx, Optional.of(contradiction).map(Contradiction::getMaxTime) .orElse(null), now.toLocalDate(), now, Default.BIG_TAG_SHWFR); @@ -293,17 +293,18 @@ public class PersonalServiceImpl implements PersonalService { .toList())))).join(); // 去重 List personals = new ArrayList<>(); - Map map = new WeakHashMap<>(); + HashSet map = new HashSet<>(); LocalDate today = now.toLocalDate(); Date nowDate = new Date(); for (GBaseSYRKXX xx : xxList) { - if (map.get(xx.getGmsfhm()) == null) { - RiskPersonal personal = createPerson(xx, nowDate, today, now, Default.BIG_TAG_PETITION); - if (personal != null) { - personals.add(personal); - } - map.put(xx.getGmsfhm(), new Byte[0]); + if (map.contains(xx.getGmsfhm())) { + continue; + } + RiskPersonal personal = createPerson(xx, nowDate, today, now, Default.BIG_TAG_PETITION); + if (personal != null) { + personals.add(personal); } + map.add(xx.getGmsfhm()); } riskPersonalService.saveDistinct(personals); } @@ -333,30 +334,31 @@ public class PersonalServiceImpl implements PersonalService { List xxList = new ArrayList<>(getByIdCode(idCards2)); // 去重 List personals = new ArrayList<>(); - Map map = new WeakHashMap<>(); + HashSet map = new HashSet<>(); LocalDateTime now = LocalDateTime.now(); LocalDate today = now.toLocalDate(); Date nowDate = new Date(); Map hope = new WeakHashMap<>(); for (GBaseSYRKXX xx : xxList) { - if (map.get(xx.getGmsfhm()) == null) { - RiskPersonal personal = createPerson(xx, nowDate, today, now, Default.BIG_TAG_PETITION); - if (personal == null) { - continue; - } - SupExternalDepart depart = Optional.ofNullable(hope.get(xx.getSspcsdm())).orElse(DepartUtil.findLevelThereOrg(xx.getSspcsdm(), OrgType.POINT)); - if (depart != null) { - hope.put(xx.getSspcsdm(), depart); - personal.setControlDepartId(depart.getInternalId()); - personal.setControlDepartName(depart.getInternalShortName()); - personal.setControlDepartType(DepartType.HUMAN.getType()); - } else { - personal.setControlDepartId(null); - personal.setControlDepartName(null); - } - personals.add(personal); - map.put(xx.getGmsfhm(), new Byte[0]); + if (map.contains(xx.getGmsfhm())) { + continue; } + RiskPersonal personal = createPerson(xx, nowDate, today, now, Default.BIG_TAG_PETITION); + if (personal == null) { + continue; + } + SupExternalDepart depart = Optional.ofNullable(hope.get(xx.getSspcsdm())).orElse(DepartUtil.findLevelThereOrg(xx.getSspcsdm(), OrgType.POINT)); + if (depart != null) { + hope.put(xx.getSspcsdm(), depart); + personal.setControlDepartId(depart.getInternalId()); + personal.setControlDepartName(depart.getInternalShortName()); + personal.setControlDepartType(DepartType.HUMAN.getType()); + } else { + personal.setControlDepartId(null); + personal.setControlDepartName(null); + } + personals.add(personal); + map.add(xx.getGmsfhm()); } riskPersonalService.saveDistinct(personals); } @@ -404,15 +406,15 @@ public class PersonalServiceImpl implements PersonalService { List xxList = new ArrayList<>(getByIdCode(idCards2)); Map xxMap = xxList.stream().collect(Collectors.toMap(GBaseSYRKXX::getGmsfhm, Function.identity(), (val, old) -> val)); - Map map = new WeakHashMap<>(); + HashSet map = new HashSet<>(); List personals = new ArrayList<>(); Map hope = new WeakHashMap<>(); for (WdpcGrjdJsbry ry : jsbryList) { - if (map.get(ry.getIdCode()) != null) { + if (map.contains(ry.getIdCode())) { continue; } - map.put(ry.getIdCode(), new Byte[0]); + map.add(ry.getIdCode()); GBaseSYRKXX xx = xxMap.get(ry.getIdCode()); @@ -489,7 +491,7 @@ public class PersonalServiceImpl implements PersonalService { log.info("有效头像共：{}", total); List infoList; List infos; - Map p = new WeakHashMap<>(); + HashSet p = new HashSet<>(); for (int page = 1;; page++) { log.info("{}", page); int pageNo = (page- 1) * 10000; @@ -498,10 +500,10 @@ public class PersonalServiceImpl implements PersonalService { infos = new ArrayList<>(); log.info("保存：{}",infoList.size()); for (PersonImageInfo item : infoList) { - if(p.get(item.getIdCode().toUpperCase()) != null) { + if(p.contains(item.getIdCode().toUpperCase())) { continue; } - p.put(item.getIdCode().toUpperCase(), new Byte[0]); + p.add(item.getIdCode().toUpperCase()); RiskPersonInfo info = new RiskPersonInfo(); info.setIdCode(item.getIdCode()); info.setImageBase64(Media.JPEG.concat(new String(item.getImage()))); diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java index ef7df3f..e41582d 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java @@ -1910,9 +1910,9 @@ public class PointServiceImpl implements PointService { if (!idCards.isEmpty()) { carMaster.addAll(zdryRepository.getBaseMapper().syncCarUser(idCards)); } - Map carMt = new WeakHashMap<>(); + HashSet carMt = new HashSet<>(); for (String s : carMaster) { - carMt.put(s, new Byte[0]); + carMt.add(s); } // 新增记录 @@ -1928,7 +1928,7 @@ public class PointServiceImpl implements PointService { LocalDateTime time = null; int count = 0; for (GBaseOilBuy item : mineBuy) { - if (carMt.get(person.getIdCode()) != null) { + if (carMt.contains(person.getIdCode())) { continue; } count++; @@ -2034,9 +2034,9 @@ public class PointServiceImpl implements PointService { RiskTask task = taskRepository.create(carUsers.size(), 53); Map clueMap = domain.getOldMap(task.getModelId(), false); - Map exist = new WeakHashMap<>(); + HashSet exist = new HashSet<>(); for (String carUser : carUsers) { - exist.put(carUser, new Byte[0]); + exist.add(carUser); } List toInsert = new ArrayList<>(); @@ -2044,7 +2044,7 @@ public class PointServiceImpl implements PointService { List idCodes = new ArrayList<>(); for (RiskPersonal person : domain.getPersons()) { // 增加 - if (exist.get(person.getIdCode()) != null && clueMap.get(person.getIdCode()) == null) { + if (exist.contains(person.getIdCode()) && clueMap.get(person.getIdCode()) == null) { toInsert.add(DataUtil.createClueData(task, ClueData.builder() .id("") .score(5) @@ -2057,7 +2057,7 @@ public class PointServiceImpl implements PointService { .build())); } // 减少 - if (exist.get(person.getIdCode()) == null && clueMap.get(person.getIdCode()) != null) { + if (!exist.contains(person.getIdCode()) && clueMap.get(person.getIdCode()) != null) { RiskModelTaskClue old = clueMap.get(person.getIdCode()); RiskModelTaskClue delete = new RiskModelTaskClue(); delete.setId(old.getId()); diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/RiskModelTaskClueServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/RiskModelTaskClueServiceImpl.java index fdb0321..aa5b4d2 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/RiskModelTaskClueServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/RiskModelTaskClueServiceImpl.java @@ -88,21 +88,21 @@ public class RiskModelTaskClueServiceImpl implements RiskModelTaskClueService { Map> oldTagMap = oldTags.stream().collect(Collectors.groupingBy(RiskPersonalTag::getIdCode)); - Map oldMap; + HashSet oldMap; List tags = new ArrayList<>(); for (Map.Entry> entry : map.entrySet()) { List oldTagList = Optional.ofNullable(oldTagMap.get(entry.getKey())).orElse(new ArrayList<>()); // 旧的tag - oldMap = new WeakHashMap<>(); + oldMap = new HashSet<>(); for (RiskPersonalTag tag : oldTagList) { - oldMap.put(tag.getSmallTag(), new Byte[0]); + oldMap.add(tag.getSmallTag()); } for (RiskModelTaskClue clue : entry.getValue()) { for (String tag : clue.getTags()) { - if (oldMap.get(tag) == null) { + if (!oldMap.contains(tag)) { tags.add(creatTag(bigTag, tag, clue)); - oldMap.put(tag, new Byte[0]); + oldMap.add(tag); } } diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java index 1e6c491..aa8e895 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java @@ -134,15 +134,15 @@ public class RiskPersonalServiceImpl implements RiskPersonalService { @Override public void fixed() { List diePerson = hzcryxxRepository.getBaseMapper().selectDistinctIdCodes(); - Map map = new WeakHashMap<>(); + HashSet map = new HashSet<>(); for (String person : diePerson) { - map.put(person, new Byte[0]); + map.add(person); } List personals = repository.list(); List del = new ArrayList<>(); for (RiskPersonal personal : personals) { - if(map.get(personal.getIdCode()) != null) { + if(map.contains(personal.getIdCode())) { RiskPersonal delete = new RiskPersonal(); delete.setId(personal.getId()); delete.setDel(1);