From f77a9d8f16bae6b4cf809891f037c038070e81ed Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 17:12:50 +0800
Subject: [PATCH] 工单，数据中心用户查看数据的权限，合同考核每日，以及导出每日和按月

---
 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml                          |    3 
 ycl-server/src/main/java/com/ycl/platform/controller/CalculateReportController.java    |    9 
 ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java          |    8 
 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java               |    3 
 ycl-server/src/main/java/com/ycl/task/ContractResultTask.java                          |   68 ++++
 ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java                               |    1 
 ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml                    |   16 
 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java      |  538 ++++++++++++++++++++++++++++++---
 ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java               |    3 
 ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java                |    2 
 ycl-server/src/main/java/com/ycl/platform/mapper/CalculateReportMapper.java            |    2 
 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java              |    2 
 ycl-server/src/main/resources/application.yml                                          |    2 
 ycl-server/src/main/java/com/ycl/utils/MongoUtil.java                                  |  153 +++++++++
 ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWConditionsForm.java     |   29 +
 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java               |    2 
 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRecord.java             |    6 
 ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java |    4 
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java       |   53 +++
 ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWConditionForm.java      |    2 
 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java         |    1 
 ycl-server/src/main/java/com/ycl/platform/service/CalculateReportService.java          |    2 
 ycl-pojo/src/main/java/com/ycl/platform/domain/query/CalculateReportQuery.java         |    2 
 23 files changed, 845 insertions(+), 66 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRecord.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRecord.java
index 5bbd972..93eec04 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRecord.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRecord.java
@@ -47,7 +47,13 @@
     @TableField("which_month")
     private Integer whichMonth;
 
+    @ApiModelProperty("鍝棩")
+    @TableField("which_day")
+    private Integer whichDay;
+
     @ApiModelProperty("鍙戝竷鐘舵��")
     @TableField("status")
     private String status;
+
+
 }
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java
index 30daa2b..945fa0b 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java
@@ -48,4 +48,6 @@
 
     private Integer whichYear;
     private Integer whichMonth;
+
+    private Integer whichDay;
 }
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWConditionForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWConditionForm.java
index 0228b49..2829cdd 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWConditionForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWConditionForm.java
@@ -3,6 +3,8 @@
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 杩愮淮鎯呭喌琛ㄥ崟
  *
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWConditionsForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWConditionsForm.java
new file mode 100644
index 0000000..d667ead
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWConditionsForm.java
@@ -0,0 +1,29 @@
+package com.ycl.platform.domain.form;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 杩愮淮鎯呭喌琛ㄥ崟
+ *
+ * @author锛歺p
+ * @date锛�2024/3/6 8:59
+ */
+@Data
+public class WorkOrderYWConditionsForm {
+
+    /**
+     * 杩愮淮鎯呭喌
+     */
+    @NotBlank
+    private String ywCondition;
+
+    /**
+     * 浣愯瘉鏉愭枡
+     */
+    private String ywProofMaterials;
+
+    private List<String> workOrderNumbers;
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CalculateReportQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CalculateReportQuery.java
index 3c630d7..5a238a3 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CalculateReportQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CalculateReportQuery.java
@@ -29,5 +29,7 @@
 
     private Integer whichYear;
 
+    private Integer whichMonth;
+
 }
 
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
index f1c0a34..d1a332c 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
@@ -57,5 +57,8 @@
      * 鍗曚綅id
      */
     private Integer unitId;
+
+
+    private String dept;
 }
 
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java
index f311d58..98ca2fe 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java
@@ -46,6 +46,8 @@
     /** 鍝湀 */
     private Integer whichMonth;
 
+    private Integer whichDay;
+
     /** 鏈�鏂颁竴鏉℃牳绠楁爣璇� */
     private Boolean latest;
 
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java
index 3d4870e..bb06601 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java
@@ -32,6 +32,7 @@
     private Integer contractId;
 
     private Integer whichYear;
+    private Integer whichMonth;
     /** 杩愮淮鍗曚綅 */
     private String unitName;
     private Integer unitId;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java
index 6af1baa..db4f596 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java
@@ -55,7 +55,10 @@
 
     private Integer whichYear;
     private Integer whichMonth;
+    private Integer whichDay;
+
     private Integer latestMonth;
+    private Integer latestDay;
 
     public static CalculateReportVO getVoByEntity(@NonNull CalculateReport entity, CalculateReportVO vo) {
         if(vo == null) {
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CalculateReportController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CalculateReportController.java
index 7fe05da..d8713e7 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CalculateReportController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CalculateReportController.java
@@ -42,13 +42,14 @@
         return calculateReportService.backfill(form);
     }
 
-    @GetMapping("/{contractId}/{whichYear}")
+    @GetMapping("/{contractId}/{whichYear}/{whichMoth}")
     @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
     @PreAuthorize("@ss.hasPermi('system:calculate:report:detail')")
-    public Result detail(@PathVariable("contractId") Integer contractId,@PathVariable("whichYear") Integer whichYear) {
+    public Result detail(@PathVariable("contractId") Integer contractId,@PathVariable("whichYear") Integer whichYear,@PathVariable("whichMoth") Integer whichMoth) {
         CalculateReportQuery query = new CalculateReportQuery();
         query.setContractId(contractId);
         query.setWhichYear(whichYear);
+        query.setWhichMonth(whichMoth);
         return calculateReportService.detail(query);
     }
 
@@ -69,8 +70,8 @@
     @PostMapping("/export")
     @ApiOperation(value = "瀵煎嚭", notes = "瀵煎嚭")
     @PreAuthorize("@ss.hasPermi('system:calculate:report:export')")
-    public void export(Integer whichYear,Integer whichMonth,Integer contractId, HttpServletResponse response) {
-        calculateReportService.export(whichYear,whichMonth,contractId, response);
+    public void export(Integer whichYear,Integer whichMonth,Integer whichDay,Integer contractId, HttpServletResponse response) {
+        calculateReportService.export(whichYear,whichMonth,whichDay,contractId, response);
     }
 
 }
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
index c3e52a4..c32720a 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -84,6 +84,14 @@
         return workOrderService.ywCondition(form);
     }
 
+    @PutMapping("/yw-condition-list")
+    @ApiOperation(value = "杩愮淮鎯呭喌", notes = "杩愮淮鎯呭喌")
+    public Result ywConditionList(@RequestBody @Validated WorkOrderYWConditionsForm form) {
+        System.out.println(form);
+//        return workOrderService.ywCondition(form);
+        return workOrderService.ywConditionList(form);
+    }
+
     //鐜板湪娌＄敤
     @PutMapping("/yw-result")
     @ApiOperation(value = "杩愮淮缁撴灉", notes = "杩愮淮缁撴灉")
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateReportMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateReportMapper.java
index 4536b7d..f11a71f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateReportMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateReportMapper.java
@@ -42,5 +42,5 @@
      * 瀵煎嚭鏁版嵁
      * @return 鏁版嵁
      */
-    List<CalculateExport> exportData(Integer whichYear,Integer whichMonth,Integer contractId);
+    List<CalculateExport> exportData(Integer whichYear,Integer whichMonth,Integer whichDay,Integer contractId);
 }
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/CalculateReportService.java b/ycl-server/src/main/java/com/ycl/platform/service/CalculateReportService.java
index b0a3bc0..4d0526f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/CalculateReportService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/CalculateReportService.java
@@ -92,5 +92,5 @@
      * 瀵煎嚭
      * @param response 鍝嶅簲
      */
-    void export(Integer whichYear,Integer whichMonth,Integer contractId, HttpServletResponse response);
+    void export(Integer whichYear,Integer whichMonth,Integer whichDay,Integer contractId, HttpServletResponse response);
 }
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
index d09037a..9f4f2c3 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -106,6 +106,7 @@
      */
     Result ywCondition(WorkOrderYWConditionForm form);
 
