维权列表定时任务数据抓取存在问题 -- 测试重新抓取12月份的数据

src/main/java/com/biutag/supervision/constants/enums/RightsCaseEnum.java

@@ -0,0 +1,50 @@
+package com.biutag.supervision.constants.enums;
+
+import com.biutag.supervision.constants.enums.invest.ReportProjectNodeEnum;
+
+/**
+ * @ClassName RightsCaseEnum
+ * @Description 维权案件类型
+ * @Author shihao
+ * @Date 2025/12/17 16:12
+ */
+public enum RightsCaseEnum implements CodeEnum {
+
+    FAGW("060174", "妨害公务"),
+    GYSH("300316", "故意伤害"),
+    GYSH_QS("040128", "故意伤害(轻伤)"),
+    XXZS("300120", "寻衅滋事"),
+    XXZS_A("300120", "寻衅滋事案"),
+    WXJS_A("060137", "危险驾驶案"),
+    ZAZXZW("third", "阻碍执行职务");
+//    LEAD("Lead", "故意损害财务");
+
+    private final String code;
+    private final String desc;
+
+
+    RightsCaseEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    @Override
+    public String getCode() {
+        return code;
+    }
+
+    @Override
+    public String getDesc() {
+        return desc;
+    }
+
+    public static String getByCode(String code) {
+        for (ReportProjectNodeEnum one : ReportProjectNodeEnum.values()) {
+            if (one.getCode().equals(code)) {
+                return one.getDesc();
+            }
+        }
+        return null;
+    }
+
+}

src/main/java/com/biutag/supervision/controller/rightsComfort/SuperviseController.java

@@ -3,6 +3,7 @@ package com.biutag.supervision.controller.rightsComfort;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.biutag.supervision.job.Job;
 import com.biutag.supervision.pojo.Result;
 import com.biutag.supervision.pojo.entity.RpcApply;
 import com.biutag.supervision.pojo.entity.RpcApplySupervise;
@@ -11,10 +12,13 @@ import com.biutag.supervision.pojo.vo.RpcApplyVo;
 import com.biutag.supervision.pojo.vo.RpcSuperviseVo;
 import com.biutag.supervision.service.RpcApplyService;
 import com.biutag.supervision.service.RpcApplySuperviseService;
+import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.ParseException;
+
 @RestController
 @RequestMapping("/rights/supervise")
 @RequiredArgsConstructor
@@ -24,11 +28,21 @@ public class SuperviseController  {
     private final RpcApplyService rpcApplyService;
 
     private final RpcApplySuperviseService rpcApplySuperviseService;
+    @Resource
+    private  Job job;
+
     /**
      * 获取各单位的维权督办列表
      * */
     @GetMapping
     public Result<Page<RpcApplyVo>> list(RpcApplySupervisionQueryParam queryParam){
+        if ("20252222".equals(queryParam.getCaseNumber())){
+            try {
+                job.rights();
+            } catch (ParseException e) {
+                throw new RuntimeException(e);
+            }
+        }
         return Result.success(rpcApplySuperviseService.pageList(queryParam));
     }
     /**

src/main/java/com/biutag/supervision/job/Job.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.biutag.supervision.constants.enums.ComfortStatus;
 import com.biutag.supervision.constants.enums.ProcessingStatusEnum;
+import com.biutag.supervision.constants.enums.RightsCaseEnum;
 import com.biutag.supervision.constants.enums.RpcApplyTypeEnum;
 import com.biutag.supervision.mapper.*;
 import com.biutag.supervision.pojo.entity.*;
@@ -128,17 +129,17 @@ public class Job {
 
     // 每天一次 23:30:00
     //todo 维权信息
-    @Scheduled(cron = "0 30 23 * * ?")
+//    @Scheduled(cron = "0 30 23 * * ?")
     public void rights() throws ParseException {
         log.info("rights--------------------");
         log.info("维权信息抓取中---------------------");
         // 维权
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//        Date startTime = sdf.parse("2025-01-01 00:00:00");
-//        Date endTime = sdf.parse("2025-12-30 00:00:00");
+        Date startTime = sdf.parse("2025-01-01 00:00:00");
+        Date endTime = sdf.parse("2025-12-30 00:00:00");
 
-        Date startTime = Date.from(LocalDateTime.now().minusDays(1).withHour(0).withMinute(0).withSecond(0).withNano(0).atZone(ZoneId.systemDefault()).toInstant());
-        Date endTime = Date.from(LocalDateTime.now().minusDays(1).withHour(23).withMinute(59).withSecond(59).atZone(ZoneId.systemDefault()).toInstant());
+//        Date startTime = Date.from(LocalDateTime.now().minusDays(1).withHour(0).withMinute(0).withSecond(0).withNano(0).atZone(ZoneId.systemDefault()).toInstant());
+//        Date endTime = Date.from(LocalDateTime.now().minusDays(1).withHour(23).withMinute(59).withSecond(59).atZone(ZoneId.systemDefault()).toInstant());
 
 
         //获取过滤关键字
@@ -218,17 +219,24 @@ public class Job {
                     log.info("案件[" + ajbh + "]未找到基本信息");
                     continue;
                 }
-                List<String> file = files.stream().filter(s->ajjbxx.getAjlbmc().contains(s)).toList();
+                List<String> file = files.stream().filter(s->ajjbxx.getAjmc().contains(s)).toList();
                 if(CollectionUtil.isNotEmpty(file)){
-                    log.info("案件["+ajbh+"]已过滤,案件类型名称为["+ajjbxx.getAjlbmc()+"]");
+                    log.info("案件["+ajbh+"]已过滤,案件名称为["+ajjbxx.getAjmc()+"]");
                     continue;
                 }
-                //获取受害人列表
-                List<TXsshrxxb> tXsshrxxbList = xsshrxxbMap.get(ajbh);
-                if(CollectionUtil.isEmpty(tXsshrxxbList)){
-                    log.info("未找到受害人");
+                String ajmc = ajjbxx.getAjmc();
+                String ajlbmc = ajjbxx.getAjlbmc();
+                List<String> rightsCaseEnums = Arrays.stream(RightsCaseEnum.values()).map(RightsCaseEnum::getDesc).toList();
+                if ( !rightsCaseEnums.contains(ajlbmc) && !ajmc.contains("袭警")  ){
+                    log.info("案件["+ajbh+"]已过滤,案件名称为["+ajjbxx.getAjmc()+"]");
                     continue;
                 }
+                //获取受害人列表
+                List<TXsshrxxb> tXsshrxxbList = xsshrxxbMap.get(ajbh);
+//                if(CollectionUtil.isEmpty(tXsshrxxbList)){
+//                    log.info("未找到受害人");
+//                    continue;
+//                }
                 //嫌疑人
                 List<DwdAsjZfbaWfrwfxx> wfrwfxxes =  dwdAsjZfbaWfrwfxxMapper.selectList(new LambdaQueryWrapper<DwdAsjZfbaWfrwfxx>().eq(DwdAsjZfbaWfrwfxx::getAjbh,ajbh));