fix:1、二级大屏（信访、案件核查）优化；2、维权数据抓取启动

src/main/java/com/biutag/supervision/controller/subdatav/SubOneCaseVerifController.java

@@ -106,7 +106,10 @@ public class SubOneCaseVerifController {
 
         endTime= DateUtil.endOfDay(endTime);
         CaseVerificationCountVo overview = negativeMapper.getSuboOneAllCaseVerificationCount(beginTime, endTime, departId);
-        long total =dataCaseVerifMapper.selectCount(new LambdaQueryWrapper<DataCaseVerif>().between(DataCaseVerif::getCreateTime,beginTime,endTime));
+        long total =dataCaseVerifMapper.selectCount(
+                new LambdaQueryWrapper<DataCaseVerif>().between(DataCaseVerif::getCreateTime,beginTime,endTime)
+                        .eq(DataCaseVerif::getSecondDepartId,departId)
+        );
         overview.setTotal((int) total);
         int confirmed = overview.getConfirmed() != null?overview.getConfirmed():0;
         overview.setRate(NumberUtil.div((Number) (confirmed * 100),total ).doubleValue());

src/main/java/com/biutag/supervision/controller/subdatav/SubOneRightsController.java

@@ -24,6 +24,7 @@ import com.biutag.supervision.service.RpcApplyService;
 import com.biutag.supervision.service.SupDepartService;
 import com.biutag.supervision.service.SupDictDataService;
 import com.biutag.supervision.util.CompletableUtils.CompletableFutureUtil;
+import io.swagger.v3.core.util.Json;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -90,11 +91,17 @@ public class SubOneRightsController {
         List<BarItem> pcsList = rpcApplyMapper.selectSubPcsProtectRightsBarList(beginTime, endTime, departId,10);
         // 维权案件情况 - 大队
        List<BarItem> dbList =  rpcApplyMapper.selectSubDdProtectRightsBarList(beginTime, endTime, departId,10);
-
+        //抚慰金额-派出所
+        List<BarItem> fxsjComfortMoneyRank = rpcApplyMapper.selectSubProtectRightsBarList(beginTime, endTime, departId,10);
+        //抚慰金额-大队
+        List<BarItem> jsdwComfortMoneyRank=rpcApplyMapper.selectSubComfortMoneyBarList(beginTime, endTime, departId,10);
         JSONObject data = new JSONObject()
                 .fluentPut("comfortOverview", comfortOverview)
                 .fluentPut("fxsjRightsRankList",pcsList)
-                .fluentPut("jsdwRightsRankList",dbList);
+                .fluentPut("jsdwRightsRankList",dbList)
+                .fluentPut("fxsjComfortMoneyRank",fxsjComfortMoneyRank)
+                .fluentPut("jsdwComfortMoneyRank",jsdwComfortMoneyRank);
+
 
         return Result.success(data);
     }
@@ -205,6 +212,10 @@ public class SubOneRightsController {
         return Result.success(data);
     }
 
+
+
+
+
     // endregion
     //打处情况
     @GetMapping("getPunishmentSituation")

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

@@ -105,7 +105,7 @@ public class Job {
     private final RpcApplySuperviseService rpcApplySuperviseService;
     // 每天一次 23:30:00
     //todo 维权信息
-//    @Scheduled(cron = "0 30 23 * * ?")
+    @Scheduled(cron = "0 30 23 * * ?")
     public void rights() {
         log.info("rights--------------------");
         log.info("维权信息抓取中---------------------");

src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java

@@ -268,6 +268,37 @@ public interface RpcApplyMapper extends BaseMapper<RpcApply> {
             " GROUP BY sdp.short_name order by value desc")
     List<BarItem> selectSubDdProtectRightsBarList(Date beginTime, Date endTime, Integer departId, Integer departGroupId);
 
+    //二级大屏抚慰金额-派出所
+    @Select("SELECT   " +
+            "      depart_name as name, " +
+            "      ROUND(sum(p.provide_relief) / 10000, 2)  as value " +
+            "      from rpc_apply_person p  " +
+            "      left join rpc_apply r on p.rpc_id = r.rpc_id  " +
+            "      left JOIN sup_depart sdp on r.depart_id = sdp.id " +
+            "      where    " +
+            "      sdp.pid= #{departId} " +
+            "       and r.type = 2 " +
+            "       and sdp.statistics_group_id =  #{departGroupId}" +
+            "       and r.crt_time between #{beginTime} and #{endTime}  " +
+            "       GROUP BY depart_name")
+    List<BarItem> selectSubProtectRightsBarList(Date beginTime, Date endTime, Integer departId, Integer departGroupId);
+    //二级大屏抚慰金额-大队
+    @Select("SELECT   " +
+            "      depart_name as name, " +
+            "      ROUND(sum(p.provide_relief) / 10000, 2)  as value " +
+            "      from rpc_apply_person p  " +
+            "      left join rpc_apply r on p.rpc_id = r.rpc_id  " +
+            "      left JOIN sup_depart sdp on r.depart_id = sdp.id " +
+            "      where    " +
+            "      sdp.pid= #{departId} " +
+            "       and r.type = 2 " +
+            "       and sdp.statistics_group_id !=  #{departGroupId}" +
+            "       and r.crt_time between #{beginTime} and #{endTime}  " +
+            "       GROUP BY depart_name")
+    List<BarItem> selectSubComfortMoneyBarList(Date beginTime, Date endTime, Integer departId, Integer departGroupId);
+
+
+
 
     //民辅警受伤表
     @Select(