+    Result ywConditionList(WorkOrderYWConditionsForm form);
     /**
      * 杩愮淮缁撴灉
      * @param form
@@ -253,4 +254,5 @@
     Result errorAll();
 
 
+
 }
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
index 0db7f41..9202248 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
@@ -225,9 +225,9 @@
 
     @Override
     @SneakyThrows
-    public void export(Integer whichYear,Integer whichMonth,Integer contractId, HttpServletResponse response) {
+    public void export(Integer whichYear,Integer whichMonth,Integer whichDay,Integer contractId, HttpServletResponse response) {
         // 鑾峰彇鏁版嵁
-        List<CalculateExport> list = baseMapper.exportData(whichYear,whichMonth,contractId);
+        List<CalculateExport> list = baseMapper.exportData(whichYear,whichMonth,whichDay,contractId);
         CalculateExport calculateExport = new CalculateExport();
         calculateExport.setRuleName("鍚堣");
         calculateExport.setNum(list.stream().mapToInt(CalculateExport::getNum).sum());
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
index 4db2f09..331ec29 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
@@ -24,9 +24,13 @@
 import com.ycl.platform.mapper.YwPointMapper;
 import com.ycl.platform.service.*;
 import com.ycl.system.Result;
+import com.ycl.system.entity.SysDept;
+import com.ycl.system.model.LoginUser;
 import com.ycl.system.service.ISysConfigService;
+import com.ycl.system.service.ISysDeptService;
 import com.ycl.utils.DateUtils;
 import com.ycl.utils.MongoUtil;
+import com.ycl.utils.SecurityUtils;
 import com.ycl.utils.StringUtils;
 import com.ycl.utils.bean.BeanUtils;
 import com.ycl.utils.poi.ExcelUtil;
@@ -80,6 +84,7 @@
 
 
     public Map<String,List<DynamicColumnVO>> getDynamicByConditions(DataCenterQuery params,List<DynamicColumnVO> list){
+        //TODO 璇ヤ綅缃病鏈夎繃婊よ处鍙风殑閮ㄩ棬瀵瑰簲鐨勮澶囦俊鎭紝鑰屾槸鏇村叿鏉′欢鏌ヨ鐨勫叏閮�
         //鑾峰緱鍒板搴攊d锛屼笖鍖呭惈浼犲叆瀛楃涓� 鍔ㄦ�佸垪闆嗗悎
         List<DynamicColumnVO> likeFieldDynamicColumnVOList = list.stream()
                 .filter(dynamicColumnVO ->
@@ -95,7 +100,7 @@
 
         return groupByRefStringIdMap;
     }
-
+    //褰曞儚鍙敤
     @Override
     public void recordingAvailabilityExport(HttpServletResponse response,DataCenterQuery params) throws IOException {
 
@@ -105,8 +110,18 @@
         if (params.getOption() != null) {
             query.addCriteria(Criteria.where("recordStatus").is(params.getOption()));
         }
+        SysDept sysDept = getSysDeptByLoginUser();
+        if (sysDept !=null){
+            AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null){
+                query.addCriteria(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+            }
+        }
         MongoUtil.setNoPage(query, params, TIME_FIELD);
         List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
+
+
+
         //缈昏瘧琛屾斂鍖哄煙
         resultList.forEach(item -> {
             String areaCode = item.getArealayername().substring(0, 6);
@@ -122,6 +137,7 @@
         if (params.getDyId() != null && StringUtils.isNotEmpty(params.getDyValue())){
             conditions = true;
             //鑾峰緱鍔ㄦ�佸垪闆嗗悎涓寘鍚簡鐨勫瓧绗︿覆鍊肩殑闆嗗悎 鍖哄垎澶у皬鍐�
+
             groupByRefStringIdMap = getDynamicByConditions(params,dynamicColumnVOList);
         }else{
             groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));
@@ -197,10 +213,21 @@
                 .doWrite(data); // 鍐欏叆鏁版嵁
     }
 
+    //鐐逛綅鍦ㄧ嚎
     @Override
     public void pointOnlineFaceExport(HttpServletResponse response, DataCenterQuery params) throws IOException {
+
         List<String> likeFileds = Arrays.asList("name", "no", "ip");
-        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        Query query = null;
+        SysDept sysDept = getSysDeptByLoginUser();
+        if (sysDept !=null){
+            AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null){
+                query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+            }
+        }else {
+            query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        }
         //鏌ヤ汉鑴歌澶�
         query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Face + ".*"));
         //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
@@ -330,12 +357,34 @@
                 .sheet("浜鸿劯鐐逛綅鍦ㄧ嚎鐜�") // 璁剧疆sheet鍚嶇О
                 .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                 .doWrite(data); // 鍐欏叆鏁版嵁
-    }
 
+    } private final ISysDeptService deptService;
+
+    public SysDept getSysDeptByLoginUser(){
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        SysDept sysDept = null;
+        Long deptId =null;
+        if (loginUser.getDeptId() != null){
+            deptId = loginUser.getDeptId();
+            sysDept = deptService.selectDeptById(deptId);
+        }
+        return sysDept;
+    }
+    //瑙嗛鍗曚綅鍦ㄧ嚎
     @Override
     public void pointOnlineVideoExport(HttpServletResponse response, DataCenterQuery params) throws IOException {
         List<String> likeFileds = Arrays.asList("name", "no", "ip");
-        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        Query query = null;
+        SysDept sysDept = getSysDeptByLoginUser();
+        if (sysDept !=null){
+            AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null){
+                query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+            }
+        }else {
+            query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        }
+
         //鏌ヨ棰戣澶�
         query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
         //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
@@ -461,11 +510,20 @@
 
 
     }
-
+    //杞﹁締鐐逛綅鍦ㄧ嚎
     @Override
     public void pointOnlineCarExport(HttpServletResponse response, DataCenterQuery params) throws IOException {
         List<String> likeFileds = Arrays.asList("name", "no", "ip");
-        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        Query query = null;
+        SysDept sysDept = getSysDeptByLoginUser();
+        if (sysDept !=null){
+            AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null){
+                query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+            }
+        }else {
+            query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        }
         //鏌ヨ溅杈嗚澶�
         query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Car + ".*"));
         //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
@@ -643,7 +701,21 @@
     @Override
     public Result videoPointOnlineRate(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("name", "no", "ip");
-        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+        Query query = null;
+        SysDept sysDept = getSysDeptByLoginUser();
+        AreaDeptEnum areaDeptEnum = null;
+        if (sysDept !=null){
+            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null){
+                query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+
+            }else{
+                query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+            }
+        }else {
+            query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        }
         //鏌ヨ棰戣澶�
         query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
         //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
@@ -702,6 +774,10 @@
         // 娣诲姞鍥哄畾鏉′欢
         criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
         criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+        if (areaDeptEnum != null){
+            criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+        }
         // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
         if (params.getDataType() == 1) {
             criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
@@ -759,7 +835,21 @@
     @Override
     public Result deptVideoPointOnlineRate(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("name", "no", "ip");
-        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+        Query query = null;
+        SysDept sysDept = getSysDeptByLoginUser();
+        AreaDeptEnum areaDeptEnum = null;
+        if (sysDept !=null){
+            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null){
+                query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+
+            }else{
+                query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+            }
+        }else {
+            query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        }
         //鏌ヨ棰戣澶�
         query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
         query.addCriteria(Criteria.where("deptTag").is(Boolean.TRUE));
@@ -797,6 +887,10 @@
         int unknownCount = 0;
         //鏋勫缓鏉′欢
         List<Criteria> criteriaList = new ArrayList<>();
+        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+        if (areaDeptEnum != null){
+            criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+        }
         // 娣诲姞鍥哄畾鏉′欢
         criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
         criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
@@ -858,7 +952,21 @@
     @Override
     public Result videoImportantPointOnlineRate(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("name", "no", "ip");
-        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+        Query query = null;
+        SysDept sysDept = getSysDeptByLoginUser();
+        AreaDeptEnum areaDeptEnum = null;
+        if (sysDept !=null){
+            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null){
+                query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+
+            }else{
+                query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+            }
+        }else {
+            query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        }
         //鏌ヨ棰戣澶�
         query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
         query.addCriteria(Criteria.where("importantTag").is(Boolean.TRUE));
@@ -899,6 +1007,10 @@
         int unknownCount = 0;
         //鏋勫缓鏉′欢
         List<Criteria> criteriaList = new ArrayList<>();
+        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+        if (areaDeptEnum != null){
+            criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+        }
         // 娣诲姞鍥哄畾鏉′欢
         criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
         criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
@@ -958,7 +1070,21 @@
     @Override
     public Result videoImportantPointImageOnlineRate(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("name", "no", "ip");
-        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+        Query query = null;
+        SysDept sysDept = getSysDeptByLoginUser();
+        AreaDeptEnum areaDeptEnum = null;
+        if (sysDept !=null){
+            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null){
+                query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+
+            }else{
+                query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+            }
+        }else {
+            query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        }
         //鏌ヨ棰戣澶�
         query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
         query.addCriteria(Criteria.where("importantCommandImageTag").is(Boolean.TRUE));
@@ -1000,6 +1126,10 @@
         int unknownCount = 0;
         //鏋勫缓鏉′欢
         List<Criteria> criteriaList = new ArrayList<>();
+        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+        if (areaDeptEnum != null){
+            criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+        }
         // 娣诲姞鍥哄畾鏉′欢
         criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
         criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
@@ -1059,7 +1189,19 @@
     @Override
     public Result videoOneMachineDocumentRegister(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
-        List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null);
+        SysDept sysDept = getSysDeptByLoginUser();
+        List<Criteria> andCriteria;
+        AreaDeptEnum areaDeptEnum = null;
+        if (sysDept != null) {
+            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null) {
+                andCriteria = MongoUtil.getAndCriteriaDateCenter(areaDeptEnum.getCode(),params, TIME_FIELD, likeFileds, null);
+            }else {
+                andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null);
+            }
+        }else {
+            andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null);
+        }
         Query query = new Query();
         Criteria and = new Criteria();
         if (params.getOption() != null) {
@@ -1082,12 +1224,23 @@
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
+        Document areDocument = null;
+        if (areaDeptEnum != null) {
+            String areaCodePrefix = areaDeptEnum.getCode();
+            areDocument = new Document("deviceNo", new Document("$regex", "^" + areaCodePrefix));
+        }
         //鎬绘暟
         List<Document> dList1 = new ArrayList<>(2);
+        if(areDocument != null){
+            dList1.add(areDocument);
+        }
         setTag(params, dList1);
         Document totalFilter = new Document("$and", dList1);
         //鏂拌澶囨暟
         List<Document> dList2 = new ArrayList<>(2);
+        if(areDocument != null){
+            dList1.add(areDocument);
+        }
         setTag(params, dList2);
         dList2.add(new Document("newDevice", Boolean.TRUE));
         Document newFilter = new Document("$and", dList2);
@@ -1143,7 +1296,20 @@
     @Override
     public Result videoOneMachineDocumentQualified(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
-        List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null);
+        SysDept sysDept = getSysDeptByLoginUser();
+        List<Criteria> andCriteria;
+        AreaDeptEnum areaDeptEnum = null;
+        if (sysDept != null) {
+            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null) {
+                andCriteria = MongoUtil.getAndCriteriaDateCenter(areaDeptEnum.getCode(),params, TIME_FIELD, likeFileds, null);
+            }else {
+                andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null);
+            }
+        }else {
+            andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null);
+        }
+
         Query query = new Query();
         Criteria and = new Criteria();
         and.andOperator(andCriteria);
@@ -1195,12 +1361,25 @@
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
+        Document areDocument = null;
+        if (areaDeptEnum != null) {
+            String areaCodePrefix = areaDeptEnum.getCode();
+            areDocument = new Document("deviceNo", new Document("$regex", "^" + areaCodePrefix));
+        }
         //鎬绘暟
         List<Document> dList1 = new ArrayList<>(2);
+        if (areDocument != null){
+            dList1.add(areDocument);
+        }
         setTag(params, dList1);
         Document totalFilter = new Document("$and", dList1);
+        //list1
+
         //鍚堟牸鏁�
         List<Document> dList2 = new ArrayList<>(2);
+        if (areDocument != null){
+            dList2.add(areDocument);
+        }
         dList2.add(new Document("serialNumber.error", Boolean.FALSE));
         dList2.add(new Document("name.error", Boolean.FALSE));
         dList2.add(new Document("civilCode.error", Boolean.FALSE));
@@ -1217,6 +1396,9 @@
         Document qualifyFilter = new Document("$and", dList2);
         //涓嶅悎鏍兼暟
         List<Document> dList3 = new ArrayList<>(2);
+        if (areDocument != null){
+            dList3.add(areDocument);
+        }
         setTag(params, dList3);
         List<Document> errorConditions = new ArrayList<>();
         errorConditions.add(new Document("serialNumber.error", new Document("$eq", Boolean.TRUE)));
@@ -1383,9 +1565,21 @@
     @Override
     public Result videoAvailabilityRate(DataCenterQuery params) {
         List<String> noString = tMonitorMapper.getIdListVideo();
-
         List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
-        Query query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
+        SysDept sysDept = getSysDeptByLoginUser();
+        AreaDeptEnum areaDeptEnum = null;
+        Query query = null;
+        if (sysDept !=null){
+            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null){
+                query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,"createTime",likeFileds,null,"no");
+            }else{
+                query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
+            }
+        }else {
+            query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
+        }
+
         if (CollectionUtils.isNotEmpty(noString)) { // 闃叉绌洪泦鍚堝紓甯�
             query.addCriteria(Criteria.where("no").in(noString));
         }
@@ -1395,7 +1589,6 @@
         }
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         MongoUtil.setPage(query, params, "createTime");
-
         List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
         //鏌ヨ鍔ㄦ�佸垪鏁版嵁
         //鏌ヨ鍔ㄦ�佸垪鏁版嵁鏇村叿id鏌ヨ
@@ -1403,8 +1596,8 @@
         //缈昏瘧琛屾斂鍖哄煙
         resultList.forEach(item -> {
             String areaCode = item.getArealayername().substring(0, 6);
-            AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode);
-            if (areaDeptEnum != null) item.setArealayername(areaDeptEnum.getName());
+            AreaDeptEnum areaDeptEnumInfo = AreaDeptEnum.fromCode(areaCode);
+            if (areaDeptEnumInfo != null) item.setArealayername(areaDeptEnumInfo.getName());
 
             List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_VIDEO,item.getId());
             item.setDynamicColumnList(list);
@@ -1415,11 +1608,20 @@
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
         List<Integer> status = Arrays.asList(1, 0, -1);
+        AreaDeptEnum finalAreaDeptEnum = areaDeptEnum;
         List<String> resultCount = status.stream().map(item -> {
             List<Document> dList = new ArrayList<>(2);
 
             dList.add(new Document("recordStatus", new Document("$eq", item)));
-            dList.add(new Document("no", new Document("$in", noString)));
+            if(finalAreaDeptEnum != null){
+                dList.add(new Document("$and", Arrays.asList(
+                        new Document("no", new Document("$in", noString)),
+                        new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+                )));
+            }else {
+                dList.add(new Document("no", new Document("$in", noString)));
+            }
+
             setTag(params, dList);
             Document filter = new Document("$and", dList);
             // 鏋勫缓鑱氬悎绠￠亾
@@ -1446,7 +1648,18 @@
         double finalRecordingMinTime = getSySMinTime();
 
         List<Document> documentList = new ArrayList<>(2);
-        documentList.add(new Document("no", new Document("$in", noString)));
+        if(finalAreaDeptEnum != null){
+            documentList.add(new Document("$and", Arrays.asList(
+                    new Document("no", new Document("$in", noString)),
+                    new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+            )));
+        }else {
+            documentList.add(new Document("no", new Document("$in", noString)));
+        }
+//        documentList.add(new Document("$and", Arrays.asList(
+//                new Document("no", new Document("$in", noString)),
+//                new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+//        )));
         setTag(params, documentList);
         Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime));
         documentList.add(recording);
@@ -1497,7 +1710,19 @@
     @Override
     public Result deptVideoAvailabilityRate(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
-        Query query = MongoUtil.getQuery(params, "createTime", likeFileds, 1);
+        SysDept sysDept = getSysDeptByLoginUser();
+        AreaDeptEnum areaDeptEnum = null;
+        Query query = null;
+        if (sysDept !=null){
+            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null){
+                query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,"createTime",likeFileds,null,"no");
+            }else{
+                query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
+            }
+        }else {
+            query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
+        }
         //涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠�
         if (params.getOption() != null) {
             query.addCriteria(Criteria.where("recordStatus").is(params.getOption()));
@@ -1508,18 +1733,25 @@
         //缈昏瘧琛屾斂鍖哄煙
         resultList.forEach(item -> {
             String areaCode = item.getArealayername().substring(0, 6);
-            AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode);
-            if (areaDeptEnum != null) item.setArealayername(areaDeptEnum.getName());
+            AreaDeptEnum areaDeptEnumInfo = AreaDeptEnum.fromCode(areaCode);
+            if (areaDeptEnumInfo != null) item.setArealayername(areaDeptEnumInfo.getName());
         });
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
         List<Integer> status = Arrays.asList(1, 0, -1);
+        AreaDeptEnum finalAreaDeptEnum = areaDeptEnum;
         List<String> resultCount = status.stream().map(item -> {
             List<Document> dList = new ArrayList<>(4);
             dList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE)));
             dList.add(new Document("recordStatus", new Document("$eq", item)));
             setTag(params, dList);
+            if (finalAreaDeptEnum != null){
+                dList.add(new Document("$and", Arrays.asList(
+//                    new Document("no", new Document("$in", noString)),
+                        new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+                )));
+            }
             Document filter = new Document("$and", dList);
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
@@ -1549,6 +1781,12 @@
         setTag(params, documentList);
         Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime));
         documentList.add(recording);
+        if (finalAreaDeptEnum != null){
+            documentList.add(new Document("$and", Arrays.asList(
+//                    new Document("no", new Document("$in", noString)),
+                    new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+            )));
+        }
         Document filter = new Document("$and", documentList);
         // 鏋勫缓鑱氬悎绠￠亾
         List<Document> pipeline = Arrays.asList(
@@ -1605,7 +1843,20 @@
     @Override
     public Result videoImportantPointAvailabilityRate(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
-        Query query = MongoUtil.getQuery(params, "createTime", likeFileds, 3);
+        SysDept sysDept = getSysDeptByLoginUser();
+        AreaDeptEnum areaDeptEnum = null;
+        Query query = null;
+        if (sysDept !=null){
+            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null){
+                query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,"createTime",likeFileds,null,"no");
+            }else{
+                query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
+            }
+        }else {
+            query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
+        }
+        query.addCriteria(Criteria.where("importantTag").is(Boolean.TRUE));
         //涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠�
         if (params.getOption() != null) {
             query.addCriteria(Criteria.where("recordStatus").is(params.getOption()));
@@ -1616,18 +1867,25 @@
         //缈昏瘧琛屾斂鍖哄煙
         resultList.forEach(item -> {
             String areaCode = item.getArealayername().substring(0, 6);
-            AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode);
-            if (areaDeptEnum != null) item.setArealayername(areaDeptEnum.getName());
+            AreaDeptEnum areaDeptEnumInfo = AreaDeptEnum.fromCode(areaCode);
+            if (areaDeptEnumInfo != null) item.setArealayername(areaDeptEnumInfo.getName());
         });
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
         List<Integer> status = Arrays.asList(1, 0, -1);
+        AreaDeptEnum finalAreaDeptEnum = areaDeptEnum;
         List<String> resultCount = status.stream().map(item -> {
             List<Document> dList = new ArrayList<>(4);
             dList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE)));
             dList.add(new Document("recordStatus", new Document("$eq", item)));
             setTag(params, dList);
+            if (finalAreaDeptEnum != null){
+                dList.add(new Document("$and", Arrays.asList(
+//                    new Document("no", new Document("$in", noString)),
+                        new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+                )));
+            }
             Document filter = new Document("$and", dList);
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
@@ -1656,6 +1914,12 @@
         setTag(params, documentList);
         Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime));
         documentList.add(recording);
+        if (finalAreaDeptEnum != null){
+            documentList.add(new Document("$and", Arrays.asList(
+//                    new Document("no", new Document("$in", noString)),
+                    new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+            )));
+        }
         Document filter = new Document("$and", documentList);
         // 鏋勫缓鑱氬悎绠￠亾
         List<Document> pipeline = Arrays.asList(
@@ -1714,12 +1978,32 @@
 
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
+        Query nonNetworkQuery;
+        Query networkQuery;
+        Query videoQuery;
+        Query carQuery;
+        Query faceQuery;
+//        if (areaDeptEnum == null){
+            nonNetworkQuery = new Query().addCriteria(Criteria.where("LWSX").is("0"));
+            networkQuery = new Query().addCriteria(Criteria.where("LWSX").is("1"));
+            videoQuery = new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*"));
+            carQuery = new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*"));
+            faceQuery = new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*"));
+//        }
+//        else {
+//            nonNetworkQuery = new Query().addCriteria(Criteria.where("LWSX").is("0")).addCriteria(Criteria.where("no").regex("^" + Pattern.quote(areaDeptEnum.getCode())));
+//            networkQuery = new Query().addCriteria(Criteria.where("LWSX").is("1")).addCriteria(Criteria.where("no").regex("^" + Pattern.quote(areaDeptEnum.getCode())));
+//            videoQuery = new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")).addCriteria(Criteria.where("no").regex("^" + Pattern.quote(areaDeptEnum.getCode())));
+//            carQuery = new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")).addCriteria(Criteria.where("no").regex("^" + Pattern.quote(areaDeptEnum.getCode())));
+//            faceQuery = new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")).addCriteria(Criteria.where("no").regex("^" + Pattern.quote(areaDeptEnum.getCode())));
+//        }
+
         // 缁熻鏁�
-        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), RecordMetaDSumResult.class);
-        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), RecordMetaDSumResult.class);
-        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), RecordMetaDSumResult.class);
-        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), RecordMetaDSumResult.class);
-        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), RecordMetaDSumResult.class);
+        long nonNetwork = mongoTemplate.count(nonNetworkQuery, RecordMetaDSumResult.class);
+        long network = mongoTemplate.count(networkQuery, RecordMetaDSumResult.class);
+        long video = mongoTemplate.count(videoQuery, RecordMetaDSumResult.class);
+        long car = mongoTemplate.count(carQuery, RecordMetaDSumResult.class);
+        long face = mongoTemplate.count(faceQuery, RecordMetaDSumResult.class);
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
         map.put("list", resultList);
@@ -1735,12 +2019,26 @@
     @Override
     public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
-        List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, null);
+        SysDept sysDept = getSysDeptByLoginUser();
+        List<Criteria> andCriteria;
+        AreaDeptEnum areaDeptEnum = null;
+        if (sysDept != null) {
+            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null) {
+                andCriteria = MongoUtil.getAndCriteriaDateCenter(areaDeptEnum.getCode(),params, "checkTime", likeFileds, null);
+            }else {
+                andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, null);
+            }
+        }else {
+            andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, null);
+        }
+
         Query query = new Query();
         Criteria and = new Criteria();
         and.andOperator(andCriteria);
         query = Query.query(and);
-        //涓嬫媺妗嗘爣娉ㄦ纭煡璇㈡潯浠�
+        query.addCriteria(Criteria.where("importantTag").is(Boolean.TRUE));
+        // 涓嬫媺妗嗘爣娉ㄦ纭煡璇㈡潯浠�
         if (params.getOption() != null) {
             if (params.getOption() == 1) {
                 andCriteria.add(Criteria.where("osdNameCorrect").is(1));
@@ -1781,13 +2079,26 @@
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("osd_check_result");
-        //鎬绘暟
+        // 纭繚鍦ㄧ粺璁℃煡璇腑涔熷簲鐢ㄧ浉鍚岀殑杩囨护鏉′欢
+        Document areDocument = null;
+        if (areaDeptEnum != null) {
+            String areaCodePrefix = areaDeptEnum.getCode();
+            areDocument = new Document("deviceNo", new Document("$regex", "^" + areaCodePrefix));
+        }
+        // 鎬绘暟
         List<Document> dList = new ArrayList<>(2);
+        if (areDocument != null){
+            dList.add(areDocument);
+        }
         dList.add(new Document("importantTag", Boolean.TRUE));
         setTag(params, dList);
+
         Document osdFilter = new Document("$and", dList);
-        //姝ｅ父鏁�
+        // 姝ｅ父鏁�
         List<Document> dList1 = new ArrayList<>(2);
+        if (areDocument != null){
+            dList1.add(areDocument);
+        }
         dList1.add(new Document("importantTag", Boolean.TRUE));
         dList1.add(new Document("osdNameCorrect", new Document("$eq", 1)));
         dList1.add(new Document("osdTimeCorrect", new Document("$eq", 1)));
@@ -1795,9 +2106,13 @@
         dList1.add(new Document("osdCityCorrect", new Document("$eq", 1)));
         dList1.add(new Document("osdPartCorrect", new Document("$eq", 1)));
         setTag(params, dList1);
+
         Document osdCorrectFilter = new Document("$and", dList1);
         //寮傚父鏁�
         List<Document> dList2 = new ArrayList<>(2);
+        if (areDocument != null){
+            dList2.add(areDocument);
+        }
         setTag(params, dList2);
         Document importantTagCondition = new Document("importantTag", Boolean.TRUE);
         dList2.add(importantTagCondition);
@@ -1809,9 +2124,14 @@
         errorConditions.add(new Document("osdPartCorrect", new Document("$eq", -1)));
         Document errorFilter = new Document("$or", errorConditions);
         dList2.add(errorFilter);
+
         Document osdErrorFilter = new Document("$and", dList2);
-        //鏈煡鏁�
+
+        // 鏈煡鏁�
         List<Document> dList3 = new ArrayList<>(2);
+        if (areDocument != null){
+            dList3.add(areDocument);
+        }
         setTag(params, dList3);
         dList3.add(importantTagCondition);
         List<Document> unknownConditions = new ArrayList<>();
@@ -1820,9 +2140,9 @@
         unknownConditions.add(new Document("osdProvinceCorrect", new Document("$eq", 0)));
         unknownConditions.add(new Document("osdCityCorrect", new Document("$eq", 0)));
         unknownConditions.add(new Document("osdPartCorrect", new Document("$eq", 0)));
-        // 浣跨敤$or閫昏緫缁勫悎鍓╀綑鐨勬潯浠�
         Document unknownFilter = new Document("$or", unknownConditions);
         dList3.add(unknownFilter);
+
         Document osdUnknownFilter = new Document("$and", dList3);
 
         List<Document> lists = Arrays.asList(osdFilter, osdCorrectFilter, osdErrorFilter, osdUnknownFilter);
@@ -1844,18 +2164,6 @@
             return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
-//        List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-//                .select(CheckIndexVideo::getKeyAnnotationAccuracy)
-//                .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-//                .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-//                .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
-//                .list();
-//        BigDecimal onlineRate = BigDecimal.ZERO;
-//        if (CollectionUtils.isNotEmpty(videoList)) {
-//            BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyAnnotationAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
-//            BigDecimal count = BigDecimal.valueOf(videoList.size());
-//            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
-//        }
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
             onlineRate = new BigDecimal(rList.get(1)).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
@@ -1962,7 +2270,25 @@
     @Override
     public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
-        Query query = MongoUtil.getQuery(params, "checkTime", likeFileds, null);
+
+        SysDept sysDept = getSysDeptByLoginUser();
+        List<Criteria> andCriteria;
+        AreaDeptEnum areaDeptEnum = null;
+        if (sysDept != null) {
+            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null) {
+                andCriteria = MongoUtil.getAndCriteriaDateCenter(areaDeptEnum.getCode(),params, "checkTime", likeFileds, null);
+            }else {
+                andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, null);
+            }
+        }else {
+            andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, null);
+        }
+        Query query = new Query();
+        Criteria and = new Criteria();
+        and.andOperator(andCriteria);
+        query = Query.query(and);
+        query.addCriteria(Criteria.where("importantTag").is(Boolean.TRUE));
         //涓嬫媺妗嗘爣娉ㄦ纭煡璇㈡潯浠�
         if (params.getOption() != null) {
             if (params.getOption() == 1) {
@@ -1977,6 +2303,11 @@
         long total = mongoTemplate.count(query, OsdCheckResult.class);
         MongoUtil.setPage(query, params, "checkTime");
         List<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.class);
+        Document areDocument = null;
+        if (areaDeptEnum != null) {
+            String areaCodePrefix = areaDeptEnum.getCode();
+            areDocument = new Document("deviceNo", new Document("$regex", "^" + areaCodePrefix));
+        }
 
         for (OsdCheckResult osdCheckResult : resultList) {
             OsdCheckResult.getError(osdCheckResult);
@@ -1985,7 +2316,10 @@
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("osd_check_result");
         //鎬绘暟
-        List<Document> dList = new ArrayList<>(2);
+        List<Document> dList = new ArrayList<>(3);
+        if (areDocument != null){
+            dList.add(areDocument);
+        }
         dList.add(new Document("importantTag", Boolean.TRUE));
         setTag(params, dList);
         Document osdFilter = new Document("$and", dList);
@@ -1997,10 +2331,16 @@
         dList1.add(new Document("osdProvinceCorrect", new Document("$eq", 1)));
         dList1.add(new Document("osdCityCorrect", new Document("$eq", 1)));
         dList1.add(new Document("osdPartCorrect", new Document("$eq", 1)));
+        if (areDocument != null){
+            dList1.add(areDocument);
+        }
         setTag(params, dList1);
         Document osdCorrectFilter = new Document("$and", dList1);
         //寮傚父鏁�
         List<Document> dList2 = new ArrayList<>(2);
+        if (areDocument != null){
+            dList2.add(areDocument);
+        }
         setTag(params, dList2);
         Document importantTagCondition = new Document("importantTag", Boolean.TRUE);
         dList2.add(importantTagCondition);
@@ -2015,6 +2355,9 @@
         Document osdErrorFilter = new Document("$and", dList2);
         //鏈煡鏁�
         List<Document> dList3 = new ArrayList<>(2);
+        if (areDocument != null){
+            dList3.add(areDocument);
+        }
         setTag(params, dList3);
         dList3.add(importantTagCondition);
         List<Document> unknownConditions = new ArrayList<>();
@@ -2080,7 +2423,20 @@
     @Override
     public Result vehicleViewDockStable(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        Query query = null;
+        SysDept sysDept = getSysDeptByLoginUser();
+        AreaDeptEnum areaDeptEnum = null;
+        if (sysDept !=null){
+            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null){
+                query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+
+            }else{
+                query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+            }
+        }else {
+            query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        }
         //鍔燚ataType涓鸿溅杈�
         query.addCriteria(Criteria.where("dataType").is(ApiConstants.HK_DataType_CAR));
         if (params.getOption() != null) {
@@ -2098,23 +2454,41 @@
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
         resultList.forEach(item -> item.setResultTypeText(item.getResultTypeText()));
+        Document areDocument = null;
+        if (areaDeptEnum != null) {
+            String areaCodePrefix = areaDeptEnum.getCode();
+            areDocument = new Document("deviceNo", new Document("$regex", "^" + areaCodePrefix));
+        }
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("hk_snapshot_data_monitor");
 
         List<Document> dList2 = new ArrayList<>(2);
+        if (areDocument != null){
+            dList2.add(areDocument);
+        }
         dList2.add(new Document("resultType", new Document("$eq", 1)));
         dList2.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR)));
         setTag(params, dList2);
+
         List<Document> dList3 = new ArrayList<>(2);
+        if (areDocument != null){
+            dList3.add(areDocument);
+        }
         dList3.add(new Document("resultType", new Document("$eq", 2)));
         dList3.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR)));
         setTag(params, dList3);
         List<Document> dList4 = new ArrayList<>(2);
+        if (areDocument != null){
+            dList4.add(areDocument);
+        }
         dList4.add(new Document("resultType", new Document("$eq", 3)));
         dList4.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR)));
         setTag(params, dList4);
         List<Document> dList5 = new ArrayList<>(2);
+        if (areDocument != null){
+            dList5.add(areDocument);
+        }
         dList5.add(new Document("resultType", new Document("$eq", 4)));
         dList5.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR)));
         setTag(params, dList5);
@@ -2184,6 +2558,24 @@
         return Result.ok().data(map).total(total);
     }
 
+    public Query buildQuery(DataCenterQuery params,List<String> likeFileds,String fileName){
+        Query query = null;
+        SysDept sysDept = getSysDeptByLoginUser();
+        AreaDeptEnum areaDeptEnum = null;
+        if (sysDept !=null){
+            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null){
+                query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+
+            }else{
+                query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+            }
+        }else {
+            query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        }
+        return query;
+    }
+
     /**
      * 杞﹁締锛氱偣浣嶅湪绾跨巼
      *
@@ -2193,7 +2585,20 @@
     @Override
     public Result vehiclePointOnlineRate(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("name", "no", "ip");
-        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        Query query = null;
+        SysDept sysDept = getSysDeptByLoginUser();
+        AreaDeptEnum areaDeptEnum = null;
+        if (sysDept !=null){
+            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null){
+                query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+
+            }else{
+                query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+            }
+        }else {
+            query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        }
         //鏌ヨ溅杈嗚澶�
         query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Car + ".*"));
         //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
@@ -2249,6 +2654,9 @@
         int unknownCount = 0;
         //鏋勫缓鏉′欢
         List<Criteria> criteriaList = new ArrayList<>();
+        if (areaDeptEnum != null){
+            criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+        }
         // 娣诲姞鍥哄畾鏉′欢
         criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Car + ".*"));
         criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
@@ -2308,7 +2716,19 @@
     @Override
     public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
-        List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null);
+        SysDept sysDept = getSysDeptByLoginUser();
+        List<Criteria> andCriteria;
+        AreaDeptEnum areaDeptEnum = null;
+        if (sysDept != null) {
+            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null) {
+                andCriteria = MongoUtil.getAndCriteriaDateCenter(areaDeptEnum.getCode(),params, "checkTime", likeFileds, null);
+            }else {
+                andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, null);
+            }
+        }else {
+            andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, null);
+        }
         // 1/2/3 瑙嗛/杞﹁締/浜鸿劯
         Pattern pattern = Pattern.compile(".*2.*");
         andCriteria.add(Criteria.where("sxjgnlx.value").regex(pattern));
@@ -2334,13 +2754,25 @@
         //缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
+        Document areDocument = null;
+        if (areaDeptEnum != null) {
+            String areaCodePrefix = areaDeptEnum.getCode();
+            areDocument = new Document("no", new Document("$regex", "^" + areaCodePrefix));
+        }
+
         //鎬绘暟
         List<Document> dList1 = new ArrayList<>(2);
+        if (areDocument != null){
+            dList1.add(areDocument);
+        }
         setTag(params, dList1);
         dList1.add(new Document("sxjgnlx.value", new Document("$regex", ".*2.*")));
         Document totalFilter = new Document("$and", dList1);
         //鏂拌澶囨暟
         List<Document> dList2 = new ArrayList<>(2);
+        if (areDocument != null){
+            dList2.add(areDocument);
+        }
         setTag(params, dList2);
         dList2.add(new Document("sxjgnlx.value", new Document("$regex", ".*2.*")));
         dList2.add(new Document("newDevice", Boolean.TRUE));
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index d557e97..cf248f7 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -27,10 +27,12 @@
 import com.ycl.platform.wvp.WVPResult;
 import com.ycl.system.Result;
 import com.ycl.system.domain.SysConfig;
+import com.ycl.system.entity.SysDept;
 import com.ycl.system.entity.SysDictData;
 import com.ycl.system.mapper.SysConfigMapper;
 import com.ycl.system.model.LoginUser;
 import com.ycl.system.page.PageUtil;
+import com.ycl.system.service.ISysDeptService;
 import com.ycl.task.DeleteWorkOrderImgTask;
 import com.ycl.utils.DateUtils;
 import com.ycl.utils.SecurityUtils;
@@ -591,6 +593,37 @@
         return Result.ok("鎿嶄綔鎴愬姛");
     }
 
+    @Override
+    public Result ywConditionList(WorkOrderYWConditionsForm form) {
+        List<WorkOrder> workOrderList = new LambdaQueryChainWrapper<>(baseMapper)
+                .in(WorkOrder::getWorkOrderNo,form.getWorkOrderNumbers())
+                .list();
+        System.out.println("--------------");
+        System.out.println(workOrderList);
+        if (CollectionUtils.isEmpty(workOrderList)) {
+            throw new ServiceException("宸ュ崟涓嶅瓨鍦�");
+        }
+        // 宸ュ崟鐘舵��
+        for (WorkOrder workOrder : workOrderList) {
+            workOrder.setStatus(WorkOrderStatusEnum.YW_HANDLE);
+            workOrder.setYwHandleTime(LocalDateTime.now());
+        }
+        baseMapper.updateMany(workOrderList);
+        // 娣诲姞涓�鏉¤繍缁存儏鍐佃褰�
+        for (WorkOrder workOrder : workOrderList) {
+            WorkOrderYwConditionRecord workOrderYwConditionRecord = new WorkOrderYwConditionRecord();
+            workOrderYwConditionRecord.setWorkOrderNo(workOrder.getWorkOrderNo());
+            workOrderYwConditionRecord.setCommitUser(SecurityUtils.getLoginUser().getUserId().intValue());
+            workOrderYwConditionRecord.setYwCondition(form.getYwCondition());
+            workOrderYwConditionRecord.setYwProofMaterials(form.getYwProofMaterials());
+            workOrderYwConditionRecord.setSysMsg(Boolean.FALSE);
+            workOrderYwConditionRecordMapper.insert(workOrderYwConditionRecord);
+            WorkOrderServiceImpl self = applicationContext.getBean(WorkOrderServiceImpl.class);
+            self.getImage(workOrder);
+        }
+        return Result.ok("鎿嶄綔鎴愬姛");
+    }
+
     @Async("threadPoolTaskExecutor")
     public void getImage(WorkOrder workOrder) {
         List<DeviceInfo> gbDevices = new LambdaQueryChainWrapper<>(deviceInfoMapper)
@@ -756,7 +789,7 @@
 
 
 
-
+    private final ISysDeptService deptService;
     /**
      * 鍒嗛〉鏌ヨ
      *
@@ -765,6 +798,24 @@
      */
     @Override
     public Result page(WorkOrderQuery query) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        SysDept sysDept = null;
