From 36b334b8f33a4b37c98c242712bf334099cf9b0f Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Sat, 15 Mar 2025 10:33:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=B1=BB=E5=90=8D=E5=8C=85=E5=90=8D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/DfYhHiddenDangerDto.java}             |  5 ++---
 .../dto}/DfYhStatisticsModelDto.java          |  2 +-
 .../kms/yxgh/df/mapper/DfRecordMapper.java    |  6 ++---
 .../kms/yxgh/df/mapper/DfYhRecordMapper.java  |  3 +--
 .../kms/yxgh/df/service/DfRecordService.java  | 22 ++++++++-----------
 .../yxgh/df/service/DfYhRecordService.java    |  9 +-------
 .../DwCheckingProblemV2Controller.java        |  2 +-
 .../DwCheckingRecordV2Controller.java         |  2 +-
 .../DwCheckingV2Controller.java               |  2 +-
 .../DwYhV2Controller.java                     |  2 +-
 .../kms/yxgh/sz/mapper/SzRecordMapper.java    |  4 ----
 11 files changed, 21 insertions(+), 38 deletions(-)
 rename shuili-system/src/main/java/com/kms/yxgh/{model/DfYhHiddenDangerModel.java => common/dto/DfYhHiddenDangerDto.java} (83%)
 rename shuili-system/src/main/java/com/kms/yxgh/{model => common/dto}/DfYhStatisticsModelDto.java (93%)
 rename shuili-system/src/main/java/com/kms/yxgh/dw/{ontroller => controller}/DwCheckingProblemV2Controller.java (96%)
 rename shuili-system/src/main/java/com/kms/yxgh/dw/{ontroller => controller}/DwCheckingRecordV2Controller.java (98%)
 rename shuili-system/src/main/java/com/kms/yxgh/dw/{ontroller => controller}/DwCheckingV2Controller.java (98%)
 rename shuili-system/src/main/java/com/kms/yxgh/dw/{ontroller => controller}/DwYhV2Controller.java (98%)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/model/DfYhHiddenDangerModel.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/DfYhHiddenDangerDto.java
similarity index 83%
rename from shuili-system/src/main/java/com/kms/yxgh/model/DfYhHiddenDangerModel.java
rename to shuili-system/src/main/java/com/kms/yxgh/common/dto/DfYhHiddenDangerDto.java
index c97c6bc4..3bdf3150 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/model/DfYhHiddenDangerModel.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/DfYhHiddenDangerDto.java
@@ -1,6 +1,5 @@
-package com.kms.yxgh.model;
+package com.kms.yxgh.common.dto;
 
-import com.kms.yxgh.df.dto.DfYhHiddenDangerDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,7 +15,7 @@ import lombok.Data;
 
 @ApiModel("巡查隐患概览统计")
 @Data
