是否重点人员多合一

src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java

@@ -115,13 +115,11 @@ public class ApplicationEvent {
 
             petitionService.petitionModelTask(initDomain(List.of(40)));
             riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41)));
-//            riskTaskService.eduModelTask(initDomain(List.of(34)));
             riskTaskService.infoModelTask(initDomain(List.of(32,33)));
             marriageService.marriageModelTask(initDomain(List.of(39,51)));
             pointService.syncSecurity(initDomain(List.of(37)));
             habitService.habitModelTask(start, initDomain(List.of(36,60,61,62)));
             pointService.syncCarUser(initDomain(List.of(53)));
-//            riskTaskService.riskAreaModelTask(initDomain(List.of(41)));
             pointService.syncScore(initDomain(List.of(43)));
             pointService.syncViolence(initDomain(List.of(44)));
             noControlService.syncNoControlData(initDomain(List.of(45)));

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

@@ -67,7 +67,7 @@ public class GBaseJJDServiceImpl implements GBaseJJDService {
         log.info("总条数 | {}条", result.size());
 
         List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>()
-                .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalName, SupExternalDepart::getSource)
+                .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalShortName, SupExternalDepart::getSource)
                 .in(SupExternalDepart::getSource, List.of("重点人员", "情指行")));
         Map<String, List<SupExternalDepart>> amp = supDeparts.stream().collect(Collectors.groupingBy(SupExternalDepart::getSource));
         Map<String, SupExternalDepart> pointExternalDepart = amp.get("重点人员").stream().collect(Collectors.toMap(SupExternalDepart::getExternalId, Function.identity(), (val, old) -> val));
