diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java index f1fa6cbf..d0ec3ada 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java @@ -1,15 +1,13 @@ package com.zdxt.enforcementcode.controller.app.enforcement; -import cn.dev33.satoken.annotation.SaIgnore; import com.zdxt.enforcementcode.common.util.StringUtils; import com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo; -import com.zdxt.enforcementcode.service.ComprehensiveAnalysisService; +import com.zdxt.enforcementcode.service.IComprehensiveAnalysisService; import org.dromara.common.core.domain.R; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.vo.SysDeptVo; -import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.mapper.SysDeptMapper; import org.dromara.system.mapper.SysUserMapper; import org.dromara.system.service.ISysDeptService; @@ -26,7 +24,7 @@ import org.springframework.web.bind.annotation.ResponseBody; @RequestMapping("/app-enf/appComprehensiveAnalysis") public class AppComprehensiveAnalysisController extends BaseController { @Autowired - private ComprehensiveAnalysisService comprehensiveAnalysisService; + private IComprehensiveAnalysisService comprehensiveAnalysisService; @Autowired private SysDeptMapper deptMapper; @Autowired diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/StatisticsComplaintController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/StatisticsComplaintController.java index 23281ee3..279d3110 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/StatisticsComplaintController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/StatisticsComplaintController.java @@ -1,12 +1,11 @@ package com.zdxt.enforcementcode.controller.web.supervision.report; -import cn.dev33.satoken.annotation.SaIgnore; import com.zdxt.enforcementcode.domain.ComplaintStatistics; import com.zdxt.enforcementcode.domain.MssqOrderFlow; import com.zdxt.enforcementcode.domain.bo.ComplaintStatisticsBo; import com.zdxt.enforcementcode.domain.vo.report.*; import com.zdxt.enforcementcode.report.IStatisticsComplaintReport; -import com.zdxt.enforcementcode.service.ComplaintsReportService; +import com.zdxt.enforcementcode.service.IComplaintsReportService; import com.zdxt.enforcementcode.service.IEnterpriseComplaintService; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; @@ -15,7 +14,6 @@ import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.springframework.ui.Model; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -36,7 +34,7 @@ import java.util.Map; public class StatisticsComplaintController { private final IStatisticsComplaintReport reportService; - private final ComplaintsReportService complaintsReportService; + private final IComplaintsReportService complaintsReportService; private final IEnterpriseComplaintService iEnterpriseComplaintService; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ComplaintsReportService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IComplaintsReportService.java similarity index 92% rename from zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ComplaintsReportService.java rename to zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IComplaintsReportService.java index 1d959864..8613470a 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ComplaintsReportService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IComplaintsReportService.java @@ -4,7 +4,7 @@ import com.zdxt.enforcementcode.domain.ComplaintStatistics; import java.util.List; -public interface ComplaintsReportService { +public interface IComplaintsReportService { /** * 获取投诉举报列表,合并两个投诉表的投诉部门 * @param complaintStatistics diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ComprehensiveAnalysisService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IComprehensiveAnalysisService.java similarity index 94% rename from zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ComprehensiveAnalysisService.java rename to zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IComprehensiveAnalysisService.java index 9316da4c..fc2c582d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ComprehensiveAnalysisService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IComprehensiveAnalysisService.java @@ -4,7 +4,11 @@ import com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo; import java.util.List; -public interface ComprehensiveAnalysisService { +public interface IComprehensiveAnalysisService { + + /** + * web:获取综合分析数据 + */ ComprehensiveAnalysisBo whole(ComprehensiveAnalysisBo comprehensiveAnalysis); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComplaintsReportServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComplaintsReportServiceImpl.java index 02986790..d6687140 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComplaintsReportServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComplaintsReportServiceImpl.java @@ -6,7 +6,7 @@ import com.zdxt.enforcementcode.domain.ZdxtFile; import com.zdxt.enforcementcode.mapper.ComplaintStatisticsMapper; import com.zdxt.enforcementcode.mapper.EnterpriseComplaintMapper; import com.zdxt.enforcementcode.mapper.ZdxtFileMapper; -import com.zdxt.enforcementcode.service.ComplaintsReportService; +import com.zdxt.enforcementcode.service.IComplaintsReportService; import com.zdxt.enforcementcode.service.IEnterpriseComplaintService; import org.dromara.system.mapper.SysDictDataMapper; import org.springframework.beans.factory.annotation.Autowired; @@ -17,7 +17,7 @@ import java.util.List; import java.util.stream.Collectors; @Service -public class ComplaintsReportServiceImpl implements ComplaintsReportService { +public class ComplaintsReportServiceImpl implements IComplaintsReportService { @Autowired private ComplaintStatisticsMapper complaintStatisticsMapper; @Autowired diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComprehensiveAnalysisServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComprehensiveAnalysisServiceImpl.java index 754f0563..3e987da3 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComprehensiveAnalysisServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComprehensiveAnalysisServiceImpl.java @@ -2,11 +2,9 @@ package com.zdxt.enforcementcode.service.impl; import com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo; import com.zdxt.enforcementcode.mapper.ComprehensiveAnalysisMapper; -import com.zdxt.enforcementcode.service.ComprehensiveAnalysisService; -import org.dromara.system.domain.SysDept; +import com.zdxt.enforcementcode.service.IComprehensiveAnalysisService; import org.dromara.system.domain.bo.SysDictDataBo; import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.mapper.SysDeptMapper; import org.dromara.system.mapper.SysDictDataMapper; import org.dromara.system.mapper.SysUserMapper; @@ -17,7 +15,7 @@ import java.util.*; import java.util.stream.Collectors; @Service -public class ComprehensiveAnalysisServiceImpl implements ComprehensiveAnalysisService { +public class ComprehensiveAnalysisServiceImpl implements IComprehensiveAnalysisService { @Autowired private ComprehensiveAnalysisMapper comprehensiveAnalysisMapper; @Autowired