-public class DfYhHiddenDangerModel {
+public class DfYhHiddenDangerDto {
 
     @ApiModelProperty("地区code")
     private String adcd;
diff --git a/shuili-system/src/main/java/com/kms/yxgh/model/DfYhStatisticsModelDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/DfYhStatisticsModelDto.java
similarity index 93%
rename from shuili-system/src/main/java/com/kms/yxgh/model/DfYhStatisticsModelDto.java
rename to shuili-system/src/main/java/com/kms/yxgh/common/dto/DfYhStatisticsModelDto.java
index 2c62e501..81fba09b 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/model/DfYhStatisticsModelDto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/DfYhStatisticsModelDto.java
@@ -1,4 +1,4 @@
-package com.kms.yxgh.model;
+package com.kms.yxgh.common.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java
index 3b4ae32b..0c9bb868 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java
@@ -6,7 +6,7 @@ import com.kms.yxgh.df.domain.DfRecord;
 import com.kms.yxgh.df.dto.DfRecordSearchDto;
 import com.kms.yxgh.df.dto.DfRecordSimpleDto;
 import com.kms.yxgh.df.dto.DfYhHiddenDangerQueDto;
-import com.kms.yxgh.model.DfYhHiddenDangerModel;
+import com.kms.yxgh.common.dto.DfYhHiddenDangerDto;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -98,7 +98,7 @@ public interface DfRecordMapper extends BaseMapper<DfRecord> {
             "and (lz.PROBLEM is null or lz.PROBLEM = '') " +
             "group by base.adcd " +
             "</script>")
-    List<DfYhHiddenDangerModel> yhNumberData(@Param("dto") DfYhHiddenDangerQueDto dto);
+    List<DfYhHiddenDangerDto> yhNumberData(@Param("dto") DfYhHiddenDangerQueDto dto);
 
 
     @Select("<script>" +
@@ -117,7 +117,7 @@ public interface DfRecordMapper extends BaseMapper<DfRecord> {
             "and (lz.HANDLE_TIME is null ) " +
             "group by base.adcd " +
             "</script>")
-    List<DfYhHiddenDangerModel> clfNumberData(@Param("dto") DfYhHiddenDangerQueDto dto);
+    List<DfYhHiddenDangerDto> clfNumberData(@Param("dto") DfYhHiddenDangerQueDto dto);
 
 
 //    @Select("<script>" +
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java
index cf7125a8..53d04588 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java
@@ -12,8 +12,7 @@ import com.kms.yxgh.df.domain.DfYhRecord;
 import com.kms.yxgh.df.dto.DfYhRecordApprovalDto;
 import com.kms.yxgh.df.dto.DfYhRecordDetailDto;
 import com.kms.yxgh.df.dto.DfYhRecordSearchDto;
-import com.kms.yxgh.df.dto.DfYhStatisticsDto;
-import com.kms.yxgh.model.DfYhStatisticsModelDto;
+import com.kms.yxgh.common.dto.DfYhStatisticsModelDto;
 import com.kms.yxgh.df.dto.DfYhStatisticsQueDto;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Result;
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java
index ce08fe5f..64b643f6 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java
@@ -3,7 +3,6 @@ package com.kms.yxgh.df.service;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,20 +20,17 @@ import com.kms.yxgh.df.dto.DfRecordDetailExportDto;
 import com.kms.yxgh.df.dto.DfRecordSearchDto;
 import com.kms.yxgh.df.dto.DfRecordSimpleDto;
 import com.kms.yxgh.df.dto.DfYhCharHiddenDangerDto;
-import com.kms.yxgh.df.dto.DfYhCharInfoDto;
 import com.kms.yxgh.df.dto.DfYhHiddenDangerQueDto;
 import com.kms.yxgh.df.mapper.DfCheckingItemMapper;
 import com.kms.yxgh.df.mapper.DfCheckingLineMapper;
 import com.kms.yxgh.df.mapper.DfPlanOperatorMapper;
 import com.kms.yxgh.df.mapper.DfRecordMapper;
-import com.kms.yxgh.model.DfYhHiddenDangerModel;
-import com.kms.yxgh.model.DfYhStatisticsModelDto;
+import com.kms.yxgh.common.dto.DfYhHiddenDangerDto;
 import com.kms.yxgh.util.BeanCopyUtils;
 import com.kms.yxgh.util.StreamUtils;
 import com.shuili.common.core.domain.AjaxResult;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.core.service.BaseService;
-import com.shuili.common.enums.DfEnum;
 import com.shuili.common.utils.StringUtils;
 import com.shuili.common.utils.poi.ExcelUtil;
 import lombok.AllArgsConstructor;
@@ -75,22 +71,22 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
         // 处置数
         dfYhCharHiddenDangerDto.setCzNumber(baseMapper.clCountNumber(dto));
 
-        List<DfYhHiddenDangerModel> list = new ArrayList<>();
+        List<DfYhHiddenDangerDto> list = new ArrayList<>();
         // 隐患数量数据
-        List<DfYhHiddenDangerModel> yhModel = baseMapper.yhNumberData(dto);
+        List<DfYhHiddenDangerDto> yhModel = baseMapper.yhNumberData(dto);
         if (!CollectionUtil.isEmpty(yhModel)) {
             list.addAll(yhModel);
         }
         // 处理数量数据
-        List<DfYhHiddenDangerModel> clModel = baseMapper.clfNumberData(dto);
+        List<DfYhHiddenDangerDto> clModel = baseMapper.clfNumberData(dto);
         if (CollectionUtil.isEmpty(list)) {
             return dfYhCharHiddenDangerDto;
         }
 
         list.addAll(clModel);
-        Map<String, List<DfYhHiddenDangerModel>> groupingByList = list.stream()
+        Map<String, List<DfYhHiddenDangerDto>> groupingByList = list.stream()
                 .filter(s -> !StringUtils.isEmpty(s.getAdcd())) // 过滤掉空字符串
-                .collect(Collectors.groupingBy(DfYhHiddenDangerModel::getAdcd));
+                .collect(Collectors.groupingBy(DfYhHiddenDangerDto::getAdcd));
 
         if (!CollectionUtil.isEmpty(groupingByList)) {
             List<String> xList = new ArrayList<>();
@@ -109,7 +105,7 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
                 }
             }
 
-            for (Map.Entry<String, List<DfYhHiddenDangerModel>> entry : groupingByList.entrySet()) {
+            for (Map.Entry<String, List<DfYhHiddenDangerDto>> entry : groupingByList.entrySet()) {
                 // 设置 x轴
                 // 转换名称
                 if (!flag) {
@@ -131,9 +127,9 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
         return dfYhCharHiddenDangerDto;
     }
 
-    private DfYhCharHiddenDangerDto.YAxis getyAxis(Map.Entry<String, List<DfYhHiddenDangerModel>> entry) {
+    private DfYhCharHiddenDangerDto.YAxis getyAxis(Map.Entry<String, List<DfYhHiddenDangerDto>> entry) {
         List<DfYhCharHiddenDangerDto.Series> seriesList = new ArrayList<>();
-        for (DfYhHiddenDangerModel it : entry.getValue()) {
+        for (DfYhHiddenDangerDto it : entry.getValue()) {
             DfYhCharHiddenDangerDto.Series series = new DfYhCharHiddenDangerDto.Series();
             series.setCount(it.getCount());
             series.setType(it.getProblem());
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java
index 64662d90..02a7b780 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java
@@ -7,9 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.base.Objects;
 import com.kms.system.domain.SysXzqh;
-import com.kms.system.service.SysUserService;
 import com.kms.system.service.SysXzqhService;
 import com.kms.yxgh.base.DfException;
 import com.kms.yxgh.common.ApprovalStatusEnum;
@@ -20,24 +18,19 @@ import com.kms.yxgh.df.dto.DfYhCharInfoDto;
 import com.kms.yxgh.df.dto.DfYhRecordApprovalDto;
 import com.kms.yxgh.df.dto.DfYhRecordDetailDto;
 import com.kms.yxgh.df.dto.DfYhRecordSearchDto;
-import com.kms.yxgh.df.dto.DfYhStatisticsDto;
-import com.kms.yxgh.model.DfYhStatisticsModelDto;
+import com.kms.yxgh.common.dto.DfYhStatisticsModelDto;
 import com.kms.yxgh.df.dto.DfYhStatisticsQueDto;
 import com.kms.yxgh.df.mapper.DfYhRecordMapper;
 import com.kms.yxgh.util.BeanCopyUtils;
 import com.shuili.common.core.domain.SearchParam;
 import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/ontroller/DwCheckingProblemV2Controller.java b/shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwCheckingProblemV2Controller.java
similarity index 96%
rename from shuili-system/src/main/java/com/kms/yxgh/dw/ontroller/DwCheckingProblemV2Controller.java
rename to shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwCheckingProblemV2Controller.java
index a5e5ab98..fb62fe93 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/dw/ontroller/DwCheckingProblemV2Controller.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwCheckingProblemV2Controller.java
@@ -1,4 +1,4 @@
-package com.kms.yxgh.dw.ontroller;
+package com.kms.yxgh.dw.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.kms.yxgh.dw.dto.DwProblemV2Dto;
diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/ontroller/DwCheckingRecordV2Controller.java b/shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwCheckingRecordV2Controller.java
similarity index 98%
rename from shuili-system/src/main/java/com/kms/yxgh/dw/ontroller/DwCheckingRecordV2Controller.java
rename to shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwCheckingRecordV2Controller.java
index a32c59c2..4af57c5b 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/dw/ontroller/DwCheckingRecordV2Controller.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwCheckingRecordV2Controller.java
@@ -1,4 +1,4 @@
-package com.kms.yxgh.dw.ontroller;
+package com.kms.yxgh.dw.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.kms.yxgh.base.Response;
diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/ontroller/DwCheckingV2Controller.java b/shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwCheckingV2Controller.java
similarity index 98%
rename from shuili-system/src/main/java/com/kms/yxgh/dw/ontroller/DwCheckingV2Controller.java
rename to shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwCheckingV2Controller.java
index 7a70c719..df0f5d03 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/dw/ontroller/DwCheckingV2Controller.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwCheckingV2Controller.java
@@ -1,4 +1,4 @@
-package com.kms.yxgh.dw.ontroller;
+package com.kms.yxgh.dw.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.kms.yxgh.base.Response;
diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/ontroller/DwYhV2Controller.java b/shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwYhV2Controller.java
similarity index 98%
rename from shuili-system/src/main/java/com/kms/yxgh/dw/ontroller/DwYhV2Controller.java
rename to shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwYhV2Controller.java
index 56b88e81..db6a162a 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/dw/ontroller/DwYhV2Controller.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwYhV2Controller.java
@@ -1,4 +1,4 @@
-package com.kms.yxgh.dw.ontroller;
+package com.kms.yxgh.dw.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.kms.yxgh.base.Response;
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java
index eaac20e3..1ce73e1e 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java
@@ -2,10 +2,6 @@ package com.kms.yxgh.sz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.kms.yxgh.df.dto.DfYhHiddenDangerQueDto;
-import com.kms.yxgh.df.dto.DfYhStatisticsQueDto;
-import com.kms.yxgh.model.DfYhHiddenDangerModel;
-import com.kms.yxgh.model.DfYhStatisticsModelDto;
 import com.kms.yxgh.sz.domain.SzRecord;
 import com.kms.yxgh.sz.dto.SzCharInfoItemQueDto;
 import com.kms.yxgh.sz.dto.SzCharInfoQueDto;