@@ -186,7 +186,7 @@ public class GBaseJJDServiceImpl implements GBaseJJDService {
                         SupExternalDepart depart = pointExternalDepart.get(org.getDm());
                         if (depart != null) {
                             personal.setControlDepartId(depart.getInternalId());
-                            personal.setControlDepartName(depart.getInternalName());
+                            personal.setControlDepartName(depart.getInternalShortName());
                             personal.setControlDepartType(DepartType.HUMAN.getType());
                             personal.setControlTime(LocalDateTime.now());
                             personal.setCreateTime(personal.getControlTime());
@@ -240,7 +240,7 @@ public class GBaseJJDServiceImpl implements GBaseJJDService {
             }
             hope.put(tmp.getGxdwdm(), depart);
             personal.setControlDepartId(depart.getInternalId());
-            personal.setControlDepartName(depart.getInternalName());
+            personal.setControlDepartName(depart.getInternalShortName());
             personal.setControlDepartType(DepartType.OTHER.getType());
             // 如果有报警时间，暂时填报警时间 处理标签回正
             try {

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

@@ -61,7 +61,7 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService {
     public void pullAndSave(LocalDateTime start, LocalDateTime end) {
         List<PointOrg> orgs = zdryRepository.getBaseMapper().selectOrg();
         List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>()
-                .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalName, SupExternalDepart::getSource)
+                .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalShortName, SupExternalDepart::getSource)
                 .in(SupExternalDepart::getSource, List.of("情指行")));
         Map<String, SupExternalDepart> externalDepart = supDeparts.stream().collect(Collectors.toMap(SupExternalDepart::getExternalId, Function.identity(), (val, old) -> val));
 

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

@@ -872,7 +872,7 @@ public class ModelClueServiceImpl implements ModelClueService {
             newModelClue.setNegativeIdEx("");
             newModelClue.setInvolvePoliceName((String) map.get("USERNAME"));
             newModelClue.setInvolveDepartName((String) map.get("orgname"));
-            SupExternalDepart supExternalDepart = supExternalDepartRepository.getOne(new LambdaQueryWrapper<SupExternalDepart>().eq(SupExternalDepart::getInternalName, map.get("orgname")).last("LIMIT 1"));
+            SupExternalDepart supExternalDepart = supExternalDepartRepository.getOne(new LambdaQueryWrapper<SupExternalDepart>().eq(SupExternalDepart::getInternalShortName, map.get("orgname")).last("LIMIT 1"));
             if (supExternalDepart != null) {
                 if (supExternalDepart.getInternalId() != null) {
                     newModelClue.setInvolveDepartId(supExternalDepart.getInternalId());

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

@@ -327,7 +327,7 @@ public class PersonalServiceImpl implements PersonalService {
                 .toList();
 
         List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>()
-                .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalName, SupExternalDepart::getSource)
+                .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalShortName, SupExternalDepart::getSource)
                 .eq(SupExternalDepart::getSource, "重点人员"));
 
         List<PointOrg> orgs = zdryRepository.getBaseMapper().selectOrg();
@@ -364,7 +364,7 @@ public class PersonalServiceImpl implements PersonalService {
                 if (depart != null) {
                     hope.put(xx.getSspcsdm(), depart);
                     personal.setControlDepartId(depart.getInternalId());
-                    personal.setControlDepartName(depart.getInternalName());
+                    personal.setControlDepartName(depart.getInternalShortName());
                     personal.setControlDepartType(DepartType.HUMAN.getType());
                 } else {
                     personal.setControlDepartId(null);
@@ -423,7 +423,7 @@ public class PersonalServiceImpl implements PersonalService {
         Map<String, GBaseSYRKXX> xxMap = xxList.stream().collect(Collectors.toMap(GBaseSYRKXX::getGmsfhm, Function.identity(), (val, old) -> val));
 
         List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>()
-                .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalName, SupExternalDepart::getSource)
+                .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalShortName, SupExternalDepart::getSource)
                 .eq(SupExternalDepart::getSource, "重点人员"));
 
         List<PointOrg> orgs = zdryRepository.getBaseMapper().selectOrg();
@@ -466,7 +466,7 @@ public class PersonalServiceImpl implements PersonalService {
                 if (depart != null) {
                     hope.put(xx.getSspcsdm(), depart);
                     person.setControlDepartId(depart.getInternalId());
-                    person.setControlDepartName(depart.getInternalName());
+                    person.setControlDepartName(depart.getInternalShortName());
                     person.setControlDepartType(DepartType.HUMAN.getType());
                 }
             }

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

@@ -67,7 +67,7 @@ public class PetitionServiceImpl implements PetitionService {
         List<String> mobiles = new ArrayList<>();
 
         List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>()
-                .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalName, SupExternalDepart::getSource)
+                .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalShortName, SupExternalDepart::getSource)
                 .eq(SupExternalDepart::getSource, "重点人员"));
         Map<String, SupExternalDepart> jqExternalDepart = supDeparts.stream().collect(Collectors.toMap(SupExternalDepart::getExternalId, Function.identity(), (val, old) -> val));
 
@@ -209,7 +209,7 @@ public class PetitionServiceImpl implements PetitionService {
                 SupExternalDepart depart = Optional.ofNullable(org).map(PointOrg::getDm).map(jqExternalDepart::get).orElse(null);
                 if (depart != null) {
                     personal.setControlDepartId(depart.getInternalId());
-                    personal.setControlDepartName(depart.getInternalName());
+                    personal.setControlDepartName(depart.getInternalShortName());
                     personal.setControlDepartType(DepartType.HUMAN.getType());
                     personal.setControlTime(LocalDateTime.now());
                 }
@@ -240,7 +240,7 @@ public class PetitionServiceImpl implements PetitionService {
                 SupExternalDepart depart = Optional.ofNullable(org).map(PointOrg::getDm).map(jqExternalDepart::get).orElse(null);
                 if (depart != null) {
                     personal.setControlDepartId(depart.getInternalId());
-                    personal.setControlDepartName(depart.getInternalName());
+                    personal.setControlDepartName(depart.getInternalShortName());
                     personal.setControlDepartType(DepartType.HUMAN.getType());
                     personal.setControlTime(LocalDateTime.now());
                 }
@@ -277,7 +277,7 @@ public class PetitionServiceImpl implements PetitionService {
                 SupExternalDepart depart = Optional.ofNullable(org).map(PointOrg::getDm).map(jqExternalDepart::get).orElse(null);
                 if (depart != null) {
                     personal.setControlDepartId(depart.getInternalId());
-                    personal.setControlDepartName(depart.getInternalName());
+                    personal.setControlDepartName(depart.getInternalShortName());
                     personal.setControlDepartType(DepartType.HUMAN.getType());
                     personal.setControlTime(LocalDateTime.now());
                 }

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

@@ -58,8 +58,6 @@ public class PointServiceImpl implements PointService {
 
     private final RiskTaskRepository taskRepository;
 
-    private final SupDepartMapper supDepartMapper;
-
     private final WdpcGrjdXfsjRepository wdpcGrjdXfsjRepository;
 
     private final WdpcGrjdXfsjCsRepository wdpcGrjdXfsjCsRepository;
@@ -103,8 +101,7 @@ public class PointServiceImpl implements PointService {
     @Override
     public void syncScore(TaskParamDomain domain) {
         List<RiskPersonal> persons = getPersons();
-        RiskTask task = createTask(persons.size(), 43);
+        RiskTask task = taskRepository.create(persons.size(), 43);
-        taskRepository.save(task);
 
         List<RiskModelTaskClue> clues = Optional.ofNullable(domain.getMap().get(task.getModelId())).orElse(new ArrayList<>());
         Map<String, List<RiskModelTaskClue>> oldClueMap = clues.stream().collect(Collectors.groupingBy(RiskModelTaskClue::getIdCode));
@@ -114,48 +111,31 @@ public class PointServiceImpl implements PointService {
 
         for (Map.Entry<String, List<RiskPersonal>> entry : map.entrySet()) {
             List<RiskModelTaskClue> olds = oldClueMap.get(entry.getKey());
-            if (olds == null) {
+            // 是否类型只存在一条
+            if (olds != null) {
+                continue;
+            }
             List<RiskPersonal> personals = entry.getValue().stream().filter(StreamUtil.distinctByKey(RiskPersonal::getTags)).toList();
+            StringBuilder sb = new StringBuilder();
             // 全部增加
             for (RiskPersonal personal : personals) {
-                    toInsert.add(createClue(task.getModelId(), 5, task.getId(), ClueData.builder()
+                sb.append(personal.getTags()).append(",");
-                            .tag("重点人员")
-                            .name(personal.getName())
-                            .idCode(personal.getIdCode())
-                            .eventTime(Optional.ofNullable(personal.getControlTime()).orElse(LocalDateTime.now()))
-                            .departId(personal.getControlDepartId())
-                            .departName(personal.getControlDepartName())
-                            .sourceData("该人员存在标签：" + personal.getTags() + "，属于重点人员")
-                            .build()));
             }
+            if(sb.isEmpty()){
                 continue;
             }
-            Map<String, RiskModelTaskClue> clueMap = olds.stream().collect(Collectors.toMap(RiskModelTaskClue::getRiskReason, Function.identity(), (oldValue, newValue) -> newValue));
-            List<RiskPersonal> personals = entry.getValue().stream().filter(StreamUtil.distinctByKey(RiskPersonal::getTags)).toList();
-            for (RiskPersonal personal : personals) {
-                if (clueMap.get(personal.getTags()) == null) {
             toInsert.add(createClue(task.getModelId(), 5, task.getId(), ClueData.builder()
                     .tag("重点人员")
-                            .name(personal.getName())
+                    .name(personals.getFirst().getName())
-                            .idCode(personal.getIdCode())
+                    .idCode(personals.getFirst().getIdCode())
-                            .eventTime(Optional.ofNullable(personal.getControlTime()).orElse(LocalDateTime.now()))
+                    .eventTime(Optional.ofNullable(personals.getFirst().getControlTime()).orElse(LocalDateTime.now()))
-                            .departId(personal.getControlDepartId())
+                    .sourceData("该人员存在标签：" +sb.substring(0,sb.length()-1) + "，属于重点人员")
-                            .departName(personal.getControlDepartName())
-                            .sourceData("该人员存在标签：" + personal.getTags() + "，属于重点人员")
                     .build()));
         }
-            }
-        }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, "是否是重点人员");
         }
-        RiskTask updateTask = new RiskTask();
+        taskRepository.updateTask(task.getId(), toInsert.size(), 0);
-        updateTask.setId(task.getId());
-        updateTask.setInsertSize(toInsert.size());
-        updateTask.setUpdateSize(0);
-        updateTask.setState(1);
-        updateTask.setEndTime(LocalDateTime.now());
-        taskRepository.updateById(updateTask);
     }
 
     private final WdpcGrjdZblxRepository zblxRepository;
@@ -176,6 +156,7 @@ public class PointServiceImpl implements PointService {
         List<RiskModelTaskClue> olds = Optional.ofNullable(domain.getMap().get(task.getModelId())).orElse(new ArrayList<>());
         Map<String, List<RiskModelTaskClue>> personMap = olds.stream().collect(Collectors.groupingBy(RiskModelTaskClue::getIdCode));
         List<RiskModelTaskClue> toInsert = new ArrayList<>();
+        Map<String, List<RiskModelTaskClue>> mapPerson = new WeakHashMap<>();
         for (GBaseZDRY ry : list) {
             RiskPersonal person = personalMap.get(ry.getSfzh());
             if(person==null) {
@@ -206,8 +187,11 @@ public class PointServiceImpl implements PointService {
                 } catch (Exception e) {
                     data.setEventTime(LocalDateTime.now());
                 }
-                toInsert.add(createClue(task.getModelId(), zblx.getScore().intValue(), task.getId(), data));
+                mapPerson.computeIfAbsent(person.getIdCode(), k -> new ArrayList<>()).add(createClue(task.getModelId(), zblx.getScore().intValue(), task.getId(), data));
+            }
         }
+        for (Map.Entry<String, List<RiskModelTaskClue>> entry : mapPerson.entrySet()) {
+            toInsert.addAll(entry.getValue().stream().filter(StreamUtil.distinctByKey(RiskModelTaskClue::getRiskReason)).toList());
         }
         if (!toInsert.isEmpty()) {
             log.info("保存重点人员标签 {}", toInsert.size());
@@ -2160,7 +2144,7 @@ public class PointServiceImpl implements PointService {
         List<GBaseTbDZdrylb> lbList = zdrylbRepository.list(new LambdaQueryWrapper<GBaseTbDZdrylb>()
                 .select(GBaseTbDZdrylb::getCode, GBaseTbDZdrylb::getDefine));
         List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>()
-                .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalName, SupExternalDepart::getSource)
+                .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalShortName, SupExternalDepart::getSource)
                 .eq(SupExternalDepart::getSource, "重点人员"));
 
         List<PointOrg> orgs = zdryRepository.getBaseMapper().selectOrg();
@@ -2232,7 +2216,7 @@ public class PointServiceImpl implements PointService {
                 personal.setIdCode(ry.getSfzh());
                 personal.setName(ry.getXm());
 
-                personal.setControlDepartName(depart.getInternalName());
+                personal.setControlDepartName(depart.getInternalShortName());
                 personal.setControlDepartId(depart.getInternalId());
                 try {
                     personal.setControlTime(LocalDateTime.parse(ry.getJlbgsj(), DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));

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

@@ -112,7 +112,6 @@ public class RiskTaskServiceImpl implements RiskTaskService {
                         "大学";
                 case "硕士研究生毕业", "研究生教育", "研究生班肄业" -> "大学以上";
                 default -> null;
-
             };
             if (edu == null) {
                 continue;
@@ -403,7 +402,7 @@ public class RiskTaskServiceImpl implements RiskTaskService {
         Map<String, GBaseSYRKXX> syrkxxMap = xxList.stream().collect(Collectors.toMap(GBaseSYRKXX::getGmsfhm, Function.identity(), (oldValue, newValue) -> newValue));
 
         List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>()
-                .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalName, SupExternalDepart::getSource)
+                .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalShortName, SupExternalDepart::getSource)
                 .eq(SupExternalDepart::getSource, "重点人员"));
         Map<String, SupExternalDepart> jqExternalDepart = supDeparts.stream().collect(Collectors.toMap(SupExternalDepart::getExternalId, Function.identity(), (val, old) -> val));
 
@@ -628,7 +627,7 @@ public class RiskTaskServiceImpl implements RiskTaskService {
             SupExternalDepart depart = Optional.ofNullable(org).map(PointOrg::getDm).map(item -> jqExternalDepart.get(item)).orElse(null);
             if (depart != null) {
                 person.setControlDepartId(depart.getInternalId());
-                person.setControlDepartName(depart.getInternalName());
+                person.setControlDepartName(depart.getInternalShortName());
                 person.setControlDepartType(DepartType.HUMAN.getType());
                 person.setControlTime(LocalDateTime.now());
             }