From 0985925479e0367d72c4dc7de8f019d1310e9b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E9=94=A6=E8=B4=A4?= <996842803@qq.com> Date: Thu, 21 May 2026 16:04:37 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=83=BD=E8=80=97=E7=BB=9F=E8=AE=A1):=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=92=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataAnalysisServiceImpl.java | 11 -- .../mapper/report/ReportPointDnbMapper.xml | 72 ++++++---- .../main/resources/mapper/open/OpenMapper.xml | 1 + sql/factory/26.0520.01.sql | 127 ++++++++++++++++++ 4 files changed, 175 insertions(+), 36 deletions(-) create mode 100644 sql/factory/26.0520.01.sql diff --git a/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java b/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java index 95dd0d12d..2bfa8ccc9 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java @@ -662,17 +662,6 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService { } else if (energyType.equals("3")) { energyList = reportPointWaterMapper.energyStatisticsData(paramMap); } -// Map sumMap = new HashMap<>(); -// if (energyList.size() > 0){ -// sumMap.put("monitorName","合计："); -// BigDecimal expend = new BigDecimal("0.00"); -// for (Map stringStringMap : energyList) { -// expend = expend.add(new BigDecimal(String.valueOf(stringStringMap.get("expend")))); -// sumMap.put("timeRange", String.valueOf(stringStringMap.get("timeRange"))); -// } -// sumMap.put("expend", expend.toPlainString()); -// energyList.add(sumMap); -// } } catch (Exception e) { System.out.println("能耗统计返回数据:" + e.getMessage()); } diff --git a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml index 70334cc77..0abd968b5 100644 --- a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml +++ b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml @@ -229,34 +229,50 @@ diff --git a/sql/factory/26.0520.01.sql b/sql/factory/26.0520.01.sql new file mode 100644 index 000000000..8060c41c1 --- /dev/null +++ b/sql/factory/26.0520.01.sql @@ -0,0 +1,127 @@ +/* + Navicat Premium Data Transfer + + Source Server : MES + Source Server Type : SQL Server + Source Server Version : 15002000 (15.00.2000) + Source Host : 192.168.202.21:1433 + Source Catalog : lanju_op_xiaolan_ds + Source Schema : dbo + + Target Server Type : SQL Server + Target Server Version : 15002000 (15.00.2000) + File Encoding : 65001 + + Date: 20/05/2026 16:36:44 +*/ + + +-- ---------------------------- +-- Table structure for report_day_dnb +-- ---------------------------- +IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[report_day_dnb]') AND type IN ('U')) + DROP TABLE [dbo].[report_day_dnb] +GO + +CREATE TABLE [dbo].[report_day_dnb] ( + [objid] int IDENTITY(1,1) NOT NULL, + [dept_id] int NULL, + [user_id] int NULL, + [monitor_id] varchar(64) COLLATE Chinese_PRC_CI_AS NULL, + [collect_time] datetime NULL, + [kwh1] decimal(18,2) NULL, + [kwh2] decimal(18,2) NULL, + [kwh3] decimal(18,2) NULL, + [kwh4] decimal(18,2) NULL, + [total_kwh] decimal(18,2) NULL +) +GO + +ALTER TABLE [dbo].[report_day_dnb] SET (LOCK_ESCALATION = TABLE) +GO + +EXEC sp_addextendedproperty +'MS_Description', N'自增标识', +'SCHEMA', N'dbo', +'TABLE', N'report_day_dnb', +'COLUMN', N'objid' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'权限标识（部门）', +'SCHEMA', N'dbo', +'TABLE', N'report_day_dnb', +'COLUMN', N'dept_id' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'权限标识（用户）', +'SCHEMA', N'dbo', +'TABLE', N'report_day_dnb', +'COLUMN', N'user_id' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'计量设备编号', +'SCHEMA', N'dbo', +'TABLE', N'report_day_dnb', +'COLUMN', N'monitor_id' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'读取日期', +'SCHEMA', N'dbo', +'TABLE', N'report_day_dnb', +'COLUMN', N'collect_time' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'已用尖电能量', +'SCHEMA', N'dbo', +'TABLE', N'report_day_dnb', +'COLUMN', N'kwh1' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'已用峰电能量', +'SCHEMA', N'dbo', +'TABLE', N'report_day_dnb', +'COLUMN', N'kwh2' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'已用平电能量', +'SCHEMA', N'dbo', +'TABLE', N'report_day_dnb', +'COLUMN', N'kwh3' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'已用谷电能量', +'SCHEMA', N'dbo', +'TABLE', N'report_day_dnb', +'COLUMN', N'kwh4' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'总的已用冻结电量', +'SCHEMA', N'dbo', +'TABLE', N'report_day_dnb', +'COLUMN', N'total_kwh' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'电日耗报表', +'SCHEMA', N'dbo', +'TABLE', N'report_day_dnb' +GO + + +-- ---------------------------- +-- Primary Key structure for table report_day_dnb +-- ---------------------------- +ALTER TABLE [dbo].[report_day_dnb] ADD CONSTRAINT [PK__report_d__530D6FE4397E551D] PRIMARY KEY CLUSTERED ([objid]) +WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) +ON [PRIMARY] +GO +