降低空间占用

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);

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<RiskPersonal> createInsertData(String tag, List<WFSHPerson> list, Map<String, WFSHPerson> tmpMap, Map<String, GBaseSYRKXX> idCodeMap) {
-        Map<String, Byte[]> exist = new WeakHashMap<>();
+        HashSet<String> exist = new HashSet<>();
         List<RiskPersonal> toInsert = new ArrayList<>();
 
         Map<String, SupExternalDepart> 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;
     }

src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java

@@ -119,14 +119,14 @@ public class PersonalServiceImpl implements PersonalService {
 
         List<RiskPersonal> personals = new ArrayList<>();
         // 已出现的份证
-        Map<String, Byte[]> cache = new WeakHashMap<>();
+        HashSet<String> 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<GBaseSYRKXX> 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<GBaseZDRY> list = zdryRepository.getBaseMapper().syncPointPeople();
         LocalDate now = LocalDate.now();
-        Map<String, Byte[]> exist = new WeakHashMap<>();
+        HashSet<String> exist = new HashSet<>();
 
         List<RiskPersonal> 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<String, Contradiction> map = list.stream().collect(Collectors.toMap(Contradiction::getGmsfhm, Function.identity(), (val, old) -> val));
         List<GBaseSYRKXX> xxList = getByIdCode(idCodes);
 
-        Map<String, Byte[]> exist = new WeakHashMap<>();
+        HashSet<String> exist = new HashSet<>();
         List<RiskPersonal> 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<RiskPersonal> personals = new ArrayList<>();
-        Map<String, Byte[]> map = new WeakHashMap<>();
+        HashSet<String> 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<GBaseSYRKXX> xxList = new ArrayList<>(getByIdCode(idCards2));
         // 去重
         List<RiskPersonal> personals = new ArrayList<>();
-        Map<String, Byte[]> map = new WeakHashMap<>();
+        HashSet<String> map = new HashSet<>();
         LocalDateTime now = LocalDateTime.now();
         LocalDate today = now.toLocalDate();
         Date nowDate = new Date();
         Map<String, SupExternalDepart> 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<GBaseSYRKXX> xxList = new ArrayList<>(getByIdCode(idCards2));
         Map<String, GBaseSYRKXX> xxMap = xxList.stream().collect(Collectors.toMap(GBaseSYRKXX::getGmsfhm, Function.identity(), (val, old) -> val));
 
-        Map<String, Byte[]> map = new WeakHashMap<>();
+        HashSet<String> map = new HashSet<>();
         List<RiskPersonal> personals = new ArrayList<>();
 
         Map<String, SupExternalDepart> 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<PersonImageInfo> infoList;
         List<RiskPersonInfo> infos;
-        Map<String, Byte[]> p = new WeakHashMap<>();
+        HashSet<String> 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())));

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<String, Byte[]> carMt = new WeakHashMap<>();
+        HashSet<String> 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<String, RiskModelTaskClue> clueMap = domain.getOldMap(task.getModelId(), false);
-        Map<String, Byte[]> exist = new WeakHashMap<>();
+        HashSet<String> exist = new HashSet<>();
         for (String carUser : carUsers) {
-            exist.put(carUser, new Byte[0]);
+            exist.add(carUser);
         }
 
         List<RiskModelTaskClue> toInsert = new ArrayList<>();
@@ -2044,7 +2044,7 @@ public class PointServiceImpl implements PointService {
         List<String> 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());

src/main/java/com/biutag/supervisiondata/service/impl/RiskModelTaskClueServiceImpl.java

@@ -88,21 +88,21 @@ public class RiskModelTaskClueServiceImpl implements RiskModelTaskClueService {
 
 
         Map<String, List<RiskPersonalTag>> oldTagMap = oldTags.stream().collect(Collectors.groupingBy(RiskPersonalTag::getIdCode));
-        Map<String, Byte[]> oldMap;
+        HashSet<String> oldMap;
 
         List<RiskPersonalTag> tags = new ArrayList<>();
         for (Map.Entry<String, List<RiskModelTaskClue>> entry : map.entrySet()) {
             List<RiskPersonalTag> 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);
                     }
                 }
 

src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java

@@ -134,15 +134,15 @@ public class RiskPersonalServiceImpl implements RiskPersonalService {
     @Override
     public void fixed() {
         List<String> diePerson = hzcryxxRepository.getBaseMapper().selectDistinctIdCodes();
-        Map<String, Byte[]> map = new WeakHashMap<>();
+        HashSet<String> map = new HashSet<>();
         for (String person : diePerson) {
-            map.put(person, new Byte[0]);
+            map.add(person);
         }
 
         List<RiskPersonal> personals = repository.list();
         List<RiskPersonal> 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);