From b648e0d38e6170d7a4a890bfe55e5dfc80697485 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 23 Jul 2025 22:27:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=92=8C=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interceptor/ParamSecureHandler.java | 4 +- .../ProjectProgressNewController.java | 65 +++++++++++++++++++ .../screen/domain/ProjectProgressNew.java | 9 +++ 3 files changed, 77 insertions(+), 1 deletion(-) 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 791bcff..69ad3ba 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 @@ -63,7 +63,9 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor { "/largeScreen/constrDisplay/pushImageData", "/largeScreen/tb_project_new/list", "/largeScreen/environment/getEnvironmentList", - "/largeScreen/tb_project_progress_new/list" + "/largeScreen/tb_project_progress_new/list", + "/largeScreen/tb_project_progress_new/list4chart", + "/largeScreen/tb_project_progress_new/list4bing" }; /** 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 af27166..77f9184 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 @@ -1,5 +1,6 @@ package com.securitycontrol.screen.controller; +import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -45,6 +46,70 @@ public class ProjectProgressNewController extends BaseController { return getDataTable(list); } + @ApiOperation(value = "查询工程进度列表") + @GetMapping("/list4chart") + public TableDataInfo list4chart() { + List list = new ArrayList<>(); + ProjectProgressNew projectProgress1 = new ProjectProgressNew(); + ProjectProgressNew projectProgress2 = new ProjectProgressNew(); + ProjectProgressNew projectProgress3 = new ProjectProgressNew(); + ProjectProgressNew projectProgress4 = new ProjectProgressNew(); + ProjectProgressNew projectProgress5 = new ProjectProgressNew(); + ProjectProgressNew projectProgress6 = new ProjectProgressNew(); + projectProgress1.setMonth("一月"); + projectProgress1.setMonthValue("60"); + projectProgress1.setMonthValue2("80"); + projectProgress2.setMonth("二月"); + projectProgress2.setMonthValue("90"); + projectProgress2.setMonthValue2("100"); + projectProgress3.setMonth("三月"); + projectProgress3.setMonthValue("50"); + projectProgress3.setMonthValue2("65"); + projectProgress4.setMonth("四月"); + projectProgress4.setMonthValue("80"); + projectProgress4.setMonthValue2("92"); + projectProgress5.setMonth("五月"); + projectProgress5.setMonthValue("100"); + projectProgress5.setMonthValue2("108"); + projectProgress6.setMonth("六月"); + projectProgress6.setMonthValue("75"); + projectProgress6.setMonthValue2("88"); + list.add(projectProgress1); + list.add(projectProgress2); + list.add(projectProgress3); + list.add(projectProgress4); + list.add(projectProgress5); + list.add(projectProgress6); + return getDataTable(list); + } + + @ApiOperation(value = "查询工程进度列表") + @GetMapping("/list4bing") + public TableDataInfo list4bing() { + List list = new ArrayList<>(); + ProjectProgressNew projectProgress1 = new ProjectProgressNew(); + ProjectProgressNew projectProgress2 = new ProjectProgressNew(); + ProjectProgressNew projectProgress3 = new ProjectProgressNew(); + ProjectProgressNew projectProgress4 = new ProjectProgressNew(); + ProjectProgressNew projectProgress5 = new ProjectProgressNew(); + projectProgress1.setCategory("大气影响"); + projectProgress1.setMonthValue("21"); + projectProgress2.setMonth("设备判断延迟"); + projectProgress2.setMonthValue("34"); + projectProgress3.setMonth("人员不足"); + projectProgress3.setMonthValue("22"); + projectProgress4.setMonth("设计变更"); + projectProgress4.setMonthValue("16"); + projectProgress5.setMonth("其他"); + projectProgress5.setMonthValue("7"); + list.add(projectProgress1); + list.add(projectProgress2); + list.add(projectProgress3); + list.add(projectProgress4); + list.add(projectProgress5); + return getDataTable(list); + } + /** * 获取工程进度详细信息 */ diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java index eadfde6..54ef82f 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java @@ -82,5 +82,14 @@ public class ProjectProgressNew extends BaseEntity { /** 关键路径任务标识（是 / 否） */ private String keyPathFlag; + private String month; + + private String monthValue; + + private String monthValue2; + + private String category; + + private String categoryValue; }