+        Long deptId =null;
+        if (loginUser.getDeptId() != null){
+            deptId = loginUser.getDeptId();
+            sysDept = deptService.selectDeptById(deptId);
+        }
+        //鏌ヨ鎸囧畾鍖烘暟鎹�
+        // 鐧诲綍璐﹀彿鐨勫瓨鍦ㄩ儴闂� 涓嶅湪閮ㄩ棬鍐呭氨涓嶄紶鍊硷紝榛樿鏌ヨ鍏ㄩ儴
+        if (sysDept !=null){
+            //鏇村叿閮ㄩ棬id鑾峰緱瀵瑰簲鏋氫妇 閮ㄩ棬code
+            AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null){
+                query.setDept(areaDeptEnum.getCode());
+            }
+        }
+
+
         IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
         if (query.getUnitId() == null) {
             query.setUnitId(SecurityUtils.getUnitId());
diff --git a/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java b/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
index ce627db..b9c6022 100644
--- a/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
@@ -11,11 +11,15 @@
 import enumeration.general.CalculateReportStatusEnum;
 import enumeration.general.PublishType;
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
@@ -26,6 +30,7 @@
  * @since 2024/4/28 涓嬪崍 4:14
  */
 
+@Slf4j
 @Data
 @Component("contractResultTask")
 public class ContractResultTask {
@@ -37,6 +42,55 @@
     private String startTime;
     private String endTime;
 
+    @Transactional
+    public void contractResultTaskByDay(){
+        // 鏌ヨ鏈夋晥鏈熷唴鐨勫悎鍚�
+        List<TContract> list = contractService.selectUsingContract();
+        String startTime = "2025-06-17 00:00:00";
+        String endTime = "2025-06-17 23:59:59";
+//        getDayStartAndEnd(startTime,endTime);
+        for (TContract tContract : list) {
+            // 鑾峰緱鏄ㄥぉ鐨勬墸鍒嗚褰�
+            List<ContractScore> contractScore = contractScoreService.getDateRangeScoreByContractId(tContract.getId(), startTime, endTime);
+
+            System.out.println("鎵撳嵃鏄ㄦ棩鎵ｅ垎璁板綍");
+            System.out.println(contractScore);
+            if (CollectionUtils.isEmpty(contractScore)){
+                log.error("鏄ㄦ棩鎵ｅ垎璁板綍鍒楄〃涓虹┖");
+                return;
+            }
+            // 鏂板鑰冩牳缁撴灉
+            Calendar calendar = Calendar.getInstance();
+            calendar.add(Calendar.DATE, -1);
+            ContractResult contractResult = getCheckResult(tContract, contractScore);
+            contractResult.setWhichMonth(calendar.get(Calendar.MONTH)+1);
+            contractResult.setWhichYear(calendar.get(Calendar.YEAR));
+            contractResult.setWhichDay(calendar.get(Calendar.DAY_OF_MONTH));
+
+            checkResultService.save(contractResult);
+//            // 鏂板鑰冩牳缁撴灉璁板綍
+//            List<ContractResultRecord> contractResultRecord = getContractResultRecord(contractScore, contractResult);
+//            checkResultService.saveBatchRecord(contractResultRecord);
+            // 鏂板鏍哥畻鏄庣粏璁板綍
+            CalculateRecord calculateRecord = new CalculateRecord();
+            //鏀逛负鐩存帴鍘绘煡
+//            calculateRecord.setScore(contractResult.getScore());
+            calculateRecord.setContractId(Integer.parseInt(tContract.getId()+""));
+            calculateRecord.setCreateTime(new Date());
+            calculateRecord.setUpdateTime(new Date());
+            calculateRecord.setStatus(PublishType.UNPUBLISHED.getCode());
+
+            calculateRecord.setWhichYear(calendar.get(Calendar.YEAR));
+            calculateRecord.setWhichMonth(calendar.get(Calendar.MONTH)+1);
+            calculateRecord.setWhichDay(calendar.get(Calendar.DAY_OF_MONTH));
+            System.out.println("鏂板鏍哥畻璁板綍");
+            System.out.println(calculateRecord);
+
+            calculateRecordMapper.insert(calculateRecord);
+
+
+        }
+    }
     /**
      * 姣忎釜鏈�1鍙锋墽琛岋紝缁熻鑰冩牳缁撴灉
      */
@@ -124,5 +178,19 @@
         this.startTime = firstDay;
         this.endTime = lastDay;
     }
+    /**
+    * 鑾峰彇浠婂ぉ鐨勫紑濮嬫椂闂翠笌缁撴潫鏃堕棿
+    * */
+    public void getDayStartAndEnd(String startTime,String endTime) {
+
+        LocalDate today = LocalDate.now().minusDays(1);
+        LocalDateTime startOfDay = today.atStartOfDay(); // 00:00:00
+        LocalDateTime endOfDay = today.atTime(LocalTime.MAX); // 23:59:59.999999999
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+        startTime = startOfDay.format(formatter);
+        endTime = endOfDay.format(formatter);
+    }
 
 }
