标签由入库改到赋分的时候标记

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

@@ -112,6 +112,8 @@ public class ApplicationEvent {
                     .eq(RiskModelTaskClue::getDel, 0));
             Map<Integer, List<RiskModelTaskClue>> map = clues.stream().collect(Collectors.groupingBy(RiskModelTaskClue::getModelId));
             TaskParamDomain domain = new TaskParamDomain(persons, map);
+            petitionService.petitionModelTask(domain);
+            riskTaskService.heightFight(domain);
             riskTaskService.eduModelTask(domain);
             riskTaskService.infoModelTask(domain);
             riskTaskService.caseModelTask(domain);
@@ -119,14 +121,14 @@ public class ApplicationEvent {
             policeService.contradictModelTask(domain);
             habitService.habitModelTask(domain);
             marriageService.marriageModelTask(domain);
-            petitionService.petitionModelTask(domain);
+
             riskTaskService.riskAreaModelTask(domain);
-            riskTaskService.heightFight(domain);
             pointService.syncScore(domain);
             pointService.syncViolence(domain);
             noControlService.syncNoControlData(domain);
             pointService.syncKillSelf(domain);
             pointService.syncDrug(domain);
+//            riskPersonalService.fixed2();
             pointService.syncControlNoPower(domain);
             pointService.syncPointCall(domain);
 //            personalService.syncOrg();

src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseJJDMapper.java

@@ -1,6 +1,7 @@
 package com.biutag.supervisiondata.mapper.dwd;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.biutag.supervisiondata.pojo.database.MuchCall;
 import com.biutag.supervisiondata.pojo.entity.dwd.GBaseJJD;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -21,7 +22,10 @@ public interface GBaseJJDMapper extends BaseMapper<GBaseJJD> {
     List<GBaseJJD> selectDataToRisk(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
 
-    @Select(" select bjrlxdh, bjdh, jqxzdm, bjrzjhm from dwd_asj_zhtx_jjd " +
+    @Select(" select bjdh, " +
-            " where bjsj >= '2024-01-01 00:00:00'")
+            " sum(IF(SUBSTR(jqxzdm, 1, 1) != '9',1,0)) as normal, " +
-    List<GBaseJJD> selectPointCall();
+            " sum(IF(SUBSTR(jqxzdm, 1, 1) = '9',1,0)) as unNormal " +
+            " from dwd_asj_zhtx_jjd where bjsj >= '2024-01-01 00:00:00' and bjdh is not null " +
+            " group by bjdh HAVING sum(IF(SUBSTR(jqxzdm, 1, 1) != '9',1,0)) > 5 or  sum(IF(SUBSTR(jqxzdm, 1, 1) = '9',1,0)) > 100")
+    List<MuchCall> selectPointCall();
 }

src/main/java/com/biutag/supervisiondata/pojo/constants/Default.java

@@ -56,5 +56,7 @@ public class Default {
 
     public static final String BASIC = "基础信息";
 
+    public static final String MUCH_CALL = "重点人员报警异常";
+
 
 }

src/main/java/com/biutag/supervisiondata/pojo/database/MuchCall.java

@@ -0,0 +1,18 @@
+package com.biutag.supervisiondata.pojo.database;
+
+import lombok.Data;
+
+/**
+ * @author kami on 2024-11-26 14:40:51
+ * @version 0.0.1
+ * @since 1.8
+ */
+@Data
+public class MuchCall {
+
+    String mobile;
+
+    Integer normal;
+
+    Integer unNormal;
+}

src/main/java/com/biutag/supervisiondata/service/RiskPersonalService.java

@@ -25,4 +25,5 @@ public interface RiskPersonalService {
     void saveDistinct(List<RiskPersonal> riskPersonals);
     void fixed();
 
+    void fixed2();
 }

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

@@ -6,6 +6,7 @@ import com.biutag.supervisiondata.config.cache.RedisDao;
 import com.biutag.supervisiondata.mapper.mine.SupDepartMapper;
 import com.biutag.supervisiondata.pojo.ClueData;
 import com.biutag.supervisiondata.pojo.constants.Default;
+import com.biutag.supervisiondata.pojo.database.MuchCall;
 import com.biutag.supervisiondata.pojo.domain.*;
 import com.biutag.supervisiondata.pojo.entity.dwd.GBaseJJD;
 import com.biutag.supervisiondata.pojo.entity.dwd.GBaseTbDZdrylb;
@@ -253,10 +254,6 @@ public class PointServiceImpl implements PointService {
                     .build();
             toInsert.add(createClue(task.getModelId(), 2, task.getId(), data));
         }
-        if (!toInsert.isEmpty()) {
-            log.info("增加涉药人员:{}", toInsert.size());
-            modelTaskClueService.saveClues(toInsert, Default.DRUG_TAG);
-        }
         RiskTask updateTask = new RiskTask();
         updateTask.setId(task.getId());
         updateTask.setInsertSize(toInsert.size());
@@ -287,7 +284,7 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("特定对象日常管控不到位")
+                    .tag("重点对象管控民警所控人员100人以上疑似日常管控不到位")
                     .departId(gBaseZDRY.getXzdpcsdm())
                     .departName(gBaseZDRY.getXzdpcs())
                     .personId(personal.getId())
@@ -318,33 +315,10 @@ public class PointServiceImpl implements PointService {
         RiskTask task = createTask(domain.getPersons().size(), 50);
         taskRepository.save(task);
         // 获取接警数据
-        List<GBaseJJD> result = jjdRepository.getBaseMapper().selectPointCall();
+        List<MuchCall> result = jjdRepository.getBaseMapper().selectPointCall();
         List<RiskPersonal> person = getPersons();
-        Map<String, Integer> map = new HashMap<>();
+        Map<String, MuchCall> map = result.stream().collect(Collectors.toMap(MuchCall::getMobile, Function.identity(), (val, old) -> val));
-        Map<String, Integer> noUseMap = new HashMap<>();
 
-        for (GBaseJJD gBaseJJD : result) {
-            String dh = gBaseJJD.getBjrlxdh();
-            if (dh == null || dh.isEmpty()) {
-                dh = gBaseJJD.getBjdh();
-            }
-            if (dh == null || dh.isEmpty()) {
-                continue;
-            }
-            if (gBaseJJD.getJqxzdm() == null) {
-                continue;
-            }
-            if (gBaseJJD.getJqxzdm().startsWith("9")) {
-                Integer count = Optional.ofNullable(noUseMap.get(dh)).orElse(0);
-                count++;
-                noUseMap.put(dh, count);
-            } else {
-                Integer count = Optional.ofNullable(map.get(dh)).orElse(0);
-                count++;
-                map.put(dh, count);
-            }
-        }
-        log.info("报警：{},{}", map.size(), noUseMap.size());
 
         List<RiskModelTaskClue> toInsert = new ArrayList<>();
         Map<String, List<RiskPersonal>> aMAP = person.stream().collect(Collectors.groupingBy(RiskPersonal::getIdCode));
@@ -360,17 +334,22 @@ public class PointServiceImpl implements PointService {
             int noUsefulNum = 0;
             StringBuilder mobile = new StringBuilder();
             for (String s : str) {
-                if (s.contains("无") || s.equals("00000000") || s.equals("1")) {
+                String number = s.chars()
+                        .filter(Character::isDigit)
+                        .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
+                        .toString();
+                if (number.length() < 8 || number.equals("00000000")) {
                     continue;
                 }
                 mobile.append(s).append(",");
-                int count = Optional.ofNullable(map.get(s)).orElse(0);
+                int count = Optional.ofNullable(map.get(s)).map(MuchCall::getNormal).orElse(0);
                 num += count;
-
+                int count2 = Optional.ofNullable(map.get(s)).map(MuchCall::getUnNormal).orElse(0);
-                int count2 = Optional.ofNullable(noUseMap.get(s)).orElse(0);
                 noUsefulNum += count2;
             }
-            if (num > 5 || noUsefulNum > 100) {
+            if(num == 0 && noUsefulNum==0) {
+                continue;
+            }
             StringBuilder mark = new StringBuilder();
             for (RiskPersonal p : entry.getValue()) {
                 mark.append(p.getTags()).append(",");
@@ -380,7 +359,7 @@ public class PointServiceImpl implements PointService {
             call.setNoUsefulCallCount(noUsefulNum);
             call.setLabels(mark.substring(0, mark.length() - 1));
             call.setName(personal.getName());
-                call.setMobiles(mobile.substring(0, mobile.length() - 1));
+            call.setMobiles(mobile.length()==0?"":mobile.substring(0, mobile.length() - 1));
             call.setIdCode(personal.getIdCode());
             call.setControlId(personal.getControlDepartId());
             call.setControlName(personal.getControlDepartName());
@@ -400,7 +379,7 @@ public class PointServiceImpl implements PointService {
             ClueData data = ClueData.builder()
                     .name(personal.getName())
                     .idCode(personal.getIdCode())
-                        .tag("重点对象报警次数异常")
+                    .tag("重点对象多次报警疑似管控不到位")
                     .departId(personal.getControlDepartId())
                     .departName(call.getControlName())
                     .personId(personal.getId())
@@ -409,14 +388,13 @@ public class PointServiceImpl implements PointService {
                     .build();
             toInsert.add(createClue(task.getModelId(), 4, task.getId(), data));
         }
-        }
         if (!tmp.isEmpty()) {
             riskTestRepository.saveBatch(tmp);
         }
 
         if (!toInsert.isEmpty()) {
             log.info("增加特定对象日常管控不到位人员:{}", toInsert.size());
-            modelTaskClueService.saveClues(toInsert, Default.BAD_HABBIT);
+            modelTaskClueService.saveClues(toInsert, Default.MUCH_CALL);
         }
 
         RiskTask updateTask = new RiskTask();
@@ -472,10 +450,10 @@ public class PointServiceImpl implements PointService {
     }
 
     SupDepart findLevelThreeDepart(SupDepart supDepart, Map<String, SupDepart> departMap) {
-        if(supDepart == null){
+        if (supDepart == null) {
             return null;
         }
-        if(supDepart.getLevel() == 3) {
+        if (supDepart.getLevel() == 3) {
             return supDepart;
         }
         supDepart = departMap.get(supDepart.getPid());
@@ -490,7 +468,7 @@ public class PointServiceImpl implements PointService {
         List<GBaseTbDZdrylb> lbList = zdrylbRepository.list(new LambdaQueryWrapper<GBaseTbDZdrylb>()
                 .select(GBaseTbDZdrylb::getCode, GBaseTbDZdrylb::getDefine));
         List<SupDepart> supDeparts = supDepartMapper.selectList(new LambdaQueryWrapper<SupDepart>()
-                .select(SupDepart::getId,SupDepart::getCode, SupDepart::getLevel, SupDepart::getShortName, SupDepart::getPid)
+                .select(SupDepart::getId, SupDepart::getCode, SupDepart::getLevel, SupDepart::getShortName, SupDepart::getPid)
                 .ge(SupDepart::getLevel, 3));
 
         Map<String, Integer> supExternalDepartMap = new WeakHashMap<>();
@@ -543,15 +521,15 @@ public class PointServiceImpl implements PointService {
             SupDepart depart = supDepartCodeMap.get(ry.getGxdwjgdm());
             depart = findLevelThreeDepart(depart, supDepartIdMap);
             Integer exist = supExternalDepartMap.get(ry.getGxdwjgdm());
-            if(exist == null) {
+            if (exist == null) {
                 SupExternalDepart externalDepart = new SupExternalDepart();
                 externalDepart.setExternalId(ry.getGxdwjgdm());
                 externalDepart.setExternalName(ry.getGxdw());
                 externalDepart.setSource("重点人员");
                 externalDeparts.add(externalDepart);
-                supExternalDepartMap.put(ry.getGxdwjgdm(),1);
+                supExternalDepartMap.put(ry.getGxdwjgdm(), 1);
             }
-            if(depart == null) {
+            if (depart == null) {
                 noDepartCount++;
             }
             for (String s : sb) {
@@ -580,14 +558,25 @@ public class PointServiceImpl implements PointService {
                 } catch (Exception e) {
                 }
                 if (ry.getZdrylxfs() != null) {
-//                    personal.setMobileNumber(ry.getZdrylxfs().length() > 20 ? "" : ry.getZdrylxfs());
+                    String[] str = ry.getZdrylxfs().split(",");
-                    personal.setMobileNumber(ry.getZdrylxfs());
+                    StringBuilder mobiles = new StringBuilder();
+                    for (String m : str) {
+                        String number = m.chars()
+                                .filter(Character::isDigit)
+                                .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
+                                .toString();
+                        if (number.length() < 8 || number.equals("00000000")) {
+                            continue;
+                        }
+                        mobiles.append(m).append(",");
+                    }
+                    personal.setMobileNumber(mobiles.length() == 0 ? "" : mobiles.substring(0, mobiles.length() - 1));
                 }
                 personals.add(personal);
             }
             map.put(ry.getSfzh(), tmp);
         }
-        log.info("重点人员入库数:{} 未匹配到本地组织机构数:{}",zdCount, noDepartCount);
+        log.info("重点人员入库数:{} 未匹配到本地组织机构数:{}", zdCount, noDepartCount);
         externalDepartRepository.saveBatch(externalDeparts);
         return personals;
     }

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

@@ -66,8 +66,18 @@ public class RiskModelTaskClueServiceImpl  implements RiskModelTaskClueService {
         for (Map.Entry<String, List<RiskModelTaskClue>> entry : map.entrySet()) {
             idCodes.add(entry.getKey());
         }
-        List<RiskPersonalTag> oldTags = tagRepository.list(new LambdaQueryWrapper<RiskPersonalTag>().eq(RiskPersonalTag::getBigTag, bigTag)
+        List<RiskPersonalTag> oldTags = new ArrayList<>();
-                .in(RiskPersonalTag::getIdCode, idCodes));
+        List<List<String>> idCode = IntStream.range(0, (idCodes.size() + 9999) / 10000)
+                .mapToObj(i -> idCodes.subList(i * 10000, Math.min((i + 1) * 10000, idCodes.size())))
+                .collect(Collectors.toList());
+        for (List<String> strList : idCode) {
+            oldTags.addAll(tagRepository.list(new LambdaQueryWrapper<RiskPersonalTag>()
+                    .select(RiskPersonalTag::getSmallTag, RiskPersonalTag::getIdCode)
+                    .eq(RiskPersonalTag::getBigTag, bigTag)
+                    .in(RiskPersonalTag::getIdCode, strList)));
+        }
+
+
         Map<String, List<RiskPersonalTag>> oldTagMap = oldTags.stream().collect(Collectors.groupingBy(RiskPersonalTag::getIdCode));
         Map<String, Byte[]> oldMap;
 
@@ -80,23 +90,23 @@ public class RiskModelTaskClueServiceImpl  implements RiskModelTaskClueService {
                 oldMap.put(tag.getSmallTag(), new Byte[0]);
             }
             for (RiskModelTaskClue clue : entry.getValue()) {
-                if(bigTag.equals(Default.BIG_TAG_SHWFR)) {
+                if (bigTag.equals(Default.BIG_TAG_SHWFR)) {
-                    String [] strs = clue.getRiskReason().split(",");
+                    String[] strs = clue.getRiskReason().split(",");
-                    for (int i =0,len = strs.length; i < len; i++) {
+                    for (int i = 0, len = strs.length; i < len; i++) {
-                        if(oldMap.get(strs[i]) == null) {
+                        if (oldMap.get(strs[i]) == null) {
                             tags.add(creatTag(bigTag, strs[i], clue));
                             oldMap.put(strs[i], new Byte[0]);
                         }
                     }
                     continue;
                 }
-                if(oldMap.get(clue.getRiskReason()) == null) {
+                if (oldMap.get(clue.getRiskReason()) == null) {
                     tags.add(creatTag(bigTag, clue.getRiskReason(), clue));
                     oldMap.put(clue.getRiskReason(), new Byte[0]);
                 }
             }
         }
-        if(!tags.isEmpty()) {
+        if (!tags.isEmpty()) {
             tagRepository.saveBatch(tags, 10000);
         }
     }

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

@@ -3,10 +3,14 @@ package com.biutag.supervisiondata.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.biutag.supervisiondata.common.exception.BusinessException;
 import com.biutag.supervisiondata.common.response.StatusCode;
+import com.biutag.supervisiondata.mapper.mine.RiskModelTaskClueMapper;
+import com.biutag.supervisiondata.pojo.constants.Default;
+import com.biutag.supervisiondata.pojo.entity.mine.RiskModelTaskClue;
 import com.biutag.supervisiondata.pojo.entity.mine.RiskPersonal;
 import com.biutag.supervisiondata.pojo.entity.mine.RiskPersonalControlRecord;
 import com.biutag.supervisiondata.pojo.entity.mine.RiskPersonalTag;
 import com.biutag.supervisiondata.repository.RiskPersonalRepository;
+import com.biutag.supervisiondata.repository.RiskPersonalTagRepository;
 import com.biutag.supervisiondata.service.RiskPersonalService;
 import com.biutag.supervisiondata.service.RiskPersonalTagService;
 import com.biutag.supervisiondata.util.IdCodeUtil;
@@ -41,8 +45,7 @@ public class RiskPersonalServiceImpl implements RiskPersonalService {
 
     private final RiskPersonalTagService tagService;
 
-    @Qualifier("chaosBean")
+    private final RiskPersonalTagRepository tagRepository;
-    private final DataSource dataSource;
 
 
     @Override
@@ -189,4 +192,24 @@ public class RiskPersonalServiceImpl implements RiskPersonalService {
             repository.removeById(i);
         }
     }
+
+    private final RiskModelTaskClueMapper clueMapper;
+
+    @Override
+    public void fixed2() {
+        List<RiskModelTaskClue> clues = clueMapper.selectList(new LambdaQueryWrapper<RiskModelTaskClue>().eq(RiskModelTaskClue::getModelId, 32));
+        List<RiskPersonalTag> tags = new ArrayList<>();
+        for (RiskModelTaskClue clue : clues) {
+            RiskPersonalTag riskTag = new RiskPersonalTag();
+            riskTag.setBigTag(Default.BASIC);
+            riskTag.setTagTime(LocalDateTime.now());
+            riskTag.setName(clue.getName());
+            riskTag.setIdCode(clue.getIdCode());
+            riskTag.setSmallTag(clue.getRiskReason());
+            riskTag.setCreateTime(LocalDateTime.now());
+            tags.add(riskTag);
+        }
+        tagRepository.saveBatch(tags);
+
+    }
 }

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

@@ -108,6 +108,8 @@ public class RiskTaskServiceImpl implements RiskTaskService {
         genderUpdate.setInsertSize(size);
         genderUpdate.setState(1);
         genderUpdate.setEndTime(LocalDateTime.now());
+        riskTaskRepository.updateById(ageUpdate);
+
         List<RiskModelTaskClue> clues = new ArrayList<>();
         clues.addAll(infos[0].getToInsert());
         clues.addAll(infos[1].getToInsert());
@@ -115,7 +117,6 @@ public class RiskTaskServiceImpl implements RiskTaskService {
         if(!infos[0].getToHidden().isEmpty()) {
             clueRepository.updateBatchById(infos[0].getToHidden());
         }
-        riskTaskRepository.updateById(ageUpdate);
     }
 
     @Override