From 0e8f471665dc2fae04062e9f0634a6bf15d68a1a Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 24 Jul 2025 17:36:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=BF=9B=E5=BA=A6=E5=88=86?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interceptor/ParamSecureHandler.java | 1 + .../controller/ProjectNewController.java | 24 +++++++++++++------ .../ProjectProgressNewController.java | 14 +++++------ .../screen/domain/ProjectRisk.java | 9 +++++++ .../screen/mapper/ProjectNewMapper.java | 3 +++ .../screen/service/IProjectNewService.java | 3 +++ .../service/impl/ProjectNewServiceImpl.java | 6 +++++ .../resources/mapper/ProjectNewMapper.xml | 6 +++++ 8 files changed, 52 insertions(+), 14 deletions(-) create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectRisk.java diff --git a/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java b/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java index 34b72bf..36dd45d 100644 --- a/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java +++ b/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java @@ -81,6 +81,7 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor { "/largeScreen/deviceEnergyAnalysis/selectAnomalyByDateRange", "/largeScreen/deviceEnergyAnalysis/selectLatestAll", "/largeScreen/tb_project_new/list4progress", + "/largeScreen/tb_project_new/listRiskDetail", }; diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectNewController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectNewController.java index e1e2ffe..a164fcc 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectNewController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectNewController.java @@ -12,6 +12,7 @@ import com.securitycontrol.common.log.annotation.Log; import com.securitycontrol.common.log.enums.OperationType; import com.securitycontrol.screen.WordUtils; import com.securitycontrol.screen.domain.ProjectProgressNew; +import com.securitycontrol.screen.domain.ProjectRisk; import com.securitycontrol.screen.domain.ScreemDocData; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -53,6 +54,15 @@ public class ProjectNewController extends BaseController { return getDataTable(list); } + @ApiOperation(value = "查询工程信息列表") + //@RequiresPermissions("screen:new:list") + @GetMapping("/listRiskDetail") + public TableDataInfo listRiskDetail(ProjectNew projectNew) { + startPage(); + List list = projectNewService.selectProjectRiskDetailList(projectNew); + return getDataTable(list); + } + @ApiOperation(value = "查询工程进度表") @GetMapping("/list4progress") public TableDataInfo list4chart() { @@ -64,25 +74,25 @@ public class ProjectNewController extends BaseController { ProjectNew projectProgress5 = new ProjectNew(); ProjectNew projectProgress6 = new ProjectNew(); ProjectNew projectProgress7 = new ProjectNew(); - projectProgress1.setMonth("一月"); + projectProgress1.setMonth("九月"); projectProgress1.setMonthProgress("90"); projectProgress1.setMonthProgress2("90"); - projectProgress2.setMonth("二月"); + projectProgress2.setMonth("十月"); projectProgress2.setMonthProgress("75"); projectProgress2.setMonthProgress2("73"); - projectProgress3.setMonth("三月"); + projectProgress3.setMonth("十一月"); projectProgress3.setMonthProgress("56"); projectProgress3.setMonthProgress2("60"); - projectProgress4.setMonth("四月"); + projectProgress4.setMonth("十二月"); projectProgress4.setMonthProgress("45"); projectProgress4.setMonthProgress2("44"); - projectProgress5.setMonth("五月"); + projectProgress5.setMonth("元月"); projectProgress5.setMonthProgress("33"); projectProgress5.setMonthProgress2("31"); - projectProgress6.setMonth("六月"); + projectProgress6.setMonth("二月"); projectProgress6.setMonthProgress("22"); projectProgress6.setMonthProgress2("20"); - projectProgress7.setMonth("七月"); + projectProgress7.setMonth("三月"); projectProgress7.setMonthProgress("9"); projectProgress7.setMonthProgress2("5"); list.add(projectProgress1); diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectProgressNewController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectProgressNewController.java index ce100da..9393d25 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectProgressNewController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectProgressNewController.java @@ -57,25 +57,25 @@ public class ProjectProgressNewController extends BaseController { ProjectProgressNew projectProgress5 = new ProjectProgressNew(); ProjectProgressNew projectProgress6 = new ProjectProgressNew(); ProjectProgressNew projectProgress7 = new ProjectProgressNew(); - projectProgress1.setMonth("一月"); + projectProgress1.setMonth("九月"); projectProgress1.setMonthValue("60"); projectProgress1.setMonthValue2("80"); - projectProgress2.setMonth("二月"); + projectProgress2.setMonth("十月"); projectProgress2.setMonthValue("90"); projectProgress2.setMonthValue2("100"); - projectProgress3.setMonth("三月"); + projectProgress3.setMonth("十一月"); projectProgress3.setMonthValue("50"); projectProgress3.setMonthValue2("65"); - projectProgress4.setMonth("四月"); + projectProgress4.setMonth("十二月"); projectProgress4.setMonthValue("80"); projectProgress4.setMonthValue2("92"); - projectProgress5.setMonth("五月"); + projectProgress5.setMonth("元月"); projectProgress5.setMonthValue("100"); projectProgress5.setMonthValue2("108"); - projectProgress6.setMonth("六月"); + projectProgress6.setMonth("二月"); projectProgress6.setMonthValue("75"); projectProgress6.setMonthValue2("88"); - projectProgress7.setMonth("七月"); + projectProgress7.setMonth("三月"); projectProgress7.setMonthValue("85"); projectProgress7.setMonthValue2("98"); list.add(projectProgress1); diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectRisk.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectRisk.java new file mode 100644 index 0000000..cb8a061 --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectRisk.java @@ -0,0 +1,9 @@ +package com.securitycontrol.screen.domain; + +import lombok.Data; + +@Data +public class ProjectRisk { + private String proPart; + private String riskDesc; +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ProjectNewMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ProjectNewMapper.java index 8930d78..70d59bb 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ProjectNewMapper.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ProjectNewMapper.java @@ -2,6 +2,7 @@ package com.securitycontrol.screen.mapper; import java.util.List; import com.securitycontrol.screen.domain.ProjectNew; +import com.securitycontrol.screen.domain.ProjectRisk; import com.securitycontrol.screen.domain.ScreemDocData; /** @@ -27,6 +28,8 @@ public interface ProjectNewMapper { */ public List selectProjectNewList(ProjectNew projectNew); + public List selectProjectRiskDetailList(ProjectNew projectNew); + /** * 新增工程信息 * diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IProjectNewService.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IProjectNewService.java index f3cd1cf..ed1dc89 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IProjectNewService.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IProjectNewService.java @@ -2,6 +2,7 @@ package com.securitycontrol.screen.service; import java.util.List; import com.securitycontrol.screen.domain.ProjectNew; +import com.securitycontrol.screen.domain.ProjectRisk; import com.securitycontrol.screen.domain.ScreemDocData; /** @@ -27,6 +28,8 @@ public interface IProjectNewService { */ public List selectProjectNewList(ProjectNew projectNew); + public List selectProjectRiskDetailList(ProjectNew projectNew); + /** * 新增工程信息 * diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectNewServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectNewServiceImpl.java index 49584a3..26e7c0c 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectNewServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectNewServiceImpl.java @@ -3,6 +3,7 @@ package com.securitycontrol.screen.service.impl; import java.util.Collections; import java.util.List; +import com.securitycontrol.screen.domain.ProjectRisk; import com.securitycontrol.screen.domain.ScreemDocData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,6 +44,11 @@ public class ProjectNewServiceImpl implements IProjectNewService { return projectNewMapper.selectProjectNewList(projectNew); } + @Override + public List selectProjectRiskDetailList(ProjectNew projectNew) { + return projectNewMapper.selectProjectRiskDetailList(projectNew); + } + /** * 新增工程信息 * diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml index cce9cfa..7607949 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml @@ -49,6 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and task_name = #{taskName} + +