diff --git a/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java b/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java
index 55403c3..39f78b7 100644
--- a/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java
@@ -92,6 +92,7 @@
         Date startDate = DateUtils.getDayStart(now);
         Date endDate = DateUtils.getDayEnd(now);
         //鑾峰緱浠婃棩宸ュ崟
+        //涓嶄粎鑾峰緱浠婃棩宸ュ崟 鑰屾槸鑾峰緱鎵�鏈夊伐鍗�
         List<WorkOrderVO> list = workOrderService.distributeList();
         log.error("鑾峰緱宸ュ崟:{}",list);
         List<String> workOrderNos = new ArrayList<>();
diff --git a/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java b/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java
index fb4494c..1fa737b 100644
--- a/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java
+++ b/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java
@@ -102,6 +102,83 @@
         return Query.query(and);
     }
 
+
+    public static Query getQueryDataCenter(String deptCode, DataCenterQuery params, String timeFiled, List<String> likeFileds, Integer dataAuth,String fieldName) {
+        // 鍏抽敭瀛楁ā绯婃煡璇㈡潯浠�
+        List<Criteria> likeList = null;
+        if (StringUtils.hasText(params.getKeyword()) && !CollectionUtils.isEmpty(likeFileds)) {
+            // 杞箟鐗规畩瀛楃
+            String keyword = Pattern.quote(params.getKeyword());
+            likeList = likeFileds.stream()
+                    .map(filed -> Criteria.where(filed).regex(".*?" + keyword + ".*"))
+                    .collect(Collectors.toList());
+        }
+
+        // 灏嗘ā绯婃煡璇㈠瓧娈电敤OR杩炴帴
+        Criteria or = null;
+        if (!CollectionUtils.isEmpty(likeList)) {
+            or = new Criteria();
+            or.orOperator(likeList);
+        }
+
+        // 鏁版嵁鏉冮檺鏍囩鏉′欢
+        Criteria tag = null;
+        if (Objects.nonNull(dataAuth)) {
+            switch (dataAuth) {
+                case 1: tag = Criteria.where("deptTag").is(Boolean.TRUE); break;
+                case 2: tag = Criteria.where("provinceTag").is(Boolean.TRUE); break;
+                case 3: tag = Criteria.where("importantTag").is(Boolean.TRUE); break;
+                case 4: tag = Criteria.where("importantCommandImageTag").is(Boolean.TRUE); break;
+                case 5: tag = Criteria.where("newDevice").is(Boolean.TRUE); break;
+                default: break;
+            }
+        }
+
+        // 鏃堕棿鑼冨洿鏉′欢
+        Criteria time = Criteria.where(timeFiled).gte(params.getStartTime()).lte(params.getEndTime());
+
+        // 鏁版嵁绫诲瀷鏉′欢
+        Criteria dType = null;
+        if (params.getDataType().equals(1)) {
+            dType = Criteria.where("provinceTag").is(Boolean.TRUE);
+        } else if(params.getDataType().equals(2)) {
+            dType = Criteria.where("deptTag").is(Boolean.TRUE);
+        }
+        Criteria noStartsWithDept = null;
+        if("no".equals(fieldName)){
+            // 鏂板锛歯o瀛楁浠eptCode寮�澶寸殑鏉′欢
+
+            if (StringUtils.hasText(deptCode)) {
+                // 浣跨敤姝ｅ垯琛ㄨ揪寮忓尮閰嶅紑澶达紝骞惰浆涔夌壒娈婂瓧绗�
+                noStartsWithDept = Criteria.where("no").regex("^" + Pattern.quote(deptCode));
+            }
+        }else if ("deviceNo".equals(fieldName)){
+            // 鏂板锛歯o瀛楁浠eptCode寮�澶寸殑鏉′欢
+            if (StringUtils.hasText(deptCode)) {
+                // 浣跨敤姝ｅ垯琛ㄨ揪寮忓尮閰嶅紑澶达紝骞惰浆涔夌壒娈婂瓧绗�
+                noStartsWithDept = Criteria.where("deviceNo").regex("^" + Pattern.quote(deptCode));
+            }
+        }
+
+
+        // 灏嗘墍鏈夋潯浠剁敤AND杩炴帴
+        Criteria and = new Criteria();
+        List<Criteria> criteriaList = new ArrayList<>();
+        criteriaList.add(time);  // 鏃堕棿鏉′欢蹇呴』瀛樺湪
+
+        // 鍙�夋潯浠�
+        if (Objects.nonNull(tag)) criteriaList.add(tag);
+        if (Objects.nonNull(or)) criteriaList.add(or);
+        if (Objects.nonNull(dType)) criteriaList.add(dType);
+        if (Objects.nonNull(noStartsWithDept)) criteriaList.add(noStartsWithDept);  // 鏂板鏉′欢
+
+        and.andOperator(criteriaList);
+
+        return Query.query(and);
+    }
+
+
+
     /**
      * 鏋勯�犳暟鎹腑蹇冩悳绱㈢殑鏉′欢
      *
@@ -201,4 +278,80 @@
         return qList;
     }
 
+    public static List<Criteria> getAndCriteriaDateCenter(String deptCode,DataCenterQuery params, String timeFiled, List<String> likeFileds, Integer dataAuth) {
+        // 鍏抽敭瀛�
+        List<Criteria> likeList = null;
+        if (StringUtils.hasText(params.getKeyword()) && !CollectionUtils.isEmpty(likeFileds)) {
+            // 杞箟
+            String keyword = Pattern.quote(params.getKeyword());
+            likeList = likeFileds.stream().map(filed -> {
+                return Criteria.where(filed).regex(".*?" + keyword + ".*");
+            }).collect(Collectors.toList());
+        }
+        // 灏唋ike瀛楁or璧锋潵
+        Criteria or = null;
+        if (! CollectionUtils.isEmpty(likeList)) {
+            or = new Criteria();
+            or.orOperator(likeList);
+        }
+
+        Criteria tag = null;
+        // in
+        if (Objects.nonNull(dataAuth)) {
+            switch (dataAuth) {
+                case 1:
+                    tag = Criteria.where("deptTag").is(Boolean.TRUE);
+                    break;
+                case 2:
+                    tag = Criteria.where("provinceTag").is(Boolean.TRUE);
+                    break;
+                case 3:
+                    tag = Criteria.where("importantTag").is(Boolean.TRUE);
+                    break;
+                case 4:
+                    tag = Criteria.where("importantCommandImageTag").is(Boolean.TRUE);
+                    break;
+                case 5:
+                    tag = Criteria.where("newDevice").is(Boolean.TRUE);
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        // 鏃堕棿
+        Criteria time = Criteria.where(timeFiled).gte(params.getStartTime()).lte(params.getEndTime());
+
+        // 鏁版嵁绫诲瀷
+        Criteria dType = null;
+        if (params.getDataType().equals(1)) {
+            dType = Criteria.where("provinceTag").is(Boolean.TRUE);
+        }else if(params.getDataType().equals(2)){
+            dType = Criteria.where("deptTag").is(Boolean.TRUE);
+        }
+        // 鏂板锛歯o瀛楁浠eptCode寮�澶寸殑鏉′欢
+        Criteria noStartsWithDept = null;
+        if (StringUtils.hasText(deptCode)) {
+            // 浣跨敤姝ｅ垯琛ㄨ揪寮忓尮閰嶅紑澶达紝骞惰浆涔夌壒娈婂瓧绗�
+            noStartsWithDept = Criteria.where("deviceNo").regex("^" + Pattern.quote(deptCode));
+        }
+
+        List<Criteria> qList = new ArrayList<>(4);
+
+
+        qList.add(time);
+        if (Objects.nonNull(tag)) {
+            qList.add(tag);
+        }
+        if (Objects.nonNull(or)) {
+            qList.add(or);
+        }
+        if (Objects.nonNull(dType)) {
+            qList.add(dType);
+        }
+        if (Objects.nonNull(noStartsWithDept)) qList.add(noStartsWithDept);
+
+        // 杩斿洖鏌ヨ
+        return qList;
+    }
 }
diff --git a/ycl-server/src/main/resources/application.yml b/ycl-server/src/main/resources/application.yml
index e7c9453..38ec44f 100644
--- a/ycl-server/src/main/resources/application.yml
+++ b/ycl-server/src/main/resources/application.yml
@@ -85,6 +85,8 @@
   level:
     org.springframework: warn
     com.ycl : debug
+    com.ycl.feign: DEBUG
+
 
 # security閰嶇疆
 security:
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
index 6852b2a..d331788 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
@@ -53,6 +53,8 @@
         tc.name as contractName,
         tcr.which_year,
         tcr.which_month,
+        tcr.which_day,
+        MAX(tcr.which_day) AS latest_day,
         SUM(tcr.deduct_money) AS deductMoney,
         MAX(tcr.which_month) AS latest_month,
         (
@@ -73,7 +75,7 @@
                 AND tcr.status = #{query.status}
             </if>
         </where>
-        group by contract_id,which_year
+        group by contract_id, which_year,which_month
     </select>
     <resultMap id="DetailResultMap" type="com.ycl.platform.domain.vo.CalculateReportDetailVO">
         <result column="id" property="id"/>
@@ -83,10 +85,11 @@
         <result column="name" property="contractName"/>
         <result column="contract_id" property="contractId"/>
         <result column="which_year" property="whichYear"/>
+        <result column="which_month" property="whichMonth"/>
         <result column="status" property="status"/>
         <collection property="ruleList" column="contract_id" ofType="com.ycl.platform.domain.vo.CalculateMoneyRuleVO"
                     select="selectRuleByContractId"/>
-        <collection property="recordList" column="{contractId=contract_id, whichYear=which_year,status=status}" ofType="com.ycl.platform.domain.vo.CalculateRecordVO"
+        <collection property="recordList" column="{contractId=contract_id, whichYear=which_year,status=status,whichMonth=which_month}" ofType="com.ycl.platform.domain.vo.CalculateRecordVO"
                     select="selectRecordByContractId"/>
     </resultMap>
 
@@ -107,6 +110,7 @@
         tcr.deduct_money as deductMoney,
         tcr.which_year as whichYear,
         tcr.which_month as whichMonth,
+        tcr.which_day as whichDay,
         tcr.status
         FROM
         t_calculate_record tcr
@@ -117,7 +121,7 @@
                    AND MONTH(tcs.create_time) = tcr.which_month
                    AND tcs.auditing_status = 'PASS'
         <where>
-            tcr.contract_id = #{contractId} AND tcr.which_year = #{whichYear} AND tcr.deleted = 0
+            tcr.contract_id = #{contractId} AND tcr.which_year = #{whichYear} AND tcr.deleted = 0 AND tcr.which_month=#{whichMonth}
             <if test="status!=null">
                 AND tcr.status=#{status}
             </if>
@@ -136,12 +140,13 @@
         tcr.create_time,
         tcr.update_time,
         tcr.which_year,
+        tcr.which_month,
         #{query.status} as status
         FROM t_calculate_record tcr
         INNER JOIN t_contract tc ON tcr.contract_id = tc.id
         INNER JOIN t_yw_unit tyu ON tyu.id = tc.unit_id
         <where>
-            tcr.contract_id = #{query.contractId} AND tcr.which_year = #{query.whichYear}
+            tcr.contract_id = #{query.contractId} AND tcr.which_year = #{query.whichYear} AND tcr.which_month = #{query.whichMonth}
         </where>
         limit 1
     </select>
@@ -166,6 +171,9 @@
             <if test="whichYear!=null">
                 and tcr.which_year = #{whichYear}
             </if>
+            <if test="whichDay!=null">
+                and tcr.which_day = #{whichDay}
+            </if>
         </where>
         GROUP BY a.id
     </select>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index e06eae5..2858c87 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -88,6 +88,9 @@
         <if test="query.start != null and query.end != null">
             AND wo.create_time BETWEEN #{query.start} AND #{query.end}
         </if>
+        <if test="query.dept != null and query.dept != ''">
+            AND wo.serial_number LIKE CONCAT(#{query.dept}, '%')
+        </if>
         GROUP BY
         wo.id, wo.status, wo.work_order_no, wo.serial_number,wo.create_time, wo.unit_id, wo.yw_people_id,tm.name, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
         u.unit_name,

--
Gitblit v1.8.0