From 1be8a758c4d86b16cd62ae36c8f810f0466c8062 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 24 Jul 2025 16:52:52 +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 | 2 +- .../controller/ProjectNewController.java | 40 +++++++++++++++++-- .../screen/domain/ProjectNew.java | 4 ++ 3 files changed, 41 insertions(+), 5 deletions(-) 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 a01ecd3..34b72bf 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 @@ -80,7 +80,7 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor { "/largeScreen/deviceEnergyAnalysis/selectDeviceEnergyByDateRange", "/largeScreen/deviceEnergyAnalysis/selectAnomalyByDateRange", "/largeScreen/deviceEnergyAnalysis/selectLatestAll", - + "/largeScreen/tb_project_new/list4progress", }; 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 4e6dba1..a6543a6 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 @@ -1,10 +1,7 @@ package com.securitycontrol.screen.controller; import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; +import java.util.*; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; @@ -14,6 +11,7 @@ import com.securitycontrol.common.core.web.page.TableDataInfo; 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.ScreemDocData; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -55,6 +53,40 @@ public class ProjectNewController extends BaseController { return getDataTable(list); } + @ApiOperation(value = "查询工程进度表") + @GetMapping("/list4progress") + public TableDataInfo list4chart() { + List list = new ArrayList<>(); + ProjectNew projectProgress1 = new ProjectNew(); + ProjectNew projectProgress2 = new ProjectNew(); + ProjectNew projectProgress3 = new ProjectNew(); + ProjectNew projectProgress4 = new ProjectNew(); + ProjectNew projectProgress5 = new ProjectNew(); + ProjectNew projectProgress6 = new ProjectNew(); + ProjectNew projectProgress7 = new ProjectNew(); + projectProgress1.setMonth("一月"); + projectProgress1.setMonthProgress("90"); + projectProgress2.setMonth("二月"); + projectProgress2.setMonthProgress("75"); + projectProgress3.setMonth("三月"); + projectProgress3.setMonthProgress("56"); + projectProgress4.setMonth("四月"); + projectProgress4.setMonthProgress("45"); + projectProgress5.setMonth("五月"); + projectProgress5.setMonthProgress("33"); + projectProgress6.setMonth("六月"); + projectProgress6.setMonthProgress("22"); + projectProgress7.setMonth("七月"); + projectProgress7.setMonthProgress("9"); + list.add(projectProgress1); + list.add(projectProgress2); + list.add(projectProgress3); + list.add(projectProgress4); + list.add(projectProgress5); + list.add(projectProgress6); + list.add(projectProgress7); + return getDataTable(list); + } /** * 获取工程信息详细信息 diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java index 33be8fc..a07216b 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java @@ -83,4 +83,8 @@ public class ProjectNew extends BaseEntity { private String suggestion; private String taskName; + + private String month; + + private String monthProgress; }