修改受到刑事处罚、受到行政处罚模型，调整时间范围，增加案件名称2

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

@@ -104,7 +104,7 @@ public class ApplicationEvent {
         DepartUtil.init(ryRepository, departRepository);
         LocalDateTime end = LocalDate.now().minusDays(1).atTime(23,59,59);
         CompletableFutureUtil.runSync(() -> {
-            personalService.init(List.of(76));
+            personalService.init(List.of(115,116));
 //            personalService.pullInvestigate();
 //            personalService.pullPsychosis();
 //            gBaseSHRWFRService.pullAndSave(LocalDateTime.of(2019,12,6,0,0,0), end);
@@ -132,7 +132,7 @@ public class ApplicationEvent {
 //            jsbryService.syncPys(initDomain(List.of(59)));
 //            gBaseSHRWFRService.combatCrime(initDomain(List.of(63)));
 //            gBaseJJDService.warningInstance(initDomain(List.of(64)));
-            gBaseJJDService.syncHomeViolence(initDomain(List.of(65,66)));
+//            gBaseJJDService.syncHomeViolence(initDomain(List.of(65,66)));
 //            pointService.syncPointType(initDomain(List.of(67)));
 //            gBaseSHRWFRService.hadWork(initDomain(List.of(68)));
 //            gBaseJJDService.syncParentRelation(initDomain(List.of(69,70)));
@@ -145,8 +145,8 @@ public class ApplicationEvent {
 //            pointService.syncFatherEducation(initDomain(List.of(112)));
 //            pointService.syncMotherEducation(initDomain(List.of(113)));
 //            pointService.syncDomicileType(initDomain(List.of(114)));
-//            pointService.syncCriminalPunishment(initDomain(List.of(115)));
-//            pointService.syncAdministrativePunishment(initDomain(List.of(116)));
+            pointService.syncCriminalPunishment(initDomain(List.of(115)));
+            pointService.syncAdministrativePunishment(initDomain(List.of(116)));
 //            pointService.syncParentsDivorce(initDomain(List.of(117)));
 //            gBaseJJDService.syncOtherContradict(initDomain(List.of(75)));
 //            pointService.syncFamilyDie(initDomain(List.of(118)));

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

@@ -348,8 +348,9 @@ public class PointServiceImpl implements PointService {
             // 去重
             wfrwfxxList = wfrwfxxList.stream().filter(StreamUtil.distinctByKey(GBaseWFRXX::getAjbh)).toList();
 
-            String context = "，案件编号为：“" + wfrwfxxList.stream().map(GBaseWFRXX::getAjbh).collect(Collectors.joining("、")) + "”";
-            context = context + "，案件名称分别为：“" + wfrwfxxList.stream().map(GBaseWFRXX::getAjmc).collect(Collectors.joining("、")) + "”。";
+            String context = wfrwfxxList.stream()
+                    .map(wfrwfxx -> "案件编号为：" + wfrwfxx.getAjbh() + "，案件名称为：" + wfrwfxx.getAjmc())
+                    .collect(Collectors.joining("；"));
             score = Math.min(wfrwfxxList.size(), 5);
             ClueData data = ClueData.builder()
                     .name(personal.getName())
@@ -359,7 +360,7 @@ public class PointServiceImpl implements PointService {
                     .score(score)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
-                    .sourceData("发现该人员涉及" + wfrwfxxList.size() + "个行政处罚" + context)
+                    .sourceData("发现该人员涉及" + wfrwfxxList.size() + "个行政处罚，" + context)
                     .build();
             toInsert.add(DataUtil.createClueData(task, data));
         }
@@ -396,8 +397,9 @@ public class PointServiceImpl implements PointService {
             // 去重
             wfrxxList = wfrxxList.stream().filter(StreamUtil.distinctByKey(GBaseWFRXX::getAjbh)).toList();
 
-            String context = "，案件编号为：“" + wfrxxList.stream().map(GBaseWFRXX::getAjbh).collect(Collectors.joining("、")) + "”";
-            context = context + "，案件名称分别为：“" + wfrxxList.stream().map(GBaseWFRXX::getAjmc).collect(Collectors.joining("、")) + "”。";
+            String context = wfrxxList.stream()
+                    .map(wfrwfxx -> "案件编号为：" + wfrwfxx.getAjbh() + "，案件名称为：" + wfrwfxx.getAjmc())
+                    .collect(Collectors.joining("；"));
             score = Math.min(wfrxxList.size(), 5);
             ClueData data = ClueData.builder()
                     .name(personal.getName())
@@ -407,7 +409,7 @@ public class PointServiceImpl implements PointService {
                     .score(score)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
-                    .sourceData("发现该人员涉及" + wfrxxList.size() + "个刑事案件" + context)
+                    .sourceData("发现该人员涉及" + wfrxxList.size() + "个刑事案件，" + context)
                     .build();
             toInsert.add(DataUtil.createClueData(task, data));
         }